Seam SVN: r11279 - in branches/enterprise/JBPAPP_5_0: src/main/org/jboss/seam/mock and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-13 11:50:48 -0400 (Mon, 13 Jul 2009)
New Revision: 11279
Added:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DelegatingServletInputStream.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DelegatingServletOutputStream.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/EnhancedMockHttpServletRequest.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/HeaderValueHolder.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockRequestDispatcher.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/ResourceRequestEnvironment.java
Removed:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java
Modified:
branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Webservices.xml
Log:
back ported JBSEAM-4195
Modified: branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Webservices.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Webservices.xml 2009-07-13 12:20:22 UTC (rev 11278)
+++ branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Webservices.xml 2009-07-13 15:50:48 UTC (rev 11279)
@@ -599,40 +599,49 @@
<title>Testing resources and providers</title>
<para>
- Seam includes an extended unit testing superclass that helps you in creating unit tests for a RESTful
- architecture. Extend the <literal>ResourceSeamTest</literal> class to emulate HTTP requests/response cycles:
+ Seam includes a unit testing utility class that helps you create unit tests for a RESTful
+ architecture. Extend the <literal>SeamTest</literal> class as usual and use the
+ <literal>ResourceRequestEnvironment.ResourceRequest</literal> to emulate HTTP requests/response cycles:
</para>
- <programlisting role="JAVA"><![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;
-import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;
-import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;
+ <programlisting role="JAVA"><![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;
+import org.jboss.seam.mock.EnhancedMockHttpServletRequest;
+import org.jboss.seam.mock.EnhancedMockHttpServletResponse;
+import static org.jboss.seam.mock.ResourceRequestEnvironment.ResourceRequest;
+import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;
-public class MyTest extends ResourceSeamTest {
+public class MyTest extends SeamTest {
- @Override
- public Map<String, Object> getDefaultHeaders()
- {
- return new HashMap<String, Object>()
- {{
- put("Accept", "text/plain");
- }};
+ ResourceRequestEnvironment sharedEnvironment;
+
+ @BeforeClass
+ public void prepareSharedEnvironment() throws Exception {
+ sharedEnvironment = new ResourceRequestEnvironment(this) {
+ @Override
+ public Map<String, Object> getDefaultHeaders() {
+ return new HashMap<String, Object>() {{
+ put("Accept", "text/plain");
+ }};
+ }
+ };
}
@Test
public void test() throws Exception
{
- new ResourceRequest(Method.GET, "/my/relative/uri)
+ //Not shared: new ResourceRequest(new ResourceRequestEnvironment(this), Method.GET, "/my/relative/uri)
+
+ new ResourceRequest(sharedEnvironment, Method.GET, "/my/relative/uri)
{
-
@Override
- protected void prepareRequest(MockHttpServletRequest request)
+ protected void prepareRequest(EnhancedMockHttpServletRequest request)
{
request.addQueryParameter("foo", "123");
request.addHeader("Accept-Language", "en_US, de");
}
@Override
- protected void onResponse(MockHttpServletResponse response)
+ protected void onResponse(EnhancedMockHttpServletResponse response)
{
assert response.getStatus() == 200;
assert response.getContentAsString().equals("foobar");
@@ -640,30 +649,22 @@
}.run();
}
-
}]]></programlisting>
<para>
This test only executes local calls, it does not communicate with the <literal>SeamResourceServlet</literal>
through TCP. The mock request is passed through the Seam servlet and filters and the response is then
- available for test assertions. Overriding the <literal>getDefaultHeaders()</literal> method allows you
- to set request headers for every test method in the test class.
+ available for test assertions. Overriding the <literal>getDefaultHeaders()</literal> method in a shared
+ instance of <literal>ResourceRequestEnvironment</literal> allows you to set request headers for every
+ test method in the test class.
</para>
<para>
Note that a <literal>ResourceRequest</literal> has to be executed in a <literal>@Test</literal> method
- or in a <literal>@BeforeMethod</literal> callback. You can and should not execute it in any other callback,
- such as <literal>@BeforeClass</literal>. (This is an implementation limitation we will remove in a future
- update.)
+ or in a <literal>@BeforeMethod</literal> callback. You can not execute it in any other callback,
+ such as <literal>@BeforeClass</literal>.
</para>
- <para>
- Also note that the imported mock objects are not the same as the mock objects you use in other Seam unit
- tests, which are in the package <literal>org.jboss.seam.mock</literal>. The
- <literal>org.jboss.seam.resteasy.testfwk</literal> variations mimic real requests and responses much
- more closely.
- </para>
-
</sect2>
</sect1>
Deleted: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java
===================================================================
Added: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DelegatingServletInputStream.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DelegatingServletInputStream.java (rev 0)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DelegatingServletInputStream.java 2009-07-13 15:50:48 UTC (rev 11279)
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.seam.mock;
+
+import javax.servlet.ServletInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Delegating implementation of {@link javax.servlet.ServletInputStream}.
+ * <p/>
+ * <p>Used by {@link MockHttpServletRequest}; typically not directly
+ * used for testing application controllers.
+ *
+ * @author Juergen Hoeller
+ * @see MockHttpServletRequest
+ * @since 1.0.2
+ */
+public class DelegatingServletInputStream extends ServletInputStream
+{
+
+ private final InputStream sourceStream;
+
+
+ /**
+ * Create a DelegatingServletInputStream for the given source stream.
+ *
+ * @param sourceStream the source stream (never <code>null</code>)
+ */
+ public DelegatingServletInputStream(InputStream sourceStream)
+ {
+ this.sourceStream = sourceStream;
+ }
+
+ /**
+ * Return the underlying source stream (never <code>null</code>).
+ */
+ public final InputStream getSourceStream()
+ {
+ return this.sourceStream;
+ }
+
+
+ public int read() throws IOException
+ {
+ return this.sourceStream.read();
+ }
+
+ public void close() throws IOException
+ {
+ super.close();
+ this.sourceStream.close();
+ }
+
+}
\ No newline at end of file
Added: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DelegatingServletOutputStream.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DelegatingServletOutputStream.java (rev 0)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DelegatingServletOutputStream.java 2009-07-13 15:50:48 UTC (rev 11279)
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.seam.mock;
+
+import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+
+/**
+ * Delegating implementation of {@link javax.servlet.ServletOutputStream}.
+ * <p/>
+ * <p>Used by {@link MockHttpServletResponse}; typically not directly
+ * used for testing application controllers.
+ *
+ * @author Juergen Hoeller
+ * @see MockHttpServletResponse
+ * @since 1.0.2
+ */
+public class DelegatingServletOutputStream extends ServletOutputStream
+{
+
+ private final OutputStream targetStream;
+
+
+ /**
+ * Create a DelegatingServletOutputStream for the given target stream.
+ *
+ * @param targetStream the target stream (never <code>null</code>)
+ */
+ public DelegatingServletOutputStream(OutputStream targetStream)
+ {
+ this.targetStream = targetStream;
+ }
+
+ /**
+ * Return the underlying target stream (never <code>null</code>).
+ */
+ public final OutputStream getTargetStream()
+ {
+ return this.targetStream;
+ }
+
+
+ public void write(int b) throws IOException
+ {
+ this.targetStream.write(b);
+ }
+
+ public void flush() throws IOException
+ {
+ super.flush();
+ this.targetStream.flush();
+ }
+
+ public void close() throws IOException
+ {
+ super.close();
+ this.targetStream.close();
+ }
+
+}
\ No newline at end of file
Copied: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/EnhancedMockHttpServletRequest.java (from rev 11257, branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockHttpServletRequest.java)
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/EnhancedMockHttpServletRequest.java (rev 0)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/EnhancedMockHttpServletRequest.java 2009-07-13 15:50:48 UTC (rev 11279)
@@ -0,0 +1,1093 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.seam.mock;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+/**
+ * Mock implementation of the {@link javax.servlet.http.HttpServletRequest}
+ * interface. Supports the Servlet 2.4 API level.
+ * <p/>
+ * <p>Used for testing the web framework; also useful for testing
+ * application controllers.
+ *
+ * @author Juergen Hoeller
+ * @author Rod Johnson
+ * @author Rick Evans
+ * @author Mark Fisher
+ * @since 1.0.2
+ */
+public class EnhancedMockHttpServletRequest implements HttpServletRequest
+{
+
+ /**
+ * The default protocol: 'http'.
+ */
+ public static final String DEFAULT_PROTOCOL = "http";
+
+ /**
+ * The default server address: '127.0.0.1'.
+ */
+ public static final String DEFAULT_SERVER_ADDR = "127.0.0.1";
+
+ /**
+ * The default server name: 'localhost'.
+ */
+ public static final String DEFAULT_SERVER_NAME = "localhost";
+
+ /**
+ * The default server port: '80'.
+ */
+ public static final int DEFAULT_SERVER_PORT = 80;
+
+ /**
+ * The default remote address: '127.0.0.1'.
+ */
+ public static final String DEFAULT_REMOTE_ADDR = "127.0.0.1";
+
+ /**
+ * The default remote host: 'localhost'.
+ */
+ public static final String DEFAULT_REMOTE_HOST = "localhost";
+
+ private boolean active = true;
+
+
+ //---------------------------------------------------------------------
+ // ServletRequest properties
+ //---------------------------------------------------------------------
+
+ private final Hashtable attributes = new Hashtable();
+
+ private String characterEncoding;
+
+ private byte[] content;
+
+ private String contentType;
+
+ private final Map parameters = new LinkedHashMap(16);
+
+ private String protocol = DEFAULT_PROTOCOL;
+
+ private String scheme = DEFAULT_PROTOCOL;
+
+ private String serverName = DEFAULT_SERVER_NAME;
+
+ private int serverPort = DEFAULT_SERVER_PORT;
+
+ private String remoteAddr = DEFAULT_REMOTE_ADDR;
+
+ private String remoteHost = DEFAULT_REMOTE_HOST;
+
+ /**
+ * List of locales in descending order
+ */
+ private final Vector locales = new Vector();
+
+ private boolean secure = false;
+
+ private final ServletContext servletContext;
+
+ private int remotePort = DEFAULT_SERVER_PORT;
+
+ private String localName = DEFAULT_SERVER_NAME;
+
+ private String localAddr = DEFAULT_SERVER_ADDR;
+
+ private int localPort = DEFAULT_SERVER_PORT;
+
+
+ //---------------------------------------------------------------------
+ // HttpServletRequest properties
+ //---------------------------------------------------------------------
+
+ private String authType;
+
+ private Cookie[] cookies;
+
+ /**
+ * The key is the lowercase header name; the value is a {@link org.jboss.seam.mock.HeaderValueHolder} object.
+ */
+ private final Hashtable headers = new Hashtable();
+
+ private String method;
+
+ private String pathInfo;
+
+ private String contextPath = "";
+
+ private String queryString;
+
+ private Map<String, String> queryParameters = new HashMap();
+
+ private String remoteUser;
+
+ private Set<String> userRoles = new HashSet();
+
+ private Principal userPrincipal;
+
+ private String requestURI;
+
+ private String servletPath = "";
+
+ private HttpSession session;
+
+ private boolean requestedSessionIdValid = true;
+
+ private boolean requestedSessionIdFromCookie = true;
+
+ private boolean requestedSessionIdFromURL = false;
+
+
+ //---------------------------------------------------------------------
+ // Constructors
+ //---------------------------------------------------------------------
+
+ /**
+ * Create a new MockHttpServletRequest with a default
+ * {@link MockServletContext}.
+ *
+ * @see MockServletContext
+ */
+ public EnhancedMockHttpServletRequest()
+ {
+ this(null, "", "");
+ }
+
+ /**
+ * Create a new MockHttpServletRequest with a default
+ * {@link MockServletContext}.
+ *
+ * @param method the request method (may be <code>null</code>)
+ * @param requestURI the request URI (may be <code>null</code>)
+ * @see #setMethod
+ * @see #setRequestURI
+ * @see MockServletContext
+ */
+ public EnhancedMockHttpServletRequest(String method, String requestURI)
+ {
+ this(null, method, requestURI);
+ }
+
+ /**
+ * Create a new MockHttpServletRequest.
+ *
+ * @param servletContext the ServletContext that the request runs in
+ * (may be <code>null</code> to use a default MockServletContext)
+ * @see MockServletContext
+ */
+ public EnhancedMockHttpServletRequest(ServletContext servletContext)
+ {
+ this(servletContext, "", "");
+ }
+
+ /**
+ * Create a new MockHttpServletRequest.
+ *
+ * @param servletContext the ServletContext that the request runs in
+ * (may be <code>null</code> to use a default MockServletContext)
+ * @param method the request method (may be <code>null</code>)
+ * @param requestURI the request URI (may be <code>null</code>)
+ * @see #setMethod
+ * @see #setRequestURI
+ * @see MockServletContext
+ */
+ public EnhancedMockHttpServletRequest(ServletContext servletContext, String method, String requestURI)
+ {
+ this.servletContext = (servletContext != null ? servletContext : new MockServletContext());
+ this.method = method;
+ this.requestURI = requestURI;
+ this.locales.add(Locale.ENGLISH);
+
+ // Old mock: The 1.2 RI NPEs if this header isn't present
+ addHeader("Accept", new String[0]);
+ }
+
+
+ // OLD CONSTRUCTORS FROM < SEAM 2.2 MOCKS!
+
+ public EnhancedMockHttpServletRequest(HttpSession session)
+ {
+ this(session, null, new HashSet<String>());
+ }
+
+ public EnhancedMockHttpServletRequest(HttpSession session, String principalName, Set<String> principalRoles)
+ {
+ this(session, principalName, principalRoles, new Cookie[]{}, null);
+ }
+
+ public EnhancedMockHttpServletRequest(HttpSession session, final String principalName, Set<String> principalRoles, Cookie[] cookies, String method)
+ {
+ this(null, method, "");
+ this.session = session;
+
+ this.userPrincipal = principalName == null
+ ? null
+ : new Principal()
+ {
+ public String getName()
+ {
+ return principalName;
+ }
+ };
+
+ this.userRoles = principalRoles;
+ this.cookies = cookies;
+
+ // Old mock: The 1.2 RI NPEs if this header isn't present
+ addHeader("Accept", new String[0]);
+ }
+
+
+ //---------------------------------------------------------------------
+ // Lifecycle methods
+ //---------------------------------------------------------------------
+
+ /**
+ * Return the ServletContext that this request is associated with.
+ * (Not available in the standard HttpServletRequest interface for some reason.)
+ */
+ public ServletContext getServletContext()
+ {
+ return this.servletContext;
+ }
+
+ /**
+ * Return whether this request is still active (that is, not completed yet).
+ */
+ public boolean isActive()
+ {
+ return this.active;
+ }
+
+ /**
+ * Mark this request as completed, keeping its state.
+ */
+ public void close()
+ {
+ this.active = false;
+ }
+
+ /**
+ * Invalidate this request, clearing its state.
+ */
+ public void invalidate()
+ {
+ close();
+ clearAttributes();
+ }
+
+ /**
+ * Check whether this request is still active (that is, not completed yet),
+ * throwing an IllegalStateException if not active anymore.
+ */
+ protected void checkActive() throws IllegalStateException
+ {
+ if (!this.active)
+ {
+ throw new IllegalStateException("Request is not active anymore");
+ }
+ }
+
+
+ //---------------------------------------------------------------------
+ // ServletRequest interface
+ //---------------------------------------------------------------------
+
+ public Object getAttribute(String name)
+ {
+ checkActive();
+ return this.attributes.get(name);
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ checkActive();
+ return this.attributes.keys();
+ }
+
+ public String getCharacterEncoding()
+ {
+ return this.characterEncoding;
+ }
+
+ public void setCharacterEncoding(String characterEncoding)
+ {
+ this.characterEncoding = characterEncoding;
+ }
+
+ public void setContent(byte[] content)
+ {
+ this.content = content;
+ }
+
+ public int getContentLength()
+ {
+ return (this.content != null ? this.content.length : -1);
+ }
+
+ public void setContentType(String contentType)
+ {
+ this.contentType = contentType;
+ }
+
+ public String getContentType()
+ {
+ return this.contentType;
+ }
+
+ public ServletInputStream getInputStream() throws IOException
+ {
+ if (this.content != null)
+ {
+ return new DelegatingServletInputStream(new ByteArrayInputStream(this.content));
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Set a single value for the specified HTTP parameter.
+ * <p>If there are already one or more values registered for the given
+ * parameter name, they will be replaced.
+ */
+ public void setParameter(String name, String value)
+ {
+ setParameter(name, new String[]{value});
+ }
+
+ /**
+ * Set an array of values for the specified HTTP parameter.
+ * <p>If there are already one or more values registered for the given
+ * parameter name, they will be replaced.
+ */
+ public void setParameter(String name, String[] values)
+ {
+ this.parameters.put(name, values);
+ }
+
+ /**
+ * Sets all provided parameters <emphasis>replacing</emphasis> any
+ * existing values for the provided parameter names. To add without
+ * replacing existing values, use {@link #addParameters(java.util.Map)}.
+ */
+ public void setParameters(Map params)
+ {
+ for (Iterator it = params.keySet().iterator(); it.hasNext();)
+ {
+ Object key = it.next();
+ Object value = params.get(key);
+ if (value instanceof String)
+ {
+ this.setParameter((String) key, (String) value);
+ }
+ else if (value instanceof String[])
+ {
+ this.setParameter((String) key, (String[]) value);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Parameter map value must be single value " +
+ " or array of type [" + String.class.getName() + "]");
+ }
+ }
+ }
+
+ /**
+ * Add a single value for the specified HTTP parameter.
+ * <p>If there are already one or more values registered for the given
+ * parameter name, the given value will be added to the end of the list.
+ */
+ public void addParameter(String name, String value)
+ {
+ addParameter(name, new String[]{value});
+ }
+
+ /**
+ * Add an array of values for the specified HTTP parameter.
+ * <p>If there are already one or more values registered for the given
+ * parameter name, the given values will be added to the end of the list.
+ */
+ public void addParameter(String name, String[] values)
+ {
+ String[] oldArr = (String[]) this.parameters.get(name);
+ if (oldArr != null)
+ {
+ String[] newArr = new String[oldArr.length + values.length];
+ System.arraycopy(oldArr, 0, newArr, 0, oldArr.length);
+ System.arraycopy(values, 0, newArr, oldArr.length, values.length);
+ this.parameters.put(name, newArr);
+ }
+ else
+ {
+ this.parameters.put(name, values);
+ }
+ }
+
+ /**
+ * Adds all provided parameters <emphasis>without</emphasis> replacing
+ * any existing values. To replace existing values, use
+ * {@link #setParameters(java.util.Map)}.
+ */
+ public void addParameters(Map params)
+ {
+ for (Iterator it = params.keySet().iterator(); it.hasNext();)
+ {
+ Object key = it.next();
+ Object value = params.get(key);
+ if (value instanceof String)
+ {
+ this.addParameter((String) key, (String) value);
+ }
+ else if (value instanceof String[])
+ {
+ this.addParameter((String) key, (String[]) value);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Parameter map value must be single value " +
+ " or array of type [" + String.class.getName() + "]");
+ }
+ }
+ }
+
+ /**
+ * Remove already registered values for the specified HTTP parameter, if any.
+ */
+ public void removeParameter(String name)
+ {
+ this.parameters.remove(name);
+ }
+
+ /**
+ * Removes all existing parameters.
+ */
+ public void removeAllParameters()
+ {
+ this.parameters.clear();
+ }
+
+ public String getParameter(String name)
+ {
+ String[] arr = (String[]) this.parameters.get(name);
+ return (arr != null && arr.length > 0 ? arr[0] : null);
+ }
+
+ public Enumeration getParameterNames()
+ {
+ return Collections.enumeration(this.parameters.keySet());
+ }
+
+ public String[] getParameterValues(String name)
+ {
+ return (String[]) this.parameters.get(name);
+ }
+
+ public Map getParameterMap()
+ {
+ return this.parameters;
+ }
+
+ // Old mock
+ public Map<String, String[]> getParameters()
+ {
+ return parameters;
+ }
+
+ /**
+ * Add a query parameter that will be appended to the URI query string.
+ */
+ public void addQueryParameter(String name, String value)
+ {
+ addParameter(name, value);
+ this.queryParameters.put(name, value);
+ }
+
+ public void removeQueryParameter(String name)
+ {
+ removeParameter(name);
+ this.queryParameters.remove(name);
+ }
+
+ public Map<String, String> getQueryParameters()
+ {
+ return queryParameters;
+ }
+
+ public void setProtocol(String protocol)
+ {
+ this.protocol = protocol;
+ }
+
+ public String getProtocol()
+ {
+ return this.protocol;
+ }
+
+ public void setScheme(String scheme)
+ {
+ this.scheme = scheme;
+ }
+
+ public String getScheme()
+ {
+ return this.scheme;
+ }
+
+ public void setServerName(String serverName)
+ {
+ this.serverName = serverName;
+ }
+
+ public String getServerName()
+ {
+ return this.serverName;
+ }
+
+ public void setServerPort(int serverPort)
+ {
+ this.serverPort = serverPort;
+ }
+
+ public int getServerPort()
+ {
+ return this.serverPort;
+ }
+
+ public BufferedReader getReader() throws UnsupportedEncodingException
+ {
+ if (this.content != null)
+ {
+ InputStream sourceStream = new ByteArrayInputStream(this.content);
+ Reader sourceReader = (this.characterEncoding != null) ?
+ new InputStreamReader(sourceStream, this.characterEncoding) : new InputStreamReader(sourceStream);
+ return new BufferedReader(sourceReader);
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public void setRemoteAddr(String remoteAddr)
+ {
+ this.remoteAddr = remoteAddr;
+ }
+
+ public String getRemoteAddr()
+ {
+ return this.remoteAddr;
+ }
+
+ public void setRemoteHost(String remoteHost)
+ {
+ this.remoteHost = remoteHost;
+ }
+
+ public String getRemoteHost()
+ {
+ return this.remoteHost;
+ }
+
+ public void setAttribute(String name, Object value)
+ {
+ checkActive();
+ if (value != null)
+ {
+ this.attributes.put(name, value);
+ }
+ else
+ {
+ this.attributes.remove(name);
+ }
+ }
+
+ public void removeAttribute(String name)
+ {
+ checkActive();
+ this.attributes.remove(name);
+ }
+
+ /**
+ * Clear all of this request's attributes.
+ */
+ public void clearAttributes()
+ {
+ this.attributes.clear();
+ }
+
+ /**
+ * Add a new preferred locale, before any existing locales.
+ */
+ public void addPreferredLocale(Locale locale)
+ {
+ this.locales.add(0, locale);
+ }
+
+ public Locale getLocale()
+ {
+ return (Locale) this.locales.get(0);
+ }
+
+ public Enumeration getLocales()
+ {
+ return this.locales.elements();
+ }
+
+ public void setSecure(boolean secure)
+ {
+ this.secure = secure;
+ }
+
+ public boolean isSecure()
+ {
+ return this.secure;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String path)
+ {
+ return new MockRequestDispatcher(path);
+ }
+
+ public String getRealPath(String path)
+ {
+ return this.servletContext.getRealPath(path);
+ }
+
+ public void setRemotePort(int remotePort)
+ {
+ this.remotePort = remotePort;
+ }
+
+ public int getRemotePort()
+ {
+ return this.remotePort;
+ }
+
+ public void setLocalName(String localName)
+ {
+ this.localName = localName;
+ }
+
+ public String getLocalName()
+ {
+ return this.localName;
+ }
+
+ public void setLocalAddr(String localAddr)
+ {
+ this.localAddr = localAddr;
+ }
+
+ public String getLocalAddr()
+ {
+ return this.localAddr;
+ }
+
+ public void setLocalPort(int localPort)
+ {
+ this.localPort = localPort;
+ }
+
+ public int getLocalPort()
+ {
+ return this.localPort;
+ }
+
+
+ //---------------------------------------------------------------------
+ // HttpServletRequest interface
+ //---------------------------------------------------------------------
+
+ public void setAuthType(String authType)
+ {
+ this.authType = authType;
+ }
+
+ public String getAuthType()
+ {
+ return this.authType;
+ }
+
+ public void setCookies(Cookie[] cookies)
+ {
+ this.cookies = cookies;
+ }
+
+ public Cookie[] getCookies()
+ {
+ return this.cookies;
+ }
+
+ public void addCookie(Cookie cookie)
+ {
+ this.cookies = new Cookie[this.cookies.length + 1];
+ this.cookies[this.cookies.length - 1] = cookie;
+ }
+
+ /**
+ * Add a header entry for the given name.
+ * <p>If there was no entry for that header name before,
+ * the value will be used as-is. In case of an existing entry,
+ * a String array will be created, adding the given value (more
+ * specifically, its toString representation) as further element.
+ * <p>Multiple values can only be stored as list of Strings,
+ * following the Servlet spec (see <code>getHeaders</code> accessor).
+ * As alternative to repeated <code>addHeader</code> calls for
+ * individual elements, you can use a single call with an entire
+ * array or Collection of values as parameter.
+ *
+ * @see #getHeaderNames
+ * @see #getHeader
+ * @see #getHeaders
+ * @see #getDateHeader
+ * @see #getIntHeader
+ */
+ public void addHeader(String name, Object value)
+ {
+ HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
+ if (header == null)
+ {
+ header = new HeaderValueHolder();
+ this.headers.put(name, header);
+ }
+ if (value instanceof Collection)
+ {
+ header.addValues((Collection) value);
+ }
+ else if (value.getClass().isArray())
+ {
+ header.addValueArray(value);
+ }
+ else
+ {
+ header.addValue(value);
+ }
+ }
+
+ public long getDateHeader(String name)
+ {
+ HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
+ Object value = (header != null ? header.getValue() : null);
+ if (value instanceof Date)
+ {
+ return ((Date) value).getTime();
+ }
+ else if (value instanceof Number)
+ {
+ return ((Number) value).longValue();
+ }
+ else if (value != null)
+ {
+ throw new IllegalArgumentException(
+ "Value for header '" + name + "' is neither a Date nor a Number: " + value);
+ }
+ else
+ {
+ return -1L;
+ }
+ }
+
+ public String getHeader(String name)
+ {
+ HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
+ return (header != null ? header.getValue().toString() : null);
+ }
+
+ public Map<String, String[]> getHeaders()
+ {
+ Map<String, String[]> headerValues = new HashMap();
+
+ for (Object o : this.headers.entrySet())
+ {
+ Map.Entry<String, HeaderValueHolder> entry = (Map.Entry<String, HeaderValueHolder>)o;
+ String[] values = (String[])entry.getValue().getValues().toArray(new String[entry.getValue().getValues().size()]);
+ headerValues.put(entry.getKey(), values);
+ }
+
+ return headerValues;
+ }
+
+ public Enumeration getHeaders(String name)
+ {
+ HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
+ return Collections.enumeration(header != null ? header.getValues() : Collections.EMPTY_LIST);
+ }
+
+ public Enumeration getHeaderNames()
+ {
+ return this.headers.keys();
+ }
+
+ public int getIntHeader(String name)
+ {
+ HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
+ Object value = (header != null ? header.getValue() : null);
+ if (value instanceof Number)
+ {
+ return ((Number) value).intValue();
+ }
+ else if (value instanceof String)
+ {
+ return Integer.parseInt((String) value);
+ }
+ else if (value != null)
+ {
+ throw new NumberFormatException("Value for header '" + name + "' is not a Number: " + value);
+ }
+ else
+ {
+ return -1;
+ }
+ }
+
+ public void setMethod(String method)
+ {
+ this.method = method;
+ }
+
+ public String getMethod()
+ {
+ return this.method;
+ }
+
+ public void setPathInfo(String pathInfo)
+ {
+ this.pathInfo = pathInfo;
+ }
+
+ public String getPathInfo()
+ {
+ return this.pathInfo;
+ }
+
+ public String getPathTranslated()
+ {
+ return (this.pathInfo != null ? getRealPath(this.pathInfo) : null);
+ }
+
+ public void setContextPath(String contextPath)
+ {
+ this.contextPath = contextPath;
+ }
+
+ public String getContextPath()
+ {
+ return this.contextPath != null ? this.contextPath : "/project"; // Old mock default
+ }
+
+ public void setQueryString(String queryString)
+ {
+ this.queryString = queryString;
+ }
+
+ public String getQueryString()
+ {
+ if (getQueryParameters().size() > 0)
+ {
+ StringBuilder q = new StringBuilder(queryString);
+ if (!queryString.endsWith("&")) q.append("&");
+ for (Map.Entry<String, String> entry : getQueryParameters().entrySet())
+ {
+ q.append(entry.getKey());
+ q.append("=");
+ q.append(entry.getValue());
+ q.append("&");
+ }
+ if (q.toString().endsWith("&"))
+ {
+ q.deleteCharAt(q.length() - 1);
+ }
+ return q.toString();
+ }
+ return this.queryString;
+ }
+
+ public void setRemoteUser(String remoteUser)
+ {
+ this.remoteUser = remoteUser;
+ }
+
+ public String getRemoteUser()
+ {
+ return this.remoteUser;
+ }
+
+ /**
+ * @see #addUserRole
+ * @deprecated in favor of addUserRole
+ */
+ public void addRole(String role)
+ {
+ addUserRole(role);
+ }
+
+ public void addUserRole(String role)
+ {
+ this.userRoles.add(role);
+ }
+
+ public boolean isUserInRole(String role)
+ {
+ return this.userRoles.contains(role);
+ }
+
+ public void setUserPrincipal(Principal userPrincipal)
+ {
+ this.userPrincipal = userPrincipal;
+ }
+
+ public Principal getUserPrincipal()
+ {
+ return this.userPrincipal;
+ }
+
+ public String getRequestedSessionId()
+ {
+ HttpSession session = getSession();
+ return (session != null ? session.getId() : null);
+ }
+
+ public void setRequestURI(String requestURI)
+ {
+ this.requestURI = requestURI;
+ }
+
+ public String getRequestURI()
+ {
+ return this.requestURI;
+ }
+
+ public StringBuffer getRequestURL()
+ {
+ StringBuffer url = new StringBuffer(this.scheme);
+ url.append("://").append(this.serverName).append(':').append(this.serverPort);
+ url.append(getRequestURI());
+ return url;
+ }
+
+ public void setServletPath(String servletPath)
+ {
+ this.servletPath = servletPath;
+ }
+
+ public String getServletPath()
+ {
+ return this.servletPath;
+ }
+
+ public void setSession(HttpSession session)
+ {
+ /*
+ TODO: We don't track access times in mocks (yet) mockSession.access();
+ if (session instanceof MockHttpSession) {
+ MockHttpSession mockSession = ((MockHttpSession) session);
+ ...
+ }
+ */
+ this.session = session;
+ }
+
+ public HttpSession getSession(boolean create)
+ {
+ checkActive();
+ // Reset session if invalidated.
+ if (this.session instanceof MockHttpSession && ((MockHttpSession) this.session).isInvalid())
+ {
+ this.session = null;
+ }
+ // Create new session if necessary.
+ if (this.session == null && create)
+ {
+ this.session = new MockHttpSession(this.servletContext);
+ }
+ return this.session;
+ }
+
+ public HttpSession getSession()
+ {
+ return getSession(true);
+ }
+
+ public void setRequestedSessionIdValid(boolean requestedSessionIdValid)
+ {
+ this.requestedSessionIdValid = requestedSessionIdValid;
+ }
+
+ public boolean isRequestedSessionIdValid()
+ {
+ return this.requestedSessionIdValid;
+ }
+
+ public void setRequestedSessionIdFromCookie(boolean requestedSessionIdFromCookie)
+ {
+ this.requestedSessionIdFromCookie = requestedSessionIdFromCookie;
+ }
+
+ public boolean isRequestedSessionIdFromCookie()
+ {
+ return this.requestedSessionIdFromCookie;
+ }
+
+ public void setRequestedSessionIdFromURL(boolean requestedSessionIdFromURL)
+ {
+ this.requestedSessionIdFromURL = requestedSessionIdFromURL;
+ }
+
+ public boolean isRequestedSessionIdFromURL()
+ {
+ return this.requestedSessionIdFromURL;
+ }
+
+ public boolean isRequestedSessionIdFromUrl()
+ {
+ return isRequestedSessionIdFromURL();
+ }
+
+ public boolean isAllParametersInQueryString() {
+ return true;
+ }
+
+}
\ No newline at end of file
Copied: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java (from rev 11257, branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockHttpServletResponse.java)
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java (rev 0)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java 2009-07-13 15:50:48 UTC (rev 11279)
@@ -0,0 +1,515 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.seam.mock;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+
+/**
+ * Mock implementation of the {@link javax.servlet.http.HttpServletResponse}
+ * interface. Supports the Servlet 2.4 API level.
+ *
+ * <p>Used for testing the web framework; also useful for testing
+ * application controllers.
+ *
+ * @author Juergen Hoeller
+ * @author Rod Johnson
+ * @since 1.0.2
+ */
+public class EnhancedMockHttpServletResponse implements HttpServletResponse {
+
+ public static final int DEFAULT_SERVER_PORT = 80;
+
+ private static final String CHARSET_PREFIX = "charset=";
+
+
+ //---------------------------------------------------------------------
+ // ServletResponse properties
+ //---------------------------------------------------------------------
+
+ private boolean outputStreamAccessAllowed = true;
+
+ private boolean writerAccessAllowed = true;
+
+ private String characterEncoding = "ISO-8859-1";
+
+ private final ByteArrayOutputStream content = new ByteArrayOutputStream();
+
+ private final ServletOutputStream outputStream = new ResponseServletOutputStream(this.content);
+
+ private PrintWriter writer;
+
+ private int contentLength = 0;
+
+ private String contentType;
+
+ private int bufferSize = 4096;
+
+ private boolean committed;
+
+ private Locale locale = Locale.getDefault();
+
+
+ //---------------------------------------------------------------------
+ // HttpServletResponse properties
+ //---------------------------------------------------------------------
+
+ 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();
+
+ private int status = HttpServletResponse.SC_OK;
+
+ private String statusMessage;
+
+ private String redirectedUrl;
+
+ private String forwardedUrl;
+
+ private String includedUrl;
+
+
+ //---------------------------------------------------------------------
+ // ServletResponse interface
+ //---------------------------------------------------------------------
+
+ /**
+ * Set whether {@link #getOutputStream()} access is allowed.
+ * <p>Default is <code>true</code>.
+ */
+ 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.
+ * <p>Default is <code>true</code>.
+ */
+ 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 <code>Set</code> of header name <code>Strings</code>, or an empty <code>Set</code> if none
+ */
+ public Set getHeaderNames() {
+ return this.headers.keySet();
+ }
+
+ /**
+ * Return the primary value for the given header, if any.
+ * <p>Will return the first value in case of multiple values.
+ * @param name the name of the header
+ * @return the associated header value, or <code>null<code> if none
+ */
+ public Object getHeader(String name) {
+ HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
+ return (header != null ? header.getValue() : 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.
+ * <p>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.
+ * <p>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
+ {
+
+ 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);
+ }
+ }
+
+}
\ No newline at end of file
Added: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/HeaderValueHolder.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/HeaderValueHolder.java (rev 0)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/HeaderValueHolder.java 2009-07-13 15:50:48 UTC (rev 11279)
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.seam.mock;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Internal helper class that serves as value holder for request headers.
+ *
+ * @author Juergen Hoeller
+ * @author Rick Evans
+ * @since 2.0.1
+ */
+class HeaderValueHolder
+{
+
+ private final List values = new LinkedList();
+
+
+ public void setValue(Object value)
+ {
+ this.values.clear();
+ this.values.add(value);
+ }
+
+ public void addValue(Object value)
+ {
+ this.values.add(value);
+ }
+
+ public void addValues(Collection values)
+ {
+ this.values.addAll(values);
+ }
+
+ public void addValueArray(Object values)
+ {
+ Object[] arr = toObjectArray(values);
+ this.values.addAll(Arrays.asList(arr));
+ }
+
+ public List getValues()
+ {
+ return Collections.unmodifiableList(this.values);
+ }
+
+ public Object getValue()
+ {
+ return (!this.values.isEmpty() ? this.values.get(0) : null);
+ }
+
+
+ /**
+ * Find a HeaderValueHolder by name, ignoring casing.
+ *
+ * @param headers the Map of header names to HeaderValueHolders
+ * @param name the name of the desired header
+ * @return the corresponding HeaderValueHolder,
+ * or <code>null</code> if none found
+ */
+ public static HeaderValueHolder getByName(Map headers, String name)
+ {
+ for (Iterator it = headers.keySet().iterator(); it.hasNext();)
+ {
+ String headerName = (String) it.next();
+ if (headerName.equalsIgnoreCase(name))
+ {
+ return (HeaderValueHolder) headers.get(headerName);
+ }
+ }
+ return null;
+ }
+
+ public static Object[] toObjectArray(Object source)
+ {
+ if (source instanceof Object[])
+ {
+ return (Object[]) source;
+ }
+ if (source == null)
+ {
+ return new Object[0];
+ }
+ if (!source.getClass().isArray())
+ {
+ throw new IllegalArgumentException("Source is not an array: " + source);
+ }
+ int length = Array.getLength(source);
+ if (length == 0)
+ {
+ return new Object[0];
+ }
+ Class wrapperType = Array.get(source, 0).getClass();
+ Object[] newArray = (Object[]) Array.newInstance(wrapperType, length);
+ for (int i = 0; i < length; i++)
+ {
+ newArray[i] = Array.get(source, i);
+ }
+ return newArray;
+ }
+
+}
\ No newline at end of file
Added: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockRequestDispatcher.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockRequestDispatcher.java (rev 0)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockRequestDispatcher.java 2009-07-13 15:50:48 UTC (rev 11279)
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.seam.mock;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+
+/**
+ * Mock implementation of the {@link javax.servlet.RequestDispatcher} interface.
+ * <p/>
+ * <p>Used for testing the web framework; typically not necessary for
+ * testing application controllers.
+ *
+ * @author Rod Johnson
+ * @author Juergen Hoeller
+ * @since 1.0.2
+ */
+public class MockRequestDispatcher implements RequestDispatcher
+{
+
+ private final Log logger = LogFactory.getLog(getClass());
+
+ private final String url;
+
+
+ /**
+ * Create a new MockRequestDispatcher for the given URL.
+ *
+ * @param url the URL to dispatch to.
+ */
+ public MockRequestDispatcher(String url)
+ {
+ this.url = url;
+ }
+
+
+ public void forward(ServletRequest request, ServletResponse response)
+ {
+ if (response.isCommitted())
+ {
+ throw new IllegalStateException("Cannot perform forward - response is already committed");
+ }
+ getMockHttpServletResponse(response).setForwardedUrl(this.url);
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("MockRequestDispatcher: forwarding to URL [" + this.url + "]");
+ }
+ }
+
+ public void include(ServletRequest request, ServletResponse response)
+ {
+ getMockHttpServletResponse(response).setIncludedUrl(this.url);
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("MockRequestDispatcher: including URL [" + this.url + "]");
+ }
+ }
+
+ /**
+ * Obtain the underlying EnhancedMockHttpServletResponse,
+ * unwrapping {@link javax.servlet.http.HttpServletResponseWrapper} decorators if necessary.
+ */
+ protected EnhancedMockHttpServletResponse getMockHttpServletResponse(ServletResponse response)
+ {
+ if (response instanceof EnhancedMockHttpServletResponse)
+ {
+ return (EnhancedMockHttpServletResponse) response;
+ }
+ if (response instanceof HttpServletResponseWrapper)
+ {
+ return getMockHttpServletResponse(((HttpServletResponseWrapper) response).getResponse());
+ }
+ throw new IllegalArgumentException("MockRequestDispatcher requires MockHttpServletResponse");
+ }
+
+}
\ No newline at end of file
Added: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/ResourceRequestEnvironment.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/ResourceRequestEnvironment.java (rev 0)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/ResourceRequestEnvironment.java 2009-07-13 15:50:48 UTC (rev 11279)
@@ -0,0 +1,267 @@
+package org.jboss.seam.mock;
+
+import org.jboss.seam.servlet.SeamResourceServlet;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Cookie;
+import javax.servlet.ServletException;
+import javax.servlet.ServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import java.util.Collections;
+import java.util.Set;
+import java.util.List;
+import java.util.Map;
+import java.util.Enumeration;
+import java.security.Principal;
+import java.io.IOException;
+
+/**
+ * Executes (through local calls, not TCP sockets) an HTTP request in a unit test, passing it through
+ * the Seam resource handlers and filters.
+ *
+ * <p>
+ * This class is supposed to be used <b>within</b> a <tt>SeamTest</tt>, in fact, you need
+ * to pass an instance of <tt>SeamTest</tt> into its constructor. This prepares the environment
+ * for the resource request processing. You can either share an instance of the environment between
+ * all your test methods (prepare it in <tt>@BeforeClass</tt>) or you can create a new instance
+ * for each <tt>ResourceRequest</tt>:
+ * </p>
+ *
+ * <pre>
+ * import org.jboss.seam.mock.ResourceRequestEnvironment;
+ * import org.jboss.seam.mock.EnhancedMockHttpServletRequest;
+ * import org.jboss.seam.mock.EnhancedMockHttpServletResponse;
+ * import static org.jboss.seam.mock.ResourceRequestEnvironment.ResourceRequest;
+ * import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;
+ *
+ * public class MyTest extends SeamTest {
+ *
+ * ResourceRequestEnvironment sharedEnvironment;
+ *
+ * @BeforeClass
+ * public void prepareSharedEnvironment() throws Exception {
+ * sharedEnvironment = new ResourceRequestEnvironment(this) {
+ * @Override
+ * public Map<String, Object> getDefaultHeaders() {
+ * return new HashMap<String, Object>() {{
+ * put("Accept", "text/plain");
+ * }};
+ * }
+ * };
+ * }
+ *
+ * @Test
+ * public void test() throws Exception
+ * {
+ * //Not shared: new ResourceRequest(new ResourceRequestEnvironment(this), Method.GET, "/my/relative/uri)
+ *
+ * new ResourceRequest(sharedEnvironment, Method.GET, "/my/relative/uri)
+ * {
+ *
+ * @Override
+ * protected void prepareRequest(EnhancedMockHttpServletRequest request)
+ * {
+ * request.addQueryParameter("foo", "123");
+ * request.addHeader("Accept-Language", "en_US, de");
+ * }
+ *
+ * @Override
+ * protected void onResponse(EnhancedMockHttpServletResponse response)
+ * {
+ * assert response.getStatus() == 200;
+ * assert response.getContentAsString().equals("foobar");
+ * }
+ *
+ * }.run();
+ * }
+ *
+ * }
+ * </pre>
+ * <p>
+ * Note that in a <tt>SeamTest</tt> the (mock) HTTP session is always shared between all requests in a particular test
+ * method. Each test method however executes with a new (mock) HTTP session. Design your tests accordingly, this is not
+ * configurable.
+ * </p>
+ * <p>
+ * <b>IMPORTANT: A <tt>ResourceRequest</tt> has to be executed in a <tt>@Test</tt> method or in a
+ * <tt>@BeforeMethod</tt> callback. You can not execute it in any other callback, such * as <tt>@BeforeClass</tt>.
+ * </p>
+ *
+ * @author Christian Bauer
+ */
+public class ResourceRequestEnvironment
+{
+
+ public enum Method
+ {
+ GET, PUT, POST, DELETE, HEAD, OPTIONS
+ }
+
+ final protected AbstractSeamTest seamTest;
+ final protected SeamResourceServlet resourceServlet;
+
+ public ResourceRequestEnvironment(AbstractSeamTest seamTest)
+ {
+ this.seamTest = seamTest;
+ resourceServlet = new SeamResourceServlet();
+ try {
+ resourceServlet.init(
+ new ServletConfig()
+ {
+ public String getServletName()
+ {
+ return "Seam Resource Servlet";
+ }
+
+ public ServletContext getServletContext()
+ {
+ return ResourceRequestEnvironment.this.seamTest.servletContext;
+ }
+
+ public String getInitParameter(String s)
+ {
+ return null;
+ }
+
+ public Enumeration getInitParameterNames()
+ {
+ return null;
+ }
+ }
+ );
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ public static class ResourceRequest
+ {
+
+ final private ResourceRequestEnvironment environment;
+ private Method httpMethod;
+ private String requestPath;
+ private EnhancedMockHttpServletRequest request;
+ private EnhancedMockHttpServletResponse response;
+
+ public ResourceRequest(ResourceRequestEnvironment environment, Method httpMethod, String requestPath)
+ {
+ this.environment = environment;
+ this.httpMethod = httpMethod;
+ this.requestPath = environment.getServletPath() + (requestPath.startsWith("/") ? requestPath : "/" + requestPath);
+ }
+
+ public void run() throws Exception
+ {
+ init();
+ prepareRequest(request);
+ environment.seamTest.seamFilter.doFilter(request, response, new FilterChain()
+ {
+ public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException
+ {
+ environment.resourceServlet.service(request, response);
+ }
+ });
+ environment.seamTest.seamFilter.destroy();
+ onResponse(getResponse());
+ }
+
+ protected void init()
+ {
+ request = createRequest();
+ response = createResponse();
+
+ request.setMethod(httpMethod.toString());
+ request.setRequestURI(requestPath);
+
+ request.setServletPath(environment.getServletPath());
+
+ request.setCookies(getCookies().toArray(new Cookie[getCookies().size()]));
+
+ for (Map.Entry<String, Object> entry : environment.getDefaultHeaders().entrySet())
+ {
+ request.addHeader(entry.getKey(), entry.getValue());
+ }
+
+ request.setUserPrincipal(
+ new Principal()
+ {
+ public String getName()
+ {
+ return getPrincipalName();
+ }
+ }
+ );
+ for (String role : getPrincipalRoles())
+ {
+ request.addUserRole(role);
+ }
+
+ // Use the (mock) HttpSession that Seam uses, see AbstractSeamTest
+ request.setSession(environment.seamTest.session);
+
+ }
+
+ protected EnhancedMockHttpServletRequest createRequest()
+ {
+ return new EnhancedMockHttpServletRequest();
+ }
+
+ protected EnhancedMockHttpServletResponse createResponse()
+ {
+ return new EnhancedMockHttpServletResponse();
+ }
+
+ protected Map<String, String> getRequestQueryParameters()
+ {
+ return Collections.EMPTY_MAP;
+ }
+
+ protected List<Cookie> getCookies()
+ {
+ return Collections.EMPTY_LIST;
+ }
+
+ protected String getPrincipalName()
+ {
+ return null;
+ }
+
+ protected Set<String> getPrincipalRoles()
+ {
+ return Collections.EMPTY_SET;
+ }
+
+ protected void prepareRequest(EnhancedMockHttpServletRequest request)
+ {
+ }
+
+ protected void onResponse(EnhancedMockHttpServletResponse response)
+ {
+ }
+
+ public HttpServletRequest getRequest()
+ {
+ return request;
+ }
+
+ public EnhancedMockHttpServletResponse getResponse()
+ {
+ return response;
+ }
+
+ }
+
+ public String getServletPath()
+ {
+ return "/seam/resource";
+ }
+
+ public Map<String, Object> getDefaultHeaders()
+ {
+ return Collections.EMPTY_MAP;
+ }
+
+}
15 years, 4 months
- 1
- 0
Seam SVN: r11278 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-13 08:20:22 -0400 (Mon, 13 Jul 2009)
New Revision: 11278
Removed:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java
Log:
back ported JBSEAM-4121 - fix the wrong placement of class PagesDotXmlDeploymentHandler
Deleted: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java 2009-07-13 11:55:08 UTC (rev 11277)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java 2009-07-13 12:20:22 UTC (rev 11278)
@@ -1,61 +0,0 @@
-package org.jboss.seam.deployment;
-
-import org.jboss.seam.contexts.Contexts;
-
-/**
- * The {@link PagesDotXmlDeploymentHandler} process pages.xml files
- * Its only purpose is to make sure pages.xml gets updated by hot deploy
- *
- * @author Stuart Douglas
- *
- */
-public class PagesDotXmlDeploymentHandler extends AbstractDeploymentHandler
-{
-
- private static DeploymentMetadata PAGESDOTXML_SUFFIX_FILE_METADATA = new DeploymentMetadata()
- {
-
- public String getFileNameSuffix()
- {
- return "WEB-INF/pages.xml";
- }
-
- };
-
- /**
- * Name under which this {@link DeploymentHandler} is registered
- */
- public static final String NAME = "org.jboss.seam.deployment.PagesDotXmlDeploymentHandler";
-
- public String getName()
- {
- return NAME;
- }
-
- public static PagesDotXmlDeploymentHandler instance()
- {
- if (Contexts.isEventContextActive())
- {
- if (Contexts.getEventContext().isSet(WarRootDeploymentStrategy.NAME))
- {
- DeploymentStrategy deploymentStrategy = (DeploymentStrategy) Contexts.getEventContext().get(WarRootDeploymentStrategy.NAME);
- Object deploymentHandler = deploymentStrategy.getDeploymentHandlers().get(NAME);
- if (deploymentHandler != null)
- {
- return (PagesDotXmlDeploymentHandler) deploymentHandler;
- }
- }
- return null;
- }
- else
- {
- throw new IllegalStateException("Event context not active");
- }
- }
-
- public DeploymentMetadata getMetadata()
- {
- return PAGESDOTXML_SUFFIX_FILE_METADATA;
- }
-
-}
15 years, 4 months
- 1
- 0
Seam SVN: r11277 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/deployment.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-13 07:55:08 -0400 (Mon, 13 Jul 2009)
New Revision: 11277
Added:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/deployment/PagesDotXmlDeploymentHandler.java
Log:
back ported JBSEAM-4121 - fix the wrong placement of class PagesDotXmlDeploymentHandler
Copied: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/deployment/PagesDotXmlDeploymentHandler.java (from rev 11271, branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java)
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/deployment/PagesDotXmlDeploymentHandler.java (rev 0)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/deployment/PagesDotXmlDeploymentHandler.java 2009-07-13 11:55:08 UTC (rev 11277)
@@ -0,0 +1,61 @@
+package org.jboss.seam.deployment;
+
+import org.jboss.seam.contexts.Contexts;
+
+/**
+ * The {@link PagesDotXmlDeploymentHandler} process pages.xml files
+ * Its only purpose is to make sure pages.xml gets updated by hot deploy
+ *
+ * @author Stuart Douglas
+ *
+ */
+public class PagesDotXmlDeploymentHandler extends AbstractDeploymentHandler
+{
+
+ private static DeploymentMetadata PAGESDOTXML_SUFFIX_FILE_METADATA = new DeploymentMetadata()
+ {
+
+ public String getFileNameSuffix()
+ {
+ return "WEB-INF/pages.xml";
+ }
+
+ };
+
+ /**
+ * Name under which this {@link DeploymentHandler} is registered
+ */
+ public static final String NAME = "org.jboss.seam.deployment.PagesDotXmlDeploymentHandler";
+
+ public String getName()
+ {
+ return NAME;
+ }
+
+ public static PagesDotXmlDeploymentHandler instance()
+ {
+ if (Contexts.isEventContextActive())
+ {
+ if (Contexts.getEventContext().isSet(WarRootDeploymentStrategy.NAME))
+ {
+ DeploymentStrategy deploymentStrategy = (DeploymentStrategy) Contexts.getEventContext().get(WarRootDeploymentStrategy.NAME);
+ Object deploymentHandler = deploymentStrategy.getDeploymentHandlers().get(NAME);
+ if (deploymentHandler != null)
+ {
+ return (PagesDotXmlDeploymentHandler) deploymentHandler;
+ }
+ }
+ return null;
+ }
+ else
+ {
+ throw new IllegalStateException("Event context not active");
+ }
+ }
+
+ public DeploymentMetadata getMetadata()
+ {
+ return PAGESDOTXML_SUFFIX_FILE_METADATA;
+ }
+
+}
15 years, 4 months
- 1
- 0
Seam SVN: r11276 - in branches/community/Seam_2_2/src/main/org/jboss/seam: deployment and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-13 07:47:08 -0400 (Mon, 13 Jul 2009)
New Revision: 11276
Added:
branches/community/Seam_2_2/src/main/org/jboss/seam/deployment/PagesDotXmlDeploymentHandler.java
Removed:
branches/community/Seam_2_2/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java
Log:
JBSEAM-4121 - fix the wrong placement of class PagesDotXmlDeploymentHandler
Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java 2009-07-13 11:07:19 UTC (rev 11275)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java 2009-07-13 11:47:08 UTC (rev 11276)
@@ -1,61 +0,0 @@
-package org.jboss.seam.deployment;
-
-import org.jboss.seam.contexts.Contexts;
-
-/**
- * The {@link PagesDotXmlDeploymentHandler} process pages.xml files
- * Its only purpose is to make sure pages.xml gets updated by hot deploy
- *
- * @author Stuart Douglas
- *
- */
-public class PagesDotXmlDeploymentHandler extends AbstractDeploymentHandler
-{
-
- private static DeploymentMetadata PAGESDOTXML_SUFFIX_FILE_METADATA = new DeploymentMetadata()
- {
-
- public String getFileNameSuffix()
- {
- return "WEB-INF/pages.xml";
- }
-
- };
-
- /**
- * Name under which this {@link DeploymentHandler} is registered
- */
- public static final String NAME = "org.jboss.seam.deployment.PagesDotXmlDeploymentHandler";
-
- public String getName()
- {
- return NAME;
- }
-
- public static PagesDotXmlDeploymentHandler instance()
- {
- if (Contexts.isEventContextActive())
- {
- if (Contexts.getEventContext().isSet(WarRootDeploymentStrategy.NAME))
- {
- DeploymentStrategy deploymentStrategy = (DeploymentStrategy) Contexts.getEventContext().get(WarRootDeploymentStrategy.NAME);
- Object deploymentHandler = deploymentStrategy.getDeploymentHandlers().get(NAME);
- if (deploymentHandler != null)
- {
- return (PagesDotXmlDeploymentHandler) deploymentHandler;
- }
- }
- return null;
- }
- else
- {
- throw new IllegalStateException("Event context not active");
- }
- }
-
- public DeploymentMetadata getMetadata()
- {
- return PAGESDOTXML_SUFFIX_FILE_METADATA;
- }
-
-}
Copied: branches/community/Seam_2_2/src/main/org/jboss/seam/deployment/PagesDotXmlDeploymentHandler.java (from rev 11275, branches/community/Seam_2_2/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java)
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/deployment/PagesDotXmlDeploymentHandler.java (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/deployment/PagesDotXmlDeploymentHandler.java 2009-07-13 11:47:08 UTC (rev 11276)
@@ -0,0 +1,61 @@
+package org.jboss.seam.deployment;
+
+import org.jboss.seam.contexts.Contexts;
+
+/**
+ * The {@link PagesDotXmlDeploymentHandler} process pages.xml files
+ * Its only purpose is to make sure pages.xml gets updated by hot deploy
+ *
+ * @author Stuart Douglas
+ *
+ */
+public class PagesDotXmlDeploymentHandler extends AbstractDeploymentHandler
+{
+
+ private static DeploymentMetadata PAGESDOTXML_SUFFIX_FILE_METADATA = new DeploymentMetadata()
+ {
+
+ public String getFileNameSuffix()
+ {
+ return "WEB-INF/pages.xml";
+ }
+
+ };
+
+ /**
+ * Name under which this {@link DeploymentHandler} is registered
+ */
+ public static final String NAME = "org.jboss.seam.deployment.PagesDotXmlDeploymentHandler";
+
+ public String getName()
+ {
+ return NAME;
+ }
+
+ public static PagesDotXmlDeploymentHandler instance()
+ {
+ if (Contexts.isEventContextActive())
+ {
+ if (Contexts.getEventContext().isSet(WarRootDeploymentStrategy.NAME))
+ {
+ DeploymentStrategy deploymentStrategy = (DeploymentStrategy) Contexts.getEventContext().get(WarRootDeploymentStrategy.NAME);
+ Object deploymentHandler = deploymentStrategy.getDeploymentHandlers().get(NAME);
+ if (deploymentHandler != null)
+ {
+ return (PagesDotXmlDeploymentHandler) deploymentHandler;
+ }
+ }
+ return null;
+ }
+ else
+ {
+ throw new IllegalStateException("Event context not active");
+ }
+ }
+
+ public DeploymentMetadata getMetadata()
+ {
+ return PAGESDOTXML_SUFFIX_FILE_METADATA;
+ }
+
+}
15 years, 4 months
- 1
- 0
Seam SVN: r11275 - in branches/enterprise/JBPAPP_5_0: examples/quartz/src/org/jboss/seam/example/quartz/test and 2 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-13 07:07:19 -0400 (Mon, 13 Jul 2009)
New Revision: 11275
Modified:
branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Testing.xml
branches/enterprise/JBPAPP_5_0/examples/quartz/src/org/jboss/seam/example/quartz/test/testng.xml
branches/enterprise/JBPAPP_5_0/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/testng.xml
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DBUnitSeamTest.java
Log:
back ported JBSEAM-4289
Modified: branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Testing.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Testing.xml 2009-07-13 10:33:11 UTC (rev 11274)
+++ branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Testing.xml 2009-07-13 11:07:19 UTC (rev 11275)
@@ -536,13 +536,13 @@
<title>Integration Testing with Mock Data</title>
<para>
- If you need to insert or clean data in your database before each
+ If you want to insert or clean data in your database before each
test you can use Seam's integration with DBUnit. To do this, extend
- <literal>DBUnitSeamTest</literal> rather than SeamTest.
+ <literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>.
</para>
<para>
- You need to provide a dataset for DBUnit.
+ You have to provide a dataset for DBUnit.
</para>
<caution>
@@ -566,7 +566,8 @@
</dataset>]]></programlisting>
<para>
- and tell Seam about it by overriding <literal>prepareDBUnitOperations()</literal>:
+ In your test class, configure your dataset with overriding
+ <literal>prepareDBUnitOperations()</literal>:
</para>
<programlisting role="JAVA"><![CDATA[protected void prepareDBUnitOperations() {
@@ -593,36 +594,31 @@
setting a TestNG test parameter named <literal>datasourceJndiName</literal>:
</para>
- <programlisting role="XML">
- <![CDATA[<parameter name="datasourceJndiName" value="java:/seamdiscsDatasource"/>]]>
- </programlisting>
+ <programlisting role="XML"><![CDATA[<parameter name="datasourceJndiName" value="java:/seamdiscsDatasource"/>]]></programlisting>
<para>
DBUnitSeamTest has support for MySQL and HSQL - you need to tell it
- which database is being used:
+ which database is being used, otherwise it defaults to HSQL:
</para>
- <programlisting><![CDATA[<parameter name="database" value="HSQL" />]]></programlisting>
+ <programlisting role="XML"><![CDATA[<parameter name="database" value="MYSQL" />]]></programlisting>
<para>
It also allows you to insert binary data into the test data set (n.b.
this is untested on Windows). You need to tell it where to locate
- these resources:
+ these resources on your classpath:
</para>
- <programlisting><![CDATA[<parameter name="binaryDir" value="images/" />]]></programlisting>
+ <programlisting role="XML"><![CDATA[<parameter name="binaryDir" value="images/" />]]></programlisting>
<para>
- You <emphasis>must</emphasis> specify these three parameters in your
- <literal>testng.xml</literal>.
+ You do not have to configure any of these parameters if you use HSQL and have
+ no binary imports. However, unless you specify <literal>datasourceJndiName</literal>
+ in your test configuration, you will have to call <literal>setDatabaseJndiName()</literal>
+ before your test runs. If you are not using HSQL or MySQL, you need to override some
+ methods. See the Javadoc of <literal>DBUnitSeamTest</literal> for more details.
</para>
- <para>
- If you want to use DBUnitSeamTest with another database, you'll need
- to implement some methods. Read the javadoc of
- <literal>AbstractDBUnitSeamTest</literal> for more.
- </para>
-
</section>
<section id="testing.mail">
Modified: branches/enterprise/JBPAPP_5_0/examples/quartz/src/org/jboss/seam/example/quartz/test/testng.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/quartz/src/org/jboss/seam/example/quartz/test/testng.xml 2009-07-13 10:33:11 UTC (rev 11274)
+++ branches/enterprise/JBPAPP_5_0/examples/quartz/src/org/jboss/seam/example/quartz/test/testng.xml 2009-07-13 11:07:19 UTC (rev 11275)
@@ -5,7 +5,6 @@
<parameter name="datasourceJndiName" value="java:/DefaultDS"/>
<parameter name="database" value="HSQL" />
- <parameter name="binaryDir" value="" />
<classes>
<class name="org.jboss.seam.example.quartz.test.AccountTest" />
Modified: branches/enterprise/JBPAPP_5_0/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/testng.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/testng.xml 2009-07-13 10:33:11 UTC (rev 11274)
+++ branches/enterprise/JBPAPP_5_0/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/testng.xml 2009-07-13 11:07:19 UTC (rev 11275)
@@ -4,7 +4,6 @@
<parameter name="datasourceJndiName" value="java:/seamdiscsDatasource"/>
<parameter name="database" value="HSQL" />
- <parameter name="binaryDir" value="" />
<classes>
<class name="org.jboss.seam.example.seamdiscs.test.DisplayArtistTest" />
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java 2009-07-13 10:33:11 UTC (rev 11274)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java 2009-07-13 11:07:19 UTC (rev 11275)
@@ -1,461 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.seam.mock;
-
-import static org.jboss.seam.mock.AbstractDBUnitSeamTest.Database.HSQL;
-import static org.jboss.seam.mock.AbstractDBUnitSeamTest.Database.MYSQL;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.dbunit.database.DatabaseConfig;
-import org.dbunit.database.DatabaseConnection;
-import org.dbunit.database.IDatabaseConnection;
-import org.dbunit.dataset.IDataSet;
-import org.dbunit.dataset.ReplacementDataSet;
-import org.dbunit.dataset.datatype.DataType;
-import org.dbunit.dataset.datatype.DataTypeException;
-import org.dbunit.dataset.datatype.DefaultDataTypeFactory;
-import org.dbunit.dataset.xml.FlatXmlDataSet;
-import org.dbunit.operation.DatabaseOperation;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-
-/**
- * Utility for integration testing with Seam and DBUnit datasets.
- * <p>
- * Subclass this class instead of <tt>SeamTest</tt> if you need to insert or clean data in
- * your database before and after a test. You need to implement <tt>prepareDBUnitOperations()</tt> and
- * add instances of <tt>DataSetOperation</tt>s to the * <tt>beforeTestOperations</tt> and
- * <tt>afterTestOperations</tt> lists. An example:
- * <pre>
- * public class MyTest extends DBUnitSeamTest {
- *
- * protected void prepareDBUnitOperations() {
- * beforeTestOperations.add(
- * new DataSetOperation("my/datasets/BaseData.xml")
- * );
- * beforeTestOperations.add(
- * new DataSetOperation("my/datasets/AdditionalData.xml", DatabaseOperation.INSERT)
- * );
- * }
- * ... // Various test methods with @Test annotation
- * }
- * </pre>
- * <p>
- * Note that <tt>DataSetOperation</tt> defaults to <tt>DatabaseOperation.CLEAN_INSERT</tt> if no
- * other operation is specified as a constructor argument. The above example cleans all tables defined
- * in <tt>BaseData.xml</tt>, then inserts all rows declared in <tt>BaseData.xml</tt>, then inserts
- * all the rows declared in <tt>AdditionalData.xml</tt>. This executes before every each test method
- * is invoked. If you require extra cleanup after a test method executes, add operations to the
- * <tt>afterTestOperations</tt> list.
- * </p>
- * <p>
- * A test class obtains the database connection for loading and cleaning of datasets in one of the following ways:
- * </p>
- * <dl>
- * <li>A TestNG test parameter named <tt>datasourceJndiName</tt> is provided by the TestNG test runner, which
- * automatically calls <tt>setDatasourceJndiName()</tt> on the test class before a logical test runs.</li>
- *
- * <li>An instance of a test class is created manually and the <tt>datasourceJndiName</tt> is passed as a
- * constructor argument.</li>
- *
- * <li>An instance of a test class is created manually and the <tt>setDatasourceJndiName()</tt> method is
- * called after creation and before a test runs.</li>
- *
- * <li>A subclass overrides the <tt>getConnection()</tt> method and returns a custom database connection.</li>
- *
- * </dl>
- * <p>
- * Referential integrity checks (foreign keys) will be or have to be disabled on the database connection
- * used for DBUnit operations. This makes adding circular references in datasets easier. Referential integrity checks
- * are enabled again after the connection has been used.
- * </p>
- * <p>
- * <b>Note that the methods <tt>disableReferentialIntegrity()</tt>,
- * <tt>enableReferentialIntegrity()</tt>, and <tt>editConfig()</tt> are implemented for HSQL DB. If you want to run
- * unit tests on any other DBMS, you need to override these methods and implement them for your DBMS.</b>
- * </p>
- *
- * @author Christian Bauer
- */
-public abstract class AbstractDBUnitSeamTest extends AbstractSeamTest
-{
-
- public enum Database
- {
- HSQL, MYSQL
- }
-
- private LogProvider log = Logging.getLogProvider(DBUnitSeamTest.class);
-
- private String datasourceJndiName;
- private String binaryDir;
- private Database database = HSQL;
- protected List<DataSetOperation> beforeTestOperations = new ArrayList<DataSetOperation>();
- protected List<DataSetOperation> afterTestOperations = new ArrayList<DataSetOperation>();
-
- protected AbstractDBUnitSeamTest()
- {
- }
-
- protected AbstractDBUnitSeamTest(String datasourceJndiName)
- {
- this.datasourceJndiName = datasourceJndiName;
- }
-
- public void setDatasourceJndiName(String datasourceJndiName)
- {
- this.datasourceJndiName = datasourceJndiName;
- }
-
- public void setBinaryDir(String binaryDir)
- {
- this.binaryDir = binaryDir;
- }
-
- public void setDatabase(String database)
- {
- if (database != null)
- {
- this.database = Database.valueOf(database.toUpperCase());
- }
- }
-
- @Override
- public void setupClass() throws Exception
- {
- super.setupClass();
- prepareDBUnitOperations();
- }
-
- @Override
- public void begin()
- {
- super.begin();
- executeOperations(beforeTestOperations);
- }
-
- @Override
- public void end()
- {
- super.end();
- executeOperations(afterTestOperations);
- }
-
- private void executeOperations(List<DataSetOperation> list)
- {
- IDatabaseConnection con = null;
- try
- {
- con = getConnection();
- disableReferentialIntegrity(con);
- for (DataSetOperation op : list)
- {
- op.execute(con);
- }
- enableReferentialIntegrity(con);
- }
- finally
- {
- if (con != null)
- {
- try
- {
- con.close();
- }
- catch (Exception ex)
- {
- ex.printStackTrace(System.err);
- }
- }
- }
- }
-
- protected class DataSetOperation
- {
- String dataSetLocation;
- ReplacementDataSet dataSet;
- DatabaseOperation operation;
-
- /**
- * Defaults to <tt>DatabaseOperation.CLEAN_INSERT</tt>
- * @param dataSetLocation location of DBUnit dataset
- */
- public DataSetOperation(String dataSetLocation)
- {
- this(dataSetLocation, DatabaseOperation.CLEAN_INSERT);
- }
-
- /**
- * Defaults to <tt>DatabaseOperation.CLEAN_INSERT</tt>
- */
- public DataSetOperation(String dataSetLocation, String dtdLocation)
- {
- this(dataSetLocation, dtdLocation, DatabaseOperation.CLEAN_INSERT);
- }
-
- public DataSetOperation(String dataSetLocation, String dtdLocation, DatabaseOperation operation)
- {
- log.debug(">>> Preparing dataset: " + dataSetLocation + " <<<");
-
- // Load the base dataset file
- InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream(dataSetLocation);
- try
- {
- InputStream dtdInput = null;
- if (dtdLocation != null)
- {
- dtdInput = Thread.currentThread().getContextClassLoader().getResourceAsStream(dtdLocation);
- }
- if (dtdInput == null)
- {
- this.dataSet = new ReplacementDataSet( new FlatXmlDataSet(input) );
- }
- else
- {
- this.dataSet = new ReplacementDataSet( new FlatXmlDataSet(input, dtdInput) );
- }
- }
- catch (Exception ex)
- {
- throw new RuntimeException(ex);
- }
- this.dataSet.addReplacementObject("[NULL]", null);
- if (binaryDir != null)
- {
- this.dataSet.addReplacementSubstring("[BINARY_DIR]", getBinaryDirFullpath().toString());
- }
- this.operation = operation;
- this.dataSetLocation = dataSetLocation;
- }
-
-
-
- public DataSetOperation(String dataSetLocation, DatabaseOperation operation)
- {
- this(dataSetLocation, null, operation);
- }
-
- public IDataSet getDataSet()
- {
- return dataSet;
- }
-
- public DatabaseOperation getOperation()
- {
- return operation;
- }
-
- public void execute(IDatabaseConnection connection)
- {
- try
- {
- this.operation.execute(connection, dataSet);
- }
- catch (Exception ex)
- {
- throw new RuntimeException(ex);
- }
- }
-
- @Override
- public String toString()
- {
- // TODO: This is not pretty because DBUnit's DatabaseOperation doesn't implement toString() properly
- return operation.getClass() + " with dataset: " + dataSetLocation;
- }
- }
-
- // Subclasses can/have to override the following methods
-
- /**
- * Override this method if you want to provide your own DBUnit <tt>IDatabaseConnection</tt> instance.
- * <p/>
- * If you do not override this, default behavior is to use the * configured datasource name and
- * to obtain a connection with a JNDI lookup.
- *
- * @return a DBUnit database connection (wrapped)
- */
- protected IDatabaseConnection getConnection()
- {
- try
- {
- DataSource datasource = ((DataSource)getInitialContext().lookup(datasourceJndiName));
-
- // Get a JDBC connection from JNDI datasource
- Connection con = datasource.getConnection();
- IDatabaseConnection dbUnitCon = new DatabaseConnection(con);
- editConfig(dbUnitCon.getConfig());
- return dbUnitCon;
- }
- catch (Exception ex)
- {
- throw new RuntimeException(ex);
- }
- }
-
- /**
- * Override this method if you aren't using HSQL DB.
- * <p/>
- * Execute whatever statement is necessary to either defer or disable foreign
- * key constraint checking on the given database connection, which is used by
- * DBUnit to import datasets.
- *
- * @param con A DBUnit connection wrapper, which is used afterwards for dataset operations
- */
- protected void disableReferentialIntegrity(IDatabaseConnection con)
- {
- try
- {
- if (database.equals(HSQL))
- {
- con.getConnection().prepareStatement("set referential_integrity FALSE").execute(); // HSQL DB
- }
- else if (database.equals(MYSQL))
- {
- con.getConnection().prepareStatement("set foreign_key_checks=0").execute(); // MySQL > 4.1.1
- }
- }
- catch (Exception ex)
- {
- throw new RuntimeException(ex);
- }
- }
-
- /**
- * Override this method if you aren't using HSQL DB.
- * <p/>
- * Execute whatever statement is necessary to enable integrity constraint checks after
- * dataset operations.
- *
- * @param con A DBUnit connection wrapper, before it is used by the application again
- */
- protected void enableReferentialIntegrity(IDatabaseConnection con) {
- try {
- if (database.equals(HSQL))
- {
- con.getConnection().prepareStatement("set referential_integrity TRUE").execute(); // HSQL DB
- }
- else if (database.equals(MYSQL))
- {
- con.getConnection().prepareStatement("set foreign_key_checks=1").execute(); // MySQL > 4.1.1
- }
- }
- catch (Exception ex)
- {
- throw new RuntimeException(ex);
- }
- }
-
- /**
- * Override this method if you require DBUnit configuration features or additional properties.
- * <p>
- * Called after a connection has been obtaind and before the connection is used. Can be a
- * NOOP method if no additional settings are necessary for your DBUnit/DBMS setup.
- *
- * @param config A DBUnit <tt>DatabaseConfig</tt> object for setting properties and features
- */
- protected void editConfig(DatabaseConfig config)
- {
- if (database.equals(HSQL)) {
- // DBUnit/HSQL bugfix
- // http://www.carbonfive.com/community/archives/2005/07/dbunit_hsql_and.html
- config.setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new DefaultDataTypeFactory()
- {
- @Override
- public DataType createDataType(int sqlType, String sqlTypeName)
- throws DataTypeException
- {
- if (sqlType == Types.BOOLEAN)
- {
- return DataType.BOOLEAN;
- }
- return super.createDataType(sqlType, sqlTypeName);
- }
- });
- }
- }
-
- /**
- * Resolves the binary dir location with the help of the classloader, we need the
- * absolute full path of that directory.
- *
- * @return URL full absolute path of the binary directory
- */
- protected URL getBinaryDirFullpath()
- {
- if (binaryDir == null) {
- throw new RuntimeException("Please set binaryDir property to location of binary test files");
- }
- return getResourceURL(binaryDir);
- }
-
- protected URL getResourceURL(String resource)
- {
- URL url = Thread.currentThread().getContextClassLoader().getResource(resource);
- if (url == null)
- {
- throw new RuntimeException("Could not find resource with classloader: " + resource);
- }
- return url;
- }
-
- protected byte[] getBinaryFile(String filename) throws Exception
- {
- File file = new File(getResourceURL(binaryDir + "/" + filename).toURI());
- InputStream is = new FileInputStream(file);
-
- // Get the size of the file
- long length = file.length();
-
- if (length > Integer.MAX_VALUE)
- {
- // File is too large
- }
-
- // Create the byte array to hold the data
- byte[] bytes = new byte[(int)length];
-
- // Read in the bytes
- int offset = 0;
- int numRead;
- while (offset < bytes.length
- && (numRead=is.read(bytes, offset, bytes.length-offset)) >= 0)
- {
- offset += numRead;
- }
-
- // Ensure all the bytes have been read in
- if (offset < bytes.length)
- {
- throw new IOException("Could not completely read file "+file.getName());
- }
-
- // Close the input stream and return bytes
- is.close();
- return bytes;
- }
-
- /**
- * Implement this in a subclass.
- * <p>
- * Use it to stack DBUnit <tt>DataSetOperation</tt>'s with
- * the <tt>beforeTestOperations</tt> and <tt>afterTestOperations</tt> lists.
- */
- protected abstract void prepareDBUnitOperations();
-
-}
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DBUnitSeamTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DBUnitSeamTest.java 2009-07-13 10:33:11 UTC (rev 11274)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/DBUnitSeamTest.java 2009-07-13 11:07:19 UTC (rev 11275)
@@ -1,81 +1,476 @@
package org.jboss.seam.mock;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterSuite;
+import static org.jboss.seam.mock.DBUnitSeamTest.Database.HSQL;
+import static org.jboss.seam.mock.DBUnitSeamTest.Database.MYSQL;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.dbunit.database.DatabaseConfig;
+import org.dbunit.database.DatabaseConnection;
+import org.dbunit.database.IDatabaseConnection;
+import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.ReplacementDataSet;
+import org.dbunit.dataset.datatype.DataType;
+import org.dbunit.dataset.datatype.DataTypeException;
+import org.dbunit.dataset.datatype.DefaultDataTypeFactory;
+import org.dbunit.dataset.xml.FlatXmlDataSet;
+import org.dbunit.operation.DatabaseOperation;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Optional;
import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Parameters;
+import org.testng.annotations.AfterMethod;
-public abstract class DBUnitSeamTest extends AbstractDBUnitSeamTest
+/**
+ * Utility for integration testing with Seam and DBUnit datasets.
+ * <p>
+ * Subclass this class instead of <tt>SeamTest</tt> if you need to insert or clean data in
+ * your database before and after a test. You need to implement <tt>prepareDBUnitOperations()</tt> and
+ * add instances of <tt>DataSetOperation</tt>s to the <tt>beforeTestOperations</tt> and
+ * <tt>afterTestOperations</tt> lists. An example:
+ * <pre>
+ * public class MyTest extends DBUnitSeamTest {
+ *
+ * protected void prepareDBUnitOperations() {
+ * beforeTestOperations.add(
+ * new DataSetOperation("my/datasets/BaseData.xml")
+ * );
+ * beforeTestOperations.add(
+ * new DataSetOperation("my/datasets/AdditionalData.xml", DatabaseOperation.INSERT)
+ * );
+ * }
+ * ... // Various test methods with @Test annotation
+ * }
+ * </pre>
+ * <p>
+ * Note that <tt>DataSetOperation</tt> defaults to <tt>DatabaseOperation.CLEAN_INSERT</tt> if no
+ * other operation is specified as a constructor argument. The above example cleans all tables defined
+ * in <tt>BaseData.xml</tt>, then inserts all rows declared in <tt>BaseData.xml</tt>, then inserts
+ * all the rows declared in <tt>AdditionalData.xml</tt>. This executes before each test method
+ * is invoked. If you require extra cleanup after a test method executes, add operations to the
+ * <tt>afterTestOperations</tt> list.
+ * </p>
+ * <p>
+ * A test class obtains the database connection for loading and cleaning of datasets in one of the following ways:
+ * </p>
+ * <dl>
+ * <li>A TestNG test parameter named <tt>datasourceJndiName</tt> is provided by the TestNG test runner, which
+ * automatically calls <tt>setDatasourceJndiName()</tt> on the test class before a logical test runs.</li>
+ * <p/>
+ * <li>An instance of a test class is created manually and the <tt>setDatasourceJndiName()</tt> method is
+ * called after creation and before a test runs.</li>
+ * <p/>
+ * <li>A subclass overrides the <tt>getConnection()</tt> method and returns a custom database connection.</li>
+ * <p/>
+ * </dl>
+ * <p>
+ * Binary files can be imported into the database from a binary directory, configured with the TestNG parameter
+ * <tt>binaryDir</tt> or by calling <tt>setBinaryDir()</tt> before a test runs. The binary directory is a classpath
+ * reference, e.g. <tt>my/org/test/package/binarydir</tt>. In your DBUnit XML flat dataset, declare the path of your file
+ * as follows: <tt><MYTABLE MYCOLUMN="[BINARY_DIR]/mytestfile.png"/></tt>
+ * </p>
+ * <p>
+ * Referential integrity checks (foreign keys) will be or have to be disabled on the database connection
+ * used for DBUnit operations. This makes adding circular references in datasets easier (especially for nullable
+ * foreign key columns). Referential integrity checks are enabled again after the connection has been used.
+ * </p>
+ * <p>
+ * <b>IMPORTANT: The methods <tt>disableReferentialIntegrity()</tt>,
+ * <tt>enableReferentialIntegrity()</tt>, and <tt>editConfig()</tt> are implemented for HSQL and MySQL. You need to
+ * configure the DBMS you are using with the <tt>database</tt> TestNG parameter or by calling <tt>setDatabase()</tt>
+ * before the the test run. If you want to run unit tests on any other DBMS, you need to override the
+ * <tt>disableReferentialIntegrity()</tt> and <tt>enableReferentialIntegrity()</tt> methods and implement them
+ * for your DBMS. Also note that by default, if no <tt>database</tt> TestNG parameter has been set or if the
+ * <tt>setDatabase()</tt> method has not been called before test runs, HSQL DB will be used as the default.</b>
+ * </p>
+ * @author Christian Bauer
+ */
+public abstract class DBUnitSeamTest extends SeamTest
{
- @Override
+ public enum Database
+ {
+ HSQL, MYSQL
+ }
+
+ private LogProvider log = Logging.getLogProvider(DBUnitSeamTest.class);
+
+ protected String datasourceJndiName;
+ protected String binaryDir;
+ protected Database database = HSQL;
+ protected List<DataSetOperation> beforeTestOperations = new ArrayList<DataSetOperation>();
+ protected List<DataSetOperation> afterTestOperations = new ArrayList<DataSetOperation>();
+
@BeforeClass
@Parameters("datasourceJndiName")
- public void setDatasourceJndiName(String datasourceJndiName)
+ public void setDatasourceJndiName(@Optional String datasourceJndiName)
{
- super.setDatasourceJndiName(datasourceJndiName);
+ this.datasourceJndiName = datasourceJndiName;
}
- @Override
@BeforeClass
@Parameters("binaryDir")
- public void setBinaryDir(String binaryDir)
+ public void setBinaryDir(@Optional String binaryDir)
{
- super.setBinaryDir(binaryDir);
+ this.binaryDir = binaryDir;
}
- @Override
@BeforeClass
@Parameters("database")
- public void setDatabase(String database)
+ public void setDatabase(@Optional String database)
{
- super.setDatabase(database);
+ if (database != null)
+ {
+ this.database = Database.valueOf(database.toUpperCase());
+ }
}
+ @BeforeClass
@Override
- @BeforeClass
- public void setupClass() throws Exception
+ public void setupClass() throws Exception
{
- super.setupClass();
+ super.setupClass();
+ prepareDBUnitOperations();
}
-
- @Override
- @AfterClass
- protected void cleanupClass() throws Exception
+
+ @BeforeMethod
+ public void prepareDataBeforeTest()
{
- super.cleanupClass();
+ executeOperations(beforeTestOperations);
}
-
- @Override
- @BeforeSuite
- protected void startSeam() throws Exception
+
+ @AfterMethod
+ public void cleanDataAfterTest()
{
- super.startSeam();
+ executeOperations(afterTestOperations);
}
-
- @Override
- @AfterSuite
- protected void stopSeam() throws Exception
+
+ private void executeOperations(List<DataSetOperation> list)
{
- super.stopSeam();
- }
-
+ IDatabaseConnection con = null;
+ try
+ {
+ con = getConnection();
+ disableReferentialIntegrity(con);
+ for (DataSetOperation op : list)
+ {
+ op.execute(con);
+ }
+ enableReferentialIntegrity(con);
+ }
+ finally
+ {
+ if (con != null)
+ {
+ try
+ {
+ con.close();
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace(System.err);
+ }
+ }
+ }
+ }
- @BeforeMethod
- @Override
- public void begin()
+ protected class DataSetOperation
{
- super.begin();
+ String dataSetLocation;
+ ReplacementDataSet dataSet;
+ DatabaseOperation operation;
+
+ /**
+ * Defaults to <tt>DatabaseOperation.CLEAN_INSERT</tt>
+ *
+ * @param dataSetLocation location of DBUnit dataset
+ */
+ public DataSetOperation(String dataSetLocation)
+ {
+ this(dataSetLocation, DatabaseOperation.CLEAN_INSERT);
+ }
+
+ /**
+ * Defaults to <tt>DatabaseOperation.CLEAN_INSERT</tt>
+ */
+ public DataSetOperation(String dataSetLocation, String dtdLocation)
+ {
+ this(dataSetLocation, dtdLocation, DatabaseOperation.CLEAN_INSERT);
+ }
+
+ public DataSetOperation(String dataSetLocation, String dtdLocation, DatabaseOperation operation)
+ {
+ log.debug(">>> Preparing dataset: " + dataSetLocation + " <<<");
+
+ // Load the base dataset file
+ InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream(dataSetLocation);
+ try
+ {
+ InputStream dtdInput = null;
+ if (dtdLocation != null)
+ {
+ dtdInput = Thread.currentThread().getContextClassLoader().getResourceAsStream(dtdLocation);
+ }
+ if (dtdInput == null)
+ {
+ this.dataSet = new ReplacementDataSet(new FlatXmlDataSet(input));
+ }
+ else
+ {
+ this.dataSet = new ReplacementDataSet(new FlatXmlDataSet(input, dtdInput));
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ this.dataSet.addReplacementObject("[NULL]", null);
+ if (binaryDir != null)
+ {
+ this.dataSet.addReplacementSubstring("[BINARY_DIR]", getBinaryDirFullpath().toString());
+ }
+ this.operation = operation;
+ this.dataSetLocation = dataSetLocation;
+ }
+
+
+ public DataSetOperation(String dataSetLocation, DatabaseOperation operation)
+ {
+ this(dataSetLocation, null, operation);
+ }
+
+ public IDataSet getDataSet()
+ {
+ return dataSet;
+ }
+
+ public DatabaseOperation getOperation()
+ {
+ return operation;
+ }
+
+ public void execute(IDatabaseConnection connection)
+ {
+ try
+ {
+ this.operation.execute(connection, dataSet);
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ @Override
+ public String toString()
+ {
+ // TODO: This is not pretty because DBUnit's DatabaseOperation doesn't implement toString() properly
+ return operation.getClass() + " with dataset: " + dataSetLocation;
+ }
}
- @AfterMethod
- @Override
- public void end()
+ // Subclasses can/have to override the following methods
+
+ /**
+ * Override this method if you want to provide your own DBUnit <tt>IDatabaseConnection</tt> instance.
+ * <p/>
+ * If you do not override this, default behavior is to use the * configured datasource name and
+ * to obtain a connection with a JNDI lookup.
+ *
+ * @return a DBUnit database connection (wrapped)
+ */
+ protected IDatabaseConnection getConnection()
{
- super.end();
+ try
+ {
+ if (datasourceJndiName == null)
+ {
+ throw new RuntimeException("Please set datasourceJndiName TestNG property");
+ }
+
+ DataSource datasource = ((DataSource) getInitialContext().lookup(datasourceJndiName));
+
+ // Get a JDBC connection from JNDI datasource
+ Connection con = datasource.getConnection();
+ IDatabaseConnection dbUnitCon = new DatabaseConnection(con);
+ editConfig(dbUnitCon.getConfig());
+ return dbUnitCon;
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException(ex);
+ }
}
-
+
+ /**
+ * Override this method if you aren't using HSQL DB.
+ * <p/>
+ * Execute whatever statement is necessary to either defer or disable foreign
+ * key constraint checking on the given database connection, which is used by
+ * DBUnit to import datasets.
+ *
+ * @param con A DBUnit connection wrapper, which is used afterwards for dataset operations
+ */
+ protected void disableReferentialIntegrity(IDatabaseConnection con)
+ {
+ try
+ {
+ if (database.equals(HSQL))
+ {
+ con.getConnection().prepareStatement("set referential_integrity FALSE").execute(); // HSQL DB
+ }
+ else if (database.equals(MYSQL))
+ {
+ con.getConnection().prepareStatement("set foreign_key_checks=0").execute(); // MySQL > 4.1.1
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ /**
+ * Override this method if you aren't using HSQL DB.
+ * <p/>
+ * Execute whatever statement is necessary to enable integrity constraint checks after
+ * dataset operations.
+ *
+ * @param con A DBUnit connection wrapper, before it is used by the application again
+ */
+ protected void enableReferentialIntegrity(IDatabaseConnection con)
+ {
+ try
+ {
+ if (database.equals(HSQL))
+ {
+ con.getConnection().prepareStatement("set referential_integrity TRUE").execute(); // HSQL DB
+ }
+ else if (database.equals(MYSQL))
+ {
+ con.getConnection().prepareStatement("set foreign_key_checks=1").execute(); // MySQL > 4.1.1
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ /**
+ * Override this method if you require DBUnit configuration features or additional properties.
+ * <p/>
+ * Called after a connection has been obtaind and before the connection is used. Can be a
+ * NOOP method if no additional settings are necessary for your DBUnit/DBMS setup.
+ *
+ * @param config A DBUnit <tt>DatabaseConfig</tt> object for setting properties and features
+ */
+ protected void editConfig(DatabaseConfig config)
+ {
+ if (database.equals(HSQL))
+ {
+ // DBUnit/HSQL bugfix
+ // http://www.carbonfive.com/community/archives/2005/07/dbunit_hsql_and.html
+ config.setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new DefaultDataTypeFactory()
+ {
+ @Override
+ public DataType createDataType(int sqlType, String sqlTypeName)
+ throws DataTypeException
+ {
+ if (sqlType == Types.BOOLEAN)
+ {
+ return DataType.BOOLEAN;
+ }
+ return super.createDataType(sqlType, sqlTypeName);
+ }
+ });
+ }
+ }
+
+ /**
+ * Resolves the binary dir location with the help of the classloader, we need the
+ * absolute full path of that directory.
+ *
+ * @return URL full absolute path of the binary directory
+ */
+ protected URL getBinaryDirFullpath()
+ {
+ if (binaryDir == null)
+ {
+ throw new RuntimeException("Please set binaryDir TestNG property to location of binary test files");
+ }
+ return getResourceURL(binaryDir);
+ }
+
+ protected URL getResourceURL(String resource)
+ {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(resource);
+ if (url == null)
+ {
+ throw new RuntimeException("Could not find resource with classloader: " + resource);
+ }
+ return url;
+ }
+
+ protected byte[] getBinaryFile(String filename) throws Exception
+ {
+ if (binaryDir == null)
+ {
+ throw new RuntimeException("Please set binaryDir TestNG property to location of binary test files");
+ }
+ File file = new File(getResourceURL(binaryDir + "/" + filename).toURI());
+ InputStream is = new FileInputStream(file);
+
+ // Get the size of the file
+ long length = file.length();
+
+ if (length > Integer.MAX_VALUE)
+ {
+ // File is too large
+ }
+
+ // Create the byte array to hold the data
+ byte[] bytes = new byte[(int) length];
+
+ // Read in the bytes
+ int offset = 0;
+ int numRead;
+ while (offset < bytes.length
+ && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0)
+ {
+ offset += numRead;
+ }
+
+ // Ensure all the bytes have been read in
+ if (offset < bytes.length)
+ {
+ throw new IOException("Could not completely read file " + file.getName());
+ }
+
+ // Close the input stream and return bytes
+ is.close();
+ return bytes;
+ }
+
+ /**
+ * Implement this in a subclass.
+ * <p/>
+ * Use it to stack DBUnit <tt>DataSetOperation</tt>'s with
+ * the <tt>beforeTestOperations</tt> and <tt>afterTestOperations</tt> lists.
+ */
+ protected abstract void prepareDBUnitOperations();
+
+
}
15 years, 4 months
- 1
- 0
Seam SVN: r11274 - in branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam: servlet and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-13 06:33:11 -0400 (Mon, 13 Jul 2009)
New Revision: 11274
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/Lifecycle.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/ServletLifecycle.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/servlet/SeamListener.java
Log:
back ported JBSEAM-2255
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/Lifecycle.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/Lifecycle.java 2009-07-13 10:28:24 UTC (rev 11273)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/Lifecycle.java 2009-07-13 10:33:11 UTC (rev 11274)
@@ -49,9 +49,14 @@
public static void endApplication()
{
+ endApplication(application);
+ }
+
+ public static void endApplication(Map<String,Object> app)
+ {
log.debug("Shutting down application and destroying contexts");
- Context tempApplicationContext = new ApplicationContext( getApplication() );
+ Context tempApplicationContext = new ApplicationContext( app );
Contexts.applicationContext.set(tempApplicationContext);
Contexts.destroy(tempApplicationContext);
Contexts.applicationContext.set(null);
@@ -244,9 +249,13 @@
}
}
-
public static void endSession(Map<String, Object> session)
{
+ endSession(session, application);
+ }
+
+ public static void endSession(Map<String, Object> session, Map<String,Object> app)
+ {
log.debug("End of session, destroying contexts");
//This code assumes that sessions are only destroyed at the very end of a
@@ -258,7 +267,7 @@
throw new IllegalStateException("Please end the HttpSession via org.jboss.seam.web.Session.instance().invalidate()");
}
- Context tempApplicationContext = new ApplicationContext( getApplication() );
+ Context tempApplicationContext = new ApplicationContext( app );
Contexts.applicationContext.set(tempApplicationContext);
//this is used just as a place to stick the ConversationManager
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/ServletLifecycle.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2009-07-13 10:28:24 UTC (rev 11273)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2009-07-13 10:33:11 UTC (rev 11274)
@@ -140,7 +140,12 @@
public static void endApplication()
{
- Lifecycle.endApplication();
+ endApplication(servletContext);
+ }
+
+ public static void endApplication(ServletContext context)
+ {
+ Lifecycle.endApplication(new ServletApplicationMap( context));
servletContext=null;
}
@@ -151,7 +156,7 @@
public static void endSession(HttpSession session)
{
- Lifecycle.endSession( new ServletSessionMap(session) );
+ Lifecycle.endSession( new ServletSessionMap(session) , new ServletApplicationMap(session.getServletContext()));
}
public static void resumeConversation(HttpServletRequest request)
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/servlet/SeamListener.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/servlet/SeamListener.java 2009-07-13 10:28:24 UTC (rev 11273)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/servlet/SeamListener.java 2009-07-13 10:33:11 UTC (rev 11274)
@@ -38,7 +38,7 @@
public void contextDestroyed(ServletContextEvent event)
{
- ServletLifecycle.endApplication();
+ ServletLifecycle.endApplication(event.getServletContext());
}
public void sessionCreated(HttpSessionEvent event)
15 years, 4 months
- 1
- 0
Seam SVN: r11273 - branches/enterprise/JBPAPP_5_0/examples/blog/src/actions.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-13 06:28:24 -0400 (Mon, 13 Jul 2009)
New Revision: 11273
Modified:
branches/enterprise/JBPAPP_5_0/examples/blog/src/actions/IndexerService.java
Log:
back ported JBSEAM-4257
Modified: branches/enterprise/JBPAPP_5_0/examples/blog/src/actions/IndexerService.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/blog/src/actions/IndexerService.java 2009-07-13 09:51:14 UTC (rev 11272)
+++ branches/enterprise/JBPAPP_5_0/examples/blog/src/actions/IndexerService.java 2009-07-13 10:28:24 UTC (rev 11273)
@@ -38,7 +38,6 @@
for (Object be : blogEntries) {
entityManager.index(be);
}
- entityManager.flushToIndexes();
}
@Remove
15 years, 4 months
- 1
- 0
Seam SVN: r11272 - branches/enterprise/JBPAPP_5_0/seam-gen/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-13 05:51:14 -0400 (Mon, 13 Jul 2009)
New Revision: 11272
Modified:
branches/enterprise/JBPAPP_5_0/seam-gen/resources/WEB-INF/components-war-tokenized.xml
Log:
bac ported JBSEAM-4276
Modified: branches/enterprise/JBPAPP_5_0/seam-gen/resources/WEB-INF/components-war-tokenized.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/seam-gen/resources/WEB-INF/components-war-tokenized.xml 2009-07-13 09:38:30 UTC (rev 11271)
+++ branches/enterprise/JBPAPP_5_0/seam-gen/resources/WEB-INF/components-war-tokenized.xml 2009-07-13 09:51:14 UTC (rev 11272)
@@ -28,10 +28,6 @@
<!-- Make sure this URL pattern is the same as that used by the Faces Servlet -->
<web:hot-deploy-filter url-pattern="*.seam"/>
- <persistence:entity-manager-factory name="entityManagerFactory"
- persistence-unit-name="@projectName@"
- installed="@seamBootstrapsPu@"/>
-
<persistence:managed-persistence-context name="entityManager" auto-create="true"
entity-manager-factory="@seamEmfRef@"
persistence-unit-jndi-name="@puJndiName@"/>
15 years, 4 months
- 1
- 0
Seam SVN: r11271 - in branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam: deployment and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-13 05:38:30 -0400 (Mon, 13 Jul 2009)
New Revision: 11271
Added:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java
Log:
back ported JBSEAM-4121
Added: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java (rev 0)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/PagesDotXmlDeploymentHandler.java 2009-07-13 09:38:30 UTC (rev 11271)
@@ -0,0 +1,61 @@
+package org.jboss.seam.deployment;
+
+import org.jboss.seam.contexts.Contexts;
+
+/**
+ * The {@link PagesDotXmlDeploymentHandler} process pages.xml files
+ * Its only purpose is to make sure pages.xml gets updated by hot deploy
+ *
+ * @author Stuart Douglas
+ *
+ */
+public class PagesDotXmlDeploymentHandler extends AbstractDeploymentHandler
+{
+
+ private static DeploymentMetadata PAGESDOTXML_SUFFIX_FILE_METADATA = new DeploymentMetadata()
+ {
+
+ public String getFileNameSuffix()
+ {
+ return "WEB-INF/pages.xml";
+ }
+
+ };
+
+ /**
+ * Name under which this {@link DeploymentHandler} is registered
+ */
+ public static final String NAME = "org.jboss.seam.deployment.PagesDotXmlDeploymentHandler";
+
+ public String getName()
+ {
+ return NAME;
+ }
+
+ public static PagesDotXmlDeploymentHandler instance()
+ {
+ if (Contexts.isEventContextActive())
+ {
+ if (Contexts.getEventContext().isSet(WarRootDeploymentStrategy.NAME))
+ {
+ DeploymentStrategy deploymentStrategy = (DeploymentStrategy) Contexts.getEventContext().get(WarRootDeploymentStrategy.NAME);
+ Object deploymentHandler = deploymentStrategy.getDeploymentHandlers().get(NAME);
+ if (deploymentHandler != null)
+ {
+ return (PagesDotXmlDeploymentHandler) deploymentHandler;
+ }
+ }
+ return null;
+ }
+ else
+ {
+ throw new IllegalStateException("Event context not active");
+ }
+ }
+
+ public DeploymentMetadata getMetadata()
+ {
+ return PAGESDOTXML_SUFFIX_FILE_METADATA;
+ }
+
+}
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java 2009-07-11 19:48:40 UTC (rev 11270)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java 2009-07-13 09:38:30 UTC (rev 11271)
@@ -29,6 +29,8 @@
public static final String NAME = "warRootDeploymentStrategy";
private DotPageDotXmlDeploymentHandler dotPageDotXmlDeploymentHandler;
+
+ private PagesDotXmlDeploymentHandler pagesDotXmlDeploymentHandler;
public WarRootDeploymentStrategy(ClassLoader classLoader, File warRoot)
{
@@ -51,7 +53,10 @@
this.warRoot = new File[0];
}
dotPageDotXmlDeploymentHandler = new DotPageDotXmlDeploymentHandler();
+ pagesDotXmlDeploymentHandler = new PagesDotXmlDeploymentHandler();
getDeploymentHandlers().put(DotPageDotXmlDeploymentHandler.NAME, dotPageDotXmlDeploymentHandler);
+ getDeploymentHandlers().put(PagesDotXmlDeploymentHandler.NAME, pagesDotXmlDeploymentHandler);
+
}
@Override
15 years, 4 months
- 1
- 0
Seam SVN: r11270 - branches/community/Seam_2_2.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2009-07-11 15:48:40 -0400 (Sat, 11 Jul 2009)
New Revision: 11270
Modified:
branches/community/Seam_2_2/build.xml
Log:
Fixed seam-tasks tests and added to testall
Modified: branches/community/Seam_2_2/build.xml
===================================================================
--- branches/community/Seam_2_2/build.xml 2009-07-11 19:47:21 UTC (rev 11269)
+++ branches/community/Seam_2_2/build.xml 2009-07-11 19:48:40 UTC (rev 11270)
@@ -528,6 +528,7 @@
<testexample name="jpa" />
<testexample name="quartz" />
<testexample name="guice" />
+ <testexample name="tasks" />
<ant dir="examples/wiki" target="test" inheritall="false">
<property name="test.output.dir" value="${test.dir}/wiki" />
</ant>
15 years, 4 months
- 1
- 0