[riftsaw-commits] riftsaw SVN: r1150 - in trunk: distribution/src/main/release/db/jboss and 6 other directories.

Author: objectiser Date: 2010-11-24 13:35:12 -0500 (Wed, 24 Nov 2010) New Revision: 1150 Modified: 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/src/main/assembly/sar.xml trunk/runtime/engine/pom.xml trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml trunk/runtime/jbossesb-bpel/pom.xml trunk/runtime/uddi/pom.xml Log: Updated to use the new separate api and jboss modules for dsp. Modified: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml =================================================================== --- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2010-11-24 16:39:43 UTC (rev 1149) +++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2010-11-24 18:35:12 UTC (rev 1150) @@ -23,7 +23,7 @@ <!-- Locate the single instance of the kernel --> - <bean name="org.jboss.soa.bpel.runtime.util:service=KernelLocator" + <bean name="org.jboss.soa.dsp:service=KernelLocator" class="org.jboss.soa.dsp.server.jboss.KernelLocator"> <property name="kernel"> <inject bean="jboss.kernel:service=Kernel" /> @@ -33,7 +33,7 @@ <!-- ServerConfig --> - <bean name="org.jboss.soa.bpel.runtime.util:service=ServerConfig" + <bean name="org.jboss.soa.dsp:service=ServerConfig" class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl"> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="webServiceHost">${jboss.bind.address}</property> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-24 16:39:43 UTC (rev 1149) +++ trunk/pom.xml 2010-11-24 18:35:12 UTC (rev 1150) @@ -230,10 +230,15 @@ <version>${riftsaw.engine.version}</version> </dependency> <dependency> - <groupId>org.jboss.soa</groupId> - <artifactId>dsp</artifactId> + <groupId>org.jboss.soa.dsp</groupId> + <artifactId>dsp-api</artifactId> <version>${dsp.version}</version> </dependency> + <dependency> + <groupId>org.jboss.soa.dsp</groupId> + <artifactId>dsp-jboss</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 2010-11-24 16:39:43 UTC (rev 1149) +++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2010-11-24 18:35:12 UTC (rev 1150) @@ -24,7 +24,7 @@ <!-- Locate the single instance of the kernel --> - <bean name="org.jboss.soa.bpel.runtime.util:service=KernelLocator" + <bean name="org.jboss.soa.dsp:service=KernelLocator" class="org.jboss.soa.dsp.server.jboss.KernelLocator"> <property name="kernel"> <inject bean="jboss.kernel:service=Kernel" /> @@ -34,7 +34,7 @@ <!-- ServerConfig --> - <bean name="org.jboss.soa.bpel.runtime.util:service=ServerConfig" + <bean name="org.jboss.soa.dsp:service=ServerConfig" class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl"> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="webServiceHost">${jboss.bind.address}</property> Modified: trunk/runtime/engine/pom.xml =================================================================== --- trunk/runtime/engine/pom.xml 2010-11-24 16:39:43 UTC (rev 1149) +++ trunk/runtime/engine/pom.xml 2010-11-24 18:35:12 UTC (rev 1150) @@ -43,9 +43,13 @@ </dependency> <dependency> - <groupId>org.jboss.soa</groupId> - <artifactId>dsp</artifactId> + <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> Modified: trunk/runtime/engine-assembly/src/main/assembly/sar.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-11-24 16:39:43 UTC (rev 1149) +++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-11-24 18:35:12 UTC (rev 1150) @@ -57,7 +57,8 @@ <include>org.jboss.soa.bpel:riftsaw-dao-jpa-hibernate</include> <!--include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include--> <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> - <include>org.jboss.soa:dsp</include> + <include>org.jboss.soa.dsp:dsp-api</include> + <include>org.jboss.soa.dsp:dsp-jboss</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 2010-11-24 16:39:43 UTC (rev 1149) +++ trunk/runtime/jbossesb-bpel/pom.xml 2010-11-24 18:35:12 UTC (rev 1150) @@ -20,11 +20,15 @@ <artifactId>riftsaw-engine</artifactId> <version>${riftsaw.engine.version}</version> </dependency> + <dependency> + <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</groupId> - <artifactId>dsp</artifactId> - </dependency> - <dependency> <groupId>org.jboss.soa.bpel.dependencies.esb</groupId> <artifactId>jbossesb-rosetta</artifactId> <version>${jbossesb.version}</version> Modified: trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml =================================================================== --- trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml 2010-11-24 16:39:43 UTC (rev 1149) +++ trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml 2010-11-24 18:35:12 UTC (rev 1150) @@ -41,7 +41,8 @@ <outputDirectory>/lib</outputDirectory> <includes> <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> - <include>org.jboss.soa:dsp</include> + <include>org.jboss.soa.dsp:dsp-api</include> + <include>org.jboss.soa.dsp:dsp-jboss</include> <include>org.jboss.soa.bpel.dependencies.esb:jbossesb-rosetta</include> <include>org.jboss.soa.bpel:riftsaw-agents</include> <include>org.jboss.soa.bpel:riftsaw-bpel-runtime</include> Modified: trunk/runtime/uddi/pom.xml =================================================================== --- trunk/runtime/uddi/pom.xml 2010-11-24 16:39:43 UTC (rev 1149) +++ trunk/runtime/uddi/pom.xml 2010-11-24 18:35:12 UTC (rev 1150) @@ -35,10 +35,14 @@ <artifactId>riftsaw-engine</artifactId> <version>${riftsaw.engine.version}</version> </dependency> - <dependency> - <groupId>org.jboss.soa</groupId> - <artifactId>dsp</artifactId> + <dependency> + <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>