8:01 a.m.
Author: objectiser
Date: 2011-01-25 09:01:32 -0500 (Tue, 25 Jan 2011)
New Revision: 1272
Added:
workspace/gbrown/as6/distribution/src/main/release/modules/riftsaw-as5.deployer/
Removed:
workspace/gbrown/as6/distribution/src/main/release/modules/riftsaw.deployer/
Modified:
workspace/gbrown/as6/distribution/src/main/assembly/bin.xml
workspace/gbrown/as6/distribution/src/main/release/install/build.xml
workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java
workspace/gbrown/as6/runtime/deployer/pom.xml
Log:
Add support for distribution and installation of AS5/6 based riftsaw.
Modified: workspace/gbrown/as6/distribution/src/main/assembly/bin.xml
===================================================================
--- workspace/gbrown/as6/distribution/src/main/assembly/bin.xml 2011-01-25 13:13:03 UTC
(rev 1271)
+++ workspace/gbrown/as6/distribution/src/main/assembly/bin.xml 2011-01-25 14:01:32 UTC
(rev 1272)
@@ -54,9 +54,9 @@
<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>
Modified: workspace/gbrown/as6/distribution/src/main/release/install/build.xml
===================================================================
--- workspace/gbrown/as6/distribution/src/main/release/install/build.xml 2011-01-25
13:13:03 UTC (rev 1271)
+++ workspace/gbrown/as6/distribution/src/main/release/install/build.xml 2011-01-25
14:01:32 UTC (rev 1272)
@@ -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: workspace/gbrown/as6/distribution/src/main/release/modules/riftsaw-as5.deployer
(from rev 1264,
workspace/gbrown/as6/distribution/src/main/release/modules/riftsaw.deployer)
Modified: workspace/gbrown/as6/runtime/deployer/pom.xml
===================================================================
--- workspace/gbrown/as6/runtime/deployer/pom.xml 2011-01-25 13:13:03 UTC (rev 1271)
+++ workspace/gbrown/as6/runtime/deployer/pom.xml 2011-01-25 14:01:32 UTC (rev 1272)
@@ -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>
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
13:13:03 UTC (rev 1271)
+++
workspace/gbrown/as6/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-01-25
14:01:32 UTC (rev 1272)
@@ -219,7 +219,7 @@
InitialContext rootCtx = new InitialContext();
Name fullName = rootCtx.getNameParser("").parse(m_jndiName);
log.debug("Binding BPEL deployer to name="+fullName);
- NonSerializableFactory.rebind(fullName, this, true);
+ NonSerializableFactory.bind(fullName.toString(), this);
}
private void unbind(String jndiName) {