[riftsaw-commits] riftsaw SVN: r1273 - in trunk: distribution/src/main/release/install and 10 other directories.

Author: objectiser Date: 2011-01-25 10:33:18 -0500 (Tue, 25 Jan 2011) New Revision: 1273 Added: trunk/distribution/src/main/release/modules/riftsaw-as5.deployer/ trunk/distribution/src/main/release/modules/riftsaw-as6.deployer/ trunk/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/ trunk/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml trunk/runtime/deployer-as6/ trunk/runtime/deployer-as6/pom.xml trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java Removed: trunk/distribution/src/main/release/modules/riftsaw.deployer/ trunk/runtime/deployer-as6/pom.xml trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java Modified: trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/install/build.xml trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml trunk/runtime/deployer/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/ws/EndpointManager.java trunk/runtime/pom.xml Log: 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. Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2011-01-25 14:01:32 UTC (rev 1272) +++ trunk/distribution/src/main/assembly/bin.xml 2011-01-25 15:33:18 UTC (rev 1273) @@ -54,13 +54,21 @@ <fileSet> <directory>../runtime/deployer/target</directory> - <outputDirectory>/modules/riftsaw.deployer</outputDirectory> + <outputDirectory>/modules/riftsaw-as5.deployer</outputDirectory> <includes> - <include>jboss-riftsaw-deployer.jar</include> + <include>jboss-riftsaw-deployer-as5.jar</include> </includes> </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> Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2011-01-25 14:01:32 UTC (rev 1272) +++ trunk/distribution/src/main/release/install/build.xml 2011-01-25 15:33:18 UTC (rev 1273) @@ -7,12 +7,14 @@ <property file="${org.jboss.soa.bpel.deployment.properties}"/> <property file="../version.properties" /> + <property name="as.version" value="5" /> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deploy.dir" value="${server.dir}/deploy"/> <property name="deployers.dir" value="${server.dir}/deployers"/> <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="bpel-deployer" value="riftsaw.deployer" /> + <property name="bpel-deployer" value="riftsaw-as${as.version}.deployer" /> <property name="bpel-runtime" value="riftsaw.sar" /> <property name="jbossesb-bpel" value="riftsaw.esb" /> <property name="bpel-esb-examples" value="esb" /> Copied: trunk/distribution/src/main/release/modules/riftsaw-as5.deployer (from rev 1272, trunk/distribution/src/main/release/modules/riftsaw.deployer) Added: trunk/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml =================================================================== --- trunk/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml (rev 0) +++ trunk/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml 2011-01-25 15:33:18 UTC (rev 1273) @@ -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: trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml 2011-01-25 14:01:32 UTC (rev 1272) +++ trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml 2011-01-25 15:33:18 UTC (rev 1273) @@ -95,13 +95,18 @@ From the install folder, run: </para> <para> - <command>ant deploy -Ddatabase=... -Dws.stack=... -Dws.version=... </command> + <command>ant deploy -Das.version=... -Ddatabase=... -Dws.stack=... -Dws.version=... </command> </para> <para> to deploy RiftSaw to JBossAS, specifying a database and mandating the upgrade of the web service stack for JBossAS. The list of available databases, and how they should be configured, is explained in the next sub-section; the list of options for update of the web service stack is discussed in the one following it. </para> + <para> + If the <emphasis>as.version</emphasis> is not specified, then JBossAS 5 is assumed. If + the target version is JBossAS 6, then simply specify "-Das.version=6" (i.e. only the + major version number needs to be specified). + </para> <note> <para> Please note that RiftSaw should not be deployed while JBoss AS is running. Modified: trunk/runtime/deployer/pom.xml =================================================================== --- trunk/runtime/deployer/pom.xml 2011-01-25 14:01:32 UTC (rev 1272) +++ trunk/runtime/deployer/pom.xml 2011-01-25 15:33:18 UTC (rev 1273) @@ -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-as5</artifactId> <packaging>jar</packaging> <version>2.3.0-SNAPSHOT</version> - <name>RiftSaw::Runtime::Deployer</name> + <name>RiftSaw::Runtime::Deployer-AS5</name> <parent> <groupId>org.jboss.soa.bpel</groupId> @@ -82,7 +82,7 @@ </dependency> </dependencies> <build> - <finalName>jboss-riftsaw-deployer</finalName> + <finalName>jboss-riftsaw-deployer-as5</finalName> <!-- This section defines the default plugin settings inherited by child projects. --> <pluginManagement> Copied: trunk/runtime/deployer-as6 (from rev 1270, workspace/gbrown/as6/runtime/deployer-as6) Deleted: trunk/runtime/deployer-as6/pom.xml =================================================================== --- workspace/gbrown/as6/runtime/deployer-as6/pom.xml 2011-01-25 12:37:40 UTC (rev 1270) +++ trunk/runtime/deployer-as6/pom.xml 2011-01-25 15:33:18 UTC (rev 1273) @@ -1,170 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - 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> - <packaging>jar</packaging> - <version>2.3.0-SNAPSHOT</version> - <name>RiftSaw::Runtime::Deployer</name> - - <parent> - <groupId>org.jboss.soa.bpel</groupId> - <artifactId>runtime</artifactId> - <version>2.3.0-SNAPSHOT</version> - </parent> - - <dependencies> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>2.2.14.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-spi</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-core-spi</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <version>2.1.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-mdr</artifactId> - <version>2.0.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - <version>2.1.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>apache-xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.0</version> - </dependency> - </dependencies> - <build> - <finalName>jboss-riftsaw-deployer</finalName> - - <!-- This section defines the default plugin settings inherited by child projects. --> - <pluginManagement> - <plugins> - <!-- Fixes how test resources of a project can be used in projects dependent on it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.2</version> - <configuration> - <aggregate>true</aggregate> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-packaging-maven-plugin</artifactId> - <version>2.0-beta-1</version> - <extensions>true</extensions> - <configuration> - <excludes> - <exclude>jboss:jboss-common</exclude> - <exclude>jboss:jboss-system</exclude> - <exclude>jboss:jboss-jmx</exclude> - </excludes> - </configuration> - </plugin> - - <!-- Specify the compiler options and settings --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - - <configuration> - <source>1.5</source> - <target>1.5</target> - <showDeprecation>false</showDeprecation> - <showWarnings>false</showWarnings> - </configuration> - </plugin> - - <!-- Produce source jars during the 'verify' phase --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/*TestCase.java</include> - <include>**/*Test.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - -</project> Copied: trunk/runtime/deployer-as6/pom.xml (from rev 1271, workspace/gbrown/as6/runtime/deployer-as6/pom.xml) =================================================================== --- trunk/runtime/deployer-as6/pom.xml (rev 0) +++ trunk/runtime/deployer-as6/pom.xml 2011-01-25 15:33:18 UTC (rev 1273) @@ -0,0 +1,170 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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-as6</artifactId> + <packaging>jar</packaging> + <version>2.3.0-SNAPSHOT</version> + <name>RiftSaw::Runtime::Deployer-AS6</name> + + <parent> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>runtime</artifactId> + <version>2.3.0-SNAPSHOT</version> + </parent> + + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>2.2.14.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-spi</artifactId> + <version>2.2.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-structure-spi</artifactId> + <version>2.2.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-core-spi</artifactId> + <version>2.2.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-client-spi</artifactId> + <version>2.2.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <version>2.2.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <version>3.0.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-mdr</artifactId> + <version>2.0.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + <version>2.1.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.0</version> + </dependency> + </dependencies> + <build> + <finalName>jboss-riftsaw-deployer-as6</finalName> + + <!-- This section defines the default plugin settings inherited by child projects. --> + <pluginManagement> + <plugins> + <!-- Fixes how test resources of a project can be used in projects dependent on it --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.2</version> + <configuration> + <aggregate>true</aggregate> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-packaging-maven-plugin</artifactId> + <version>2.0-beta-1</version> + <extensions>true</extensions> + <configuration> + <excludes> + <exclude>jboss:jboss-common</exclude> + <exclude>jboss:jboss-system</exclude> + <exclude>jboss:jboss-jmx</exclude> + </excludes> + </configuration> + </plugin> + + <!-- Specify the compiler options and settings --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + + <configuration> + <source>1.5</source> + <target>1.5</target> + <showDeprecation>false</showDeprecation> + <showWarnings>false</showWarnings> + </configuration> + </plugin> + + <!-- Produce source jars during the 'verify' phase --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*TestCase.java</include> + <include>**/*Test.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + </plugins> + </reporting> + +</project> Deleted: trunk/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) +++ trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-01-25 15:33:18 UTC (rev 1273) @@ -1,240 +0,0 @@ -/* - * 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.deployer; - -import javax.naming.InitialContext; -import javax.naming.Name; -import javax.naming.NamingException; - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; - -import org.jboss.logging.Logger; -import org.jboss.util.naming.NonSerializableFactory; -import org.jboss.virtual.VFSUtils; -import org.jboss.virtual.VirtualFile; - -/** - * This is the deployer for deploying BPEL (and associated artifacts) into - * the runtime. - * - * @author gbrown - * - */ -public class BPELDeployer extends AbstractDeployer { - - public static final String BPELDeployerService="bpel/Deployer"; - - public void deploy(DeploymentUnit du) throws DeploymentException { - - if (du instanceof VFSDeploymentUnit && - (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) || - du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) { - DeploymentUnit top=du; - - if (top.isTopLevel() == false) { - top = du.getTopLevel(); - } - - logger.info("Deploy: "+top.getSimpleName()+" relativePath="+ - du.getRelativePath()); - - VirtualFile root=((VFSDeploymentUnit)du).getRoot(); - - logger.debug("Deployment descriptor file="+root); - - try { - VirtualFile parent=((VFSDeploymentUnit)du).getRoot().getParent(); - - logger.debug("Deployment unit dir="+parent); - - VirtualFile tmp=VFSUtils.explode(parent); - - java.net.URL url=VFSUtils.getCompatibleURL(tmp); - - logger.debug("Deployment exploded to dir="+tmp+" URL="+url); - - long lastModTime=0; - - if (top instanceof VFSDeploymentUnit) { - lastModTime = ((VFSDeploymentUnit)top).getRoot().getLastModified(); - } else { - logger.warn("Unable to determine last modified time for: "+top); - } - - // TODO: Need to be a more unique name, as it is possible that more - // than one deployment descriptor may exist in the same AS archive - BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), lastModTime); - - java.io.File ddfile=new java.io.File(url.getFile(), du.getSimpleName()); //BPELDeploymentUnit.BPEL_DEPLOY_XML); - - if (ddfile.exists() == false) { - logger.error("Failed to deploy '"+ddfile+ - "', unable to locate deployment descriptor file"); - } else { - unit.setDeploymentDescriptor(ddfile); - - synchronized(m_deploymentUnits) { - m_deploymentUnits.put(unit.getName(), unit); - - if (m_listener != null) { - m_listener.deploy(unit); - } - } - } - - } catch (Exception e) { - throw new DeploymentException("Failed to explode deployment unit '"+root+"'", e); - } - } - } - - @Override - public void undeploy(DeploymentUnit du) { - - if (du instanceof VFSDeploymentUnit && - (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) || - du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) { - DeploymentUnit top=du; - - if (top.isTopLevel() == false) { - top = du.getTopLevel(); - } - - logger.info("Undeploy: "+top.getSimpleName()+" relativePath="+ - du.getRelativePath()); - - try { - BPELDeploymentUnit prev=m_deploymentUnits.get(top.getSimpleName()); - - // Undeploy if deployment unit no longer exists on the filesystem, OR - // the last modified time of the cached deployment unit is older than - // the last modified time of the current deployment unit, signifying - // it has been updated and therefore must be undeployed first - if (top instanceof VFSDeploymentUnit && - (((VFSDeploymentUnit)top).getRoot().exists() == false || - (prev != null && prev.getLastModified() < - ((VFSDeploymentUnit)top).getRoot().getLastModified()))) { - - // TODO: Unique name - see deploy - BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), 0); - - // NOTE: File required to provide path for use in ODE - // process store impl. When this is replaced, this information - // will not be required. - java.io.File ddfile=new java.io.File(((VFSDeploymentUnit)du).getRoot().toURL().getFile()); - - unit.setDeploymentDescriptor(ddfile); - - synchronized(m_deploymentUnits) { - m_deploymentUnits.remove(unit.getName()); - - if (m_listener != null) { - m_listener.undeploy(unit); - } - } - } else { - logger.info("Not undeploying BPEL: "+top.getSimpleName()+" relativePath="+ - du.getRelativePath()); - } - } catch(Exception e) { - logger.error("Failed to undeploy '"+du+"'", e); - } - } - } - - /** - * This method sets the deployment listener that will be - * informed when BPEL deployment units are detected. - * - * @param l The BPEL deployment listener - */ - public void setDeploymentListener(BPELDeploymentListener l) { - - logger.debug("Set deployment listener: "+l); - - synchronized(m_deploymentUnits) { - m_listener = l; - - // Notify listener of the currently deployed units - java.util.Iterator<BPELDeploymentUnit> iter=m_deploymentUnits.values().iterator(); - while (iter.hasNext()) { - l.deploy(iter.next()); - } - } - } - - /** - * This method returns the JNDI name for the BPEL deployer. - * - * @return The JNDI name - */ - public String getJndiName() { - return m_jndiName; - } - - /** - * This method sets the JNDI name for the BPEL deployer. - * - * @param jndiName The JNDI name - * @throws NamingException Failed to update JNDI with the supplied - * name binding - */ - public void setJndiName(String jndiName)throws NamingException { - String oldName = m_jndiName; - m_jndiName = jndiName; - - if (oldName != null) { - unbind(oldName); - } - - try { - rebind(); - } catch(Exception e) { - NamingException ne = new NamingException("Failed to update jndiName"); - ne.setRootCause(e); - throw ne; - } - } - - private void rebind() throws NamingException { - InitialContext rootCtx = new InitialContext(); - Name fullName = rootCtx.getNameParser("").parse(m_jndiName); - log.debug("Binding BPEL deployer to name="+fullName); - NonSerializableFactory.rebind(fullName, this, true); - } - - private void unbind(String jndiName) { - try { - InitialContext rootCtx = new InitialContext(); - rootCtx.unbind(jndiName); - NonSerializableFactory.unbind(jndiName); - } catch(NamingException e) { - log.error("Failed to unbind map", e); - } - } - - private final static Logger logger = Logger.getLogger(BPELDeployer.class); - - private String m_jndiName=null; - private BPELDeploymentListener m_listener=null; - private java.util.Map<String, BPELDeploymentUnit> m_deploymentUnits= - new java.util.HashMap<String, BPELDeploymentUnit>(); -} Copied: trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java (from rev 1272, workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java) =================================================================== --- trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java (rev 0) +++ trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-01-25 15:33:18 UTC (rev 1273) @@ -0,0 +1,241 @@ +/* + * 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.deployer; + +import javax.naming.InitialContext; +import javax.naming.Name; +import javax.naming.NamingException; + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; + +import org.jboss.logging.Logger; +import org.jboss.util.naming.NonSerializableFactory; +import org.jboss.vfs.VFSUtils; +import org.jboss.vfs.VirtualFile; + +/** + * This is the deployer for deploying BPEL (and associated artifacts) into + * the runtime. + * + * @author gbrown + * + */ +public class BPELDeployer extends AbstractDeployer { + + public static final String BPELDeployerService="bpel/Deployer"; + + public void deploy(DeploymentUnit du) throws DeploymentException { + + if (du instanceof VFSDeploymentUnit && + (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) || + du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) { + DeploymentUnit top=du; + + if (top.isTopLevel() == false) { + top = du.getTopLevel(); + } + + logger.info("Deploy: "+top.getSimpleName()+" relativePath="+ + du.getRelativePath()); + + VirtualFile root=((VFSDeploymentUnit)du).getRoot(); + + logger.debug("Deployment descriptor file="+root); + + try { + VirtualFile parent=((VFSDeploymentUnit)du).getRoot().getParent(); + + logger.debug("Deployment unit dir="+parent); + + //VirtualFile tmp=VFSUtils.explode(parent); + + //java.net.URL url=VFSUtils.getCompatibleURL(tmp); + java.net.URL url=VFSUtils.getPhysicalURL(root); + + logger.debug("Deployment exploded to dir="+root+" URL="+url); + + long lastModTime=0; + + if (top instanceof VFSDeploymentUnit) { + lastModTime = ((VFSDeploymentUnit)top).getRoot().getLastModified(); + } else { + logger.warn("Unable to determine last modified time for: "+top); + } + + // TODO: Need to be a more unique name, as it is possible that more + // than one deployment descriptor may exist in the same AS archive + BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), lastModTime); + + java.io.File ddfile=new java.io.File(url.getFile(), du.getSimpleName()); //BPELDeploymentUnit.BPEL_DEPLOY_XML); + + if (ddfile.exists() == false) { + logger.error("Failed to deploy '"+ddfile+ + "', unable to locate deployment descriptor file"); + } else { + unit.setDeploymentDescriptor(ddfile); + + synchronized(m_deploymentUnits) { + m_deploymentUnits.put(unit.getName(), unit); + + if (m_listener != null) { + m_listener.deploy(unit); + } + } + } + + } catch (Exception e) { + throw new DeploymentException("Failed to explode deployment unit '"+root+"'", e); + } + } + } + + @Override + public void undeploy(DeploymentUnit du) { + + if (du instanceof VFSDeploymentUnit && + (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) || + du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) { + DeploymentUnit top=du; + + if (top.isTopLevel() == false) { + top = du.getTopLevel(); + } + + logger.info("Undeploy: "+top.getSimpleName()+" relativePath="+ + du.getRelativePath()); + + try { + BPELDeploymentUnit prev=m_deploymentUnits.get(top.getSimpleName()); + + // Undeploy if deployment unit no longer exists on the filesystem, OR + // the last modified time of the cached deployment unit is older than + // the last modified time of the current deployment unit, signifying + // it has been updated and therefore must be undeployed first + if (top instanceof VFSDeploymentUnit && + (((VFSDeploymentUnit)top).getRoot().exists() == false || + (prev != null && prev.getLastModified() < + ((VFSDeploymentUnit)top).getRoot().getLastModified()))) { + + // TODO: Unique name - see deploy + BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), 0); + + // NOTE: File required to provide path for use in ODE + // process store impl. When this is replaced, this information + // will not be required. + java.io.File ddfile=new java.io.File(((VFSDeploymentUnit)du).getRoot().toURL().getFile()); + + unit.setDeploymentDescriptor(ddfile); + + synchronized(m_deploymentUnits) { + m_deploymentUnits.remove(unit.getName()); + + if (m_listener != null) { + m_listener.undeploy(unit); + } + } + } else { + logger.info("Not undeploying BPEL: "+top.getSimpleName()+" relativePath="+ + du.getRelativePath()); + } + } catch(Exception e) { + logger.error("Failed to undeploy '"+du+"'", e); + } + } + } + + /** + * This method sets the deployment listener that will be + * informed when BPEL deployment units are detected. + * + * @param l The BPEL deployment listener + */ + public void setDeploymentListener(BPELDeploymentListener l) { + + logger.debug("Set deployment listener: "+l); + + synchronized(m_deploymentUnits) { + m_listener = l; + + // Notify listener of the currently deployed units + java.util.Iterator<BPELDeploymentUnit> iter=m_deploymentUnits.values().iterator(); + while (iter.hasNext()) { + l.deploy(iter.next()); + } + } + } + + /** + * This method returns the JNDI name for the BPEL deployer. + * + * @return The JNDI name + */ + public String getJndiName() { + return m_jndiName; + } + + /** + * This method sets the JNDI name for the BPEL deployer. + * + * @param jndiName The JNDI name + * @throws NamingException Failed to update JNDI with the supplied + * name binding + */ + public void setJndiName(String jndiName)throws NamingException { + String oldName = m_jndiName; + m_jndiName = jndiName; + + if (oldName != null) { + unbind(oldName); + } + + try { + rebind(); + } catch(Exception e) { + NamingException ne = new NamingException("Failed to update jndiName"); + ne.setRootCause(e); + throw ne; + } + } + + private void rebind() throws NamingException { + InitialContext rootCtx = new InitialContext(); + Name fullName = rootCtx.getNameParser("").parse(m_jndiName); + log.debug("Binding BPEL deployer to name="+fullName); + NonSerializableFactory.bind(fullName.toString(), this); + } + + private void unbind(String jndiName) { + try { + InitialContext rootCtx = new InitialContext(); + rootCtx.unbind(jndiName); + NonSerializableFactory.unbind(jndiName); + } catch(NamingException e) { + log.error("Failed to unbind map", e); + } + } + + private final static Logger logger = Logger.getLogger(BPELDeployer.class); + + private String m_jndiName=null; + private BPELDeploymentListener m_listener=null; + private java.util.Map<String, BPELDeploymentUnit> m_deploymentUnits= + new java.util.HashMap<String, BPELDeploymentUnit>(); +} Deleted: trunk/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) +++ trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java 2011-01-25 15:33:18 UTC (rev 1273) @@ -1,65 +0,0 @@ -/* - * 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.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; - -/** - * Implementation of the BPEL Structure Deployer, used to locate the - * BPEL deployment descriptor and create a context for the BPEL - * deployment unit. - * - * @author gbrown - * - */ -public class BPELStructureDeployer extends AbstractStructureDeployer { - - @Override - protected AnnotationEnvironment createAnnotationEnvironment(VirtualFile arg0) { - return null; - } - - public boolean determineStructure(StructureContext sc) - throws DeploymentException { - boolean ret=false; - - try { - // Must look for the deployment descriptor, as opposed to the container - // that contains the descriptor, because in the case of a Jar with the descriptor - // at the top level, the deployer will not get called with the Jar top level - // node, as this is handled by a Jar deployer. - if (sc.getName().equals(BPELDeploymentUnit.DEPLOY_XML) || - sc.getName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML)) { - ret = true; - - // Create the context for the deployment associated with - // the deployment descriptor's parent container - createContext(sc); - } - } catch (Exception e) { - throw new DeploymentException(e); - } - - return(ret); - } - -} Copied: trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java (from rev 1271, workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java) =================================================================== --- trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java (rev 0) +++ trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java 2011-01-25 15:33:18 UTC (rev 1273) @@ -0,0 +1,66 @@ +/* + * 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.deployer; + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.vfs.spi.structure.StructureContext; +import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer; +import org.jboss.scanning.annotations.spi.AnnotationRepository; + +/** + * Implementation of the BPEL Structure Deployer, used to locate the + * BPEL deployment descriptor and create a context for the BPEL + * deployment unit. + * + * @author gbrown + * + */ +public class BPELStructureDeployer extends AbstractStructureDeployer { + + public boolean determineStructure(StructureContext sc) + throws DeploymentException { + boolean ret=false; + + try { + // Must look for the deployment descriptor, as opposed to the container + // that contains the descriptor, because in the case of a Jar with the descriptor + // at the top level, the deployer will not get called with the Jar top level + // node, as this is handled by a Jar deployer. + if (sc.getName().equals(BPELDeploymentUnit.DEPLOY_XML) || + sc.getName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML)) { + ret = true; + + // Create the context for the deployment associated with + // the deployment descriptor's parent container + createContext(sc); + } + } catch (Exception e) { + throw new DeploymentException(e); + } + + return(ret); + } + + @Override + protected AnnotationRepository createAnnotationRepository( + org.jboss.vfs.VirtualFile arg0) { + // TODO Auto-generated method stub + return null; + } + +} 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-25 14:01:32 UTC (rev 1272) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java 2011-01-25 15:33:18 UTC (rev 1273) @@ -579,8 +579,11 @@ { if (datadir == null) { - final ServerConfigImpl serverConfig = (ServerConfigImpl) MBeanProxyExt.create(ServerConfigImplMBean.class,ServerConfigImplMBean.OBJECT_NAME); - return serverConfig.getServerDataDir(); + //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(); + return(serverConfig.getServerDeployDir()); } return new File(datadir); } 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-25 14:01:32 UTC (rev 1272) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2011-01-25 15:33:18 UTC (rev 1273) @@ -25,16 +25,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.iapi.EndpointReference; import org.apache.ode.bpel.iapi.ProcessConf; -import org.jboss.dependency.spi.ControllerContext; -import org.jboss.deployers.client.spi.DeployerClient; -import org.jboss.deployers.client.spi.Deployment; -import org.jboss.deployers.spi.attachments.MutableAttachments; -import org.jboss.deployers.structure.spi.ClassLoaderFactory; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.structure.spi.DeploymentUnitFilter; -import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; -import org.jboss.kernel.Kernel; -import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.soa.bpel.deployer.BPELDeploymentUnit; import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl; import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment; @@ -44,19 +34,15 @@ import org.jboss.soa.dsp.ServiceEndpointReference; import org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer; import org.jboss.soa.dsp.server.ServerConfig; -import org.jboss.soa.dsp.server.jboss.KernelLocator; import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; import org.jboss.soa.dsp.ws.BaseWebServiceEndpoint; import org.jboss.soa.dsp.ws.DeploymentBuilder; import org.jboss.soa.dsp.ws.WSDLParser; import org.jboss.soa.dsp.ws.WSDLReference; import org.jboss.soa.dsp.ws.WebServiceProviderGenerator; -import org.jboss.virtual.VFS; -import org.jboss.virtual.VirtualFile; import javax.xml.namespace.QName; import java.io.File; -import java.io.IOException; import java.net.URL; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -247,41 +233,34 @@ log.debug("Remove endpoint service="+service+" port="+port+" deploymentName="+ref.getDeploymentName()+" ref="+ref); } - if(ref!=null) + try { - try - { - m_deployer.undeploy(ref, serverConfig); - - // unregister - endpointMapping.remove(key); - - if (log.isDebugEnabled()) { - log.debug("Undeployed web service with deploymentName="+ref.getDeploymentName()); - } - - // remove physical artifacts - File warArchive = new File(ref.getArchiveLocation()); - if(warArchive.exists()) - { - if(!deleteDirectory(warArchive)) log.warn(warArchive + " could no be deleted"); - } - else - { - log.warn(ref.getArchiveLocation() + " cannot be removed (doesn't exist)."); - } - if (uddiRegistration!=null) { - uddiRegistration.unRegisterEPR(service, port); - } - } - catch (Exception e) - { - throw new EndpointManagementException("Failed to undeploy "+ref.getDeploymentName(), e); - } + m_deployer.undeploy(ref, serverConfig); + + // unregister + endpointMapping.remove(key); + + if (log.isDebugEnabled()) { + log.debug("Undeployed web service with deploymentName="+ref.getDeploymentName()); + } + + // remove physical artifacts + File warArchive = new File(ref.getArchiveLocation()); + if(warArchive.exists()) + { + if(!deleteDirectory(warArchive)) log.warn(warArchive + " could no be deleted"); + } + else + { + log.warn(ref.getArchiveLocation() + " cannot be removed (doesn't exist)."); + } + if (uddiRegistration!=null) { + uddiRegistration.unRegisterEPR(service, port); + } } - else + catch (Exception e) { - log.warn("Endpoint not found for removal: "+key); + throw new EndpointManagementException("Failed to undeploy "+ref.getDeploymentName(), e); } } Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2011-01-25 14:01:32 UTC (rev 1272) +++ trunk/runtime/pom.xml 2011-01-25 15:33:18 UTC (rev 1273) @@ -17,6 +17,7 @@ <modules> <module>deployer</module> + <module>deployer-as6</module> <module>engine</module> <module>uddi</module> <module>engine-assembly</module>