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