6:14 p.m.
Author: chris.laprun(a)jboss.com
Date: 2010-06-17 19:14:00 -0400 (Thu, 17 Jun 2010)
New Revision: 3376
Removed:
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/registration/
Modified:
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java
components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/META-INF/jboss-beans.xml
Log:
- Retrieve Google portlet from PC samples to use in tests.
- Reverted to using JBOSS_HOME instead of zip installer for faster execution. Trimming
down AS installation to minimum would further speed up tests.
- Reduced cargo logging but doesn't seem to have much effect. >_<
- Removed duplicated RegistrationPropertyDescriptionTestCase.
- Fixed several typos and cleaned up a little.
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-17 20:28:01 UTC (rev 3375)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-17 23:14:00 UTC (rev 3376)
@@ -248,17 +248,41 @@
<version>2.1.1</version>
</dependency>
</dependencies>
-
</plugin>
-
<plugin>
+ <!-- Copy Google Portlet samples from PC module to test-archives so that
they can be used in tests -->
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-samples</artifactId>
+ <version>2.1.1-GA</version>
+ <classifier>google-portlet</classifier>
+ <type>war</type>
+ <destFileName>google-portlet.war</destFileName>
+
<outputDirectory>${project.build.directory}/test-archives</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
<excludes>
<exclude>org/gatein/wsrp/protocol/v1/*</exclude>
- <exclude>org/gatein/wsrp/protocol/v1a/*</exclude>
</excludes>
</configuration>
<executions>
@@ -270,7 +294,6 @@
</goals>
<configuration>
<skip>false</skip>
- <!--<skip>false</skip>-->
<includes>
<include>org/gatein/wsrp/protocol/v1/MarkupTestCase.class</include>
<include>org/gatein/wsrp/protocol/v1/PortletManagementTestCase.class</include>
@@ -280,7 +303,6 @@
</includes>
<excludes>
<exclude>org/gatein/wsrp/producer/**</exclude>
- <exclude>org/gatein/wsrp/registration/**</exclude>
</excludes>
</configuration>
</execution>
@@ -293,10 +315,7 @@
<configuration>
<container>
<containerId>jboss51x</containerId>
- <zipUrlInstaller>
- <url>${JBOSS_ZIP_URL}</url>
- <installDir>${basedir}/target/servers</installDir>
- </zipUrlInstaller>
+ <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
@@ -313,19 +332,11 @@
<configuration>
<home>${basedir}/target/cargo</home>
<properties>
+ <cargo.logging>low</cargo.logging>
<cargo.jvmargs>-Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=false</cargo.jvmargs>
</properties>
<deployables>
<deployable>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-producer</artifactId>
- <type>war</type>
- <properties>
- <context>wsrp-producer</context>
- </properties>
-
<pingURL>http://localhost:8080/wsrp-producer/MarkupService?WSDL</pingURL>
- </deployable>
- <deployable>
<location>${basedir}/target/test-archives/test-producer.sar</location>
<type>sar</type>
</deployable>
Modified:
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java
===================================================================
---
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java 2010-06-17
20:28:01 UTC (rev 3375)
+++
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java 2010-06-17
23:14:00 UTC (rev 3376)
@@ -10,7 +10,7 @@
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
- * This software is distributed in the hope that it will be useful,
+ * This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
@@ -88,7 +88,7 @@
}
else
{
- throw new Exception("Could not find the jboss.deploy.url.prefix system
property.");
+ throw new Exception("Could not find the jboss.undeploy.url.prefix system
property.");
}
}
Modified:
components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/META-INF/jboss-beans.xml
===================================================================
---
components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/META-INF/jboss-beans.xml 2010-06-17
20:28:01 UTC (rev 3375)
+++
components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/META-INF/jboss-beans.xml 2010-06-17
23:14:00 UTC (rev 3376)
@@ -1,112 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-<!--
- <bean name="TestDriverServer"
class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+ <!--
+ <bean name="TestDriverServer"
class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
- <bean name="TestDriverServerExporter"
-
class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
- <constructor>
- <parameter>socket://localhost:5400</parameter>
- <parameter><inject
bean="TestDriverServer"/></parameter>
-
<parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
+ <bean name="TestDriverServerExporter"
+
class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
+ <constructor>
+ <parameter>socket://localhost:5400</parameter>
+ <parameter><inject
bean="TestDriverServer"/></parameter>
+
<parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
+ </constructor>
+ </bean>
+ -->
+ <bean name="WSRPProducer"
class="org.gatein.wsrp.producer.WSRPProducerImpl">
+ <constructor factoryClass="org.gatein.wsrp.producer.ProducerHolder"
factoryMethod="getProducer">
+ <parameter>true</parameter>
</constructor>
+ <property name="portletInvoker">
+ <inject bean="PortletInvoker"/>
+ </property>
+ <property name="registrationManager">
+ <inject bean="RegistrationManagerService"/>
+ </property>
+ <property name="configurationService">
+ <inject bean="ConfigurationService"/>
+ </property>
</bean>
--->
- <bean name="WSRPProducer"
class="org.gatein.wsrp.producer.WSRPProducerImpl">
- <constructor factoryClass="org.gatein.wsrp.producer.ProducerHolder"
factoryMethod="getProducer">
- <parameter>true</parameter>
- </constructor>
- <property name="portletInvoker"><inject
bean="PortletInvoker"/></property>
- <property name="registrationManager"><inject
bean="RegistrationManagerService"/></property>
- <property name="configurationService"><inject
bean="ConfigurationService"/></property>
- </bean>
<bean name="PortletInvoker"
class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject
bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject
bean="ProducerPersistenceManagerService"/></property>
- <property name="stateManagementPolicy"><inject
bean="StateManagmentPolicyService"/></property>
- <property name="stateConverter"><inject
bean="StateConverterService"/></property>
+ <property name="next">
+ <inject bean="ContainerPortletInvoker"/>
+ </property>
+ <property name="persistenceManager">
+ <inject bean="ProducerPersistenceManagerService"/>
+ </property>
+ <property name="stateManagementPolicy">
+ <inject bean="StateManagmentPolicyService"/>
+ </property>
+ <property name="stateConverter">
+ <inject bean="StateConverterService"/>
+ </property>
</bean>
<!-- TODO: may need to write a new class for this -->
- <bean name="ProducerPersistenceManagerService"
class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+ <bean name="ProducerPersistenceManagerService"
+
class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
<bean name="StateManagmentPolicyService"
class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally">true</property>
+ <property name="persistLocally">true</property>
</bean>
<bean name="StateConverterService"
class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
<bean name="RegistrationManagerService"
class="org.gatein.registration.impl.RegistrationManagerImpl">
- <property name="persistenceManager"><inject
bean="RegistrationPersistenceManagerService"/></property>
+ <property name="persistenceManager">
+ <inject bean="RegistrationPersistenceManagerService"/>
+ </property>
</bean>
<!-- TODO: may need to write a new class for this -->
- <bean name="RegistrationPersistenceManagerService"
class="org.gatein.registration.impl.RegistrationPersistenceManagerImpl">
+ <bean name="RegistrationPersistenceManagerService"
+
class="org.gatein.registration.impl.RegistrationPersistenceManagerImpl">
</bean>
<bean name="ConfigurationService"
class="org.gatein.wsrp.config.FileSystemXmlProducerConfigWithReload">
- <property
name="configFile">conf/producer-config.xml</property>
- <!-- <property
name="configFile">/tmp/producer-config.xml</property> -->
+ <property
name="configFile">conf/producer-config.xml</property>
+ <!-- <property
name="configFile">/tmp/producer-config.xml</property> -->
</bean>
- <bean name="SerletAccess"
class="org.gatein.wsrp.servlet.ServletAccess"/>
+ <bean name="ServletAccess"
class="org.gatein.wsrp.servlet.ServletAccess"/>
</deployment>
<!-- Dummy test WSRP Producer implementation -->
-<!-- <bean name="DummyWSRPProducer"
class="org.gatein.wsrp.test.TestWSRPProducerImpl"/> -->
+ <!-- <bean name="DummyWSRPProducer"
class="org.gatein.wsrp.test.TestWSRPProducerImpl"/> -->
<!-- Hack to get access to req/resp -->
-<!-- <bean name="ServletAccess"
class="org.gatein.wsrp.servlet.ServletAccessFilter"/> -->
+ <!-- <bean name="ServletAccess"
class="org.gatein.wsrp.servlet.ServletAccessFilter"/> -->
-<!-- <bean name="ServiceFactory"
class="org.gatein.wsrp.services.PerEndpointSOAPInvokerServiceFactory">
- <property
name="ServiceDescriptionURL">http://localhost:8080/test-wsrp-consumer/ServiceDescriptionService</property>
- <property
name="MarkupURL">http://localhost:8080/test-wsrp-consumer/MarkupService</property>
- <property
name="RegistrationURL">http://localhost:8080/test-wsrp-consumer/RegistrationService</property>
- <property
name="PortletManagementURL">http://localhost:8080/test-wsrp-consumer/PortletManagementService</property>
- <property name="Env">
- java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
- java.naming.provider.url=jnp://localhost:1099
- java.naming.factory.url.pkgs=org.jboss.naming.client
- j2ee.clientName=wsrp-client
- </property>
- <property name="PortJNDIMapping">
-
org.gatein.wsrp.core.WSRP_v1_ServiceDescription_PortType=java:comp/env/service/ServiceDescriptionService
-
org.gatein.wsrp.core.WSRP_v1_Markup_PortType=java:comp/env/service/MarkupService
-
org.gatein.wsrp.core.WSRP_v1_Registration_PortType=java:comp/env/service/RegistrationService
-
org.gatein.wsrp.core.WSRP_v1_PortletManagement_PortType=java:comp/env/service/PortletManagementService
- </property>
- </bean>
+ <!-- <bean name="ServiceFactory"
class="org.gatein.wsrp.services.PerEndpointSOAPInvokerServiceFactory">
+ <property
name="ServiceDescriptionURL">http://localhost:8080/test-wsrp-consumer/ServiceDescriptionService</property>
+ <property
name="MarkupURL">http://localhost:8080/test-wsrp-consumer/MarkupService</property>
+ <property
name="RegistrationURL">http://localhost:8080/test-wsrp-consumer/RegistrationService</property>
+ <property
name="PortletManagementURL">http://localhost:8080/test-wsrp-consumer/PortletManagementService</property>
+ <property name="Env">
+ java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+ java.naming.provider.url=jnp://localhost:1099
+ java.naming.factory.url.pkgs=org.jboss.naming.client
+ j2ee.clientName=wsrp-client
+ </property>
+ <property name="PortJNDIMapping">
+
org.gatein.wsrp.core.WSRP_v1_ServiceDescription_PortType=java:comp/env/service/ServiceDescriptionService
+
org.gatein.wsrp.core.WSRP_v1_Markup_PortType=java:comp/env/service/MarkupService
+
org.gatein.wsrp.core.WSRP_v1_Registration_PortType=java:comp/env/service/RegistrationService
+
org.gatein.wsrp.core.WSRP_v1_PortletManagement_PortType=java:comp/env/service/PortletManagementService
+ </property>
+ </bean>
- <bean name="CachingServiceFactory"
class="CachingServiceFactory">
- <property name="Delegate"><inject
bean="ServiceFactory"/></property>
- </bean>
+ <bean name="CachingServiceFactory"
class="CachingServiceFactory">
+ <property name="Delegate"><inject
bean="ServiceFactory"/></property>
+ </bean>
- <bean name="WSRPConsumer"
class="org.gatein.wsrp.consumer.WSRPConsumerImpl">
- <property name="ServiceFactory"><inject
bean="CachingServiceFactory"/></property>
- </bean>
--->
-<!--</deployment> -->
+ <bean name="WSRPConsumer"
class="org.gatein.wsrp.consumer.WSRPConsumerImpl">
+ <property name="ServiceFactory"><inject
bean="CachingServiceFactory"/></property>
+ </bean>
+ -->
+ <!--</deployment> -->