riftsaw SVN: r1101 - tags.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-11-09 16:32:00 -0500 (Tue, 09 Nov 2010)
New Revision: 1101
Added:
tags/RiftSaw-2.2.0.CR1/
Log:
RiftSaw artifacts for 2.2.0.CR1 release
Copied: tags/RiftSaw-2.2.0.CR1 (from rev 1100, branches/RiftSaw-2.2.x)
14 years, 11 months
riftsaw SVN: r1100 - tags.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-11-09 16:30:13 -0500 (Tue, 09 Nov 2010)
New Revision: 1100
Added:
tags/RiftSaw-ODE-2.2.0.CR1/
Log:
RiftSaw-ODE artifacts for 2.2.0.CR1 release.
Copied: tags/RiftSaw-ODE-2.2.0.CR1 (from rev 1099, branches/RiftSaw-ODE-2.2.x)
14 years, 11 months
riftsaw SVN: r1099 - branches.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-11-09 16:25:27 -0500 (Tue, 09 Nov 2010)
New Revision: 1099
Added:
branches/RiftSaw-2.2.x/
Log:
Branch for RiftSaw 2.2.x
Copied: branches/RiftSaw-2.2.x (from rev 1098, trunk)
14 years, 11 months
riftsaw SVN: r1098 - branches.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-11-09 16:22:59 -0500 (Tue, 09 Nov 2010)
New Revision: 1098
Added:
branches/RiftSaw-ODE-2.2.x/
Log:
Branch for RiftSaw-ODE 2.2.x
Copied: branches/RiftSaw-ODE-2.2.x (from rev 1097, branches/ODE/RiftSaw-ODE-trunk)
14 years, 11 months
riftsaw SVN: r1097 - trunk.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-11-09 16:19:11 -0500 (Tue, 09 Nov 2010)
New Revision: 1097
Modified:
trunk/pom.xml
Log:
Remove the staging repository.
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-09 19:14:46 UTC (rev 1096)
+++ trunk/pom.xml 2010-11-09 21:19:11 UTC (rev 1097)
@@ -467,12 +467,6 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
-
- <repository>
- <id>riftsaw-ode-2.2.0.CR1</id>
- <name>riftsaw-ode 2.2.0.CR1</name>
- <url>https://repository.jboss.org/nexus/content/repositories/jboss_release_sta...</url>
- </repository>
</repositories>
14 years, 11 months
riftsaw SVN: r1096 - in trunk: distribution/src/main/release and 2 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-11-09 14:14:46 -0500 (Tue, 09 Nov 2010)
New Revision: 1096
Modified:
trunk/distribution/src/main/release/ReleaseNotes.txt
trunk/integration-tests/pom.xml
trunk/pom.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
Log:
Backing out changes related to RIFTSAW-238, which is causing npe, details logged under RIFTSAW-316.
Modified: trunk/distribution/src/main/release/ReleaseNotes.txt
===================================================================
--- trunk/distribution/src/main/release/ReleaseNotes.txt 2010-11-09 19:03:12 UTC (rev 1095)
+++ trunk/distribution/src/main/release/ReleaseNotes.txt 2010-11-09 19:14:46 UTC (rev 1096)
@@ -23,6 +23,7 @@
Know issues:
1. RIFTSAW-198 : CronScheduler is not supporting cluster
2. RIFTSAW-316 : exception when WSDL service has multiple ports
+3. RIFTSAW-238 : Undeploying active process unpublishes webservice, even when retired processes still exist with active instances
RiftSaw 2.2.0.M1
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2010-11-09 19:03:12 UTC (rev 1095)
+++ trunk/integration-tests/pom.xml 2010-11-09 19:14:46 UTC (rev 1096)
@@ -591,7 +591,6 @@
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude>
-<exclude>org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java</exclude>
</excludes>
</configuration>
<executions>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-09 19:03:12 UTC (rev 1095)
+++ trunk/pom.xml 2010-11-09 19:14:46 UTC (rev 1096)
@@ -471,7 +471,7 @@
<repository>
<id>riftsaw-ode-2.2.0.CR1</id>
<name>riftsaw-ode 2.2.0.CR1</name>
- <url>https://repository.jboss.org/nexus/content/repositories/jboss_release_sta...</url>
+ <url>https://repository.jboss.org/nexus/content/repositories/jboss_release_sta...</url>
</repository>
</repositories>
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-11-09 19:03:12 UTC (rev 1095)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-11-09 19:14:46 UTC (rev 1096)
@@ -648,12 +648,7 @@
break;
case DISABLED:
case UNDEPLOYED:
- List<String> retireProcess = _store.getPreviousPackageVersions(pse.deploymentUnit);
- boolean deactivateEndpoints = true;
- if (retireProcess.size() > 0) {
- deactivateEndpoints = false;
- }
- _bpelServer.unregister(pse.pid, deactivateEndpoints);
+ _bpelServer.unregister(pse.pid);
if (pconf != null) {
_bpelServer.cleanupProcess(pconf);
}
14 years, 11 months
riftsaw SVN: r1095 - in branches/ODE/RiftSaw-ODE-trunk: bpel-runtime/src/main/java/org/apache/ode/bpel/engine and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-11-09 14:03:12 -0500 (Tue, 09 Nov 2010)
New Revision: 1095
Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/BpelServer.java
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
branches/ODE/RiftSaw-ODE-trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Log:
Backing out changes related to RIFTSAW-238, which is causing npe, details logged under RIFTSAW-316.
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/BpelServer.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/BpelServer.java 2010-11-08 12:23:11 UTC (rev 1094)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/BpelServer.java 2010-11-09 19:03:12 UTC (rev 1095)
@@ -116,8 +116,6 @@
* @throws BpelEngineException
*/
void unregister(QName pid) throws BpelEngineException;
-
- void unregister(QName pid, boolean deactivateEndpoints) throws BpelEngineException;
void cleanupProcess(ProcessConf conf) throws BpelEngineException;
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java 2010-11-08 12:23:11 UTC (rev 1094)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java 2010-11-09 19:03:12 UTC (rev 1095)
@@ -272,11 +272,7 @@
.getInitialMyRoleEPR(plink) : null, process.getPartnerRoleChannel(plink));
}
- public BpelProcess unregister1Process(QName process) {
- return unregisterProcess(process, true);
- }
-
- public BpelProcess unregisterProcess(QName process, boolean needToDeactivate) {
+ BpelProcess unregisterProcess(QName process) {
BpelProcess p = _activeProcesses.remove(process);
__log.debug("Unregister process: serviceId=" + process + ", process=" + p);
if (p != null) {
@@ -293,11 +289,9 @@
}
}
}
-
- if (needToDeactivate) {
- // unregister the services provided by the process
- p.deactivate();
- }
+
+ // unregister the services provided by the process
+ p.deactivate();
// release the resources held by this process
p.dehydrate();
// update the process footprints list
@@ -318,14 +312,18 @@
* Register a process with the engine.
* @param process the process to register
*/
- public void registerProcess(BpelProcess process) {
+ void registerProcess(BpelProcess process) {
_activeProcesses.put(process.getPID(), process);
for (Endpoint e : process.getServiceNames()) {
__log.debug("Register process: serviceId=" + e + ", process=" + process);
List<BpelProcess> processes = _serviceMap.get(e.serviceName);
if (processes == null) {
processes = new ArrayList<BpelProcess>();
- _serviceMap.put(e.serviceName, processes);
+ // https://jira.jboss.org/browse/RIFTSAW-155
+ // this is the "incomplete.patch" from
+ // https://issues.apache.org/jira/browse/ODE-697
+ if (process.getConf().getState() == ProcessState.ACTIVE)
+ _serviceMap.put(e.serviceName, processes);
}
// Remove any older version of the process from the list
Iterator<BpelProcess> processesIter = processes.iterator();
@@ -340,14 +338,18 @@
process.deactivate();
return;
} else {
- __log.debug("deactivating the older version.");
+ __log.debug("removing cached older version");
+ processesIter.remove();
cachedVersion.deactivate();
}
}
}
-
- processes.add(process);
+ // https://jira.jboss.org/browse/RIFTSAW-155
+ // this is the "incomplete.patch" from
+ // https://issues.apache.org/jira/browse/ODE-697
+ if (process.getConf().getState() == ProcessState.ACTIVE)
+ processes.add(process);
}
process.activate(this);
}
@@ -737,7 +739,7 @@
}
}
faultQName = constants.qnRetiredProcess;
- faultDetail.setTextContent("The process you are trying to instantiate has been retired. Retired process can not take any new instance creation.");
+ faultDetail.setTextContent("The process you're trying to instantiate has been retired.");
break;
case InvalidProcessException.DEFAULT_CAUSE_CODE:
default:
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2010-11-08 12:23:11 UTC (rev 1094)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2010-11-09 19:03:12 UTC (rev 1095)
@@ -627,22 +627,27 @@
}
void deactivate() {
- // Deactivate all the my-role endpoints.
- for (Endpoint endpoint : _myEprs.keySet()) {
- // Deactivate the EPR only if there are no more references
- // to this endpoint from any (active) BPEL process.
- if (isShareable(endpoint)) {
- if(__log.isDebugEnabled()) __log.debug("deactivating shared endpoint " + endpoint+ " for pid "+ _pid);
- if (!_sharedEps.decrementReferenceCount(endpoint)) {
+ // the BindingContext contains only the endpoints for the latest process version
+ if (org.apache.ode.bpel.iapi.ProcessState.ACTIVE.equals(_pconf.getState())) {
+ // Deactivate all the my-role endpoints.
+ for (Endpoint endpoint : _myEprs.keySet()) {
+ // Deactivate the EPR only if there are no more references
+ // to this endpoint from any (active) BPEL process.
+ if (isShareable(endpoint)) {
+ if(__log.isDebugEnabled()) __log.debug("deactivating shared endpoint " + endpoint+ " for pid "+ _pid);
+ if (!_sharedEps.decrementReferenceCount(endpoint)) {
+ _engine._contexts.bindingContext.deactivateMyRoleEndpoint(endpoint);
+ _sharedEps.removeEndpoint(endpoint);
+ }
+ } else {
+ if(__log.isDebugEnabled()) __log.debug("deactivating non-shared endpoint " + endpoint + " for pid "+ _pid);
_engine._contexts.bindingContext.deactivateMyRoleEndpoint(endpoint);
- _sharedEps.removeEndpoint(endpoint);
}
- } else {
- if(__log.isDebugEnabled()) __log.debug("deactivating non-shared endpoint " + endpoint + " for pid "+ _pid);
- _engine._contexts.bindingContext.deactivateMyRoleEndpoint(endpoint);
}
+ // TODO Deactivate all the partner-role channels
+ } else {
+ if(__log.isDebugEnabled()) __log.debug("pid "+_pid+" is not ACTIVE, no endpoints to deactivate");
}
- // TODO Deactivate all the partner-role channels
}
private boolean isShareable(Endpoint endpoint) {
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java 2010-11-08 12:23:11 UTC (rev 1094)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java 2010-11-09 19:03:12 UTC (rev 1095)
@@ -347,12 +347,7 @@
return new BpelProcess(conf);
}
-
public void unregister(QName pid) throws BpelEngineException {
- unregister(pid, true);
- }
-
- public void unregister(QName pid, boolean deactiveEndpoints) throws BpelEngineException {
if (__log.isTraceEnabled())
__log.trace("unregister: " + pid);
@@ -366,7 +361,7 @@
try {
BpelProcess p = null;
if (_engine != null) {
- p = _engine.unregisterProcess(pid, deactiveEndpoints);
+ p = _engine.unregisterProcess(pid);
if (p != null)
{
_registeredProcesses.remove(p);
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java 2010-11-08 12:23:11 UTC (rev 1094)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java 2010-11-09 19:03:12 UTC (rev 1095)
@@ -338,35 +338,23 @@
// is different from ODE.
protected void retirePreviousPackageVersions(DeploymentUnitDir du) {
//retire all the other versions of the same DU
- List<String> deployedDUnames = getPreviousPackageVersions(du.getName());
-
- for (String deployedDuname : deployedDUnames) {
- setRetiredPackage(deployedDuname, true);
+ String[] nameParts = du.getName().split("/");
+ /* Replace the version number (if any) with regexp to match any version number */
+ nameParts[0] = nameParts[0].replaceAll("([-\\Q.\\E](\\d)+)?\\z", "");
+ nameParts[0] += "([-\\Q.\\E](\\d)+)?";
+ StringBuilder duNameRegExp = new StringBuilder(du.getName().length() * 2);
+ for (int i = 0, n = nameParts.length; i < n; i++) {
+ if (i > 0) duNameRegExp.append("/");
+ duNameRegExp.append(nameParts[i]);
}
- }
-
- public List<String> getPreviousPackageVersions(String duName) {
- List<String> duNames = new ArrayList<String>();
-
- String[] nameParts = duName.split("/");
- /* Replace the version number (if any) with regexp to match any version number */
- nameParts[0] = nameParts[0].replaceAll("([-\\Q.\\E](\\d)+)?\\z", "");
- nameParts[0] += "([-\\Q.\\E](\\d)+)?";
- StringBuilder duNameRegExp = new StringBuilder(duName.length() * 2);
- for (int i = 0, n = nameParts.length; i < n; i++) {
- if (i > 0) duNameRegExp.append("/");
- duNameRegExp.append(nameParts[i]);
- }
-
Pattern duNamePattern = Pattern.compile(duNameRegExp.toString());
for (String deployedDUname : _deploymentUnits.keySet()) {
Matcher matcher = duNamePattern.matcher(deployedDUname);
if (matcher.matches()) {
- duNames.add(deployedDUname);
+ setRetiredPackage(deployedDUname, true);
}
}
- return duNames;
}
public Collection<QName> undeploy(final File dir) {
@@ -402,7 +390,6 @@
}
_processes.keySet().removeAll(undeployed);
-
} finally {
_rw.writeLock().unlock();
}
14 years, 11 months
riftsaw SVN: r1094 - trunk/integration-tests.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-11-08 07:23:11 -0500 (Mon, 08 Nov 2010)
New Revision: 1094
Modified:
trunk/integration-tests/pom.xml
Log:
* comment the riftsaw-296.
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2010-11-08 12:00:04 UTC (rev 1093)
+++ trunk/integration-tests/pom.xml 2010-11-08 12:23:11 UTC (rev 1094)
@@ -591,6 +591,7 @@
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude>
+<exclude>org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java</exclude>
</excludes>
</configuration>
<executions>
14 years, 11 months
