Author: objectiser Date: 2011-01-25 08:13:03 -0500 (Tue, 25 Jan 2011) New Revision: 1271 Added: workspace/gbrown/as6/distribution/src/main/release/modules/riftsaw-as6.deployer/ workspace/gbrown/as6/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/ workspace/gbrown/as6/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml Modified: workspace/gbrown/as6/distribution/src/main/assembly/bin.xml workspace/gbrown/as6/runtime/deployer-as6/pom.xml workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java workspace/gbrown/as6/runtime/pom.xml Log: Initial updates to build deployer - but currently throws jndi exception when server starts up. Modified: workspace/gbrown/as6/distribution/src/main/assembly/bin.xml =================================================================== --- workspace/gbrown/as6/distribution/src/main/assembly/bin.xml 2011-01-25 12:37:40 UTC (rev 1270) +++ workspace/gbrown/as6/distribution/src/main/assembly/bin.xml 2011-01-25 13:13:03 UTC (rev 1271) @@ -61,6 +61,14 @@ </fileSet> <fileSet> + <directory>../runtime/deployer-as6/target</directory> + <outputDirectory>/modules/riftsaw-as6.deployer</outputDirectory> + <includes> + <include>jboss-riftsaw-deployer-as6.jar</include> + </includes> + </fileSet> + + <fileSet> <directory>../samples</directory> <outputDirectory>samples</outputDirectory> <includes> Added: workspace/gbrown/as6/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml =================================================================== --- workspace/gbrown/as6/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml (rev 0) +++ workspace/gbrown/as6/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml 2011-01-25 13:13:03 UTC (rev 1271) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="BPELStructureDeployer" class="org.jboss.soa.bpel.deployer.BPELStructureDeployer"> + </bean> + + <bean name="BPELDeployer" class="org.jboss.soa.bpel.deployer.BPELDeployer"> + <property name="jndiName" > + <value>bpel/Deployer</value> + </property> + </bean> + +</deployment> Modified: workspace/gbrown/as6/runtime/deployer-as6/pom.xml =================================================================== --- workspace/gbrown/as6/runtime/deployer-as6/pom.xml 2011-01-25 12:37:40 UTC (rev 1270) +++ workspace/gbrown/as6/runtime/deployer-as6/pom.xml 2011-01-25 13:13:03 UTC (rev 1271) @@ -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.bpel.runtime</groupId> - <artifactId>deployer</artifactId> + <artifactId>deployer-as6</artifactId> <packaging>jar</packaging> <version>2.3.0-SNAPSHOT</version> - <name>RiftSaw::Runtime::Deployer</name> + <name>RiftSaw::Runtime::Deployer-AS6</name> <parent> <groupId>org.jboss.soa.bpel</groupId> @@ -24,37 +24,37 @@ <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-spi</artifactId> - <version>2.0.7.GA</version> + <version>2.2.0.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-structure-spi</artifactId> - <version>2.0.7.GA</version> + <version>2.2.0.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-core-spi</artifactId> - <version>2.0.7.GA</version> + <version>2.2.0.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-client-spi</artifactId> - <version>2.0.7.GA</version> + <version>2.2.0.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-vfs-spi</artifactId> - <version>2.0.7.GA</version> + <version>2.2.0.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-vfs</artifactId> - <version>2.1.2.GA</version> + <version>3.0.0.GA</version> <scope>provided</scope> </dependency> <dependency> @@ -82,7 +82,7 @@ </dependency> </dependencies> <build> - <finalName>jboss-riftsaw-deployer</finalName> + <finalName>jboss-riftsaw-deployer-as6</finalName> <!-- This section defines the default plugin settings inherited by child projects. --> <pluginManagement> Modified: workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java =================================================================== --- workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-01-25 12:37:40 UTC (rev 1270) +++ workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-01-25 13:13:03 UTC (rev 1271) @@ -28,8 +28,8 @@ import org.jboss.logging.Logger; import org.jboss.util.naming.NonSerializableFactory; -import org.jboss.virtual.VFSUtils; -import org.jboss.virtual.VirtualFile; +import org.jboss.vfs.VFSUtils; +import org.jboss.vfs.VirtualFile; /** * This is the deployer for deploying BPEL (and associated artifacts) into @@ -65,11 +65,12 @@ logger.debug("Deployment unit dir="+parent); - VirtualFile tmp=VFSUtils.explode(parent); + //VirtualFile tmp=VFSUtils.explode(parent); - java.net.URL url=VFSUtils.getCompatibleURL(tmp); + //java.net.URL url=VFSUtils.getCompatibleURL(tmp); + java.net.URL url=VFSUtils.getPhysicalURL(root); - logger.debug("Deployment exploded to dir="+tmp+" URL="+url); + logger.debug("Deployment exploded to dir="+root+" URL="+url); long lastModTime=0; Modified: workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java =================================================================== --- workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java 2011-01-25 12:37:40 UTC (rev 1270) +++ workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java 2011-01-25 13:13:03 UTC (rev 1271) @@ -18,10 +18,9 @@ package org.jboss.soa.bpel.deployer; import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.annotations.AnnotationEnvironment; import org.jboss.deployers.vfs.spi.structure.StructureContext; import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer; -import org.jboss.virtual.VirtualFile; +import org.jboss.scanning.annotations.spi.AnnotationRepository; /** * Implementation of the BPEL Structure Deployer, used to locate the @@ -33,11 +32,6 @@ */ public class BPELStructureDeployer extends AbstractStructureDeployer { - @Override - protected AnnotationEnvironment createAnnotationEnvironment(VirtualFile arg0) { - return null; - } - public boolean determineStructure(StructureContext sc) throws DeploymentException { boolean ret=false; @@ -62,4 +56,11 @@ return(ret); } + @Override + protected AnnotationRepository createAnnotationRepository( + org.jboss.vfs.VirtualFile arg0) { + // TODO Auto-generated method stub + return null; + } + } Modified: workspace/gbrown/as6/runtime/pom.xml =================================================================== --- workspace/gbrown/as6/runtime/pom.xml 2011-01-25 12:37:40 UTC (rev 1270) +++ workspace/gbrown/as6/runtime/pom.xml 2011-01-25 13:13:03 UTC (rev 1271) @@ -17,6 +17,7 @@ <modules> <module>deployer</module> + <module>deployer-as6</module> <module>engine</module> <module>uddi</module> <module>engine-assembly</module>