Author: mwringe Date: 2010-06-18 18:36:00 -0400 (Fri, 18 Jun 2010) New Revision: 3389 Modified: components/wsrp/trunk/hibernate-impl/ components/wsrp/trunk/wsrp-producer-war/pom.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-applicationscope-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-basic-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-dispatcher-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-encodeurl-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-getlocales-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-implicitcloning-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-markup-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-multivalued-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-renderparam-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resource-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourcenoencodeurl-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-session-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-usercontext-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ReleaseSessionTestCase.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java components/wsrp/trunk/wsrp2-ws/ Log: GTNWSRP-46: properly separating out the tests to be more independent. A few steps closer to being able to run the tests independently through a ide. Added a few target dirs to svn:ignore (ie wsrp-wsrp2-ws and hibernate-impl). Property changes on: components/wsrp/trunk/hibernate-impl ___________________________________________________________________ Name: svn:ignore + target Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -106,6 +106,64 @@ </plugins> </build> </profile> + <profile> + <id>start-test-server</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.0.1</version> + <configuration> +<!-- <container>--> + <!--<containerId>jboss51x</containerId> + <home>${JBOSS_HOME}</home> + <log>${basedir}/target/jboss51x/container.log</log> + <systemProperties>--> + <!-- Since the tests run on the server, we need to pass system properties to the + server so that the tests can use them. --> + <!-- The tests need to deploy and undeploy artifacts during the test so we need to pass + properties to enable this behaviour. --> +<!-- <jboss.deploy.dir>${jboss.server.home.dir}/conf</jboss.deploy.dir> + <test.deployables.dir>${basedir}/target/test-archives</test.deployables.dir> + <jboss.deploy.url.prefix>http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&amp;name=jboss.system:service%3DMainDeployer&amp;methodName=deploy&amp;argType=java.net.URL&amp;arg0=</jboss.deploy.url.prefix> + <jboss.undeploy.url.prefix>http://localhost:8080//jmx-console/HtmlAdaptor?action=invokeOpByName&amp;name=jboss.system:service%3DMainDeployer&amp;methodName=undeploy&amp;argType=java.net.URL&amp;arg0=</jboss.undeploy.url.prefix> + </systemProperties> + </container>--> + <wait>true</wait> +<!-- <configuration> + <home>${basedir}/target/cargo/standalone</home> + <properties> + <cargo.logging>low</cargo.logging> + <cargo.jvmargs>${cargo.jvmargs}</cargo.jvmargs> + </properties> + <deployables> + <deployable> + <location>${basedir}/target/test-archives/test-producer.sar</location> + <type>sar</type> + </deployable> + </deployables> + <configfiles> + <configfile> + <file>${JBOSS_HOME}/server/default/conf/jboss-log4j.xml</file> + <tofile>/conf/jboss-log4j.xml</tofile> + </configfile> + </configfiles> + </configuration>--> + </configuration> +<!-- <executions> + <execution> + <id>pre-integration-test</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + </execution> + </executions> --> + </plugin> + </plugins> + </build> + </profile> </profiles> <dependencies> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-applicationscope-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-applicationscope-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-applicationscope-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/**</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-basic-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-basic-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-basic-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/BasicPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-dispatcher-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-dispatcher-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-dispatcher-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/DispatcherPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-encodeurl-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-encodeurl-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-encodeurl-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/EncodeURLPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-getlocales-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-getlocales-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-getlocales-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/GetLocalesPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-implicitcloning-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-implicitcloning-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-implicitcloning-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/ImplicitCloningPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-markup-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-markup-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-markup-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/MarkupPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-multivalued-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-multivalued-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-multivalued-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/MultiValuedPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> <outputDirectory></outputDirectory> <includes> - <include>org/**</include> + <include>org/gatein/wsrp/config/**</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-renderparam-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-renderparam-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-renderparam-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/RenderParamPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resource-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resource-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resource-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/ResourcePortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourcenoencodeurl-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourcenoencodeurl-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourcenoencodeurl-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/ResourceNoEncodeURLPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-session-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-session-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-session-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/SessionPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-usercontext-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-usercontext-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-usercontext-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389) @@ -7,12 +7,11 @@ <fileSets> <!-- Test Classes --> - <!-- TODO: we probably shouldn't be using all of these classes here --> <fileSet> <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> + <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org/**MarkupPortlet.java</include> + <include>org/gatein/wsrp/portlet/UserContextPortlet.class</include> </includes> </fileSet> <!-- Fileset for the sar strucuture --> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-06-18 22:36:00 UTC (rev 3389) @@ -27,6 +27,7 @@ import org.gatein.wsrp.WSRPConstants; import org.gatein.wsrp.WSRPPortletURL; import org.gatein.wsrp.WSRPRenderURL; +import org.gatein.wsrp.producer.WSRPProducerBaseTest; import org.gatein.wsrp.spec.v1.WSRP1TypeFactory; import org.gatein.wsrp.servlet.ServletAccess; import org.gatein.wsrp.test.ExtendedAssert; @@ -83,7 +84,11 @@ @Deployment public static JavaArchive createDeployment() { - return ShrinkWrap.create("test.jar", JavaArchive.class); + JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class); + jar.addClass(NeedPortletHandleTest.class); + jar.addClass(V1ProducerBaseTest.class); + jar.addClass(WSRPProducerBaseTest.class); + return jar; } @Before Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java 2010-06-18 22:36:00 UTC (rev 3389) @@ -24,6 +24,7 @@ package org.gatein.wsrp.protocol.v1; import org.gatein.wsrp.WSRPConstants; +import org.gatein.wsrp.producer.WSRPProducerBaseTest; import org.gatein.wsrp.servlet.ServletAccess; import org.gatein.wsrp.spec.v1.WSRP1TypeFactory; import org.gatein.wsrp.test.ExtendedAssert; @@ -83,7 +84,11 @@ @Deployment public static JavaArchive createDeployment() { - return ShrinkWrap.create("test.jar", JavaArchive.class); + JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class); + jar.addClass(NeedPortletHandleTest.class); + jar.addClass(V1ProducerBaseTest.class); + jar.addClass(WSRPProducerBaseTest.class); + return jar; } @Before Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java 2010-06-18 22:36:00 UTC (rev 3389) @@ -28,6 +28,7 @@ import org.gatein.registration.RegistrationManager; import org.gatein.wsrp.WSRPConstants; import org.gatein.wsrp.WSRPUtils; +import org.gatein.wsrp.producer.WSRPProducerBaseTest; import org.gatein.wsrp.registration.RegistrationPropertyDescription; import org.gatein.wsrp.servlet.ServletAccess; import org.gatein.wsrp.spec.v1.WSRP1TypeFactory; @@ -71,7 +72,11 @@ @Deployment public static JavaArchive createDeployment() { - return ShrinkWrap.create("test.jar", JavaArchive.class); + JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class); + jar.addClass(NeedPortletHandleTest.class); + jar.addClass(V1ProducerBaseTest.class); + jar.addClass(WSRPProducerBaseTest.class); + return jar; } @Before Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ReleaseSessionTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ReleaseSessionTestCase.java 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ReleaseSessionTestCase.java 2010-06-18 22:36:00 UTC (rev 3389) @@ -23,6 +23,7 @@ package org.gatein.wsrp.protocol.v1; +import org.gatein.wsrp.producer.WSRPProducerBaseTest; import org.gatein.wsrp.servlet.ServletAccess; import org.gatein.wsrp.spec.v1.WSRP1TypeFactory; import org.gatein.wsrp.test.ExtendedAssert; @@ -73,7 +74,11 @@ @Deployment public static JavaArchive createDeployment() { - return ShrinkWrap.create("test.jar", JavaArchive.class); + JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class); + jar.addClass(NeedPortletHandleTest.class); + jar.addClass(V1ProducerBaseTest.class); + jar.addClass(WSRPProducerBaseTest.class); + return jar; } @Before @@ -142,6 +147,7 @@ // so we need to wait for the proper case to init the registration context... Hackish! :( if (index == 0) { + System.out.println("REGISTRATIONCONTEXT : " + releaseSessions.getRegistrationContext()); releaseSessions.setRegistrationContext(registerConsumer()); } } @@ -152,9 +158,14 @@ catch (V1OperationFailed operationFailedFault) { // expected fault. + operationFailedFault.printStackTrace(); } finally { + if (index == 0 && useRegistration) + { + releaseSessions.setRegistrationContext(null); + } tearDown(); } } Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java 2010-06-18 22:36:00 UTC (rev 3389) @@ -30,6 +30,7 @@ package org.gatein.wsrp.protocol.v1; import org.gatein.wsrp.WSRPUtils; +import org.gatein.wsrp.producer.WSRPProducerBaseTest; import org.gatein.wsrp.protocol.v1.V1ProducerBaseTest; import org.gatein.wsrp.registration.RegistrationPropertyDescription; import org.gatein.wsrp.servlet.ServletAccess; @@ -71,7 +72,11 @@ @Deployment public static JavaArchive createDeployment() { - return ShrinkWrap.create("test.jar", JavaArchive.class); + JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class); + jar.addClass(NeedPortletHandleTest.class); + jar.addClass(V1ProducerBaseTest.class); + jar.addClass(WSRPProducerBaseTest.class); + return jar; } @Before Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2010-06-18 19:00:26 UTC (rev 3388) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2010-06-18 22:36:00 UTC (rev 3389) @@ -24,6 +24,9 @@ package org.gatein.wsrp.protocol.v2; import org.gatein.common.util.ParameterValidation; +import org.gatein.wsrp.producer.WSRPProducerBaseTest; +import org.gatein.wsrp.protocol.v1.NeedPortletHandleTest; +import org.gatein.wsrp.protocol.v1.V1ProducerBaseTest; import org.gatein.wsrp.servlet.ServletAccess; import org.gatein.wsrp.spec.v2.WSRP2Constants; import org.gatein.wsrp.test.ExtendedAssert; @@ -61,7 +64,11 @@ @Deployment public static JavaArchive createDeployment() { - return ShrinkWrap.create("test.jar", JavaArchive.class); + JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class); + jar.addClass(NeedPortletHandleTest.class); + jar.addClass(V2ProducerBaseTest.class); + jar.addClass(WSRPProducerBaseTest.class); + return jar; } @Before Property changes on: components/wsrp/trunk/wsrp2-ws ___________________________________________________________________ Name: svn:ignore + target