riftsaw SVN: r1284 - dsp/tags.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2011-01-27 11:22:34 -0500 (Thu, 27 Jan 2011)
New Revision: 1284
Added:
dsp/tags/DSP-1.0.0.CR2/
Log:
Tagged 1.0.0.CR2
Copied: dsp/tags/DSP-1.0.0.CR2 (from rev 1283, dsp/trunk)
13 years, 11 months
riftsaw SVN: r1283 - in dsp/trunk: api and 5 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2011-01-27 11:18:34 -0500 (Thu, 27 Jan 2011)
New Revision: 1283
Modified:
dsp/trunk/api/pom.xml
dsp/trunk/distribution/pom.xml
dsp/trunk/integration/jbossas5/pom.xml
dsp/trunk/integration/jbossas6/pom.xml
dsp/trunk/integration/pom.xml
dsp/trunk/integration/tomcat/pom.xml
dsp/trunk/pom.xml
Log:
Update version to 1.0.0.CR2
Modified: dsp/trunk/api/pom.xml
===================================================================
--- dsp/trunk/api/pom.xml 2011-01-27 11:06:04 UTC (rev 1282)
+++ dsp/trunk/api/pom.xml 2011-01-27 16:18:34 UTC (rev 1283)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-api</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
<name>SOA::DSP::API</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
</parent>
<dependencies>
Modified: dsp/trunk/distribution/pom.xml
===================================================================
--- dsp/trunk/distribution/pom.xml 2011-01-27 11:06:04 UTC (rev 1282)
+++ dsp/trunk/distribution/pom.xml 2011-01-27 16:18:34 UTC (rev 1283)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>distribution</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
<name>SOA::DSP::Distribution</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
</parent>
<properties>
Modified: dsp/trunk/integration/jbossas5/pom.xml
===================================================================
--- dsp/trunk/integration/jbossas5/pom.xml 2011-01-27 11:06:04 UTC (rev 1282)
+++ dsp/trunk/integration/jbossas5/pom.xml 2011-01-27 16:18:34 UTC (rev 1283)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-jbossas5</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
<name>SOA::DSP::Integration::JBossAS5</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>integration</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
</parent>
<properties>
Modified: dsp/trunk/integration/jbossas6/pom.xml
===================================================================
--- dsp/trunk/integration/jbossas6/pom.xml 2011-01-27 11:06:04 UTC (rev 1282)
+++ dsp/trunk/integration/jbossas6/pom.xml 2011-01-27 16:18:34 UTC (rev 1283)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-jbossas6</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
<name>SOA::DSP::Integration::JBossAS6</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>integration</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
</parent>
<properties>
Modified: dsp/trunk/integration/pom.xml
===================================================================
--- dsp/trunk/integration/pom.xml 2011-01-27 11:06:04 UTC (rev 1282)
+++ dsp/trunk/integration/pom.xml 2011-01-27 16:18:34 UTC (rev 1283)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>integration</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
<name>SOA::DSP::Integration</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
</parent>
<modules>
Modified: dsp/trunk/integration/tomcat/pom.xml
===================================================================
--- dsp/trunk/integration/tomcat/pom.xml 2011-01-27 11:06:04 UTC (rev 1282)
+++ dsp/trunk/integration/tomcat/pom.xml 2011-01-27 16:18:34 UTC (rev 1283)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-tomcat</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
<name>SOA::DSP::Integration::Tomcat</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>integration</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
</parent>
<dependencies>
Modified: dsp/trunk/pom.xml
===================================================================
--- dsp/trunk/pom.xml 2011-01-27 11:06:04 UTC (rev 1282)
+++ dsp/trunk/pom.xml 2011-01-27 16:18:34 UTC (rev 1283)
@@ -5,11 +5,11 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR2</version>
<name>SOA::DSP</name>
<properties>
- <dsp.version>1.0.0-SNAPSHOT</dsp.version>
+ <dsp.version>1.0.0.CR2</dsp.version>
<junit.version>4.8.1</junit.version>
<jaxws.version>2.1</jaxws.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
13 years, 11 months
riftsaw SVN: r1282 - in dsp/trunk/samples/example-deployer: deployer and 11 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2011-01-27 06:06:04 -0500 (Thu, 27 Jan 2011)
New Revision: 1282
Added:
dsp/trunk/samples/example-deployer/deployer/conf/
dsp/trunk/samples/example-deployer/deployer/conf/jbossas5/
dsp/trunk/samples/example-deployer/deployer/conf/jbossas5/WEB-INF/
dsp/trunk/samples/example-deployer/deployer/conf/jbossas5/WEB-INF/classes/
dsp/trunk/samples/example-deployer/deployer/conf/jbossas5/WEB-INF/classes/dsp.properties
dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/
dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/WEB-INF/
dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/WEB-INF/classes/
dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/WEB-INF/classes/dsp.properties
dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/WEB-INF/jboss-beans.xml
dsp/trunk/samples/example-deployer/deployer/conf/tomcat/
dsp/trunk/samples/example-deployer/deployer/conf/tomcat/WEB-INF/
dsp/trunk/samples/example-deployer/deployer/conf/tomcat/WEB-INF/classes/
dsp/trunk/samples/example-deployer/deployer/conf/tomcat/WEB-INF/classes/dsp.properties
Removed:
dsp/trunk/samples/example-deployer/deployer/resources/WEB-INF/classes/dsp.properties
Modified:
dsp/trunk/samples/example-deployer/build.xml
dsp/trunk/samples/example-deployer/readme.txt
Log:
RIFTSAW-336 - DSP now supports JBossAS 5 and 6.
Modified: dsp/trunk/samples/example-deployer/build.xml
===================================================================
--- dsp/trunk/samples/example-deployer/build.xml 2011-01-27 09:54:00 UTC (rev 1281)
+++ dsp/trunk/samples/example-deployer/build.xml 2011-01-27 11:06:04 UTC (rev 1282)
@@ -22,8 +22,12 @@
<fileset dir="deployer/resources" />
</copy>
+ <copy todir="${build.dir}/war" >
+ <fileset dir="deployer/conf/${platform}" />
+ </copy>
+
<copy todir="${build.dir}/war/WEB-INF/lib" >
- <fileset dir="../../lib" includes="dsp*.jar" />
+ <fileset dir="../../lib" includes="dsp-api-*.jar,dsp-${platform}-*.jar" />
</copy>
<copy todir="${build.dir}/war/WEB-INF/lib" >
Added: dsp/trunk/samples/example-deployer/deployer/conf/jbossas5/WEB-INF/classes/dsp.properties
===================================================================
--- dsp/trunk/samples/example-deployer/deployer/conf/jbossas5/WEB-INF/classes/dsp.properties (rev 0)
+++ dsp/trunk/samples/example-deployer/deployer/conf/jbossas5/WEB-INF/classes/dsp.properties 2011-01-27 11:06:04 UTC (rev 1282)
@@ -0,0 +1,4 @@
+# JBOSS APPLICATION SERVER 5
+dsp.server.config.factory = org.jboss.soa.dsp.server.jbossas5.JBossServerConfigFactory
+dsp.service.deployer = org.jboss.soa.dsp.deployer.jbossas5.JBossServiceDeployer
+
Added: dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/WEB-INF/classes/dsp.properties
===================================================================
--- dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/WEB-INF/classes/dsp.properties (rev 0)
+++ dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/WEB-INF/classes/dsp.properties 2011-01-27 11:06:04 UTC (rev 1282)
@@ -0,0 +1,4 @@
+# JBOSS APPLICATION SERVER 6
+dsp.server.config.factory = org.jboss.soa.dsp.server.jbossas6.JBossServerConfigFactory
+dsp.service.deployer = org.jboss.soa.dsp.deployer.jbossas6.JBossServiceDeployer
+
Added: dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/WEB-INF/jboss-beans.xml
===================================================================
--- dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/WEB-INF/jboss-beans.xml (rev 0)
+++ dsp/trunk/samples/example-deployer/deployer/conf/jbossas6/WEB-INF/jboss-beans.xml 2011-01-27 11:06:04 UTC (rev 1282)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ Locate the single instance of the kernel
+ -->
+ <bean name="org.jboss.soa.dsp:service=KernelLocator"
+ class="org.jboss.soa.dsp.server.jbossas6.KernelLocator">
+ <property name="kernel">
+ <inject bean="jboss.kernel:service=Kernel" />
+ </property>
+ </bean>
+
+ <!--
+ ServerConfig
+ -->
+ <bean name="org.jboss.soa.dsp:service=ServerConfig"
+ class="org.jboss.soa.dsp.server.jbossas6.JBossServerConfigImpl">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ </bean>
+
+
+</deployment>
Added: dsp/trunk/samples/example-deployer/deployer/conf/tomcat/WEB-INF/classes/dsp.properties
===================================================================
--- dsp/trunk/samples/example-deployer/deployer/conf/tomcat/WEB-INF/classes/dsp.properties (rev 0)
+++ dsp/trunk/samples/example-deployer/deployer/conf/tomcat/WEB-INF/classes/dsp.properties 2011-01-27 11:06:04 UTC (rev 1282)
@@ -0,0 +1,3 @@
+# APACHE TOMCAT
+dsp.server.config.factory = org.jboss.soa.dsp.server.tomcat.TomcatServerConfigFactory
+dsp.service.deployer = org.jboss.soa.dsp.deployer.tomcat.TomcatServiceDeployer
Deleted: dsp/trunk/samples/example-deployer/deployer/resources/WEB-INF/classes/dsp.properties
===================================================================
--- dsp/trunk/samples/example-deployer/deployer/resources/WEB-INF/classes/dsp.properties 2011-01-27 09:54:00 UTC (rev 1281)
+++ dsp/trunk/samples/example-deployer/deployer/resources/WEB-INF/classes/dsp.properties 2011-01-27 11:06:04 UTC (rev 1282)
@@ -1,12 +0,0 @@
-
-# JBOSS APPLICATION SERVER 5
-dsp.server.config.factory = org.jboss.soa.dsp.server.jbossas5.JBossServerConfigFactory
-dsp.service.deployer = org.jboss.soa.dsp.deployer.jbossas5.JBossServiceDeployer
-
-# JBOSS APPLICATION SERVER 6
-#dsp.server.config.factory = org.jboss.soa.dsp.server.jbossas6.JBossServerConfigFactory
-#dsp.service.deployer = org.jboss.soa.dsp.deployer.jbossas6.JBossServiceDeployer
-
-# APACHE TOMCAT
-#dsp.server.config.factory = org.jboss.soa.dsp.server.tomcat.TomcatServerConfigFactory
-#dsp.service.deployer = org.jboss.soa.dsp.deployer.tomcat.TomcatServiceDeployer
Modified: dsp/trunk/samples/example-deployer/readme.txt
===================================================================
--- dsp/trunk/samples/example-deployer/readme.txt 2011-01-27 09:54:00 UTC (rev 1281)
+++ dsp/trunk/samples/example-deployer/readme.txt 2011-01-27 11:06:04 UTC (rev 1282)
@@ -8,17 +8,14 @@
Build the Example
-----------------
-1) Set the properties for the target environment
+The only task is to build the war ready for deployment.
-Uncomment the relevant properties in the $DSP/samples/example-deployer/deployer/resources/WEB-INF/classes/dsp.properties
-file. Currently only Apache Tomcat and JBoss App Server are supported.
+From the $DSP/samples/example-deployer folder, run the following command:
-2) Build the war ready for deployment
+ ant build -Dplatform=<platform>
-From the $DSP/samples/example-deployer folder, run the following command:
+(current platforms supported are: jbossas5, jbossas6 and tomcat)
- ant build
-
If built successfully, this will create a war file in the build folder.
@@ -86,6 +83,11 @@
</SOAP-ENV:Body>
</SOAP-ENV:Envelope>
+NOTE: The response may vary slightly depending upon the platform used. The important part of the
+response is the fault code, which should represent an 'ExampleFault' in the 'http://www.example.org'
+namespace.
+
+
3) Undeploy the service
Select the service in the undeploy section of the deployer's web page. This will remove the web service
13 years, 11 months
riftsaw SVN: r1281 - in trunk: distribution/src/main/release/install and 1 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2011-01-27 04:54:00 -0500 (Thu, 27 Jan 2011)
New Revision: 1281
Modified:
trunk/distribution/src/main/release/db/jboss/as5.properties
trunk/distribution/src/main/release/db/jboss/as6.properties
trunk/distribution/src/main/release/db/jboss/jboss-beans.xml
trunk/distribution/src/main/release/install/build.xml
trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml
Log:
Update install script and config files to deal with AS5/6 implementation differences.
Modified: trunk/distribution/src/main/release/db/jboss/as5.properties
===================================================================
--- trunk/distribution/src/main/release/db/jboss/as5.properties 2011-01-26 18:26:35 UTC (rev 1280)
+++ trunk/distribution/src/main/release/db/jboss/as5.properties 2011-01-27 09:54:00 UTC (rev 1281)
@@ -1,2 +1,4 @@
dsp.service.deployer=org.jboss.soa.dsp.deployer.jbossas5.JBossServiceDeployer
dsp.server.config.factory=org.jboss.soa.dsp.server.jbossas5.JBossServerConfigFactory
+kernel.locator=org.jboss.soa.dsp.server.jbossas5.KernelLocator
+dsp.server.config.impl=org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl
Modified: trunk/distribution/src/main/release/db/jboss/as6.properties
===================================================================
--- trunk/distribution/src/main/release/db/jboss/as6.properties 2011-01-26 18:26:35 UTC (rev 1280)
+++ trunk/distribution/src/main/release/db/jboss/as6.properties 2011-01-27 09:54:00 UTC (rev 1281)
@@ -1,2 +1,4 @@
dsp.service.deployer=org.jboss.soa.dsp.deployer.jbossas6.JBossServiceDeployer
dsp.server.config.factory=org.jboss.soa.dsp.server.jbossas6.JBossServerConfigFactory
+kernel.locator=org.jboss.soa.dsp.server.jbossas6.KernelLocator
+dsp.server.config.impl=org.jboss.soa.dsp.server.jbossas6.JBossServerConfigImpl
Modified: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml
===================================================================
--- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-26 18:26:35 UTC (rev 1280)
+++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-27 09:54:00 UTC (rev 1281)
@@ -24,7 +24,7 @@
Locate the single instance of the kernel
-->
<bean name="org.jboss.soa.dsp:service=KernelLocator"
- class="org.jboss.soa.dsp.server.jbossas5.KernelLocator">
+ class="@kernel.locator@">
<property name="kernel">
<inject bean="jboss.kernel:service=Kernel" />
</property>
@@ -34,7 +34,7 @@
ServerConfig
-->
<bean name="org.jboss.soa.dsp:service=ServerConfig"
- class="org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl">
+ class="@dsp.server.config.impl@">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="webServiceHost">${jboss.bind.address}</property>
</bean>
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2011-01-26 18:26:35 UTC (rev 1280)
+++ trunk/distribution/src/main/release/install/build.xml 2011-01-27 09:54:00 UTC (rev 1281)
@@ -87,6 +87,7 @@
overwrite="true">
<filterset>
<filter token="database" value="${database}"/>
+ <filterset filtersfile="../db/jboss/as${as.version}.properties" />
</filterset>
</copy>
@@ -237,6 +238,7 @@
overwrite="true">
<filterset>
<filter token="database" value="${database}"/>
+ <filterset filtersfile="../db/jboss/as${as.version}.properties" />
</filterset>
</copy>
<copy todir="${deploy.dir}/${bpel-runtime}/lib" overwrite="true">
Modified: trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2011-01-26 18:26:35 UTC (rev 1280)
+++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2011-01-27 09:54:00 UTC (rev 1281)
@@ -25,7 +25,7 @@
Locate the single instance of the kernel
-->
<bean name="org.jboss.soa.dsp:service=KernelLocator"
- class="org.jboss.soa.dsp.server.jbossas5.KernelLocator">
+ class="@kernel.locator@">
<property name="kernel">
<inject bean="jboss.kernel:service=Kernel" />
</property>
@@ -35,7 +35,7 @@
ServerConfig
-->
<bean name="org.jboss.soa.dsp:service=ServerConfig"
- class="org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl">
+ class="@dsp.server.config.impl@">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="webServiceHost">${jboss.bind.address}</property>
<property name="clusterNodeName"><inject bean="HAPartition" property="nodeName" /></property>
13 years, 11 months
riftsaw SVN: r1280 - in dsp/trunk/integration: jbossas6/src/main/resources/META-INF and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2011-01-26 13:26:35 -0500 (Wed, 26 Jan 2011)
New Revision: 1280
Modified:
dsp/trunk/integration/jbossas5/src/main/resources/META-INF/jboss-beans.xml
dsp/trunk/integration/jbossas6/src/main/resources/META-INF/jboss-beans.xml
Log:
Updated implementation classes.
Modified: dsp/trunk/integration/jbossas5/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/resources/META-INF/jboss-beans.xml 2011-01-26 18:25:14 UTC (rev 1279)
+++ dsp/trunk/integration/jbossas5/src/main/resources/META-INF/jboss-beans.xml 2011-01-26 18:26:35 UTC (rev 1280)
@@ -5,7 +5,7 @@
Locate the single instance of the kernel
-->
<bean name="org.jboss.soa.dsp:service=KernelLocator"
- class="org.jboss.soa.dsp.server.jboss.KernelLocator">
+ class="org.jboss.soa.dsp.server.jbossas5.KernelLocator">
<property name="kernel">
<inject bean="jboss.kernel:service=Kernel" />
</property>
@@ -15,7 +15,7 @@
ServerConfig
-->
<bean name="org.jboss.soa.dsp:service=ServerConfig"
- class="org.jboss.soa.dsp.server.jboss.JBossServerConfigImpl">
+ class="org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="webServiceHost">${jboss.bind.address}</property>
</bean>
Modified: dsp/trunk/integration/jbossas6/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- dsp/trunk/integration/jbossas6/src/main/resources/META-INF/jboss-beans.xml 2011-01-26 18:25:14 UTC (rev 1279)
+++ dsp/trunk/integration/jbossas6/src/main/resources/META-INF/jboss-beans.xml 2011-01-26 18:26:35 UTC (rev 1280)
@@ -5,7 +5,7 @@
Locate the single instance of the kernel
-->
<bean name="org.jboss.soa.dsp:service=KernelLocator"
- class="org.jboss.soa.dsp.server.jboss.KernelLocator">
+ class="org.jboss.soa.dsp.server.jbossas6.KernelLocator">
<property name="kernel">
<inject bean="jboss.kernel:service=Kernel" />
</property>
@@ -15,7 +15,7 @@
ServerConfig
-->
<bean name="org.jboss.soa.dsp:service=ServerConfig"
- class="org.jboss.soa.dsp.server.jboss.JBossServerConfigImpl">
+ class="org.jboss.soa.dsp.server.jbossas6.JBossServerConfigImpl">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="webServiceHost">${jboss.bind.address}</property>
</bean>
13 years, 11 months
riftsaw SVN: r1279 - in trunk: console/integration and 13 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2011-01-26 13:25:14 -0500 (Wed, 26 Jan 2011)
New Revision: 1279
Added:
trunk/distribution/src/main/release/db/jboss/as6.properties
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/JBossDSPFactory.java
Modified:
trunk/console/integration/pom.xml
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java
trunk/distribution/src/main/release/db/jboss/as5.properties
trunk/distribution/src/main/release/db/jboss/jboss-beans.xml
trunk/pom.xml
trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml
trunk/runtime/engine-assembly/pom.xml
trunk/runtime/engine-assembly/src/main/assembly/sar.xml
trunk/runtime/engine/pom.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
trunk/runtime/jbossesb-bpel/pom.xml
trunk/runtime/uddi/pom.xml
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
Log:
Further work to support AS5 and AS6. Changed to use an updated DSP - still needs further config work to sort out the jboss-beans.xml - set to AS5 for now.
Modified: trunk/console/integration/pom.xml
===================================================================
--- trunk/console/integration/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/console/integration/pom.xml 2011-01-26 18:25:14 UTC (rev 1279)
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-jboss</artifactId>
+ <artifactId>dsp-api</artifactId>
</dependency>
<!-- ODE 2.0 dependencies
Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java
===================================================================
--- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2011-01-26 18:25:14 UTC (rev 1279)
@@ -29,8 +29,8 @@
import org.jboss.soa.bpel.bpel2svg.BPEL2SVGUtil;
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
-import org.jboss.soa.dsp.server.jboss.JBossServerConfig;
-import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory;
+import org.jboss.soa.bpel.runtime.JBossDSPFactory;
+import org.jboss.soa.dsp.server.ServerConfig;
import org.wso2.carbon.bpel.ui.bpel2svg.ActivityInterface;
import org.wso2.carbon.bpel.ui.bpel2svg.SVGInterface;
@@ -69,7 +69,7 @@
public SVGPlugin() {
// host & port resolution
- JBossServerConfig serverConfig = JBossServerConfigFactory.createServerConfig();
+ ServerConfig serverConfig = JBossDSPFactory.getServerConfig();
this.webServiceHost = serverConfig.getWebServiceHost();
this.webServicePort = serverConfig.getWebServicePort();
Modified: trunk/distribution/src/main/release/db/jboss/as5.properties
===================================================================
--- trunk/distribution/src/main/release/db/jboss/as5.properties 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/distribution/src/main/release/db/jboss/as5.properties 2011-01-26 18:25:14 UTC (rev 1279)
@@ -1,2 +1,2 @@
-dsp.service.deployer=org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer
-dsp.server.config.factory=org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory
+dsp.service.deployer=org.jboss.soa.dsp.deployer.jbossas5.JBossServiceDeployer
+dsp.server.config.factory=org.jboss.soa.dsp.server.jbossas5.JBossServerConfigFactory
Added: trunk/distribution/src/main/release/db/jboss/as6.properties
===================================================================
--- trunk/distribution/src/main/release/db/jboss/as6.properties (rev 0)
+++ trunk/distribution/src/main/release/db/jboss/as6.properties 2011-01-26 18:25:14 UTC (rev 1279)
@@ -0,0 +1,2 @@
+dsp.service.deployer=org.jboss.soa.dsp.deployer.jbossas6.JBossServiceDeployer
+dsp.server.config.factory=org.jboss.soa.dsp.server.jbossas6.JBossServerConfigFactory
Modified: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml
===================================================================
--- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-26 18:25:14 UTC (rev 1279)
@@ -24,7 +24,7 @@
Locate the single instance of the kernel
-->
<bean name="org.jboss.soa.dsp:service=KernelLocator"
- class="org.jboss.soa.dsp.server.jboss.KernelLocator">
+ class="org.jboss.soa.dsp.server.jbossas5.KernelLocator">
<property name="kernel">
<inject bean="jboss.kernel:service=Kernel" />
</property>
@@ -34,7 +34,7 @@
ServerConfig
-->
<bean name="org.jboss.soa.dsp:service=ServerConfig"
- class="org.jboss.soa.dsp.server.jboss.JBossServerConfigImpl">
+ class="org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="webServiceHost">${jboss.bind.address}</property>
</bean>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/pom.xml 2011-01-26 18:25:14 UTC (rev 1279)
@@ -242,9 +242,14 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-jboss</artifactId>
+ <artifactId>dsp-jbossas5</artifactId>
<version>${dsp.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jbossas6</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
<!-- ODE1.3.3 dependencies -->
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
Modified: trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2011-01-26 18:25:14 UTC (rev 1279)
@@ -25,7 +25,7 @@
Locate the single instance of the kernel
-->
<bean name="org.jboss.soa.dsp:service=KernelLocator"
- class="org.jboss.soa.dsp.server.jboss.KernelLocator">
+ class="org.jboss.soa.dsp.server.jbossas5.KernelLocator">
<property name="kernel">
<inject bean="jboss.kernel:service=Kernel" />
</property>
@@ -35,7 +35,7 @@
ServerConfig
-->
<bean name="org.jboss.soa.dsp:service=ServerConfig"
- class="org.jboss.soa.dsp.server.jboss.JBossServerConfigImpl">
+ class="org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="webServiceHost">${jboss.bind.address}</property>
<property name="clusterNodeName"><inject bean="HAPartition" property="nodeName" /></property>
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/engine/pom.xml 2011-01-26 18:25:14 UTC (rev 1279)
@@ -46,10 +46,6 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-jboss</artifactId>
- </dependency>
<!-- ODE2 dependencies
<dependency>
Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/JBossDSPFactory.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/JBossDSPFactory.java (rev 0)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/JBossDSPFactory.java 2011-01-26 18:25:14 UTC (rev 1279)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.soa.bpel.runtime;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.soa.dsp.deployer.ServiceDeployer;
+import org.jboss.soa.dsp.server.ServerConfig;
+import org.jboss.soa.dsp.server.ServerConfigFactory;
+
+/**
+ * This class provides a factory for retrieving the Dynamic Service
+ * Provider components suitable for the JBoss environment.
+ *
+ */
+public class JBossDSPFactory {
+
+ private static final String BPEL_DSP_SERVICE_DEPLOYER = "bpel.dsp.service.deployer";
+ private static final String BPEL_DSP_SERVER_CONFIG_FACTORY = "bpel.dsp.server.config.factory";
+
+ private static final Log log = LogFactory.getLog(JBossDSPFactory.class);
+
+ private static ServiceDeployer m_serviceDeployer=null;
+ private static ServerConfig m_serverConfig=null;
+
+ public static ServerConfig getServerConfig() {
+ if (m_serverConfig == null) {
+ java.util.ResourceBundle bundle=java.util.ResourceBundle.getBundle("bpel");
+
+ String configFactoryClassName=bundle.getString(BPEL_DSP_SERVER_CONFIG_FACTORY);
+
+ if (configFactoryClassName != null) {
+ try {
+ Class<?> cls=Class.forName(configFactoryClassName);
+
+ ServerConfigFactory factory = (ServerConfigFactory)cls.newInstance();
+
+ m_serverConfig = factory.getServerConfig();
+
+ } catch(Exception e) {
+ log.error("Failed to get server config factory '"+configFactoryClassName+"'", e);
+ }
+ } else {
+ log.error("Failed to find server config factory property '"+BPEL_DSP_SERVER_CONFIG_FACTORY+"'");
+ }
+ }
+
+ return(m_serverConfig);
+ }
+
+ public static synchronized ServiceDeployer getServiceDeployer() {
+ if (m_serviceDeployer == null) {
+ java.util.ResourceBundle bundle=java.util.ResourceBundle.getBundle("bpel");
+
+ String deployerClassName=bundle.getString(BPEL_DSP_SERVICE_DEPLOYER);
+
+ if (deployerClassName != null) {
+ try {
+ Class<?> cls=Class.forName(deployerClassName);
+
+ m_serviceDeployer = (ServiceDeployer)cls.newInstance();
+
+ } catch(Exception e) {
+ log.error("Failed to get service deployer '"+deployerClassName+"'", e);
+ }
+ } else {
+ log.error("Failed to find service deployer property '"+BPEL_DSP_SERVICE_DEPLOYER+"'");
+ }
+ }
+
+ return(m_serviceDeployer);
+ }
+
+}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java 2011-01-26 18:25:14 UTC (rev 1279)
@@ -29,10 +29,7 @@
import java.sql.Statement;
import org.h2.tools.Server;
-import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigImpl;
-import org.jboss.system.server.ServerConfigImplMBean;
/**
* Integration with H2.
@@ -582,7 +579,7 @@
//final ServerConfigImpl serverConfig = (ServerConfigImpl) MBeanProxyExt.create(ServerConfigImplMBean.class,ServerConfigImplMBean.OBJECT_NAME);
//return serverConfig.getServerDataDir();
org.jboss.soa.dsp.server.ServerConfig serverConfig=
- org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory.createServerConfig();
+ org.jboss.soa.bpel.runtime.JBossDSPFactory.getServerConfig();
return(serverConfig.getServerDeployDir());
}
return new File(datadir);
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2011-01-26 18:25:14 UTC (rev 1279)
@@ -43,7 +43,7 @@
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
import org.jboss.soa.bpel.runtime.ws.ODEMessageAdapter;
import org.jboss.soa.dsp.InvocationAdapter;
-import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory;
+import org.jboss.soa.bpel.runtime.JBossDSPFactory;
import org.w3c.dom.Element;
import javax.transaction.*;
@@ -485,7 +485,7 @@
protected Scheduler createScheduler() {
- String clusterNodeName=JBossServerConfigFactory.createServerConfig().getClusterNodeName();
+ String clusterNodeName=JBossDSPFactory.getServerConfig().getClusterNodeName();
__log.info("Scheduler node name: "+clusterNodeName);
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2011-01-26 18:25:14 UTC (rev 1279)
@@ -23,7 +23,6 @@
import org.jboss.soa.bpel.runtime.engine.PartnerChannel;
import org.jboss.soa.bpel.runtime.ws.*;
import org.jboss.soa.dsp.EndpointMetaData;
-import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory;
import org.jboss.soa.dsp.ws.WSDLReference;
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2011-01-26 18:25:14 UTC (rev 1279)
@@ -26,15 +26,15 @@
import org.apache.ode.bpel.iapi.EndpointReference;
import org.apache.ode.bpel.iapi.ProcessConf;
import org.jboss.soa.bpel.deployer.BPELDeploymentUnit;
+import org.jboss.soa.bpel.runtime.JBossDSPFactory;
import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.dsp.EndpointMetaData;
import org.jboss.soa.dsp.ServiceEndpointReference;
-import org.jboss.soa.dsp.deployer.ServiceDeployer;
import org.jboss.soa.dsp.server.ServerConfig;
-import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory;
+import org.jboss.soa.bpel.runtime.JBossDSPFactory;
import org.jboss.soa.dsp.ws.BaseWebServiceEndpoint;
import org.jboss.soa.dsp.ws.DeploymentBuilder;
import org.jboss.soa.dsp.ws.WSDLParser;
@@ -60,8 +60,7 @@
*/
public class EndpointManager
{
- private static final String BPEL_DSP_SERVICE_DEPLOYER = "dsp.service.deployer";
-protected final Log log = LogFactory.getLog(getClass());
+ protected final Log log = LogFactory.getLog(getClass());
// we should consider having our own OdeConfigProperties class if we need more properties
private final static String BPEL_UDDI_REGISTRATION = "uddi.registration";
private static final String BPEL_WS_STABLE_INTERFACE = "ws.stableInterface";
@@ -73,13 +72,10 @@
private UDDIRegistration uddiRegistration = null;
private boolean stableInterface=false;
- private ServiceDeployer m_deployer=null; //new JBossServiceDeployer();
-
-
public EndpointManager(ExecutionEnvironment executionEnvironment)
{
this.executionEnvironment = executionEnvironment;
- this.serverConfig = JBossServerConfigFactory.createServerConfig();
+ this.serverConfig = JBossDSPFactory.getServerConfig();
if (isUDDIRegistration()) {
try {
uddiRegistration = UDDIClientFactory.newInstance(executionEnvironment.getOdeConfig().getProperties());
@@ -94,27 +90,6 @@
log.info("Use stable interface: "+stableInterface);
}
- protected synchronized ServiceDeployer getDeployer() {
- if (m_deployer == null) {
- String deployerClassName=executionEnvironment.getOdeConfig().getProperty(BPEL_DSP_SERVICE_DEPLOYER);
-
- if (deployerClassName != null) {
- try {
- Class<?> cls=Class.forName(deployerClassName);
-
- m_deployer = (ServiceDeployer)cls.newInstance();
-
- } catch(Exception e) {
- log.error("Failed to get service deployer '"+deployerClassName+"'", e);
- }
- } else {
- log.error("Failed to find service deployer property '"+BPEL_DSP_SERVICE_DEPLOYER+"'");
- }
- }
-
- return(m_deployer);
- }
-
public boolean isStableInterface() {
return(stableInterface);
}
@@ -176,7 +151,7 @@
URL serviceUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(), metaData.getPortName());
- ServiceEndpointReference ref = getDeployer().deploy(metaData, providerImpl.getClass(),
+ ServiceEndpointReference ref = JBossDSPFactory.getServiceDeployer().deploy(metaData, providerImpl.getClass(),
serviceUrl, classLoader, warArchive, serverConfig);
/*
@@ -257,7 +232,7 @@
try
{
- getDeployer().undeploy(ref, serverConfig);
+ JBossDSPFactory.getServiceDeployer().undeploy(ref, serverConfig);
// unregister
endpointMapping.remove(key);
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2011-01-26 18:25:14 UTC (rev 1279)
@@ -54,8 +54,7 @@
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.dsp.EndpointMetaData;
import org.jboss.soa.dsp.server.ServerConfig;
-import org.jboss.soa.dsp.server.jboss.JBossServerConfig;
-import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory;
+import org.jboss.soa.bpel.runtime.JBossDSPFactory;
import org.jboss.soa.dsp.ws.DOMWriter;
import org.jboss.soa.dsp.ws.JavaUtils;
import org.jboss.soa.dsp.ws.SOAPMessageAdapter;
@@ -116,7 +115,7 @@
private synchronized void initialize() {
if (isUDDILookup()) {
try {
- JBossServerConfig serverConfig=JBossServerConfigFactory.createServerConfig();
+ ServerConfig serverConfig=JBossDSPFactory.getServerConfig();
String webServiceHost = serverConfig.getWebServiceHost();
int webServicePort = serverConfig.getWebServicePort();
URL url = new URL("http://" + webServiceHost + ":" + webServicePort);
Modified: trunk/runtime/engine-assembly/pom.xml
===================================================================
--- trunk/runtime/engine-assembly/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/engine-assembly/pom.xml 2011-01-26 18:25:14 UTC (rev 1279)
@@ -28,9 +28,13 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-jboss</artifactId>
+ <artifactId>dsp-jbossas5</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jbossas6</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-bpel-compiler</artifactId>
</dependency>
Modified: trunk/runtime/engine-assembly/src/main/assembly/sar.xml
===================================================================
--- trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2011-01-26 18:25:14 UTC (rev 1279)
@@ -58,7 +58,8 @@
<!--include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include-->
<include>org.jboss.soa.bpel.runtime:riftsaw-engine</include>
<include>org.jboss.soa.dsp:dsp-api</include>
- <include>org.jboss.soa.dsp:dsp-jboss</include>
+ <include>org.jboss.soa.dsp:dsp-jbossas5</include>
+ <include>org.jboss.soa.dsp:dsp-jbossas6</include>
<include>org.jboss.soa.bpel:riftsaw-jacob</include>
<include>org.jboss.soa.bpel:riftsaw-scheduler-simple</include>
<include>org.jboss.soa.bpel.runtime:riftsaw-uddi</include>
Modified: trunk/runtime/jbossesb-bpel/pom.xml
===================================================================
--- trunk/runtime/jbossesb-bpel/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/jbossesb-bpel/pom.xml 2011-01-26 18:25:14 UTC (rev 1279)
@@ -24,10 +24,6 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-jboss</artifactId>
- </dependency>
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
Modified: trunk/runtime/uddi/pom.xml
===================================================================
--- trunk/runtime/uddi/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/uddi/pom.xml 2011-01-26 18:25:14 UTC (rev 1279)
@@ -39,10 +39,6 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-jboss</artifactId>
- </dependency>
<dependency>
<groupId>wsdl4j</groupId>
Modified: trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
===================================================================
--- trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2011-01-26 15:41:31 UTC (rev 1278)
+++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2011-01-26 18:25:14 UTC (rev 1279)
@@ -47,8 +47,7 @@
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.bpel.runtime.ws.WebServiceClient;
import org.jboss.soa.dsp.server.ServerConfig;
-import org.jboss.soa.dsp.server.jboss.JBossServerConfig;
-import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory;
+import org.jboss.soa.bpel.runtime.JBossDSPFactory;
import org.jboss.soa.dsp.ws.WSDLReference;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
@@ -202,7 +201,7 @@
if (bpelClerk!=null) {
try {
Properties properties = bpelClerk.getUDDINode().getProperties();
- properties.put("nodeName", JBossServerConfigFactory.createServerConfig().getUddiNodeName());
+ properties.put("nodeName", JBossDSPFactory.getServerConfig().getUddiNodeName());
//Constructing the bindingKey
String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + bindingName, properties);
if (properties.containsKey(BINDING_KEY_FORMAT)) {
@@ -253,7 +252,7 @@
String serviceName, String portName, URL accessUrl)
throws DispositionReportFaultMessage, RemoteException, ConfigurationException, TransportException {
Properties properties = clerk.getUDDINode().getProperties();
- properties.put("nodeName", JBossServerConfigFactory.createServerConfig().getUddiNodeName());
+ properties.put("nodeName", JBossDSPFactory.getServerConfig().getUddiNodeName());
//Constructing the serviceKey
String serviceKey = TokenResolver.replaceTokens(DEFAULT_SERVICE_KEY_FORMAT + serviceName, properties);
@@ -523,7 +522,7 @@
private String getDefaultWebServiceBaseUrl() {
try {
- JBossServerConfig serverConfig=JBossServerConfigFactory.createServerConfig();
+ ServerConfig serverConfig=JBossDSPFactory.getServerConfig();
String webServiceHost = serverConfig.getWebServiceHost();
int webServicePort = serverConfig.getWebServicePort();
URL theURL = new URL("http://" + webServiceHost + ":" + webServicePort);
13 years, 11 months
riftsaw SVN: r1278 - in dsp/trunk: distribution and 14 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2011-01-26 10:41:31 -0500 (Wed, 26 Jan 2011)
New Revision: 1278
Added:
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/
dsp/trunk/integration/jbossas6/
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/
Removed:
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jboss/
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jboss/
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jboss/
Modified:
dsp/trunk/distribution/pom.xml
dsp/trunk/distribution/src/main/assembly/bin.xml
dsp/trunk/distribution/src/main/assembly/src.xml
dsp/trunk/integration/jbossas5/pom.xml
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/JBossServiceDeployer.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/WebMetaDataFactory.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfig.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfigFactory.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfigImpl.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/KernelAwareSPIFactory.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/KernelLocator.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/MBeanServerLocator.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/ObjectNameFactory.java
dsp/trunk/integration/jbossas6/pom.xml
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/JBossServiceDeployer.java
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfig.java
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfigFactory.java
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfigImpl.java
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/KernelAwareSPIFactory.java
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/KernelLocator.java
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/MBeanServerLocator.java
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/ObjectNameFactory.java
dsp/trunk/integration/pom.xml
dsp/trunk/integration/tomcat/
dsp/trunk/pom.xml
dsp/trunk/samples/example-deployer/deployer/resources/WEB-INF/classes/dsp.properties
Log:
RIFTSAW-336 - further refactoring work to support AS6.
Modified: dsp/trunk/distribution/pom.xml
===================================================================
--- dsp/trunk/distribution/pom.xml 2011-01-26 14:13:36 UTC (rev 1277)
+++ dsp/trunk/distribution/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
@@ -25,11 +25,16 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-jboss</artifactId>
+ <artifactId>dsp-jbossas5</artifactId>
<version>${dsp.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jbossas6</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-tomcat</artifactId>
<version>${dsp.version}</version>
</dependency>
Modified: dsp/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- dsp/trunk/distribution/src/main/assembly/bin.xml 2011-01-26 14:13:36 UTC (rev 1277)
+++ dsp/trunk/distribution/src/main/assembly/bin.xml 2011-01-26 15:41:31 UTC (rev 1278)
@@ -35,7 +35,8 @@
<outputDirectory>/lib</outputDirectory>
<includes>
<include>org.jboss.soa.dsp:dsp-api</include>
- <include>org.jboss.soa.dsp:dsp-jboss</include>
+ <include>org.jboss.soa.dsp:dsp-jbossas5</include>
+ <include>org.jboss.soa.dsp:dsp-jbossas6</include>
<include>org.jboss.soa.dsp:dsp-tomcat</include>
<include>commons-logging:commons-logging</include>
<include>javax.servlet:servlet-api</include>
Modified: dsp/trunk/distribution/src/main/assembly/src.xml
===================================================================
--- dsp/trunk/distribution/src/main/assembly/src.xml 2011-01-26 14:13:36 UTC (rev 1277)
+++ dsp/trunk/distribution/src/main/assembly/src.xml 2011-01-26 15:41:31 UTC (rev 1278)
@@ -54,8 +54,8 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../jboss</directory>
- <outputDirectory>/jboss</outputDirectory>
+ <directory>../integration</directory>
+ <outputDirectory>/integration</outputDirectory>
<excludes>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
@@ -69,21 +69,6 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../tomcat</directory>
- <outputDirectory>/tomcat</outputDirectory>
- <excludes>
- <exclude>**/.project</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.settings/**/*</exclude>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
- </excludes>
- </fileSet>
- <fileSet>
<directory>../samples</directory>
<outputDirectory>/samples</outputDirectory>
<excludes>
Modified: dsp/trunk/integration/jbossas5/pom.xml
===================================================================
--- dsp/trunk/integration/jbossas5/pom.xml 2011-01-26 14:13:36 UTC (rev 1277)
+++ dsp/trunk/integration/jbossas5/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,6 +14,13 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
+ <properties>
+ <jboss.version>5.1.0.GA</jboss.version>
+ <jboss.metadata.version>1.0.1.GA</jboss.metadata.version>
+ <jboss.microcontainer.version>2.0.6.GA</jboss.microcontainer.version>
+ <jboss.deployers.version>2.0.7.GA</jboss.deployers.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.jboss.soa.dsp</groupId>
Copied: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5 (from rev 1276, dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jboss)
Modified: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/JBossServiceDeployer.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jboss/JBossServiceDeployer.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/JBossServiceDeployer.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.deployer.jboss;
+package org.jboss.soa.dsp.deployer.jbossas5;
import java.io.File;
import java.io.IOException;
@@ -34,7 +34,7 @@
import org.jboss.soa.dsp.ServiceEndpointReference;
import org.jboss.soa.dsp.deployer.ServiceDeployer;
import org.jboss.soa.dsp.server.ServerConfig;
-import org.jboss.soa.dsp.server.jboss.KernelLocator;
+import org.jboss.soa.dsp.server.jbossas5.KernelLocator;
import org.jboss.soa.dsp.ws.BuildProcessor;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
Modified: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/WebMetaDataFactory.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jboss/WebMetaDataFactory.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/WebMetaDataFactory.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.deployer.jboss;
+package org.jboss.soa.dsp.deployer.jbossas5;
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossServletsMetaData;
Copied: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5 (from rev 1276, dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss)
Modified: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfig.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfig.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas5;
import org.jboss.soa.dsp.server.ServerConfig;
Modified: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfigFactory.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfigFactory.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas5;
import org.jboss.soa.dsp.server.ServerConfig;
Modified: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfigImpl.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfigImpl.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas5;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/KernelAwareSPIFactory.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/KernelAwareSPIFactory.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas5;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.kernel.spi.dependency.KernelController;
Modified: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/KernelLocator.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/KernelLocator.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas5;
//$Id$
Modified: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/MBeanServerLocator.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/MBeanServerLocator.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas5;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
Modified: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/ObjectNameFactory.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/ObjectNameFactory.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas5;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
Copied: dsp/trunk/integration/jbossas6 (from rev 1276, dsp/trunk/integration/jbossas5)
Modified: dsp/trunk/integration/jbossas6/pom.xml
===================================================================
--- dsp/trunk/integration/jbossas5/pom.xml 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas6/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-jbossas5</artifactId>
+ <artifactId>dsp-jbossas6</artifactId>
<packaging>jar</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>SOA::DSP::Integration::JBossAS5</name>
+ <name>SOA::DSP::Integration::JBossAS6</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
@@ -14,6 +14,15 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
+ <properties>
+ <jboss.version>6.0.0.Final</jboss.version>
+ <jboss.metadata.version>1.0.1.GA</jboss.metadata.version>
+ <jboss.kernel.version>2.2.0.GA</jboss.kernel.version>
+ <jboss.microcontainer.version>2.2.0.GA</jboss.microcontainer.version>
+ <jboss.deployers.version>2.2.0.GA</jboss.deployers.version>
+ <jboss.vfs.version>3.0.0.GA</jboss.vfs.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.jboss.soa.dsp</groupId>
@@ -53,15 +62,21 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${jboss.microcontainer.version}</version>
+ <version>${jboss.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${jboss.vfs.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
- <version>${jboss.microcontainer.version}</version>
+ <version>${jboss.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Copied: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6 (from rev 1276, dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jboss)
Modified: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/JBossServiceDeployer.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jboss/JBossServiceDeployer.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/JBossServiceDeployer.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.deployer.jboss;
+package org.jboss.soa.dsp.deployer.jbossas6;
import java.io.File;
import java.io.IOException;
@@ -34,10 +34,10 @@
import org.jboss.soa.dsp.ServiceEndpointReference;
import org.jboss.soa.dsp.deployer.ServiceDeployer;
import org.jboss.soa.dsp.server.ServerConfig;
-import org.jboss.soa.dsp.server.jboss.KernelLocator;
+import org.jboss.soa.dsp.server.jbossas6.KernelLocator;
import org.jboss.soa.dsp.ws.BuildProcessor;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
public class JBossServiceDeployer implements ServiceDeployer {
@@ -93,7 +93,7 @@
}
private Deployment createVFSDeployment(File war) throws IOException {
- VirtualFile webAppVFS = VFS.getRoot(war.toURI().toURL());
+ VirtualFile webAppVFS = VFS.getChild(war.toURI());
return VFSDeploymentFactory.getInstance().createVFSDeployment(webAppVFS);
}
Modified: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jboss/WebMetaDataFactory.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.deployer.jboss;
+package org.jboss.soa.dsp.deployer.jbossas6;
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossServletsMetaData;
Copied: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6 (from rev 1276, dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss)
Modified: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfig.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfig.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas6;
import org.jboss.soa.dsp.server.ServerConfig;
Modified: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfigFactory.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfigFactory.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas6;
import org.jboss.soa.dsp.server.ServerConfig;
Modified: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfigImpl.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfigImpl.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas6;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/KernelAwareSPIFactory.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/KernelAwareSPIFactory.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas6;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.kernel.spi.dependency.KernelController;
Modified: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/KernelLocator.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/KernelLocator.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas6;
//$Id$
Modified: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/MBeanServerLocator.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/MBeanServerLocator.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas6;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
Modified: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/ObjectNameFactory.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java 2011-01-26 14:12:29 UTC (rev 1276)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/ObjectNameFactory.java 2011-01-26 15:41:31 UTC (rev 1278)
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.jboss.soa.dsp.server.jboss;
+package org.jboss.soa.dsp.server.jbossas6;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
Modified: dsp/trunk/integration/pom.xml
===================================================================
--- dsp/trunk/integration/pom.xml 2011-01-26 14:13:36 UTC (rev 1277)
+++ dsp/trunk/integration/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
@@ -16,6 +16,7 @@
<modules>
<module>jbossas5</module>
+ <module>jbossas6</module>
<module>tomcat</module>
</modules>
</project>
Property changes on: dsp/trunk/integration/tomcat
___________________________________________________________________
Name: svn:ignore
- target
.settings
+ target
.settings
.classpath
.project
Modified: dsp/trunk/pom.xml
===================================================================
--- dsp/trunk/pom.xml 2011-01-26 14:13:36 UTC (rev 1277)
+++ dsp/trunk/pom.xml 2011-01-26 15:41:31 UTC (rev 1278)
@@ -11,14 +11,10 @@
<properties>
<dsp.version>1.0.0-SNAPSHOT</dsp.version>
<junit.version>4.8.1</junit.version>
- <jboss.version>5.1.0.GA</jboss.version>
<jaxws.version>2.1</jaxws.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.11.0.GA</javassist.version>
- <jboss.metadata.version>1.0.1.GA</jboss.metadata.version>
- <jboss.microcontainer.version>2.0.6.GA</jboss.microcontainer.version>
- <jboss.deployers.version>2.0.7.GA</jboss.deployers.version>
</properties>
<modules>
Modified: dsp/trunk/samples/example-deployer/deployer/resources/WEB-INF/classes/dsp.properties
===================================================================
--- dsp/trunk/samples/example-deployer/deployer/resources/WEB-INF/classes/dsp.properties 2011-01-26 14:13:36 UTC (rev 1277)
+++ dsp/trunk/samples/example-deployer/deployer/resources/WEB-INF/classes/dsp.properties 2011-01-26 15:41:31 UTC (rev 1278)
@@ -1,8 +1,12 @@
-# JBOSS APPLICATION SERVER
-dsp.server.config.factory = org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory
-dsp.service.deployer = org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer
+# JBOSS APPLICATION SERVER 5
+dsp.server.config.factory = org.jboss.soa.dsp.server.jbossas5.JBossServerConfigFactory
+dsp.service.deployer = org.jboss.soa.dsp.deployer.jbossas5.JBossServiceDeployer
+# JBOSS APPLICATION SERVER 6
+#dsp.server.config.factory = org.jboss.soa.dsp.server.jbossas6.JBossServerConfigFactory
+#dsp.service.deployer = org.jboss.soa.dsp.deployer.jbossas6.JBossServiceDeployer
+
# APACHE TOMCAT
#dsp.server.config.factory = org.jboss.soa.dsp.server.tomcat.TomcatServerConfigFactory
#dsp.service.deployer = org.jboss.soa.dsp.deployer.tomcat.TomcatServiceDeployer
13 years, 11 months
Build failed in Hudson: RiftSaw-jbossws-cxf #130
by jboss-qa-internal@redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-jbossws-cxf/130/changes>
Changes:
[objectiser] First part of sorting out RIFTSAW-336 - ensures riftsaw can be configured with the appropriate service deployer for the AS version.
[objectiser] RIFTSAW-333 - created a separate AS6 deployer, and renamed the existing one as AS5, to enable version to be selected on the installation of RiftSaw.
[jeff.yuchang] * only to download the db2 or oracle driver if it needed.
------------------------------------------
[...truncated 4065 lines...]
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.03 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.samples.QuickstartBPELHelloWorldExtendedTimeoutTestCase
java.lang.RuntimeException: Cannot obtain MBeanServerConnection using jndi props: {java.naming.provider.url=localhost:1099, java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory, java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jnp.interfaces, hostKey=localhost/127.0.0.1:1099}
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:75)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getDeployer(RiftSawTestHelper.java:82)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:22)
at junit.framework.TestResult.runProtected(TestResult.java:128)
at junit.extensions.TestSetup.run(TestSetup.java:27)
at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:83)
at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: javax.naming.NameNotFoundException: invoker not bound
at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
at org.jnp.server.NamingServer.lookup(NamingServer.java:396)
at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
at sun.reflect.GeneratedMethodAccessor602.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
at sun.rmi.transport.Transport$1.run(Transport.java:159)
at java.security.AccessController.doPrivileged(Native Method)
at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
at javax.naming.InitialContext.lookup(InitialContext.java:392)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.031 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.testcases.RiftSaw70TestCase
java.lang.RuntimeException: Cannot obtain MBeanServerConnection using jndi props: {java.naming.provider.url=localhost:1099, java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory, java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jnp.interfaces, hostKey=localhost/127.0.0.1:1099}
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:75)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getDeployer(RiftSawTestHelper.java:82)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:22)
at junit.framework.TestResult.runProtected(TestResult.java:128)
at junit.extensions.TestSetup.run(TestSetup.java:27)
at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:83)
at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: javax.naming.NameNotFoundException: invoker not bound
at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
at org.jnp.server.NamingServer.lookup(NamingServer.java:396)
at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
at sun.reflect.GeneratedMethodAccessor602.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
at sun.rmi.transport.Transport$1.run(Transport.java:159)
at java.security.AccessController.doPrivileged(Native Method)
at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
at javax.naming.InitialContext.lookup(InitialContext.java:392)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.031 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.samples.QuickstartBPELSecureInvokeTestCase
java.lang.RuntimeException: Cannot obtain MBeanServerConnection using jndi props: {java.naming.provider.url=localhost:1099, java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory, java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jnp.interfaces, hostKey=localhost/127.0.0.1:1099}
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:75)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getDeployer(RiftSawTestHelper.java:82)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:22)
at junit.framework.TestResult.runProtected(TestResult.java:128)
at junit.extensions.TestSetup.run(TestSetup.java:27)
at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:83)
at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: javax.naming.NameNotFoundException: invoker not bound
at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
at org.jnp.server.NamingServer.lookup(NamingServer.java:396)
at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
at sun.reflect.GeneratedMethodAccessor602.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
at sun.rmi.transport.Transport$1.run(Transport.java:159)
at java.security.AccessController.doPrivileged(Native Method)
at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
at javax.naming.InitialContext.lookup(InitialContext.java:392)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.035 sec <<< FAILURE!
Results :
Tests in error:
junit.framework.TestSuite(a)2980f96c(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)31ad98ef(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)761eec35(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)6659fb21(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)a81b1fb(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)3c50507(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)4ab122a1(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)49bdc9d8(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)208a0544(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)48bd6a5f(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)687bc899(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)286e4365(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)559113f8(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)62acc57(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)2880cac9(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)5d3e754f(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)236527f(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)76a9b9c(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)25961581(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)3d358f03(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)45b34126(org.jboss.soa.bpel.tests.RiftSawTestSetup)
testSendHello(org.jboss.soa.bpel.tests.management.RiftSaw238TestCase)
junit.framework.TestSuite(a)7d5718f2(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)1a3a9bba(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)235dd910(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)7e9ffe3f(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)595e2ccd(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)4f2b6c89(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)45660d6(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)5076e8a7(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)b035079(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)dfa6d18(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)49d8c528(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)670fe2b9(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)565c7f6(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)f8622f3(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)48fd918a(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)112c3327(org.jboss.soa.bpel.tests.RiftSawTestSetup)
Tests run: 38, Failures: 0, Errors: 38, Skipped: 0
[ERROR] There are test failures.
Please refer to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-jbossws-cxf/ws/riftsaw/inte...> for the individual test results.
[INFO] [antrun:run {execution: undeploy-riftsaw}]
[INFO] Executing tasks
stop-server:
[echo] Stopping the server
[echo] Server is at <http://hudson.qa.jboss.com/hudson/job/RiftSaw-jbossws-cxf/ws/riftsaw-2.3....>
[java] Exception in thread "main" javax.naming.NameNotFoundException: RMIAdaptor not bound
[java] at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
[java] at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
[java] at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
[java] at org.jnp.server.NamingServer.lookup(NamingServer.java:443)
[java] at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
[java] at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
[java] at sun.reflect.GeneratedMethodAccessor602.invoke(Unknown Source)
[java] at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
[java] at java.lang.reflect.Method.invoke(Method.java:597)
[java] at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
[java] at sun.rmi.transport.Transport$1.run(Transport.java:159)
[java] at java.security.AccessController.doPrivileged(Native Method)
[java] at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
[java] at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
[java] at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
[java] at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
[java] at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
[java] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
[java] at java.lang.Thread.run(Thread.java:619)
[java] at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
[java] at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
[java] at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
[java] at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
[java] at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
[java] at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
[java] at javax.naming.InitialContext.lookup(InitialContext.java:392)
[java] at org.jboss.Shutdown.main(Shutdown.java:219)
[java] Java Result: 1
[echo] Shutdown rc = 1
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] An Ant BuildException has occured: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/RiftSaw-jbossws-cxf/ws/riftsaw/inte...>:162: Unable to shut down JBoss (maybe it hasn't fully started yet?).
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 7 minutes 59 seconds
[INFO] Finished at: Wed Jan 26 09:43:53 EST 2011
[INFO] Final Memory: 117M/661M
[INFO] ------------------------------------------------------------------------
Recording test results
Archiving artifacts
13 years, 11 months