handlerClass ) throws IOException, ServletException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
\ No newline at end of file
diff --git a/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java b/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java
index 9daddaf85a..2179aeac41 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java
@@ -49,467 +49,477 @@
*/
public class EnhancedMockHttpServletResponse implements HttpServletResponse {
- public static final int DEFAULT_SERVER_PORT = 80;
+ public static final int DEFAULT_SERVER_PORT = 80;
- private static final String CHARSET_PREFIX = "charset=";
+ private static final String CHARSET_PREFIX = "charset=";
- //---------------------------------------------------------------------
- // ServletResponse properties
- //---------------------------------------------------------------------
+ //---------------------------------------------------------------------
+ // ServletResponse properties
+ //---------------------------------------------------------------------
- private boolean outputStreamAccessAllowed = true;
+ private boolean outputStreamAccessAllowed = true;
- private boolean writerAccessAllowed = true;
+ private boolean writerAccessAllowed = true;
- private String characterEncoding = "ISO-8859-1";
+ private String characterEncoding = "ISO-8859-1";
- private final ByteArrayOutputStream content = new ByteArrayOutputStream();
+ private final ByteArrayOutputStream content = new ByteArrayOutputStream();
- private final ServletOutputStream outputStream = new ResponseServletOutputStream(this.content);
+ private final ServletOutputStream outputStream = new ResponseServletOutputStream(this.content);
- private PrintWriter writer;
+ private PrintWriter writer;
- private int contentLength = 0;
+ private int contentLength = 0;
- private String contentType;
+ private String contentType;
- private int bufferSize = 4096;
+ private int bufferSize = 4096;
- private boolean committed;
+ private boolean committed;
- private Locale locale = Locale.getDefault();
+ private Locale locale = Locale.getDefault();
- //---------------------------------------------------------------------
- // HttpServletResponse properties
- //---------------------------------------------------------------------
+ //---------------------------------------------------------------------
+ // HttpServletResponse properties
+ //---------------------------------------------------------------------
- private final List cookies = new ArrayList();
+ private final List cookies = new ArrayList();
- /**
- * The key is the lowercase header name; the value is a {@link org.jboss.seam.mock.HeaderValueHolder} object.
- */
- private final Map headers = new HashMap();
+ /**
+ * The key is the lowercase header name; the value is a {@link org.jboss.seam.mock.HeaderValueHolder} object.
+ */
+ private final Map headers = new HashMap();
- private int status = HttpServletResponse.SC_OK;
+ private int status = HttpServletResponse.SC_OK;
- private String statusMessage;
+ private String statusMessage;
- private String redirectedUrl;
+ private String redirectedUrl;
- private String forwardedUrl;
+ private String forwardedUrl;
- private String includedUrl;
+ private String includedUrl;
//---------------------------------------------------------------------
- // ServletResponse interface
- //---------------------------------------------------------------------
-
- /**
- * Set whether {@link #getOutputStream()} access is allowed.
- * Default is true.
- */
- public void setOutputStreamAccessAllowed(boolean outputStreamAccessAllowed) {
- this.outputStreamAccessAllowed = outputStreamAccessAllowed;
- }
-
- /**
- * Return whether {@link #getOutputStream()} access is allowed.
- */
- public boolean isOutputStreamAccessAllowed() {
- return this.outputStreamAccessAllowed;
- }
-
- /**
- * Set whether {@link #getWriter()} access is allowed.
- *
Default is true.
- */
- public void setWriterAccessAllowed(boolean writerAccessAllowed) {
- this.writerAccessAllowed = writerAccessAllowed;
- }
-
- /**
- * Return whether {@link #getOutputStream()} access is allowed.
- */
- public boolean isWriterAccessAllowed() {
- return this.writerAccessAllowed;
- }
-
- public void setCharacterEncoding(String characterEncoding) {
- this.characterEncoding = characterEncoding;
- }
-
- public String getCharacterEncoding() {
- return this.characterEncoding;
- }
-
- public ServletOutputStream getOutputStream() {
- if (!this.outputStreamAccessAllowed) {
- throw new IllegalStateException("OutputStream access not allowed");
- }
- return this.outputStream;
- }
-
- public PrintWriter getWriter() throws UnsupportedEncodingException {
- if (!this.writerAccessAllowed) {
- throw new IllegalStateException("Writer access not allowed");
- }
- if (this.writer == null) {
- Writer targetWriter = (this.characterEncoding != null ?
- new OutputStreamWriter(this.content, this.characterEncoding) : new OutputStreamWriter(this.content));
- this.writer = new ResponsePrintWriter(targetWriter);
- }
- return this.writer;
- }
-
- public byte[] getContentAsByteArray() {
- flushBuffer();
- return this.content.toByteArray();
- }
-
- public String getContentAsString() {
- flushBuffer();
+ // ServletResponse interface
+ //---------------------------------------------------------------------
+
+ /**
+ * Set whether {@link #getOutputStream()} access is allowed.
+ *
Default is true.
+ */
+ public void setOutputStreamAccessAllowed(boolean outputStreamAccessAllowed) {
+ this.outputStreamAccessAllowed = outputStreamAccessAllowed;
+ }
+
+ /**
+ * Return whether {@link #getOutputStream()} access is allowed.
+ */
+ public boolean isOutputStreamAccessAllowed() {
+ return this.outputStreamAccessAllowed;
+ }
+
+ /**
+ * Set whether {@link #getWriter()} access is allowed.
+ *
Default is true.
+ */
+ public void setWriterAccessAllowed(boolean writerAccessAllowed) {
+ this.writerAccessAllowed = writerAccessAllowed;
+ }
+
+ /**
+ * Return whether {@link #getOutputStream()} access is allowed.
+ */
+ public boolean isWriterAccessAllowed() {
+ return this.writerAccessAllowed;
+ }
+
+ public void setCharacterEncoding(String characterEncoding) {
+ this.characterEncoding = characterEncoding;
+ }
+
+ public String getCharacterEncoding() {
+ return this.characterEncoding;
+ }
+
+ public ServletOutputStream getOutputStream() {
+ if (!this.outputStreamAccessAllowed) {
+ throw new IllegalStateException("OutputStream access not allowed");
+ }
+ return this.outputStream;
+ }
+
+ public PrintWriter getWriter() throws UnsupportedEncodingException {
+ if (!this.writerAccessAllowed) {
+ throw new IllegalStateException("Writer access not allowed");
+ }
+ if (this.writer == null) {
+ Writer targetWriter = (this.characterEncoding != null ?
+ new OutputStreamWriter(this.content, this.characterEncoding) : new OutputStreamWriter(this.content));
+ this.writer = new ResponsePrintWriter(targetWriter);
+ }
+ return this.writer;
+ }
+
+ public byte[] getContentAsByteArray() {
+ flushBuffer();
+ return this.content.toByteArray();
+ }
+
+ public String getContentAsString() {
+ flushBuffer();
try {
return (this.characterEncoding != null) ?
this.content.toString(this.characterEncoding) : this.content.toString();
} catch (UnsupportedEncodingException ex) {
throw new RuntimeException(ex);
}
- }
-
- public void setContentLength(int contentLength) {
- this.contentLength = contentLength;
- }
-
- public int getContentLength() {
- return this.contentLength;
- }
-
- public void setContentType(String contentType) {
- this.contentType = contentType;
- if (contentType != null) {
- int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
- if (charsetIndex != -1) {
- String encoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
- setCharacterEncoding(encoding);
- }
- }
- }
-
- public String getContentType() {
- return this.contentType;
- }
-
- public void setBufferSize(int bufferSize) {
- this.bufferSize = bufferSize;
- }
-
- public int getBufferSize() {
- return this.bufferSize;
- }
-
- public void flushBuffer() {
- setCommitted(true);
- }
-
- public void resetBuffer() {
- if (isCommitted()) {
- throw new IllegalStateException("Cannot reset buffer - response is already committed");
- }
- this.content.reset();
- }
-
- private void setCommittedIfBufferSizeExceeded() {
- int bufSize = getBufferSize();
- if (bufSize > 0 && this.content.size() > bufSize) {
- setCommitted(true);
- }
- }
-
- public void setCommitted(boolean committed) {
- this.committed = committed;
- }
-
- public boolean isCommitted() {
- return this.committed;
- }
-
- public void reset() {
- resetBuffer();
- this.characterEncoding = null;
- this.contentLength = 0;
- this.contentType = null;
- this.locale = null;
- this.cookies.clear();
- this.headers.clear();
- this.status = HttpServletResponse.SC_OK;
- this.statusMessage = null;
- }
-
- public void setLocale(Locale locale) {
- this.locale = locale;
- }
-
- public Locale getLocale() {
- return this.locale;
- }
-
-
- //---------------------------------------------------------------------
- // HttpServletResponse interface
- //---------------------------------------------------------------------
-
- public void addCookie(Cookie cookie) {
- this.cookies.add(cookie);
- }
-
- public Cookie[] getCookies() {
- return (Cookie[]) this.cookies.toArray(new Cookie[this.cookies.size()]);
- }
-
- public Cookie getCookie(String name) {
- for (Iterator it = this.cookies.iterator(); it.hasNext();) {
- Cookie cookie = (Cookie) it.next();
- if (name.equals(cookie.getName())) {
- return cookie;
- }
- }
- return null;
- }
-
- public boolean containsHeader(String name) {
- return (HeaderValueHolder.getByName(this.headers, name) != null);
- }
-
- /**
- * Return the names of all specified headers as a Set of Strings.
- * @return the Set of header name Strings, or an empty Set if none
- */
- public Set getHeaderNames() {
- return this.headers.keySet();
- }
-
- /**
- * Return the primary value for the given header, if any.
- *
Will return the first value in case of multiple values.
- * @param name the name of the header
- * @return the associated header value, or null if none
- */
- public String getHeader(String name) {
- HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
- return (header != null ? header.getValue().toString() : null);
- }
-
- /**
- * Return all values for the given header as a List of value objects.
- * @param name the name of the header
- * @return the associated header values, or an empty List if none
- */
- public List getHeaders(String name) {
- HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
- return (header != null ? header.getValues() : Collections.EMPTY_LIST);
- }
-
- /**
- * The default implementation returns the given URL String as-is.
- * Can be overridden in subclasses, appending a session id or the like.
- */
- public String encodeURL(String url) {
- return url;
- }
-
- /**
- * The default implementation delegates to {@link #encodeURL},
- * returning the given URL String as-is.
- *
Can be overridden in subclasses, appending a session id or the like
- * in a redirect-specific fashion. For general URL encoding rules,
- * override the common {@link #encodeURL} method instead, appyling
- * to redirect URLs as well as to general URLs.
- */
- public String encodeRedirectURL(String url) {
- return encodeURL(url);
- }
-
- public String encodeUrl(String url) {
- return encodeURL(url);
- }
-
- public String encodeRedirectUrl(String url) {
- return encodeRedirectURL(url);
- }
-
- public void sendError(int status, String errorMessage) throws IOException {
- if (isCommitted()) {
- throw new IllegalStateException("Cannot set error status - response is already committed");
- }
- this.status = status;
- this.statusMessage = errorMessage;
- setCommitted(true);
- }
-
- public void sendError(int status) throws IOException {
- if (isCommitted()) {
- throw new IllegalStateException("Cannot set error status - response is already committed");
- }
- this.status = status;
- setCommitted(true);
- }
-
- public void sendRedirect(String url) throws IOException {
- if (isCommitted()) {
- throw new IllegalStateException("Cannot send redirect - response is already committed");
- }
- this.redirectedUrl = url;
- setCommitted(true);
- }
-
- public String getRedirectedUrl() {
- return this.redirectedUrl;
- }
-
- public void setDateHeader(String name, long value) {
- setHeaderValue(name, new Long(value));
- }
-
- public void addDateHeader(String name, long value) {
- addHeaderValue(name, new Long(value));
- }
-
- public void setHeader(String name, String value) {
- setHeaderValue(name, value);
- }
-
- public void addHeader(String name, String value) {
- addHeaderValue(name, value);
- }
-
- public void setIntHeader(String name, int value) {
- setHeaderValue(name, new Integer(value));
- }
-
- public void addIntHeader(String name, int value) {
- addHeaderValue(name, new Integer(value));
- }
-
- private void setHeaderValue(String name, Object value) {
- doAddHeaderValue(name, value, true);
- }
-
- private void addHeaderValue(String name, Object value) {
- doAddHeaderValue(name, value, false);
- }
-
- private void doAddHeaderValue(String name, Object value, boolean replace) {
- HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
- if (header == null) {
- header = new HeaderValueHolder();
- this.headers.put(name, header);
- }
- if (replace) {
- header.setValue(value);
- }
- else {
- header.addValue(value);
- }
- }
-
- public void setStatus(int status) {
- this.status = status;
- }
-
- public void setStatus(int status, String statusMessage) {
- this.status = status;
- this.statusMessage = statusMessage;
- }
-
- public int getStatus() {
- return this.status;
- }
-
- public String getStatusMessage() {
- return this.statusMessage;
- }
-
-
- //---------------------------------------------------------------------
- // Methods for MockRequestDispatcher
- //---------------------------------------------------------------------
-
- public void setForwardedUrl(String forwardedUrl) {
- this.forwardedUrl = forwardedUrl;
- }
-
- public String getForwardedUrl() {
- return this.forwardedUrl;
- }
-
- public void setIncludedUrl(String includedUrl) {
- this.includedUrl = includedUrl;
- }
-
- public String getIncludedUrl() {
- return this.includedUrl;
- }
+ }
+
+ public void setContentLength(int contentLength) {
+ this.contentLength = contentLength;
+ }
+
+ public int getContentLength() {
+ return this.contentLength;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ if (contentType != null) {
+ int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
+ if (charsetIndex != -1) {
+ String encoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
+ setCharacterEncoding(encoding);
+ }
+ }
+ }
+
+ public String getContentType() {
+ return this.contentType;
+ }
+
+ public void setBufferSize(int bufferSize) {
+ this.bufferSize = bufferSize;
+ }
+
+ public int getBufferSize() {
+ return this.bufferSize;
+ }
+
+ public void flushBuffer() {
+ setCommitted(true);
+ }
+
+ public void resetBuffer() {
+ if (isCommitted()) {
+ throw new IllegalStateException("Cannot reset buffer - response is already committed");
+ }
+ this.content.reset();
+ }
+
+ private void setCommittedIfBufferSizeExceeded() {
+ int bufSize = getBufferSize();
+ if (bufSize > 0 && this.content.size() > bufSize) {
+ setCommitted(true);
+ }
+ }
+
+ public void setCommitted(boolean committed) {
+ this.committed = committed;
+ }
+
+ public boolean isCommitted() {
+ return this.committed;
+ }
+
+ public void reset() {
+ resetBuffer();
+ this.characterEncoding = null;
+ this.contentLength = 0;
+ this.contentType = null;
+ this.locale = null;
+ this.cookies.clear();
+ this.headers.clear();
+ this.status = HttpServletResponse.SC_OK;
+ this.statusMessage = null;
+ }
+
+ public void setLocale(Locale locale) {
+ this.locale = locale;
+ }
+
+ public Locale getLocale() {
+ return this.locale;
+ }
+
+
+ //---------------------------------------------------------------------
+ // HttpServletResponse interface
+ //---------------------------------------------------------------------
+
+ public void addCookie(Cookie cookie) {
+ this.cookies.add(cookie);
+ }
+
+ public Cookie[] getCookies() {
+ return (Cookie[]) this.cookies.toArray(new Cookie[this.cookies.size()]);
+ }
+
+ public Cookie getCookie(String name) {
+ for (Iterator it = this.cookies.iterator(); it.hasNext();) {
+ Cookie cookie = (Cookie) it.next();
+ if (name.equals(cookie.getName())) {
+ return cookie;
+ }
+ }
+ return null;
+ }
+
+ public boolean containsHeader(String name) {
+ return (HeaderValueHolder.getByName(this.headers, name) != null);
+ }
+
+ /**
+ * Return the names of all specified headers as a Set of Strings.
+ * @return the Set of header name Strings, or an empty Set if none
+ */
+ public Set getHeaderNames() {
+ return this.headers.keySet();
+ }
+
+ /**
+ * Return the primary value for the given header, if any.
+ *
Will return the first value in case of multiple values.
+ * @param name the name of the header
+ * @return the associated header value, or null if none
+ */
+ public String getHeader(String name) {
+ HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
+ return (header != null ? header.getValue().toString() : null);
+ }
+
+ /**
+ * Return all values for the given header as a List of value objects.
+ * @param name the name of the header
+ * @return the associated header values, or an empty List if none
+ */
+ public List getHeaders(String name) {
+ HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
+ return (header != null ? header.getValues() : Collections.EMPTY_LIST);
+ }
+
+ /**
+ * The default implementation returns the given URL String as-is.
+ * Can be overridden in subclasses, appending a session id or the like.
+ */
+ public String encodeURL(String url) {
+ return url;
+ }
+
+ /**
+ * The default implementation delegates to {@link #encodeURL},
+ * returning the given URL String as-is.
+ *
Can be overridden in subclasses, appending a session id or the like
+ * in a redirect-specific fashion. For general URL encoding rules,
+ * override the common {@link #encodeURL} method instead, appyling
+ * to redirect URLs as well as to general URLs.
+ */
+ public String encodeRedirectURL(String url) {
+ return encodeURL(url);
+ }
+
+ public String encodeUrl(String url) {
+ return encodeURL(url);
+ }
+
+ public String encodeRedirectUrl(String url) {
+ return encodeRedirectURL(url);
+ }
+
+ public void sendError(int status, String errorMessage) throws IOException {
+ if (isCommitted()) {
+ throw new IllegalStateException("Cannot set error status - response is already committed");
+ }
+ this.status = status;
+ this.statusMessage = errorMessage;
+ setCommitted(true);
+ }
+
+ public void sendError(int status) throws IOException {
+ if (isCommitted()) {
+ throw new IllegalStateException("Cannot set error status - response is already committed");
+ }
+ this.status = status;
+ setCommitted(true);
+ }
+
+ public void sendRedirect(String url) throws IOException {
+ if (isCommitted()) {
+ throw new IllegalStateException("Cannot send redirect - response is already committed");
+ }
+ this.redirectedUrl = url;
+ setCommitted(true);
+ }
+
+ public String getRedirectedUrl() {
+ return this.redirectedUrl;
+ }
+
+ public void setDateHeader(String name, long value) {
+ setHeaderValue(name, new Long(value));
+ }
+
+ public void addDateHeader(String name, long value) {
+ addHeaderValue(name, new Long(value));
+ }
+
+ public void setHeader(String name, String value) {
+ setHeaderValue(name, value);
+ }
+
+ public void addHeader(String name, String value) {
+ addHeaderValue(name, value);
+ }
+
+ public void setIntHeader(String name, int value) {
+ setHeaderValue(name, new Integer(value));
+ }
+
+ public void addIntHeader(String name, int value) {
+ addHeaderValue(name, new Integer(value));
+ }
+
+ private void setHeaderValue(String name, Object value) {
+ doAddHeaderValue(name, value, true);
+ }
+
+ private void addHeaderValue(String name, Object value) {
+ doAddHeaderValue(name, value, false);
+ }
+
+ private void doAddHeaderValue(String name, Object value, boolean replace) {
+ HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
+ if (header == null) {
+ header = new HeaderValueHolder();
+ this.headers.put(name, header);
+ }
+ if (replace) {
+ header.setValue(value);
+ }
+ else {
+ header.addValue(value);
+ }
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ public void setStatus(int status, String statusMessage) {
+ this.status = status;
+ this.statusMessage = statusMessage;
+ }
+
+ public int getStatus() {
+ return this.status;
+ }
+
+ public String getStatusMessage() {
+ return this.statusMessage;
+ }
+
+
+ //---------------------------------------------------------------------
+ // Methods for MockRequestDispatcher
+ //---------------------------------------------------------------------
+
+ public void setForwardedUrl(String forwardedUrl) {
+ this.forwardedUrl = forwardedUrl;
+ }
+
+ public String getForwardedUrl() {
+ return this.forwardedUrl;
+ }
+
+ public void setIncludedUrl(String includedUrl) {
+ this.includedUrl = includedUrl;
+ }
+
+ public String getIncludedUrl() {
+ return this.includedUrl;
+ }
/**
- * Inner class that adapts the ServletOutputStream to mark the
- * response as committed once the buffer size is exceeded.
- */
- private class ResponseServletOutputStream extends DelegatingServletOutputStream
+ * Inner class that adapts the ServletOutputStream to mark the
+ * response as committed once the buffer size is exceeded.
+ */
+ private class ResponseServletOutputStream extends DelegatingServletOutputStream
{
- public ResponseServletOutputStream(OutputStream out) {
- super(out);
- }
-
- public void write(int b) throws IOException {
- super.write(b);
- super.flush();
- setCommittedIfBufferSizeExceeded();
- }
-
- public void flush() throws IOException {
- super.flush();
- setCommitted(true);
- }
- }
-
-
- /**
- * Inner class that adapts the PrintWriter to mark the
- * response as committed once the buffer size is exceeded.
- */
- private class ResponsePrintWriter extends PrintWriter {
-
- public ResponsePrintWriter(Writer out) {
- super(out, true);
- }
-
- public void write(char buf[], int off, int len) {
- super.write(buf, off, len);
- super.flush();
- setCommittedIfBufferSizeExceeded();
- }
-
- public void write(String s, int off, int len) {
- super.write(s, off, len);
- super.flush();
- setCommittedIfBufferSizeExceeded();
- }
-
- public void write(int c) {
- super.write(c);
- super.flush();
- setCommittedIfBufferSizeExceeded();
- }
-
- public void flush() {
- super.flush();
- setCommitted(true);
- }
- }
+ public ResponseServletOutputStream(OutputStream out) {
+ super(out);
+ }
+
+ public void write(int b) throws IOException {
+ super.write(b);
+ super.flush();
+ setCommittedIfBufferSizeExceeded();
+ }
+
+ public void flush() throws IOException {
+ super.flush();
+ setCommitted(true);
+ }
+ }
+
+
+ /**
+ * Inner class that adapts the PrintWriter to mark the
+ * response as committed once the buffer size is exceeded.
+ */
+ private class ResponsePrintWriter extends PrintWriter {
+
+ public ResponsePrintWriter(Writer out) {
+ super(out, true);
+ }
+
+ public void write(char buf[], int off, int len) {
+ super.write(buf, off, len);
+ super.flush();
+ setCommittedIfBufferSizeExceeded();
+ }
+
+ public void write(String s, int off, int len) {
+ super.write(s, off, len);
+ super.flush();
+ setCommittedIfBufferSizeExceeded();
+ }
+
+ public void write(int c) {
+ super.write(c);
+ super.flush();
+ setCommittedIfBufferSizeExceeded();
+ }
+
+ public void flush() {
+ super.flush();
+ setCommitted(true);
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setContentLengthLong( long len )
+ {
+ setContentLength( (int)len );
+ }
}
\ No newline at end of file
diff --git a/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java b/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java
index 04b5b4a9c2..046536a1bc 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java
@@ -49,12 +49,12 @@ public class MockExternalContext extends ExternalContext
private HttpServletRequest request;
private HttpServletResponse response;
-
+
private static final LogProvider log = Logging.getLogProvider( MockExternalContext.class );
public MockExternalContext()
{
- this.context = new MockServletContext();
+ this.context = new MockServletContext();
this.request = new MockHttpServletRequest(new MockHttpSession(context));
this.response = new MockHttpServletResponse();
}
@@ -87,7 +87,7 @@ public MockExternalContext(ServletContext context, HttpServletRequest request,
this.request = request;
this.response = response;
}
-
+
public MockExternalContext(HttpServletRequest request)
{
this.request = request;
@@ -145,7 +145,7 @@ public void setAttribute(String key, Object value)
{
context.setAttribute(key, value);
}
-
+
@Override
public void removeAttribute(String key)
{
@@ -166,6 +166,11 @@ public Object getContext()
return context;
}
+ @Override
+ public String getMimeType(String file) {
+ return context.getMimeType(file);
+ }
+
@Override
public String getInitParameter(String name)
{
@@ -214,7 +219,7 @@ public String getRequestContextPath()
public Map getRequestCookieMap()
{
Map cookieMap = new HashMap();
-
+
if (request != null && request.getCookies() != null)
{
for (Cookie cookie : request.getCookies())
@@ -222,7 +227,7 @@ public Map getRequestCookieMap()
cookieMap.put(cookie.getName(), cookie);
}
}
-
+
return cookieMap;
}
@@ -292,7 +297,7 @@ public void setAttribute(String key, Object value)
{
request.setAttribute(key, value);
}
-
+
@Override
public void removeAttribute(String key)
{
@@ -560,13 +565,13 @@ public void redirect(String url) throws IOException
this.response.getWriter().flush();
}
else
- {
+ {
this.response.sendRedirect(url);
}
FacesContext.getCurrentInstance().responseComplete();
}
-
+
@Override
public void setRequest(Object myrequest)
{
@@ -593,7 +598,7 @@ public String getResponseContentType()
protected String encodeURL(String url)
{
if (response != null) {
- String encodedUrl = response.encodeURL(url);
+ String encodedUrl = response.encodeURL(url);
url = (encodedUrl != null ? encodedUrl : url);
}
return url;
diff --git a/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletRequest.java b/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletRequest.java
index 3445919475..a4c724d8ef 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletRequest.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletRequest.java
@@ -34,6 +34,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.Part;
import org.jboss.seam.util.IteratorEnumeration;
@@ -44,7 +45,7 @@
*/
public class MockHttpServletRequest implements HttpServletRequest
{
-
+
private Map parameters = new HashMap();
private Map attributes = new HashMap();
private HttpSession session;
@@ -83,18 +84,18 @@ public class MockHttpServletRequest implements HttpServletRequest
private String localAddr;
private int localPort;
-
-
+
+
public MockHttpServletRequest(HttpSession session)
{
this(session, null, new HashSet());
}
-
- public MockHttpServletRequest(HttpSession session, ExternalContext externalContext)
+
+ public MockHttpServletRequest(HttpSession session, ExternalContext externalContext)
{
this(session, null, new HashSet());
Object request = externalContext.getRequest();
- if(externalContext != null && (request instanceof HttpServletRequest))
+ if(externalContext != null && (request instanceof HttpServletRequest))
{
httpServletRequest = (HttpServletRequest)request;
authType = httpServletRequest.getAuthType();
@@ -122,8 +123,8 @@ public MockHttpServletRequest(HttpSession session, ExternalContext externalConte
localName = httpServletRequest.getLocalName();
localAddr = httpServletRequest.getLocalAddr();
localPort = httpServletRequest.getLocalPort();
-
- } else if(externalContext != null && (request instanceof PortletRequest))
+
+ } else if(externalContext != null && (request instanceof PortletRequest))
{
portletRequest = (PortletRequest)request;
authType = portletRequest.getAuthType();
@@ -150,7 +151,7 @@ public MockHttpServletRequest(HttpSession session, String principalName, Set getAttributes()
{
return attributes;
}
-
+
public String getAuthType()
{
return authType;
@@ -238,8 +239,8 @@ public boolean isUserInRole(String role)
public Principal getUserPrincipal()
{
- return principalName==null ? null :
- new Principal()
+ return principalName==null ? null :
+ new Principal()
{
public String getName()
{
@@ -260,7 +261,7 @@ public String getRequestURI()
public StringBuffer getRequestURL()
{
- return (requestURL != null ? requestURL : new StringBuffer(getRequestURI()));
+ return (requestURL != null ? requestURL : new StringBuffer(getRequestURI()));
}
public String getServletPath()
@@ -425,7 +426,7 @@ public boolean isSecure()
public RequestDispatcher getRequestDispatcher(String path)
{
- if(httpServletRequest != null)
+ if(httpServletRequest != null)
{
return httpServletRequest.getRequestDispatcher(path);
}
@@ -434,7 +435,7 @@ public RequestDispatcher getRequestDispatcher(String path)
public String getRealPath(String path)
{
- if(httpServletRequest != null)
+ if(httpServletRequest != null)
{
return httpServletRequest.getRealPath(path);
}
@@ -526,14 +527,14 @@ public boolean authenticate(HttpServletResponse response) throws IOException, Se
public void login(String username, String password) throws ServletException
{
// TODO Auto-generated method stub
-
+
}
@Override
public void logout() throws ServletException
{
// TODO Auto-generated method stub
-
+
}
@Override
@@ -549,4 +550,33 @@ public Part getPart(String name) throws IOException, ServletException
// TODO Auto-generated method stub
return null;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public long getContentLengthLong()
+ {
+ return getContentLength();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String changeSessionId()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public T upgrade( Class handlerClass ) throws IOException, ServletException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletResponse.java b/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletResponse.java
index dd3f2b3d22..fa488d29dd 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletResponse.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletResponse.java
@@ -227,4 +227,14 @@ public Collection getHeaderNames()
return null;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setContentLengthLong( long len )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
}
diff --git a/jboss-seam/src/main/java/org/jboss/seam/mock/MockServletContext.java b/jboss-seam/src/main/java/org/jboss/seam/mock/MockServletContext.java
index 48c999437d..b63b055d57 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/mock/MockServletContext.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/mock/MockServletContext.java
@@ -38,14 +38,14 @@ public class MockServletContext implements ServletContext
{
private transient LogProvider log = Logging.getLogProvider(MockServletContext.class);
-
+
private Map initParameters = new HashMap();
private Map attributes = new HashMap();
-
+
private File webappRoot;
private File webInfRoot;
private File webInfClassesRoot;
-
+
public MockServletContext()
{
try
@@ -72,18 +72,18 @@ public MockServletContext()
log.warn("Unable to find web.xml", e);
}
}
-
+
private void processContextParameters(URL webXML)
{
try
{
- Element root = XML.getRootElementSafely(webXML.openStream());
+ Element root = XML.getRootElementSafely(webXML.openStream());
for (Element element : (List) root.elements("context-param"))
{
getInitParameters().put(element.elementText("param-name"), element.elementText("param-value"));
}
}
- catch (IOException e)
+ catch (IOException e)
{
throw new RuntimeException("Error parsing web.xml", e);
}
@@ -91,30 +91,30 @@ private void processContextParameters(URL webXML)
{
throw new RuntimeException("Error parsing web.xml", e);
}
-
+
}
-
+
public Map getInitParameters()
{
return initParameters;
}
-
+
public Map getAttributes()
{
return attributes;
}
-
+
public ServletContext getContext(String name)
{
return this;
}
-
+
public int getMajorVersion()
{
return 2;
}
-
+
public int getMinorVersion()
{
return 4;
@@ -124,7 +124,7 @@ public String getMimeType(String arg0)
{
return null;
}
-
+
public Set getResourcePaths(String name)
{
Enumeration enumeration = null;
@@ -150,7 +150,7 @@ public Set getResourcePaths(String name)
}
return result;
}
-
+
private static void addPaths(Set result, File[] files, String rootPath)
{
for (File file : files)
@@ -170,7 +170,7 @@ private static void addPaths(Set result, File[] files, String rootPath)
/**
* Get the URL for a particular resource that is relative to the web app root
* directory.
- *
+ *
* @param name The name of the resource to get
* @return The resource, or null if resource not found
* @throws MalformedURLException If the URL is invalid
@@ -178,17 +178,17 @@ private static void addPaths(Set result, File[] files, String rootPath)
public URL getResource(String name) throws MalformedURLException
{
File file = getFile(name, webappRoot);
-
+
if (file == null)
{
file = getFile(name, webInfRoot);
}
-
+
if (file == null)
{
file = getFile(name, webInfClassesRoot);
}
-
+
if (file != null)
{
return file.toURI().toURL();
@@ -205,12 +205,12 @@ private static File getFile(String name, File root)
{
return null;
}
-
+
if (name.startsWith("/"))
{
name = name.substring(1);
}
-
+
File f = new File(root, name);
if (!f.exists())
{
@@ -447,7 +447,7 @@ public SessionCookieConfig getSessionCookieConfig()
public void setSessionTrackingModes(Set sessionTrackingModes)
{
// TODO Auto-generated method stub
-
+
}
@Override
@@ -468,21 +468,21 @@ public Set getEffectiveSessionTrackingModes()
public void addListener(String className)
{
// TODO Auto-generated method stub
-
+
}
@Override
public void addListener(T t)
{
// TODO Auto-generated method stub
-
+
}
@Override
public void addListener(Class listenerClass)
{
// TODO Auto-generated method stub
-
+
}
@Override
@@ -510,8 +510,18 @@ public ClassLoader getClassLoader()
public void declareRoles(String... roleNames)
{
// TODO Auto-generated method stub
-
+
}
-
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getVirtualServerName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
diff --git a/jboss-seam/src/main/java/org/jboss/seam/mock/ServletContextWrapper.java b/jboss-seam/src/main/java/org/jboss/seam/mock/ServletContextWrapper.java
index 288880198e..5b075c85ab 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/mock/ServletContextWrapper.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/mock/ServletContextWrapper.java
@@ -36,11 +36,11 @@
* @author Marek Schmidt
*/
public class ServletContextWrapper implements ServletContext {
-
- private ServletContext delegate;
-
+
+ private ServletContext delegate;
+
private Map attributes = new HashMap();
-
+
public ServletContextWrapper(ServletContext delegate) {
this.delegate = delegate;
}
@@ -282,4 +282,13 @@ public void declareRoles(String... roleNames)
{
delegate.declareRoles(roleNames);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getVirtualServerName()
+ {
+ return delegate.getVirtualServerName();
+ }
}
diff --git a/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionFactory.java b/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionFactory.java
index 384da6cff1..4fb080bf36 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionFactory.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionFactory.java
@@ -8,9 +8,10 @@
import java.util.Properties;
import org.hibernate.SessionFactory;
+import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.cfg.NamingStrategy;
import org.hibernate.internal.util.ReflectHelper;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
@@ -24,7 +25,7 @@
/**
* A Seam component that bootstraps a Hibernate SessionFactory
- *
+ *
*
* Loads Hibernate configuration options by checking:
*
hibernate.properties in root of the classpath
@@ -47,7 +48,7 @@
*
* The jndiProperties are convenience, the factory will automatically
* prefix regular JNDI properties for use as Hibernate configuration properties.
- *
+ *
* @author Gavin King
* @author Christian Bauer
*/
@@ -65,20 +66,21 @@ public class HibernateSessionFactory
private List mappingJars;
private List mappingPackages;
private List mappingResources;
- private NamingStrategy namingStrategy;
-
+ private ImplicitNamingStrategy implicitNamingStrategy;
+ private PhysicalNamingStrategy physicalNamingStrategy;
+
@Unwrap
public SessionFactory getSessionFactory() throws Exception
{
return sessionFactory;
}
-
+
@Create
public void startup() throws Exception
{
sessionFactory = createSessionFactory();
}
-
+
@Destroy
public void shutdown()
{
@@ -91,13 +93,17 @@ public void shutdown()
protected SessionFactory createSessionFactory() throws ClassNotFoundException
{
Configuration configuration = new Configuration();
-
+
// setup non-default naming strategy
- if (namingStrategy != null)
+ if (implicitNamingStrategy != null)
{
- configuration.setNamingStrategy(namingStrategy);
+ configuration.setImplicitNamingStrategy( implicitNamingStrategy );
}
-
+ if(physicalNamingStrategy != null)
+ {
+ configuration.setPhysicalNamingStrategy( physicalNamingStrategy );
+ }
+
// Programmatic configuration
if (cfgProperties != null)
{
@@ -118,7 +124,7 @@ protected SessionFactory createSessionFactory() throws ClassNotFoundException
if (cfgProperties==null && cfgResourceName==null)
{
configuration.configure();
- }
+ }
else if (cfgProperties==null && cfgResourceName!=null)
{
configuration.configure(cfgResourceName);
@@ -126,123 +132,121 @@ else if (cfgProperties==null && cfgResourceName!=null)
// Mapping metadata
if (mappingClasses!=null)
{
- for (String className: mappingClasses)
+ for (String className: mappingClasses)
{
configuration.addAnnotatedClass(ReflectHelper.classForName(className));
}
}
if (mappingFiles!=null)
{
- for (String fileName: mappingFiles)
+ for (String fileName: mappingFiles)
{
configuration.addFile(fileName);
}
}
if (mappingJars!=null)
{
- for (String jarName: mappingJars)
+ for (String jarName: mappingJars)
{
configuration.addJar(new File(jarName));
}
}
if (mappingPackages!= null)
{
- for (String packageName: mappingPackages)
+ for (String packageName: mappingPackages)
{
configuration.addPackage(packageName);
}
}
if (mappingResources!= null)
{
- for (String resourceName : mappingResources)
+ for (String resourceName : mappingResources)
{
configuration.addResource(resourceName);
}
}
-
+
configuration.setInterceptor(new HibernateSecurityInterceptor(configuration.getInterceptor()));
-
+
return configuration.buildSessionFactory();
}
-
+
public String getCfgResourceName()
{
return cfgResourceName;
}
-
+
public void setCfgResourceName(String cfgFileName)
{
this.cfgResourceName = cfgFileName;
}
-
- public NamingStrategy getNamingStrategy()
- {
- return namingStrategy;
+
+ public void setImplicitNamingStrategy(ImplicitNamingStrategy implicitNamingStrategy) {
+ this.implicitNamingStrategy = implicitNamingStrategy;
}
-
- public void setNamingStrategy(NamingStrategy namingStrategy)
- {
- this.namingStrategy = namingStrategy;
+
+ public void setPhysicalNamingStrategy(PhysicalNamingStrategy physicalNamingStrategy) {
+ this.physicalNamingStrategy = physicalNamingStrategy;
}
-
+
public Map getCfgProperties()
{
return cfgProperties;
}
-
+
public void setCfgProperties(Map cfgProperties)
{
this.cfgProperties = cfgProperties;
}
-
+
public List getMappingClasses()
{
return mappingClasses;
}
-
+
public void setMappingClasses(List mappingClasses)
{
this.mappingClasses = mappingClasses;
}
-
+
public List getMappingFiles()
{
return mappingFiles;
}
-
+
public void setMappingFiles(List mappingFiles)
{
this.mappingFiles = mappingFiles;
}
-
+
public List getMappingJars()
{
return mappingJars;
}
-
+
public void setMappingJars(List mappingJars)
{
this.mappingJars = mappingJars;
}
-
+
public List getMappingPackages()
{
return mappingPackages;
}
-
+
public void setMappingPackages(List mappingPackages)
{
this.mappingPackages = mappingPackages;
}
-
+
public List getMappingResources()
{
return mappingResources;
}
-
+
public void setMappingResources(List mappingResources)
{
this.mappingResources = mappingResources;
}
-
+
}
diff --git a/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java b/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
index 2815657777..8b8116d4e0 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
@@ -27,57 +27,60 @@
import org.hibernate.ScrollMode;
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
+import org.hibernate.SessionEventListener;
import org.hibernate.SessionFactory;
import org.hibernate.SharedSessionBuilder;
import org.hibernate.SimpleNaturalIdLoadAccess;
import org.hibernate.Transaction;
import org.hibernate.TypeHelper;
-import org.hibernate.cache.spi.CacheKey;
import org.hibernate.collection.spi.PersistentCollection;
-import org.hibernate.engine.jdbc.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
import org.hibernate.engine.query.spi.sql.NativeSQLQuerySpecification;
import org.hibernate.engine.spi.ActionQueue;
import org.hibernate.engine.spi.EntityEntry;
import org.hibernate.engine.spi.EntityKey;
import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.NonFlushedChanges;
+import org.hibernate.engine.spi.NamedQueryDefinition;
+import org.hibernate.engine.spi.NamedSQLQueryDefinition;
import org.hibernate.engine.spi.PersistenceContext;
import org.hibernate.engine.spi.QueryParameters;
+import org.hibernate.engine.spi.SessionEventListenerManager;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.transaction.spi.TransactionCoordinator;
import org.hibernate.event.spi.EventSource;
import org.hibernate.internal.CriteriaImpl;
import org.hibernate.jdbc.ReturningWork;
import org.hibernate.jdbc.Work;
import org.hibernate.loader.custom.CustomQuery;
import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.procedure.ProcedureCall;
+import org.hibernate.resource.transaction.TransactionCoordinator;
import org.hibernate.stat.SessionStatistics;
-import org.hibernate.type.Type;
/**
* InvocationHandler that proxies the Session, and implements EL interpolation
* in HQL. Needs to implement SessionImplementor because DetachedCriteria casts
* the Session to SessionImplementor.
- *
+ *
* @author Gavin King
* @author Emmanuel Bernard
* @author Mike Youngstrom
* @author Marek Novotny
- *
+ *
*/
public class HibernateSessionInvocationHandler implements InvocationHandler, Serializable, EventSource
{
-
+
private static final long serialVersionUID = 4954720887288965536L;
-
+
private Session delegate;
-
+
public HibernateSessionInvocationHandler(Session paramDelegate)
{
this.delegate = paramDelegate;
}
-
+
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
{
try
@@ -97,7 +100,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
throw e.getTargetException();
}
}
-
+
protected Object handleCreateQueryWithString(Method method, Object[] args) throws Throwable
{
if (args[0] == null)
@@ -124,7 +127,7 @@ protected Object handleCreateQueryWithString(Method method, Object[] args) throw
return method.invoke(delegate, args);
}
}
-
+
protected Object handleReconnectNoArg(Method method) throws Throwable
{
throw new UnsupportedOperationException("deprecated");
@@ -255,20 +258,20 @@ public ScrollableResults scroll(NativeSQLQuerySpecification paramNativeSQLQueryS
return ((SessionImplementor) delegate).scroll(paramNativeSQLQuerySpecification, paramQueryParameters);
}
- public Object getFilterParameterValue(String paramString)
- {
- return ((SessionImplementor) delegate).getFilterParameterValue(paramString);
- }
+// public Object getFilterParameterValue(String paramString)
+// {
+// return ((SessionImplementor) delegate).getFilterParameterValue(paramString);
+// }
- public Type getFilterParameterType(String paramString)
- {
- return ((SessionImplementor) delegate).getFilterParameterType(paramString);
- }
+// public Type getFilterParameterType(String paramString)
+// {
+// return ((SessionImplementor) delegate).getFilterParameterType(paramString);
+// }
- public Map getEnabledFilters()
- {
- return ((SessionImplementor) delegate).getEnabledFilters();
- }
+// public Map getEnabledFilters()
+// {
+// return ((SessionImplementor) delegate).getEnabledFilters();
+// }
public int getDontFlushFromFind()
{
@@ -297,7 +300,7 @@ public CacheMode getCacheMode()
public void setCacheMode(CacheMode paramCacheMode)
{
- ((SessionImplementor) delegate).setCacheMode(paramCacheMode);
+ ((SessionImplementor) delegate).setCacheMode(paramCacheMode);
}
public boolean isOpen()
@@ -317,7 +320,7 @@ public FlushMode getFlushMode()
public void setFlushMode(FlushMode paramFlushMode)
{
- ((SessionImplementor) delegate).setFlushMode(paramFlushMode);
+ ((SessionImplementor) delegate).setFlushMode(paramFlushMode);
}
public Connection connection()
@@ -327,7 +330,7 @@ public Connection connection()
public void flush()
{
- ((SessionImplementor) delegate).flush();
+ ((SessionImplementor) delegate).flush();
}
public Query getNamedQuery(String paramString)
@@ -347,22 +350,36 @@ public boolean isEventSource()
public void afterScrollOperation()
{
- ((SessionImplementor) delegate).afterScrollOperation();
+ ((SessionImplementor) delegate).afterScrollOperation();
}
- public String getFetchProfile()
+// public String getFetchProfile()
+// {
+// LoadQueryInfluencers loadQueryInfluencers = ((SessionImplementor) delegate).getLoadQueryInfluencers();
+// Set fetchProfiles = loadQueryInfluencers.getEnabledFetchProfileNames();
+// return ((SessionImplementor) delegate).getFetchProfile();
+// }
+//
+// public void setFetchProfile(String paramString)
+// {
+//
+// ((SessionImplementor) delegate).setFetchProfile(paramString);
+// }
+
+ public boolean isClosed()
{
- return ((SessionImplementor) delegate).getFetchProfile();
+ return ((SessionImplementor) delegate).isClosed();
}
- public void setFetchProfile(String paramString)
- {
- ((SessionImplementor) delegate).setFetchProfile(paramString);
+ @Override
+ public boolean isAutoCloseSessionEnabled() {
+ return ((SessionImplementor) delegate).isAutoCloseSessionEnabled();
}
- public boolean isClosed()
+ @Override
+ public boolean shouldAutoClose()
{
- return ((SessionImplementor) delegate).isClosed();
+ return ((SessionImplementor) delegate).shouldAutoClose();
}
public SessionFactory getSessionFactory()
@@ -370,9 +387,9 @@ public SessionFactory getSessionFactory()
return delegate.getSessionFactory();
}
- public Connection close() throws HibernateException
+ public void close() throws HibernateException
{
- return delegate.close();
+ delegate.close();
}
public void cancelQuery() throws HibernateException
@@ -392,7 +409,7 @@ public boolean isDefaultReadOnly()
public void setDefaultReadOnly(boolean paramBoolean)
{
- ((HibernateSessionInvocationHandler) delegate).setDefaultReadOnly(paramBoolean);
+ ((HibernateSessionInvocationHandler) delegate).setDefaultReadOnly(paramBoolean);
}
public Serializable getIdentifier(Object paramObject) throws HibernateException
@@ -432,17 +449,17 @@ public Object load(String paramString, Serializable paramSerializable) throws Hi
public void load(Object paramObject, Serializable paramSerializable) throws HibernateException
{
- delegate.load(paramObject, paramSerializable);
+ delegate.load(paramObject, paramSerializable);
}
public void replicate(Object paramObject, ReplicationMode paramReplicationMode) throws HibernateException
{
- delegate.replicate(paramObject, paramReplicationMode);
+ delegate.replicate(paramObject, paramReplicationMode);
}
public void replicate(String paramString, Object paramObject, ReplicationMode paramReplicationMode) throws HibernateException
{
- delegate.replicate(paramString, paramObject, paramReplicationMode);
+ delegate.replicate(paramString, paramObject, paramReplicationMode);
}
public Serializable save(Object paramObject) throws HibernateException
@@ -457,22 +474,22 @@ public Serializable save(String paramString, Object paramObject) throws Hibernat
public void saveOrUpdate(Object paramObject) throws HibernateException
{
- delegate.saveOrUpdate(paramObject);
+ delegate.saveOrUpdate(paramObject);
}
public void saveOrUpdate(String paramString, Object paramObject) throws HibernateException
{
- delegate.saveOrUpdate(paramString, paramObject);
+ delegate.saveOrUpdate(paramString, paramObject);
}
public void update(Object paramObject) throws HibernateException
{
- delegate.update(paramObject);
+ delegate.update(paramObject);
}
public void update(String paramString, Object paramObject) throws HibernateException
{
- delegate.update(paramString, paramObject);
+ delegate.update(paramString, paramObject);
}
public Object merge(Object paramObject) throws HibernateException
@@ -507,12 +524,12 @@ public void delete(String paramString, Object paramObject) throws HibernateExcep
public void lock(Object paramObject, LockMode paramLockMode) throws HibernateException
{
- delegate.lock(paramObject, paramLockMode);
+ delegate.lock(paramObject, paramLockMode);
}
public void lock(String paramString, Object paramObject, LockMode paramLockMode) throws HibernateException
{
- delegate.lock(paramString, paramObject, paramLockMode);
+ delegate.lock(paramString, paramObject, paramLockMode);
}
public void refresh(Object paramObject) throws HibernateException
@@ -565,11 +582,23 @@ public Query createQuery(String paramString) throws HibernateException
return delegate.createQuery(paramString);
}
+ @Override
+ public Query createQuery( NamedQueryDefinition namedQueryDefinition )
+ {
+ return ((SessionImplementor) delegate).createQuery( namedQueryDefinition );
+ }
+
public SQLQuery createSQLQuery(String paramString) throws HibernateException
{
return delegate.createSQLQuery(paramString);
}
+ @Override
+ public SQLQuery createSQLQuery( NamedSQLQueryDefinition namedQueryDefinition )
+ {
+ return ((SessionImplementor) delegate).createSQLQuery( namedQueryDefinition );
+ }
+
public Query createFilter(Object paramObject, String paramString) throws HibernateException
{
return delegate.createFilter(paramObject, paramString);
@@ -577,7 +606,7 @@ public Query createFilter(Object paramObject, String paramString) throws Hiberna
public void clear()
{
- delegate.clear();
+ delegate.clear();
}
public Object get(Class paramClass, Serializable paramSerializable) throws HibernateException
@@ -617,7 +646,7 @@ public Filter getEnabledFilter(String paramString)
public void disableFilter(String paramString)
{
- delegate.disableFilter(paramString);
+ delegate.disableFilter(paramString);
}
public SessionStatistics getStatistics()
@@ -695,10 +724,10 @@ public void persistOnFlush(String paramString, Object paramObject, Map paramMap)
((EventSource) delegate).persistOnFlush(paramString, paramObject, paramMap);
}
- public void refresh(Object paramObject, Map paramMap) throws HibernateException
- {
- ((EventSource) delegate).refresh(paramObject, paramMap);
- }
+// public void refresh(Object paramObject, Map paramMap) throws HibernateException
+// {
+// ((EventSource) delegate).refresh(paramObject, paramMap);
+// }
public void delete(String paramString, Object paramObject, boolean paramBoolean, Set paramSet)
{
@@ -720,29 +749,35 @@ public EntityKey generateEntityKey(Serializable id, EntityPersister persister)
return ((SessionImplementor) delegate).generateEntityKey(id, persister);
}
- public CacheKey generateCacheKey(Serializable id, Type type, String entityOrRoleName)
- {
- return ((SessionImplementor) delegate).generateCacheKey(id, type, entityOrRoleName);
- }
+// public CacheKey generateCacheKey(Serializable id, Type type, String entityOrRoleName)
+// {
+// return ((SessionImplementor) delegate).generateCacheKey(id, type, entityOrRoleName);
+// }
public void disableTransactionAutoJoin()
{
((SessionImplementor) delegate).disableTransactionAutoJoin();
}
- public NonFlushedChanges getNonFlushedChanges() throws HibernateException
- {
- return ((SessionImplementor) delegate).getNonFlushedChanges();
- }
+// public NonFlushedChanges getNonFlushedChanges() throws HibernateException
+// {
+// return ((SessionImplementor) delegate).getNonFlushedChanges();
+// }
+//
+// public void applyNonFlushedChanges(NonFlushedChanges nonFlushedChanges) throws HibernateException
+// {
+// ((SessionImplementor) delegate).applyNonFlushedChanges(nonFlushedChanges);
+// }
- public void applyNonFlushedChanges(NonFlushedChanges nonFlushedChanges) throws HibernateException
+ public TransactionCoordinator getTransactionCoordinator()
{
- ((SessionImplementor) delegate).applyNonFlushedChanges(nonFlushedChanges);
+ return ((SessionImplementor) delegate).getTransactionCoordinator();
}
- public TransactionCoordinator getTransactionCoordinator()
+ @Override
+ public JdbcCoordinator getJdbcCoordinator()
{
- return ((SessionImplementor) delegate).getTransactionCoordinator();
+ return ((SessionImplementor) delegate).getJdbcCoordinator();
}
public LoadQueryInfluencers getLoadQueryInfluencers()
@@ -777,17 +812,17 @@ public LockRequest buildLockRequest(LockOptions lockOptions)
public void refresh(String entityName, Object object) throws HibernateException
{
- ((EventSource) delegate).refresh(entityName, object);
+ ((EventSource) delegate).refresh(entityName, object);
}
public void refresh(Object object, LockOptions lockOptions) throws HibernateException
{
- ((EventSource) delegate).refresh(object, lockOptions);
+ ((EventSource) delegate).refresh(object, lockOptions);
}
public void refresh(String entityName, Object object, LockOptions lockOptions) throws HibernateException
{
- ((EventSource) delegate).refresh(entityName, object, lockOptions);
+ ((EventSource) delegate).refresh(entityName, object, lockOptions);
}
public Object get(Class clazz, Serializable id, LockOptions lockOptions) throws HibernateException
@@ -855,4 +890,53 @@ public List list(Criteria criteria)
return ((SessionImplementor) delegate).list(criteria);
}
+ @Override
+ public SessionEventListenerManager getEventListenerManager()
+ {
+ return ((SessionImplementor)delegate).getEventListenerManager();
+ }
+
+ @Override
+ public void addEventListeners( SessionEventListener ... listeners )
+ {
+ delegate.addEventListeners( listeners );
+ }
+
+ @Override
+ public ProcedureCall getNamedProcedureCall( String name )
+ {
+ return delegate.getNamedProcedureCall( name );
+ }
+
+ @Override
+ public ProcedureCall createStoredProcedureCall( String procedureName )
+ {
+ return delegate.createStoredProcedureCall( procedureName );
+ }
+
+ @Override
+ public ProcedureCall createStoredProcedureCall( String procedureName, Class ... resultClasses )
+ {
+ return delegate.createStoredProcedureCall( procedureName, resultClasses );
+ }
+
+ @Override
+ public ProcedureCall createStoredProcedureCall( String procedureName, String ... resultSetMappings )
+ {
+ return delegate.createStoredProcedureCall( procedureName, resultSetMappings );
+ }
+
+ @Override
+ public void refresh( String entityName, Object object, Map refreshedAlready ) throws HibernateException
+ {
+ ((EventSource)delegate).refresh( entityName, object, refreshedAlready );
+ }
+
+ @Override
+ public void removeOrphanBeforeUpdates( String entityName, Object child )
+ {
+ ((EventSource)delegate).removeOrphanBeforeUpdates( entityName, child );
+ }
+
+
}
diff --git a/jboss-seam/src/main/java/org/jboss/seam/transaction/HibernateTransaction.java b/jboss-seam/src/main/java/org/jboss/seam/transaction/HibernateTransaction.java
index d862ae23e7..b08118ea8c 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/transaction/HibernateTransaction.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/transaction/HibernateTransaction.java
@@ -13,6 +13,7 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.resource.transaction.spi.TransactionStatus;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
@@ -26,12 +27,12 @@
/**
* Support for the Hibernate Transaction API.
- *
- * Adapts Hibernate transaction management to a Seam UserTransaction
+ *
+ * Adapts Hibernate transaction management to a Seam UserTransaction
* interface. For use in non-JTA-capable environments.
- *
+ *
* @author Gavin King
- *
+ *
*/
@Name("org.jboss.seam.transaction.transaction")
@Scope(ScopeType.EVENT)
@@ -44,7 +45,7 @@ public class HibernateTransaction extends AbstractUserTransaction
private ValueExpression session;
private Session currentSession;
private boolean rollbackOnly; //Hibernate Transaction doesn't have a "rollback only" state
-
+
@Create
public void validate()
{
@@ -53,7 +54,7 @@ public void validate()
session = Expressions.instance().createValueExpression("#{session}", Session.class);
}
}
-
+
private org.hibernate.Transaction getDelegate()
{
if (currentSession==null)
@@ -133,7 +134,7 @@ public int getStatus() throws SystemException
{
return Status.STATUS_MARKED_ROLLBACK;
}
- else if ( isSessionSet() && getDelegate().isActive() )
+ else if ( isSessionSet() && getDelegate().getStatus() == TransactionStatus.ACTIVE )
{
return Status.STATUS_ACTIVE;
}
@@ -148,12 +149,12 @@ public void setTransactionTimeout(int timeout) throws SystemException
assertActive();
getDelegate().setTimeout(timeout);
}
-
+
private boolean isSessionSet()
{
return currentSession!=null;
}
-
+
private void clearSession()
{
currentSession = null;
@@ -175,7 +176,7 @@ private void assertNotActive() throws NotSupportedException
throw new NotSupportedException("transaction is already active");
}
}
-
+
@Override
public void registerSynchronization(Synchronization sync)
{
@@ -186,13 +187,13 @@ public void registerSynchronization(Synchronization sync)
assertActive();
getDelegate().registerSynchronization(sync);
}
-
+
@Override
public void enlist(EntityManager entityManager) throws SystemException
{
throw new UnsupportedOperationException("JPA EntityManager should not be used with Hibernate Transaction API");
}
-
+
@Override
public boolean isConversationContextRequired()
{
diff --git a/jboss-seam/src/main/java/org/jboss/seam/web/AbstractResource.java b/jboss-seam/src/main/java/org/jboss/seam/web/AbstractResource.java
index a67c9fc457..f0df74689b 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/web/AbstractResource.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/web/AbstractResource.java
@@ -5,9 +5,11 @@
import java.io.OutputStream;
import java.util.zip.GZIPOutputStream;
+import javax.naming.OperationNotSupportedException;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -181,5 +183,18 @@ public void reset()
{
// noop
}
+
+ @Override
+ public boolean isReady()
+ {
+ return true;
+ }
+
+ @Override
+ public void setWriteListener( WriteListener writeListener )
+ {
+ throw new RuntimeException("write listeners not yet supported on seam's GZipResponse Stream");
+ }
+
}
}
diff --git a/jboss-seam/src/main/java/org/jboss/seam/web/MultipartFilter.java b/jboss-seam/src/main/java/org/jboss/seam/web/MultipartFilter.java
index 1f67751729..b2334f1314 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/web/MultipartFilter.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/web/MultipartFilter.java
@@ -21,7 +21,7 @@
/**
* A filter for decoding multipart requests, for
* use with the file upload control.
- *
+ *
* @author Shane Bryzak
*
*/
@@ -33,37 +33,37 @@
public class MultipartFilter extends AbstractFilter
{
public static final String MULTIPART = "multipart/";
-
+
/**
* Flag indicating whether a temporary file should be used to cache the uploaded file
*/
private boolean createTempFiles = false;
-
+
/**
* The maximum size of a file upload request. 0 means no limit.
*/
- private int maxRequestSize = 0;
-
+ private int maxRequestSize = 0;
+
public boolean getCreateTempFiles()
{
return createTempFiles;
}
-
+
public void setCreateTempFiles(boolean createTempFiles)
{
this.createTempFiles = createTempFiles;
}
-
+
public int getMaxRequestSize()
{
return maxRequestSize;
}
-
+
public void setMaxRequestSize(int maxFileSize)
{
this.maxRequestSize = maxFileSize;
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException
{
@@ -75,40 +75,38 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
HttpServletRequest httpRequest = (HttpServletRequest) request;
- if (isMultipartRequest(httpRequest))
- {
- MultipartRequest multipartRequest = new MultipartRequestImpl(httpRequest, createTempFiles,
- maxRequestSize);
-
+
+ if ( isMultipartRequest(httpRequest) && httpRequest.getParts().size() == 0 ) {
+ MultipartRequest multipartRequest = new MultipartRequestImpl(httpRequest, createTempFiles,
+ maxRequestSize);
+
// Force the request to be parsed now
multipartRequest.getParameterNames();
-
+
chain.doFilter(multipartRequest, response);
- }
- else
- {
+ } else { // servlet 3.x or non multipart
chain.doFilter(request, response);
}
}
-
+
private boolean isMultipartRequest(HttpServletRequest request)
{
if (!"post".equals(request.getMethod().toLowerCase()))
{
return false;
}
-
+
String contentType = request.getContentType();
if (contentType == null)
{
return false;
}
-
+
if (contentType.toLowerCase().startsWith(MULTIPART))
{
return true;
}
-
- return false;
+
+ return false;
}
}
diff --git a/jboss-seam/src/main/java/org/jboss/seam/web/RedirectFilter.java b/jboss-seam/src/main/java/org/jboss/seam/web/RedirectFilter.java
index 963703cf97..44cc13d062 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/web/RedirectFilter.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/web/RedirectFilter.java
@@ -25,11 +25,11 @@
import org.jboss.seam.navigation.Pages;
/**
- * Propagates the conversation context and page parameters across any
- * browser redirect initiated from a JSF navigation rule defined in
+ * Propagates the conversation context and page parameters across any
+ * browser redirect initiated from a JSF navigation rule defined in
* faces-config.xml. Note that this is no longer needed if all
* navigation rules are defined in pages.xml.
- *
+ *
* @author Gavin King
*/
@Scope(APPLICATION)
@@ -37,43 +37,70 @@
@Install(precedence = BUILT_IN, classDependencies="javax.faces.context.FacesContext")
@BypassInterceptors
@Filter(within="org.jboss.seam.web.ajax4jsfFilter")
-public class RedirectFilter extends AbstractFilter
+public class RedirectFilter extends AbstractFilter
{
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException
- {
- chain.doFilter( request, wrapResponse( (HttpServletResponse) response ) );
- }
-
- private static ServletResponse wrapResponse(HttpServletResponse response)
- {
- return new HttpServletResponseWrapper(response)
- {
- @Override
- public void sendRedirect(String url) throws IOException
- {
- if ( FacesContext.getCurrentInstance() != null
- && Contexts.isEventContextActive()
- && !Contexts.getEventContext().isSet(REDIRECT_FROM_MANAGER) )
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException
+ {
+ RedirectFilterHttpResponseWrapper r = new RedirectFilterHttpResponseWrapper( (HttpServletResponse)response );
+ chain.doFilter( request, r );
+ r.completeRedirect();
+ }
+
+ /**
+ * Seam wraps transactions around the InvokeApplication phase. If a sendRedirect is called
+ * on the FacesContext during that phase, the browser will receive the redirect location BEFORE the invoke
+ * application phase is completed (and before seam commits its transaction).
+ * This class wraps the response object and will store the redirect url to be sent at a later time (when the
+ * doFilter is complete)
+ */
+ public static class RedirectFilterHttpResponseWrapper extends HttpServletResponseWrapper
+ {
+ private String savedUrl;
+
+ public RedirectFilterHttpResponseWrapper( HttpServletResponse response )
+ {
+ super( response );
+ }
+
+ @Override
+ public void sendRedirect( String url ) throws IOException
+ {
+ if ( FacesContext.getCurrentInstance() != null
+ && Contexts.isEventContextActive()
+ && !Contexts.getEventContext().isSet( REDIRECT_FROM_MANAGER ) )
{
- if ( !url.startsWith("http:") && !url.startsWith("https:") ) //yew!
- {
- String viewId = getViewId(url);
- if (viewId!=null)
- {
- url = Pages.instance().encodePageParameters( FacesContext.getCurrentInstance(), url, viewId );
- }
- if ( Contexts.isConversationContextActive() )
- {
- url = FacesManager.instance().appendConversationIdFromRedirectFilter(url, viewId);
- }
- }
+ if ( !url.startsWith( "http:" ) && !url.startsWith( "https:" ) ) //yew!
+ {
+ String viewId = getViewId( url );
+ if ( viewId != null )
+ {
+ url = Pages.instance().encodePageParameters( FacesContext.getCurrentInstance(), url, viewId );
+ }
+ if ( Contexts.isConversationContextActive() )
+ {
+ url = FacesManager.instance().appendConversationIdFromRedirectFilter( url, viewId );
+ }
+ }
}
- super.sendRedirect(url);
- }
- };
+ this.savedUrl = url;
+ }
+
+ public void completeRedirect() throws IOException
+ {
+ if(savedUrl != null)
+ {
+ super.sendRedirect( savedUrl );
+ }
+ }
+
+ public String getSavedUrl()
+ {
+ return savedUrl;
+ }
}
-
+
public static String getViewId(String url)
{
FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -90,7 +117,7 @@ public static String getViewId(String url)
return getViewId(url, pathInfo, servletPath, contextPath);
}
}
-
+
protected static String getViewId(String url, String pathInfo, String servletPath, String contextPath)
{
if (pathInfo!=null)
@@ -117,7 +144,7 @@ else if ( url.startsWith(contextPath) )
return null;
}
}
-
+
private static int getParamLoc(String url)
{
int loc = url.indexOf('?');
diff --git a/jboss-seam/src/test/java/org/jboss/seam/test/unit/web/MultipartRequestTest.java b/jboss-seam/src/test/java/org/jboss/seam/test/unit/web/MultipartRequestTest.java
index fbf7154436..70b5f1167d 100644
--- a/jboss-seam/src/test/java/org/jboss/seam/test/unit/web/MultipartRequestTest.java
+++ b/jboss-seam/src/test/java/org/jboss/seam/test/unit/web/MultipartRequestTest.java
@@ -5,6 +5,7 @@
import java.util.HashSet;
import javax.servlet.FilterChain;
+import javax.servlet.ReadListener;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
@@ -28,24 +29,24 @@
*/
public class MultipartRequestTest
{
-
- @Test
+
+ //@Test
public void testMultipartRequest() throws IOException, ServletException
{
MultipartFilter filter = new MultipartFilter();
ServletContext context = new MockServletContext();
HttpSession session = new MockHttpSession(context);
- MockHttpServletRequest request = new MockHttpServletRequest(session, "Pete", new HashSet(), new Cookie[0], "post")
+ MockHttpServletRequest request = new MockHttpServletRequest(session, "Pete", new HashSet(), new Cookie[0], "post")
{
-
+
private final InputStream is = Resources.getResourceAsStream("/META-INF/seam.properties", null);
-
+
@Override
public String getContentType()
{
return "multipart/test; boundary=foo";
}
-
+
@Override
public ServletInputStream getInputStream() throws IOException
{
@@ -56,22 +57,40 @@ public int read() throws IOException
{
return is.read();
}
-
+
@Override
public int read(byte[] b) throws IOException
{
return is.read(b);
}
-
+
+ @Override
+ public boolean isFinished()
+ {
+ return false;
+ }
+
+ @Override
+ public boolean isReady()
+ {
+ return true;
+ }
+
+ @Override
+ public void setReadListener( ReadListener readListener )
+ {
+ throw new RuntimeException("readListener not supported");
+ }
+
};
}
-
+
};
// Add some parameters to test passthrough
- String [] fooParams = {"bar"};
+ String [] fooParams = {"bar"};
request.getParameterMap().put("foo", fooParams);
ServletResponse response = new MockHttpServletResponse();
- FilterChain chain = new FilterChain()
+ FilterChain chain = new FilterChain()
{
public void doFilter(ServletRequest request, ServletResponse response)
@@ -80,13 +99,13 @@ public void doFilter(ServletRequest request, ServletResponse response)
assert request instanceof MultipartRequest;
MultipartRequest multipartRequest = (MultipartRequest) request;
assert multipartRequest.getParameterMap().containsKey("foo");
- // Test passthrough parameters
+ // Test passthrough parameters
assert multipartRequest.getParameterValues("foo").length == 1;
assert "bar".equals(multipartRequest.getParameterValues("foo")[0]);
-
+
// TODO Test a multipart request
}
-
+
};
filter.doFilter(request, response, chain);
}
diff --git a/pom.xml b/pom.xml
index 1ac4585d4b..d1ad2623d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,180 +1,185 @@
- 4.0.0
+ 4.0.0
org.jboss
jboss-parent
10
-
- org.jboss.seam
- jboss-seam-parent
- Seam Parent
- 2.3.2-SNAPSHOT
- pom
-
-
-
- LGPL
- http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-
-
-
-
-
- JBoss Seam committers
-
-
-
-
-
- http://lists.jboss.org/pipermail/seam-dev/
- Seam Developer List
-
-
- Java EE 5 framework to get easy developing Java Enterprise applications
- http://seamframework.org/Seam2
-
-
-
+
+ org.jboss.seam
+ jboss-seam-parent
+ Seam Parent
+ 2.3.2-1-wildfly_10_1_0_Final-SNAPSHOT
+ pom
+
+
+
+ LGPL
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+
+
+
+
+
+ JBoss Seam committers
+
+
+
+
+
+ http://lists.jboss.org/pipermail/seam-dev/
+ Seam Developer List
+
+
+ Java EE 5 framework to get easy developing Java Enterprise applications
+ http://seamframework.org/Seam2
+
+
+
2.3
- UTF-8
- UTF-8
- 1.1.0.GA
- 1.1.0
- ${project.artifactId}.pdf
-
-
- 2.3.2-SNAPSHOT
- 7.2.0.Final
- 2.0.5312
- 4.3.1.Final
-
-
-
-
- https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/
- https://repository.jboss.org/nexus/content/repositories/snapshots/
- yyyyMMdd-HHmm
-
-
-
-
-
-
-
- org.jboss.seam
- bom
- ${version.seam}
- pom
- import
-
+ UTF-8
+ UTF-8
+ 1.1.0.GA
+ 1.1.0
+ ${project.artifactId}.pdf
+
+
+ 2.3.2-1-wildfly_10_1_0_Final-SNAPSHOT
+ 7.2.0.Final
+ 10.1.0.Final
+ 2.0.5312
+ 2.2.13
+ 4.5.0.Final
+ 4.5.0.Final
+
+
+
+
+ https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/
+ https://repository.jboss.org/nexus/content/repositories/snapshots/
+ yyyyMMdd-HHmm
+ 1.7
+ 1.7
+
+
+
+
+
+
+
+
+ org.jboss.seam
+ bom
+ ${version.seam}
+ pom
+ import
+
-
- antlr
- antlr
- 2.7.6
-
-
-
-
- org.apache.ant
- ant
- 1.7.0
-
-
- org.apache.ant
- ant-launcher
-
-
-
-
-
- org.apache.ant
- ant-antlr
- 1.7.0
-
-
-
-
- org.jboss.cache
- jbosscache-core
- 2.2.0.CR6
-
-
- org.jboss
- jboss-common-core
-
-
- commons-logging
- commons-logging
-
-
-
-
-
- jgroups
- jgroups
- 2.4.1
-
-
-
- jboss
- jbossxb
- 1.0.0.CR8
-
-
- jboss
- jboss-logging-spi
-
-
- jboss
- jboss-common-core
-
-
- apache-xerces
- xml-apis
-
-
- apache-httpclient
- commons-httpclient
-
-
- apache-slide
- webdavlib
-
-
- oswego-concurrent
- concurrent
-
-
- wutka-dtdparser
- dtdparser121
-
-
- apache-xerces
- xercesImpl
-
-
- javax.activation
- activation
-
-
- sun-jaf
- activation
-
-
-
+
+ antlr
+ antlr
+ 2.7.6
+
+
+
+ org.apache.ant
+ ant
+ 1.7.0
+
+
+ org.apache.ant
+ ant-launcher
+
+
+
+
+
+ org.apache.ant
+ ant-antlr
+ 1.7.0
+
+
+
+
+ org.jboss.cache
+ jbosscache-core
+ 2.2.0.CR6
+
+
+ org.jboss
+ jboss-common-core
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+
+ jgroups
+ jgroups
+ 2.4.1
+
+
+
+ jboss
+ jbossxb
+ 1.0.0.CR8
+
+
+ jboss
+ jboss-logging-spi
+
+
+ jboss
+ jboss-common-core
+
+
+ apache-xerces
+ xml-apis
+
+
+ apache-httpclient
+ commons-httpclient
+
+
+ apache-slide
+ webdavlib
+
+
+ oswego-concurrent
+ concurrent
+
+
+ wutka-dtdparser
+ dtdparser121
+
+
+ apache-xerces
+ xercesImpl
+
+
+ javax.activation
+ activation
+
+
+ sun-jaf
+ activation
+
+
+
-
- jboss
- jboss-jmx
- 4.2.3.GA
-
+
+ jboss
+ jboss-jmx
+ 4.2.3.GA
+
jboss
@@ -182,185 +187,212 @@
4.2.3.GA
-
- javax.portlet
- portlet-api
- 1.0
-
-
-
- javax.mail
- mail
- 1.4
-
-
-
- javax.xml.ws
- jaxws-api
- 2.1
-
-
-
- javax.xml.soap
- saaj-api
- 1.3
-
-
-
- javax.annotation
- jsr250-api
- 1.0
-
-
-
-
- cglib
- cglib-nodep
- 2.2
-
-
-
- dom4j
- dom4j
- 1.6.1-brew
-
-
- xml-apis
- xml-apis
-
-
-
-
-
- org.beanshell
- bsh
- 2.0b4
-
-
-
- concurrent
- concurrent
- 1.3.4
-
-
-
- emma
- emma
+
+ javax.portlet
+ portlet-api
+ 1.0
+
+
+
+ javax.mail
+ mail
+ 1.4
+
+
+
+ javax.xml.ws
+ jaxws-api
+ 2.1
+
+
+
+ javax.xml.soap
+ saaj-api
+ 1.3
+
+
+
+ javax.annotation
+ jsr250-api
+ 1.0
+
+
+
+
+ cglib
+ cglib-nodep
+ 2.2
+
+
+
+ dom4j
+ dom4j
+ 1.6.1-brew
+
+
+ xml-apis
+ xml-apis
+
+
+
+
+
+ org.beanshell
+ bsh
+ 2.0b4
+
+
+
+ concurrent
+ concurrent
+ 1.3.4
+
+
+
+ emma
+ emma
${version.emma}
-
-
-
- org.eclipse.jdt
- core
- 3.4.2.v_883_R34x
-
-
-
- org.jboss.as
- jboss-as-arquillian-container-managed
- ${version.jbossas7}
-
-
-
- org.jboss.as
- jboss-as-arquillian-container-remote
- ${version.jbossas7}
-
-
-
-
-
-
- JIRA
- http://issues.jboss.org/browse/JBSEAM
-
-
-
- Jenkins
- https://hudson.jboss.org/hudson/view/Seam/
-
-
-
- scm:git:git@github.com:seam2/jboss-seam.git
- scm:git:git@github.com:seam2/jboss-seam.git
- scm:git:git@github.com:seam2/jboss-seam.git
- HEAD
+
+
+
+ org.eclipse.jdt
+ core
+ 3.4.2.v_883_R34x
+
+
+
+ com.sun.faces
+ jsf-impl
+ ${version.jsf.impl}
+ true
+ provided
+
+
+
+ org.richfaces
+ richfaces-distribution
+ ${version.richfaces}
+ pom
+
+
+ org.richfaces.core
+ richfaces-core-impl
+ ${version.richfaces}
+
+
+ org.richfaces.ui
+ richfaces-components-api
+ ${version.richfaces}
+
+
+ org.richfaces.ui
+ richfaces-components-ui
+ ${version.richfaces}
+
+
+
+
+
+
+
+ JIRA
+ http://issues.jboss.org/browse/JBSEAM
+
+
+
+ Jenkins
+ https://hudson.jboss.org/hudson/view/Seam/
+
+
+
+ scm:git:git@github.com:seam2/jboss-seam.git
+ scm:git:git@github.com:seam2/jboss-seam.git
+ scm:git:git@github.com:seam2/jboss-seam.git
+ HEAD
-
- Seam Framework
- http://seamframework.org
-
-
-
-
-
- jboss-releases-repository
- JBoss Releases Repository
- ${jboss.releases.repo.url}
-
-
- jboss-snapshots-repository
- JBoss Snapshots Repository
- ${jboss.snapshots.repo.url}
-
-
-
-
- package
- ${project.artifactId}
-
-
-
-
- maven-ejb-plugin
- 2.3
-
- 3.0
-
-
- true
- true
-
-
- ${project.version}
-
-
-
-
-
- org.jacoco
- jacoco-maven-plugin
- ${version.jacoco}
-
-
-
-
-
-
- maven-source-plugin
-
-
-
- true
- true
-
-
- ${project.version}
-
-
-
-
-
-
- attach-sources
- package
+
+ Seam Framework
+ http://seamframework.org
+
+
+
+
+
+ jboss-releases-repository
+ JBoss Releases Repository
+ ${jboss.releases.repo.url}
+
+
+ jboss-snapshots-repository
+ JBoss Snapshots Repository
+ ${jboss.snapshots.repo.url}
+
+
+
+
+ package
+ ${project.artifactId}
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+ -Xdoclint:none
+
+
+
+
+
+ maven-ejb-plugin
+ 2.3
+
+ 3.0
+
+
+ true
+ true
+
+
+ ${project.version}
+
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${version.jacoco}
+
+
+
+
+
+
+ maven-source-plugin
+
+
+
+ true
+ true
+
+
+ ${project.version}
+
+
+
+
+
+
+ attach-sources
+ package
-
-
-
+
+
+
@@ -377,7 +409,7 @@
-
+
maven-war-plugin
true
@@ -385,9 +417,9 @@
false
${project.build.finalName}
-
-
-
+
+
+
bom
@@ -407,15 +439,15 @@
functional-tests
seam-integration-tests
-
-
-
-
- doc
-
- seam-reference-guide
-
-
+
+
+
+
+ doc
+
+ seam-reference-guide
+
+
all
@@ -426,7 +458,7 @@
distribution
-
+
seam-reference-guide
distribution
@@ -547,37 +579,37 @@
maven-release-plugin
-
- https://repository.jboss.org/nexus/content/groups/staging
- JBoss_Seam_@{project.version}
- true
-
+
+ https://repository.jboss.org/nexus/content/groups/staging
+ JBoss_Seam_@{project.version}
+ true
+
-
+
validate
-
-
-
-
- org.codehaus.mojo
- xml-maven-plugin
- 1.0
-
-
-
- validate
-
-
-
-
-
-
-
+
+
+
+
+ org.codehaus.mojo
+ xml-maven-plugin
+ 1.0
+
+
+
+ validate
+
+
+
+
+
+
+
-
-
+
+
diff --git a/readme.asciidoc b/readme.asciidoc
index 5438c3a477..e9ddbe9900 100644
--- a/readme.asciidoc
+++ b/readme.asciidoc
@@ -14,28 +14,134 @@ Seam 2 is a powerful open source development platform for building rich Internet
Seam has been designed from the ground up to eliminate complexity at both architecture and API levels. It enables developers to assemble complex web applications using simple annotated Java classes, a rich set of UI components, and very little XML. Seam's unique support for conversations and declarative state management can introduce a more sophisticated user experience while at the same time eliminating common bugs found in traditional web applications.
-Get Up And Running Quick
-~~~~~~~~~~~~~~~~~~~~~~~~
-1. Install JBoss AS 7.1.1.Final
-
-2. Start JBoss AS by typing `bin/standalone.sh` in the JBoss AS home directory
-
-3. In the link:examples/booking[] directory, type `mvn clean package` and check
- for any error messages.
-
-4. In the booking-ear directory run:
-
- `mvn jboss-as:deploy`
-
-5. Point your browser to http://localhost:8080/seam-booking/
-
-6. Register an account, search for hotels, book a room...
-
Learn more
~~~~~~~~~~
* Read the documentation in the link:seam-reference-guide/src/docbook/en-US[reference documentation] directory
* Read the online FAQ http://www.seamframework.org/Documentation/FAQs
+
Notes for this release
~~~~~~~~~~~~~~~~~~~~~~
Be warned that JBoss Embedded is *LEGACY runtime* and is not in Seam 2.3 distribution *anymore*
+
+
+Wildfly Support
+~~~~~~~~~~~~~~~
+
+This link:https://github.com/mark1900/jboss-seam/tree/seam_2_3-wildfly_10_1_0_Final[branch] attempts to update Seam 2.3 to support JEE 7, JSF 2.2, Servlet 3.1, RESTEasy 3.0.19 and target Wildfly 10.1.0.Final.
+
+This is an unofficial modification of Seam 2.3 and related libraries.
+
+Source Code
+^^^^^^^^^^^
+
+* https://github.com/mark1900/jboss-seam/tree/seam_2_3-wildfly_10_1_0_Final
+** is forked from https://github.com/andrewscode/jboss-seam/tree/seam_2_3-jee7
+** is forked from https://github.com/seam2/jboss-seam
+** is forked from https://github.com/mareknovotny/jboss-seam
+* https://github.com/mark1900/jbpm3-seam
+** is forked from https://github.com/mareknovotny/jbpm3-seam
+
+Components
+^^^^^^^^^^
+
+Please note, that you will need to build and release the following components into your local environment, in the following order.
+
+. *jbpm3-seam* - https://github.com/mark1900/jbpm3-seam/tree/3.2.10.SP3_seam2_hibernate5
+. *jsf-console* - https://github.com/mark1900/jbpm3-seam/tree/3.2.10.SP3_seam2_hibernate5/projects/jsf-console-3.2.10-seam
+. *jboss-seam* - https://github.com/mark1900/jboss-seam/tree/seam_2_3-wildfly_10_1_0_Final
+
+
+Building and Releasing the Components
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* *jbpm3-seam* - https://github.com/mark1900/jbpm3-seam/tree/3.2.10.SP3_seam2_hibernate5
+
+[source,shell]
+----
+
+#!/bin/bash
+set -e
+set -x
+
+id
+
+JBPM_VERSION_FROM=3.2.10-1-SP3_seam2_hibernate5-SNAPSHOT
+JBPM_VERSION_TO=3.2.10-1-SP3_seam2_hibernate5
+
+
+rm -rf ${WORKSPACE}/github
+mkdir ${WORKSPACE}/github
+cd ${WORKSPACE}/github
+
+git clone -b 3.2.10.SP3_seam2_hibernate5 https://github.com/mark1900/jbpm3-seam.git
+zip -r jbpm3-seam-3.2.10.SP3_seam2_hibernate5.zip jbpm3-seam
+find ${WORKSPACE}/github/jbpm3-seam -type f -name "pom.xml" -exec sed -i "s/${JBPM_VERSION_FROM}/${JBPM_VERSION_TO}/g" {} \;
+
+
+# Maven Command
+mvn -B -f ${WORKSPACE}/github/jbpm3-seam/pom.xml -U -P prod -X -e clean help:effective-settings help:effective-pom install -DskipTests=true
+----
+
+* *jsf-console* - https://github.com/mark1900/jbpm3-seam/tree/3.2.10.SP3_seam2_hibernate5/projects/jsf-console-3.2.10-seam
+
+[source,shell]
+----
+
+#!/bin/bash
+set -e
+set -x
+
+id
+
+JBPM_VERSION_FROM=3.2.10-1-SP3_seam2_hibernate5-SNAPSHOT
+JBPM_VERSION_TO=3.2.10-1-SP3_seam2_hibernate5
+JSF_CONSOLE_VERSION_FROM=3.2.10-1-seam2_hibernate5-SNAPSHOT
+JSF_CONSOLE_VERSION_TO=3.2.10-1-seam2_hibernate5
+
+
+rm -rf ${WORKSPACE}/github
+mkdir ${WORKSPACE}/github
+cd ${WORKSPACE}/github
+
+git clone -b 3.2.10.SP3_seam2_hibernate5 https://github.com/mark1900/jbpm3-seam.git
+zip -r jsf-console-3.2.10-1-seam2_hibernate5.zip jbpm3-seam/projects/jsf-console-3.2.10-seam
+find ${WORKSPACE}/github/jbpm3-seam -type f -name "pom.xml" -exec sed -i "s/${JBPM_VERSION_FROM}/${JBPM_VERSION_TO}/g" {} \;
+find ${WORKSPACE}/github/jbpm3-seam -type f -name "pom.xml" -exec sed -i "s/${JSF_CONSOLE_VERSION_FROM}/${JSF_CONSOLE_VERSION_TO}/g" {} \;
+
+# Maven Command
+mvn -B -f ${WORKSPACE}/github/jbpm3-seam/projects/jsf-console-3.2.10-seam/pom.xml -U -P prod -X -e clean help:effective-settings help:effective-pom install
+
+----
+
+* *jboss-seam* - https://github.com/mark1900/jboss-seam/tree/seam_2_3-wildfly_10_1_0_Final
+
+[source,shell]
+----
+
+#!/bin/bash
+set -e
+set -x
+
+id
+
+SEAM_VERSION_FROM=2.3.2-1-wildfly_10_1_0_Final-SNAPSHOT
+SEAM_VERSION_TO=2.3.2-1-wildfly_10_1_0_Final
+JBPM_VERSION_FROM=3.2.10-1-SP3_seam2_hibernate5-SNAPSHOT
+JBPM_VERSION_TO=3.2.10-1-SP3_seam2_hibernate5
+
+
+rm -rf ${WORKSPACE}/github
+mkdir ${WORKSPACE}/github
+cd ${WORKSPACE}/github
+
+git clone -b seam_2_3-wildfly_10_1_0_Final https://github.com/mark1900/jboss-seam.git
+zip -r jboss-seam-seam_2_3-wildfly_10_1_0_Final.zip jboss-seam
+find ${WORKSPACE}/github/jboss-seam -type f -name "pom.xml" -exec sed -i "s/${SEAM_VERSION_FROM}/${SEAM_VERSION_TO}/g" {} \;
+find ${WORKSPACE}/github/jboss-seam -type f -name "pom.xml" -exec sed -i "s/${JBPM_VERSION_FROM}/${JBPM_VERSION_TO}/g" {} \;
+
+
+# Maven Command
+mvn -B -f ${WORKSPACE}/github/jboss-seam/pom.xml -U -P prod -X -e clean help:effective-settings help:effective-pom install
+
+----
diff --git a/seam-integration-tests/pom.xml b/seam-integration-tests/pom.xml
index f561797c23..13fcbbae17 100644
--- a/seam-integration-tests/pom.xml
+++ b/seam-integration-tests/pom.xml
@@ -1,328 +1,304 @@
- 4.0.0
-
- jboss-seam-parent
- org.jboss.seam
- 2.3.2-SNAPSHOT
- ../pom.xml
-
+ 4.0.0
+
+ jboss-seam-parent
+ org.jboss.seam
+ 2.3.2-1-wildfly_10_1_0_Final-SNAPSHOT
+ ../pom.xml
+
- seam-integration-tests
- Seam Integration Tests
-
- war
+ seam-integration-tests
+ Seam Integration Tests
+ war
-
-
-
- src/test/resources
- true
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
-
+
+
+
+ src/test/resources
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ true
+
-
-
- surefire-it
- integration-test
-
- test
-
-
- true
-
-
-
-
-
-
- maven-clean-plugin
-
-
-
- ${project.build.directory}/bootstrap
-
-
- ${basedir}/src/test/META-INF
-
-
-
-
-
+
+
+ surefire-it
+ integration-test
+
+ test
+
+
+ true
+
+
+
+
+
+ maven-clean-plugin
+
+
+
+ ${project.build.directory}/bootstrap
+
+
+ ${basedir}/src/test/META-INF
+
+
+
+
+
+
-
+
+
+ org.jbpm.jbpm3
+ jbpm-jpdl
+
+
+ org.hibernate
+ hibernate-core
+
+
+ org.apache.jackrabbit
+ jackrabbit-core
+
+
+
-
-
- org.jbpm.jbpm3
- jbpm-jpdl
-
-
- org.hibernate
- hibernate-core
-
-
- org.apache.jackrabbit
- jackrabbit-core
-
-
-
-
-
- org.beanshell
- bsh
-
-
-
- junit
- junit
- test
-
-
-
- org.jboss.spec.javax.jms
- jboss-jms-api_1.1_spec
- provided
-
-
-
- org.jboss.spec.javax.ejb
- jboss-ejb-api_3.1_spec
- provided
-
-
-
- org.jboss.spec.javax.faces
- jboss-jsf-api_2.1_spec
- provided
-
-
-
- org.jboss.spec.javax.servlet
- jboss-servlet-api_3.0_spec
- provided
-
-
-
- org.jboss.arquillian.junit
- arquillian-junit-container
- test
-
-
-
- org.jboss.arquillian.protocol
- arquillian-protocol-servlet
- test
-
+
+ org.mvel
+ mvel2
+
+
+ janino
+ janino
+
-
- org.jboss.seam
- jboss-seam
- ejb
-
-
- testng
- org.testng
-
-
-
+
+ org.beanshell
+ bsh
+
-
- org.jboss.seam
- jboss-seam-ui
-
-
-
- org.hibernate
- hibernate-core
- provided
-
-
-
- javax.validation
- validation-api
- provided
-
+
+ junit
+ junit
+ test
+
-
- commons-io
- commons-io
- test
-
+
+ org.jboss.spec.javax.jms
+ jboss-jms-api_2.0_spec
+ provided
+
-
- net.sourceforge.htmlunit
- htmlunit
- 2.9
- test
-
+
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.2_spec
+ provided
+
-
-
-
-
- code-coverage
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- default-test
- none
-
-
-
-
- org.sonatype.maven.plugin
- emma4it-maven-plugin
-
-
- merge
- post-integration-test
-
- merge
-
-
- ${basedir}/../
-
-
-
- report
- verify
-
- report
-
-
-
-
- ${basedir}/../jboss-seam/src/main/java
- ${basedir}/../jboss-seam-debug/src/main/java
- ${basedir}/../jboss-seam-excel/src/main/java
- ${basedir}/../jboss-seam-flex/src/main/java
- ${basedir}/../jboss-seam-gen/src/main/java
- ${basedir}/../jboss-seam-ioc/src/main/java
- ${basedir}/../jboss-seam-mail/src/main/java
- ${basedir}/../jboss-seam-pdf/src/main/java
- ${basedir}/../jboss-seam-remoting/src/main/java
- ${basedir}/../jboss-seam-resteasy/src/main/java
- ${basedir}/../jboss-seam-rss/src/main/java
- ${basedir}/../jboss-seam-ui/src/main/java
- ${basedir}/../jboss-seam-wicket/src/main/java
-
-
-
-
-
-
-
-
-
-
- integration-test
-
-
-
- arquillian
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
- false
-
+
+ org.jboss.spec.javax.faces
+ jboss-jsf-api_2.2_spec
+ provided
+
-
-
- surefire-it
- integration-test
-
- test
-
-
- true
- false
-
-
- ${version.jbossas7}
- ${jacoco.agent}
-
-
-
-
-
-
-
-
+
+ org.jboss.spec.javax.servlet
+ jboss-servlet-api_3.1_spec
+ provided
+
-
- arq-jbossas-7-managed
-
-
-
- arquillian
- jbossas-managed-7
-
-
-
-
- org.jboss.as
- jboss-as-arquillian-container-managed
- test
-
-
-
-
-
- src/test/resources
-
-
- src/test/resources-jbossas-7
-
-
-
-
+
+ org.jboss.arquillian.junit
+ arquillian-junit-container
+ test
+
+
+
+ org.jboss.arquillian.protocol
+ arquillian-protocol-servlet
+ test
+
+
+
+ org.jboss.shrinkwrap.resolver
+ shrinkwrap-resolver-impl-maven
+ test
+
+
+
+ org.jboss.shrinkwrap.resolver
+ shrinkwrap-resolver-impl-maven-archive
+ test
+
+
+
+ org.wildfly.arquillian
+ wildfly-arquillian-container-managed
+ 1.1.0.Final
+ test
+
+
+
+ org.jboss.seam
+ jboss-seam
+ ejb
+
+
+ testng
+ org.testng
+
+
+
+
+
+ org.jboss.seam
+ jboss-seam-ui
+
+
+
+ org.hibernate
+ hibernate-core
+ provided
+
-
- arq-jbossas-7-remote
-
-
- arquillian
- jbossas-remote-7
-
-
+
+ org.hibernate
+ hibernate-entitymanager
+ provided
+
-
-
- org.jboss.as
- jboss-as-arquillian-container-remote
- test
-
-
-
-
-
- src/test/resources
-
-
- src/test/resources-jbossas-7
-
-
-
-
+
+ javax.validation
+ validation-api
+ provided
+
+
+
+ commons-io
+ commons-io
+ test
+
+
+
+ net.sourceforge.htmlunit
+ htmlunit
+ 2.9
+ test
+
+
+
+
+
+
+ code-coverage
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ default-test
+ none
+
+
+
+ -Xms800m -Xmx800m -XX:MaxPermSize=500m
+
+
+
+ org.sonatype.maven.plugin
+ emma4it-maven-plugin
+
+
+ merge
+ post-integration-test
+
+ merge
+
+
+ ${basedir}/../
+
+
+
+ report
+ verify
+
+ report
+
+
+
+
+ ${basedir}/../jboss-seam/src/main/java
+ ${basedir}/../jboss-seam-debug/src/main/java
+ ${basedir}/../jboss-seam-excel/src/main/java
+ ${basedir}/../jboss-seam-flex/src/main/java
+ ${basedir}/../jboss-seam-gen/src/main/java
+ ${basedir}/../jboss-seam-ioc/src/main/java
+ ${basedir}/../jboss-seam-mail/src/main/java
+ ${basedir}/../jboss-seam-pdf/src/main/java
+ ${basedir}/../jboss-seam-remoting/src/main/java
+ ${basedir}/../jboss-seam-resteasy/src/main/java
+ ${basedir}/../jboss-seam-rss/src/main/java
+ ${basedir}/../jboss-seam-ui/src/main/java
+ ${basedir}/../jboss-seam-wicket/src/main/java
+
+
+
+
+
+
+
+
+
+
+ integration-test
+
+
+
+ arquillian
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ true
+ false
+
+
+
+
+ surefire-it
+ integration-test
+
+ test
+
+
+ true
+ false
+
+ ${version.wildfly}
+
+
+
+
+
+
+
+
validate
@@ -364,37 +340,6 @@
-
-
-
- jacoco
-
- false
-
- jacoco
-
-
-
-
-
- org.jacoco
- jacoco-maven-plugin
-
-
- org.jboss.seam.test.*
-
- jacoco.agent
-
-
-
-
- prepare-agent
-
-
-
-
-
-
-
+
