riftsaw SVN: r834 - branches/RiftSaw-2.1.x/distribution/src/main/release/db and 6 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-07-05 09:58:55 -0400 (Mon, 05 Jul 2010)
New Revision: 834
Added:
branches/RiftSaw-2.1.x/docs/docbook/userguide/src/main/images/ActivateRetire.png
trunk/docs/docbook/userguide/src/main/images/ActivateRetire.png
Modified:
branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties
branches/RiftSaw-2.1.x/docs/docbook/userguide/src/main/module/admin.xml
branches/RiftSaw-2.1.x/pom.xml
trunk/distribution/src/main/release/db/bpel.properties
trunk/docs/docbook/userguide/src/main/module/admin.xml
trunk/pom.xml
Log:
RIFTSAW-241 - added documentation on activate/retire and the stable interface property.
Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties 2010-07-05 09:40:40 UTC (rev 833)
+++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties 2010-07-05 13:58:55 UTC (rev 834)
@@ -90,6 +90,7 @@
bpel.db.mode=EXTERNAL
db.emb.create=false
bpel.db.ext.dataSource=java:BPELDB
+
# if set to true will self-register BPEL endpoints upon deployment to a UDDI.
# this uses the juddi-client-3.0.x and the uddi client config can be set in the uddi.xml
# file
@@ -131,6 +132,3 @@
jta.UserTransaction=UserTransaction
ode.persistence=hibernate
-
-ode.process.checkguid=false
-ode.process.store=org.apache.ode.store.JBossProcessStoreImpl
Added: branches/RiftSaw-2.1.x/docs/docbook/userguide/src/main/images/ActivateRetire.png
===================================================================
(Binary files differ)
Property changes on: branches/RiftSaw-2.1.x/docs/docbook/userguide/src/main/images/ActivateRetire.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/RiftSaw-2.1.x/docs/docbook/userguide/src/main/module/admin.xml
===================================================================
--- branches/RiftSaw-2.1.x/docs/docbook/userguide/src/main/module/admin.xml 2010-07-05 09:40:40 UTC (rev 833)
+++ branches/RiftSaw-2.1.x/docs/docbook/userguide/src/main/module/admin.xml 2010-07-05 13:58:55 UTC (rev 834)
@@ -14,7 +14,7 @@
</section>
<section>
- <title>BPM Console</title>
+ <title>BPEL Console</title>
<section>
<title>Overview</title>
@@ -116,7 +116,100 @@
</imageobject>
</section>
+
+ <section>
+ <title>Retiring and Reactivating Process Definitions</title>
+
+ <para>
+ When a process definition is initially deployed (i.e. the first version of the process),
+ it automatically becomes the active process definition. If that BPEL process definition
+ is subsequently change and redeployed, then the previous version is <emphasis>retired</emphasis>,
+ and the new version becomes the <emphasis>active</emphasis> version.
+ </para>
+
+ <para>
+ The only difference between an <emphasis>active</emphasis> and <emphasis>retired</emphasis>
+ process definition is that a <emphasis>retired</emphasis> process definition can no longer
+ create new process instances. However if there are current process instances associated
+ with the <emphasis>retired</emphasis> process definition version, then these will continue
+ to execute.
+ </para>
+
+ <para>
+ On some occasions, the administrator may wish to change which version of a process definition
+ is considered the <emphasis>active</emphasis> version. Or they may simply want to
+ <emphasis>retire</emphasis> the currently active process definition, so that no more
+ process instances can be created, only allowing the already running process instances to
+ continue until completed.
+ </para>
+
+ <para>
+ To change the status of a process definition, the administrator should select the
+ <emphasis>Runtime</emphasis> tab from the lefthand panel, and then select the
+ <emphasis>Deployments</emphasis> option. This will show the process definitions, their
+ versions and their current status (active or retired).
+ </para>
+
+ <imageobject>
+ <imagedata fileref="images/ActivateRetire.png" align="center" width="6in" />
+ </imageobject>
+
+ <para>
+ To change a particular version from <emphasis>retired</emphasis> to <emphasis>active</emphasis>,
+ simply select the <emphasis>retired</emphasis> version and press the <emphasis>Activate</emphasis>
+ button in the bottom right.
+ </para>
+
+ <para>
+ To retire a currently active process definition, simply select the particular version and
+ then press the <emphasis>Retire</emphasis> button in the bottom right.
+ </para>
+
+ </section>
</section>
+ <section>
+ <title>BPEL Properties</title>
+
+ <para>
+ When RiftSaw has been installed within the JBossAS environment, there is a property file
+ located at <filename>${JBossAS}/server/default/deploy/riftsaw.sar/bpel.properties</filename>.
+ </para>
+
+ <para>
+ This property file contains a number of properties that are specific to ODE, and if interested
+ in these properties, then you should refer to the ODE documentation. Only one point to note,
+ the name of the property in this file maybe prefixed with <emphasis>bpel.</emphasis>, however
+ in the ODE documentation the prefix would be <emphasis>ode.</emphasis>.
+ </para>
+
+ <para>
+ This section will present the properties that are specific to RiftSaw.
+ </para>
+
+ <table frame="all">
+ <title>RiftSaw specific properties</title>
+ <tr>
+ <td>bpel.uddi.*</td>
+ <td>These properties relate to the UDDI support, which is discussed in a subsequent chapter.</td>
+ </tr>
+ <tr>
+ <td>bpel.jaxws.client.initializer.impl</td>
+ <td>This property is automatically set upon installation, based on the JAXWS stack being used.
+ This value should not be changed.</td>
+ </tr>
+ <tr>
+ <td>bpel.ws.stableInterface (default false)</td>
+ <td>This property determines whether the Web Service interface, associated with a BPEL process,
+ will be updated when a new version of the BPEL process is deployed. The benefit of setting this
+ to <emphasis>false</emphasis> is that changes to the WSDL will be made active with the BPEL
+ process. However the issue is that during the transition between the interfaces, the web service
+ will momentarily be unavailble - which may cause heavily used services to reject requests. By
+ setting this value to <emphasis>true</emphasis>, then the web service will remain available
+ while the BPEL process is updated, however any changes in the WSDL will not be made available.</td>
+ </tr>
+ </table>
+ </section>
+
</chapter>
Modified: branches/RiftSaw-2.1.x/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/pom.xml 2010-07-05 09:40:40 UTC (rev 833)
+++ branches/RiftSaw-2.1.x/pom.xml 2010-07-05 13:58:55 UTC (rev 834)
@@ -74,7 +74,7 @@
<properties>
<riftsaw.ode.version>2.1.0-SNAPSHOT</riftsaw.ode.version>
<riftsaw.engine.version>2.1.0-SNAPSHOT</riftsaw.engine.version>
- <bpm.console.version>2.1</bpm.console.version>
+ <bpel.console.version>2.1.1-SNAPSHOT</bpel.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.1</junit.version>
<jboss.version>5.1.0.GA</jboss.version>
@@ -97,24 +97,24 @@
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-rpc</artifactId>
- <version>${bpm.console.version}</version>
+ <version>${bpel.console.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-server-integration</artifactId>
- <version>${bpm.console.version}</version>
+ <version>${bpel.console.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-server</artifactId>
- <version>${bpm.console.version}</version>
+ <version>${bpel.console.version}</version>
<classifier>riftsaw</classifier>
<type>war</type>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console</artifactId>
- <version>${bpm.console.version}</version>
+ <version>${bpel.console.version}</version>
<classifier>riftsaw</classifier>
<type>war</type>
</dependency>
Modified: trunk/distribution/src/main/release/db/bpel.properties
===================================================================
--- trunk/distribution/src/main/release/db/bpel.properties 2010-07-05 09:40:40 UTC (rev 833)
+++ trunk/distribution/src/main/release/db/bpel.properties 2010-07-05 13:58:55 UTC (rev 834)
@@ -90,6 +90,7 @@
bpel.db.mode=EXTERNAL
db.emb.create=false
bpel.db.ext.dataSource=java:BPELDB
+
# if set to true will self-register BPEL endpoints upon deployment to a UDDI.
# this uses the juddi-client-3.0.x and the uddi client config can be set in the uddi.xml
# file
@@ -131,6 +132,3 @@
jta.UserTransaction=UserTransaction
ode.persistence=hibernate
-
-ode.process.checkguid=false
-ode.process.store=org.apache.ode.store.JBossProcessStoreImpl
Added: trunk/docs/docbook/userguide/src/main/images/ActivateRetire.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/docbook/userguide/src/main/images/ActivateRetire.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/docs/docbook/userguide/src/main/module/admin.xml
===================================================================
--- trunk/docs/docbook/userguide/src/main/module/admin.xml 2010-07-05 09:40:40 UTC (rev 833)
+++ trunk/docs/docbook/userguide/src/main/module/admin.xml 2010-07-05 13:58:55 UTC (rev 834)
@@ -14,7 +14,7 @@
</section>
<section>
- <title>BPM Console</title>
+ <title>BPEL Console</title>
<section>
<title>Overview</title>
@@ -116,7 +116,100 @@
</imageobject>
</section>
+
+ <section>
+ <title>Retiring and Reactivating Process Definitions</title>
+
+ <para>
+ When a process definition is initially deployed (i.e. the first version of the process),
+ it automatically becomes the active process definition. If that BPEL process definition
+ is subsequently change and redeployed, then the previous version is <emphasis>retired</emphasis>,
+ and the new version becomes the <emphasis>active</emphasis> version.
+ </para>
+
+ <para>
+ The only difference between an <emphasis>active</emphasis> and <emphasis>retired</emphasis>
+ process definition is that a <emphasis>retired</emphasis> process definition can no longer
+ create new process instances. However if there are current process instances associated
+ with the <emphasis>retired</emphasis> process definition version, then these will continue
+ to execute.
+ </para>
+
+ <para>
+ On some occasions, the administrator may wish to change which version of a process definition
+ is considered the <emphasis>active</emphasis> version. Or they may simply want to
+ <emphasis>retire</emphasis> the currently active process definition, so that no more
+ process instances can be created, only allowing the already running process instances to
+ continue until completed.
+ </para>
+
+ <para>
+ To change the status of a process definition, the administrator should select the
+ <emphasis>Runtime</emphasis> tab from the lefthand panel, and then select the
+ <emphasis>Deployments</emphasis> option. This will show the process definitions, their
+ versions and their current status (active or retired).
+ </para>
+
+ <imageobject>
+ <imagedata fileref="images/ActivateRetire.png" align="center" width="6in" />
+ </imageobject>
+
+ <para>
+ To change a particular version from <emphasis>retired</emphasis> to <emphasis>active</emphasis>,
+ simply select the <emphasis>retired</emphasis> version and press the <emphasis>Activate</emphasis>
+ button in the bottom right.
+ </para>
+
+ <para>
+ To retire a currently active process definition, simply select the particular version and
+ then press the <emphasis>Retire</emphasis> button in the bottom right.
+ </para>
+
+ </section>
</section>
+ <section>
+ <title>BPEL Properties</title>
+
+ <para>
+ When RiftSaw has been installed within the JBossAS environment, there is a property file
+ located at <filename>${JBossAS}/server/default/deploy/riftsaw.sar/bpel.properties</filename>.
+ </para>
+
+ <para>
+ This property file contains a number of properties that are specific to ODE, and if interested
+ in these properties, then you should refer to the ODE documentation. Only one point to note,
+ the name of the property in this file maybe prefixed with <emphasis>bpel.</emphasis>, however
+ in the ODE documentation the prefix would be <emphasis>ode.</emphasis>.
+ </para>
+
+ <para>
+ This section will present the properties that are specific to RiftSaw.
+ </para>
+
+ <table frame="all">
+ <title>RiftSaw specific properties</title>
+ <tr>
+ <td>bpel.uddi.*</td>
+ <td>These properties relate to the UDDI support, which is discussed in a subsequent chapter.</td>
+ </tr>
+ <tr>
+ <td>bpel.jaxws.client.initializer.impl</td>
+ <td>This property is automatically set upon installation, based on the JAXWS stack being used.
+ This value should not be changed.</td>
+ </tr>
+ <tr>
+ <td>bpel.ws.stableInterface (default false)</td>
+ <td>This property determines whether the Web Service interface, associated with a BPEL process,
+ will be updated when a new version of the BPEL process is deployed. The benefit of setting this
+ to <emphasis>false</emphasis> is that changes to the WSDL will be made active with the BPEL
+ process. However the issue is that during the transition between the interfaces, the web service
+ will momentarily be unavailble - which may cause heavily used services to reject requests. By
+ setting this value to <emphasis>true</emphasis>, then the web service will remain available
+ while the BPEL process is updated, however any changes in the WSDL will not be made available.</td>
+ </tr>
+ </table>
+ </section>
+
</chapter>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-07-05 09:40:40 UTC (rev 833)
+++ trunk/pom.xml 2010-07-05 13:58:55 UTC (rev 834)
@@ -74,7 +74,7 @@
<properties>
<riftsaw.ode.version>2.2.0-SNAPSHOT</riftsaw.ode.version>
<riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version>
- <bpm.console.version>2.1.1-SNAPSHOT</bpm.console.version>
+ <bpel.console.version>2.1.1-SNAPSHOT</<bpel.console.version>>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.1</junit.version>
<jboss.version>5.1.0.GA</jboss.version>
@@ -97,24 +97,24 @@
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-rpc</artifactId>
- <version>${bpm.console.version}</version>
+ <version>${bpel.console.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-server-integration</artifactId>
- <version>${bpm.console.version}</version>
+ <version>${bpel.console.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-server</artifactId>
- <version>${bpm.console.version}</version>
+ <version>${bpel.console.version}</version>
<classifier>riftsaw</classifier>
<type>war</type>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console</artifactId>
- <version>${bpm.console.version}</version>
+ <version>${bpel.console.version}</version>
<classifier>riftsaw</classifier>
<type>war</type>
</dependency>
13 years, 10 months
riftsaw SVN: r833 - trunk.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-07-05 05:40:40 -0400 (Mon, 05 Jul 2010)
New Revision: 833
Modified:
trunk/pom.xml
Log:
set console version 2.1.1-SNAPSHOT
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-07-02 14:49:38 UTC (rev 832)
+++ trunk/pom.xml 2010-07-05 09:40:40 UTC (rev 833)
@@ -74,7 +74,7 @@
<properties>
<riftsaw.ode.version>2.2.0-SNAPSHOT</riftsaw.ode.version>
<riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version>
- <bpm.console.version>2.1</bpm.console.version>
+ <bpm.console.version>2.1.1-SNAPSHOT</bpm.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.1</junit.version>
<jboss.version>5.1.0.GA</jboss.version>
13 years, 10 months
riftsaw SVN: r832 - branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode and 4 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-07-02 10:49:38 -0400 (Fri, 02 Jul 2010)
New Revision: 832
Modified:
branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
trunk/distribution/src/main/release/db/bpel.properties
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
Log:
RIFTSAW-239 - added config property to determine whether web service interface should be updated during deployment of new version of a BPEL process.
Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties 2010-07-02 10:04:43 UTC (rev 831)
+++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties 2010-07-02 14:49:38 UTC (rev 832)
@@ -110,6 +110,14 @@
bpel.jaxws.client.initializer.impl=(a)jaxws.client.initializer.impl@
+# This property defines whether the Web Service interface should be updated when a new version
+# of the BPEL process is deployed. If the property is false, then the web service interface
+# will be updated when a new version is deployed, however this means that the service will
+# briefly be unavailable during the transition. If the property is true, then the web service
+# interface associated with the first deployed version will be maintained during the deployment
+# of subsequent versions.
+bpel.ws.stableInterface = false
+
# all hibernate specific properties
hibernate.dialect=@dialect@
Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-07-02 10:04:43 UTC (rev 831)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-07-02 14:49:38 UTC (rev 832)
@@ -67,7 +67,7 @@
org.apache.ode.bpel.iapi.EndpointReference ref =
endpointManager.maintains(myRoleEndpoint.serviceName, myRoleEndpoint.portName);
- if(ref!=null)
+ if(ref!=null && endpointManager.isStableInterface())
{
// might happen when processes are retired.
// See https://jira.jboss.org/jira/browse/RIFTSAW-57
Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-02 10:04:43 UTC (rev 831)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-02 14:49:38 UTC (rev 832)
@@ -69,12 +69,14 @@
protected final Log log = LogFactory.getLog(getClass());
// we should consider having our own OdeConfigProperties class if we need more properties
private final static String BPEL_UDDI_REGISTRATION = "uddi.registration";
+ private static final String BPEL_WS_STABLE_INTERFACE = "ws.stableInterface";
private Map<String, ServiceEndpointReference> endpointMapping = new ConcurrentHashMap<String, ServiceEndpointReference>();
private ServerConfig serverConfig;
private ExecutionEnvironment executionEnvironment;
private UDDIRegistration uddiRegistration = null;
+ private boolean stableInterface=false;
public EndpointManager(ExecutionEnvironment executionEnvironment)
{
@@ -88,7 +90,15 @@
log.error("Running without UDDI integration.");
}
}
+
+ stableInterface = executionEnvironment.getOdeConfig().getProperty(BPEL_WS_STABLE_INTERFACE,
+ "false").equalsIgnoreCase("true");
+ log.info("Use stable interface: "+stableInterface);
}
+
+ public boolean isStableInterface() {
+ return(stableInterface);
+ }
public EndpointReference createEndpoint(EndpointMetaData metaData, WSDLReference wsdlRef, final ClassLoader classLoader)
throws EndpointManagementException
@@ -150,6 +160,17 @@
mutableAttachments.addAttachment(JBossWebMetaData.class, wmdFactory.createWebMetaData(classLoader));
mutableAttachments.addAttachment(DeploymentUnitFilter.class, new RiftsawWSDeploymentUnitFilter());
+
+ if (!stableInterface) {
+ // Undeploy
+ try {
+ log.debug("Check if can remove existing service: "+metaData.getServiceName()+":"+metaData.getPortName());
+ removeEndpoint(metaData.getServiceName(), metaData.getPortName());
+ } catch(IllegalStateException ise) {
+ // Ignore for now - endpoint may not exist if first version
+ }
+ }
+
getMainDeployer().deploy(deployment);
ServiceEndpointReference ref = new ServiceEndpointReference(
Modified: trunk/distribution/src/main/release/db/bpel.properties
===================================================================
--- trunk/distribution/src/main/release/db/bpel.properties 2010-07-02 10:04:43 UTC (rev 831)
+++ trunk/distribution/src/main/release/db/bpel.properties 2010-07-02 14:49:38 UTC (rev 832)
@@ -110,6 +110,14 @@
bpel.jaxws.client.initializer.impl=(a)jaxws.client.initializer.impl@
+# This property defines whether the Web Service interface should be updated when a new version
+# of the BPEL process is deployed. If the property is false, then the web service interface
+# will be updated when a new version is deployed, however this means that the service will
+# briefly be unavailable during the transition. If the property is true, then the web service
+# interface associated with the first deployed version will be maintained during the deployment
+# of subsequent versions.
+bpel.ws.stableInterface = false
+
# all hibernate specific properties
hibernate.dialect=@dialect@
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-07-02 10:04:43 UTC (rev 831)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-07-02 14:49:38 UTC (rev 832)
@@ -67,7 +67,7 @@
org.apache.ode.bpel.iapi.EndpointReference ref =
endpointManager.maintains(myRoleEndpoint.serviceName, myRoleEndpoint.portName);
- if(ref!=null)
+ if(ref!=null && endpointManager.isStableInterface())
{
// might happen when processes are retired.
// See https://jira.jboss.org/jira/browse/RIFTSAW-57
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 2010-07-02 10:04:43 UTC (rev 831)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-02 14:49:38 UTC (rev 832)
@@ -69,12 +69,14 @@
protected final Log log = LogFactory.getLog(getClass());
// we should consider having our own OdeConfigProperties class if we need more properties
private final static String BPEL_UDDI_REGISTRATION = "uddi.registration";
+ private static final String BPEL_WS_STABLE_INTERFACE = "ws.stableInterface";
private Map<String, ServiceEndpointReference> endpointMapping = new ConcurrentHashMap<String, ServiceEndpointReference>();
private ServerConfig serverConfig;
private ExecutionEnvironment executionEnvironment;
private UDDIRegistration uddiRegistration = null;
+ private boolean stableInterface=false;
public EndpointManager(ExecutionEnvironment executionEnvironment)
{
@@ -88,7 +90,15 @@
log.error("Running without UDDI integration.");
}
}
+
+ stableInterface = executionEnvironment.getOdeConfig().getProperty(BPEL_WS_STABLE_INTERFACE,
+ "false").equalsIgnoreCase("true");
+ log.info("Use stable interface: "+stableInterface);
}
+
+ public boolean isStableInterface() {
+ return(stableInterface);
+ }
public EndpointReference createEndpoint(EndpointMetaData metaData, WSDLReference wsdlRef, final ClassLoader classLoader)
throws EndpointManagementException
@@ -150,6 +160,17 @@
mutableAttachments.addAttachment(JBossWebMetaData.class, wmdFactory.createWebMetaData(classLoader));
mutableAttachments.addAttachment(DeploymentUnitFilter.class, new RiftsawWSDeploymentUnitFilter());
+
+ if (!stableInterface) {
+ // Undeploy
+ try {
+ log.debug("Check if can remove existing service: "+metaData.getServiceName()+":"+metaData.getPortName());
+ removeEndpoint(metaData.getServiceName(), metaData.getPortName());
+ } catch(IllegalStateException ise) {
+ // Ignore for now - endpoint may not exist if first version
+ }
+ }
+
getMainDeployer().deploy(deployment);
ServiceEndpointReference ref = new ServiceEndpointReference(
13 years, 11 months
riftsaw SVN: r831 - branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws and 2 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-07-02 06:04:43 -0400 (Fri, 02 Jul 2010)
New Revision: 831
Modified:
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
Log:
RIFTSAW-155 - problem was that the web service was being undeployed in a different classloader context (associated with the BPM console), and therefore when redeployed (after activate) the bind of the TransactionSynchronizationRegistry link had previously been registered in that classloader context. All RiftSaw web services had been deployed (and the bind of the link performed) in the context of the riftsaw.sar classloader.
Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-07-01 12:27:41 UTC (rev 830)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-07-02 10:04:43 UTC (rev 831)
@@ -81,7 +81,7 @@
try
{
- final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader classLoader = JAXWSBindingContext.class.getClassLoader(); //Thread.currentThread().getContextClassLoader();
String endpointId = UUID.randomUUID().toString();
EndpointMetaData endpointMD = new EndpointMetaData(
Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-01 12:27:41 UTC (rev 830)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-02 10:04:43 UTC (rev 831)
@@ -224,6 +224,10 @@
String deploymentId = ref.getDeploymentName();
+ if (log.isDebugEnabled()) {
+ log.debug("Remove endpoint service="+service+" port="+port+" deploymentId="+deploymentId+" ref="+ref);
+ }
+
if(ref!=null)
{
try
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-07-01 12:27:41 UTC (rev 830)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-07-02 10:04:43 UTC (rev 831)
@@ -81,7 +81,7 @@
try
{
- final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader classLoader = JAXWSBindingContext.class.getClassLoader(); //Thread.currentThread().getContextClassLoader();
String endpointId = UUID.randomUUID().toString();
EndpointMetaData endpointMD = new EndpointMetaData(
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 2010-07-01 12:27:41 UTC (rev 830)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-02 10:04:43 UTC (rev 831)
@@ -224,6 +224,10 @@
String deploymentId = ref.getDeploymentName();
+ if (log.isDebugEnabled()) {
+ log.debug("Remove endpoint service="+service+" port="+port+" deploymentId="+deploymentId+" ref="+ref);
+ }
+
if(ref!=null)
{
try
13 years, 11 months
riftsaw SVN: r830 - trunk/runtime/jbossesb-bpel and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-07-01 08:27:41 -0400 (Thu, 01 Jul 2010)
New Revision: 830
Modified:
branches/RiftSaw-2.1.x/runtime/jbossesb-bpel/pom.xml
trunk/runtime/jbossesb-bpel/pom.xml
Log:
Remove ESB rosetta jar from riftsaw.esb/lib.
Modified: branches/RiftSaw-2.1.x/runtime/jbossesb-bpel/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/runtime/jbossesb-bpel/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
+++ branches/RiftSaw-2.1.x/runtime/jbossesb-bpel/pom.xml 2010-07-01 12:27:41 UTC (rev 830)
@@ -23,6 +23,7 @@
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
<version>${jbossesb.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
Modified: trunk/runtime/jbossesb-bpel/pom.xml
===================================================================
--- trunk/runtime/jbossesb-bpel/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
+++ trunk/runtime/jbossesb-bpel/pom.xml 2010-07-01 12:27:41 UTC (rev 830)
@@ -23,6 +23,7 @@
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
<version>${jbossesb.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
13 years, 11 months
riftsaw SVN: r829 - in branches/RiftSaw-ODE-2.1.x: agents and 34 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-07-01 08:23:19 -0400 (Thu, 01 Jul 2010)
New Revision: 829
Modified:
branches/RiftSaw-ODE-2.1.x/agents/pom.xml
branches/RiftSaw-ODE-2.1.x/axis2-war/pom.xml
branches/RiftSaw-ODE-2.1.x/axis2/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-api-jca/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-api/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-compiler/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-connector/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-dao/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-epr/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-obj/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-ql/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-runtime/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
branches/RiftSaw-ODE-2.1.x/bpel-schemas/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-scripts/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-store/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-test/pom.xml
branches/RiftSaw-ODE-2.1.x/dao-hibernate-db/pom.xml
branches/RiftSaw-ODE-2.1.x/dao-hibernate/pom.xml
branches/RiftSaw-ODE-2.1.x/dao-jpa-db/pom.xml
branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/pom.xml
branches/RiftSaw-ODE-2.1.x/dao-jpa-ojpa-derby/pom.xml
branches/RiftSaw-ODE-2.1.x/dao-jpa-ojpa/pom.xml
branches/RiftSaw-ODE-2.1.x/dao-jpa/pom.xml
branches/RiftSaw-ODE-2.1.x/distro/pom.xml
branches/RiftSaw-ODE-2.1.x/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
branches/RiftSaw-ODE-2.1.x/jacob/pom.xml
branches/RiftSaw-ODE-2.1.x/jbi-bundle/pom.xml
branches/RiftSaw-ODE-2.1.x/jbi-karaf/pom.xml
branches/RiftSaw-ODE-2.1.x/jbi/pom.xml
branches/RiftSaw-ODE-2.1.x/jca-ra/pom.xml
branches/RiftSaw-ODE-2.1.x/jca-server/pom.xml
branches/RiftSaw-ODE-2.1.x/pom.xml
branches/RiftSaw-ODE-2.1.x/scheduler-simple/pom.xml
branches/RiftSaw-ODE-2.1.x/tools/pom.xml
branches/RiftSaw-ODE-2.1.x/utils/pom.xml
Log:
* RIFTSAW-236, fix the NPE for invalid wsdl op.
* update version back to 2.1.0-SNAPSHOT.
Modified: branches/RiftSaw-ODE-2.1.x/agents/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/agents/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/agents/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,6 +28,6 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
</project>
Modified: branches/RiftSaw-ODE-2.1.x/axis2/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/axis2/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/axis2/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/RiftSaw-ODE-2.1.x/axis2-war/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/axis2-war/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/axis2-war/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-api/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-api/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-api/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-api-jca/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-api-jca/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-api-jca/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-compiler/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-compiler/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-compiler/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-connector/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-connector/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-connector/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-dao/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-dao/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-dao/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-epr/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-epr/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-epr/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-obj/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-obj/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-obj/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-ql/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-ql/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-ql/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-runtime/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-runtime/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-runtime/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2010-07-01 12:23:19 UTC (rev 829)
@@ -31,6 +31,8 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import javax.wsdl.Operation;
+import javax.wsdl.PortType;
import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
@@ -320,7 +322,12 @@
}
}
if (target != null) {
- mex.setPortOp(target._plinkDef.myRolePortType, target._plinkDef.getMyRoleOperation(mex.getOperationName()));
+ PortType portType = target._plinkDef.myRolePortType;
+ Operation operation = target._plinkDef.getMyRoleOperation(mex.getOperationName());
+ if (operation == null) {
+ throw new BpelEngineException("Operation[" + mex.getOperationName() + "] could not be found on the portType [" + portType.getQName() + "]");
+ }
+ mex.setPortOp(portType, operation);
} else {
__log.warn("Couldn't find endpoint from service " + mex.getServiceName() + " when initializing a myRole mex.");
}
Modified: branches/RiftSaw-ODE-2.1.x/bpel-schemas/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-schemas/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-schemas/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-scripts/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-scripts/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-scripts/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,6 +28,6 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
</project>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-store/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-store/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-store/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-test/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-test/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/bpel-test/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/dao-hibernate/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/dao-hibernate/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/dao-hibernate/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/dao-hibernate-db/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/dao-hibernate-db/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/dao-hibernate-db/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/dao-jpa/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/dao-jpa/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa-db/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/dao-jpa-db/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/dao-jpa-db/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa-ojpa/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/dao-jpa-ojpa/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/dao-jpa-ojpa/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa-ojpa-derby/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/dao-jpa-ojpa-derby/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/dao-jpa-ojpa-derby/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/distro/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/distro/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/distro/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/RiftSaw-ODE-2.1.x/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.examples</groupId>
<artifactId>ping-pong-bundle</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>ODE :: examples :: Ping Pong OSGi </name>
<packaging>bundle</packaging>
Modified: branches/RiftSaw-ODE-2.1.x/jacob/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/jacob/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/jacob/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/jbi/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/jbi/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/jbi/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/RiftSaw-ODE-2.1.x/jbi-bundle/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/jbi-bundle/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/jbi-bundle/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -33,7 +33,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<build>
Modified: branches/RiftSaw-ODE-2.1.x/jbi-karaf/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/jbi-karaf/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/jbi-karaf/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>riftsaw-jbi-karaf</artifactId>
Modified: branches/RiftSaw-ODE-2.1.x/jca-ra/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/jca-ra/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/jca-ra/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/jca-server/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/jca-server/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/jca-server/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
<url>http://ode.apache.org</url>
<issueManagement>
<system>jira</system>
@@ -36,7 +36,7 @@
</prerequisites>
-->
<properties>
- <ode.version>2.1.0.CR2</ode.version>
+ <ode.version>2.1.0-SNAPSHOT</ode.version>
<activation.version>1.1</activation.version>
<annogen.version>0.1.0</annogen.version>
<antlr.version>2.7.7</antlr.version>
Modified: branches/RiftSaw-ODE-2.1.x/scheduler-simple/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/scheduler-simple/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/scheduler-simple/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/tools/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/tools/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/tools/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/RiftSaw-ODE-2.1.x/utils/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/utils/pom.xml 2010-07-01 12:20:39 UTC (rev 828)
+++ branches/RiftSaw-ODE-2.1.x/utils/pom.xml 2010-07-01 12:23:19 UTC (rev 829)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR2</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
13 years, 11 months
riftsaw SVN: r828 - trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-07-01 08:20:39 -0400 (Thu, 01 Jul 2010)
New Revision: 828
Modified:
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
Log:
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 2010-07-01 12:06:24 UTC (rev 827)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-01 12:20:39 UTC (rev 828)
@@ -234,6 +234,10 @@
// unregister
endpointMapping.remove(key);
+ if (log.isDebugEnabled()) {
+ log.debug("Undeployed web service with deploymentId="+deploymentId);
+ }
+
// remove physical artifacts
File warArchive = new File(ref.getArchiveLocation());
if(warArchive.exists())
13 years, 11 months
riftsaw SVN: r827 - branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-07-01 08:06:24 -0400 (Thu, 01 Jul 2010)
New Revision: 827
Modified:
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
Log:
Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-01 10:34:54 UTC (rev 826)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-01 12:06:24 UTC (rev 827)
@@ -233,6 +233,10 @@
// unregister
endpointMapping.remove(key);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Undeployed web service with deploymentId="+deploymentId);
+ }
// remove physical artifacts
File warArchive = new File(ref.getArchiveLocation());
13 years, 11 months
riftsaw SVN: r826 - in workspace/gbrown/RiftSaw-2.1.x-VersionedInterfaces/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime: ws and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-07-01 06:34:54 -0400 (Thu, 01 Jul 2010)
New Revision: 826
Modified:
workspace/gbrown/RiftSaw-2.1.x-VersionedInterfaces/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
workspace/gbrown/RiftSaw-2.1.x-VersionedInterfaces/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
Log:
Removes endpoint when activating another, so the interface now can change with the BPEL process.
Modified: workspace/gbrown/RiftSaw-2.1.x-VersionedInterfaces/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
===================================================================
--- workspace/gbrown/RiftSaw-2.1.x-VersionedInterfaces/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-07-01 09:54:10 UTC (rev 825)
+++ workspace/gbrown/RiftSaw-2.1.x-VersionedInterfaces/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-07-01 10:34:54 UTC (rev 826)
@@ -67,6 +67,7 @@
org.apache.ode.bpel.iapi.EndpointReference ref =
endpointManager.maintains(myRoleEndpoint.serviceName, myRoleEndpoint.portName);
+ /*
if(ref!=null)
{
// might happen when processes are retired.
@@ -76,6 +77,7 @@
}
else
{
+ */
WSDLReference wsdlReference = new WSDLHelper().createWSDLReference(engine, processId,
myRoleEndpoint.serviceName, myRoleEndpoint.portName);
@@ -96,7 +98,7 @@
{
throw new ContextException("Failed to activate endpoint", e);
}
- }
+ //}
return(ref);
}
Modified: workspace/gbrown/RiftSaw-2.1.x-VersionedInterfaces/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- workspace/gbrown/RiftSaw-2.1.x-VersionedInterfaces/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-01 09:54:10 UTC (rev 825)
+++ workspace/gbrown/RiftSaw-2.1.x-VersionedInterfaces/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-07-01 10:34:54 UTC (rev 826)
@@ -105,6 +105,10 @@
handlerFile = null;
}
+ // WebMetaData
+ URL serviceUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(), metaData.getPortName());
+ String[] webContext = deriveWebContextFromServiceUrl(serviceUrl);
+
// generate provider impl
WebServiceProviderFactory providerFactory = new WebServiceProviderFactory();
@@ -133,10 +137,6 @@
// Classloading
ClassLoaderFactory clf = new DelegatingClassLoaderFactory(classLoader);
- // WebMetaData
- URL serviceUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(), metaData.getPortName());
- String[] webContext = deriveWebContextFromServiceUrl(serviceUrl);
-
WebMetaDataFactory wmdFactory = new WebMetaDataFactory(
metaData.getEndpointId(), webContext[0], webContext[1], providerImpl.getClass().getName()
);
@@ -150,6 +150,15 @@
mutableAttachments.addAttachment(JBossWebMetaData.class, wmdFactory.createWebMetaData(classLoader));
mutableAttachments.addAttachment(DeploymentUnitFilter.class, new RiftsawWSDeploymentUnitFilter());
+
+ // Undeploy
+ try {
+ log.debug("Check if can remove existing service: "+metaData.getServiceName()+":"+metaData.getPortName());
+ removeEndpoint(metaData.getServiceName(), metaData.getPortName());
+ } catch(IllegalStateException ise) {
+ // Ignore for now - endpoint may not exist if first version
+ }
+
getMainDeployer().deploy(deployment);
ServiceEndpointReference ref = new ServiceEndpointReference(
@@ -233,6 +242,10 @@
// unregister
endpointMapping.remove(key);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Undeployed web service with deploymentId="+deploymentId);
+ }
// remove physical artifacts
File warArchive = new File(ref.getArchiveLocation());
13 years, 11 months
