Author: vanto
Date: Thu Nov 15 18:56:14 2012
New Revision: 1409927
URL: http://svn.apache.org/viewvc?rev=1409927&view=rev
Log:
ODE-980: Update to Java 6. Thanks to Hadrian for the patch!
Modified:
ode/trunk/Rakefile
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ProcessManagementTest.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
Modified: ode/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Thu Nov 15 18:56:14 2012
@@ -71,8 +71,8 @@ define "ode" do
project.version = VERSION_NUMBER
project.group = "org.apache.ode"
- compile.options.source = "1.5"
- compile.options.target = "1.5"
+ compile.options.source = "1.6"
+ compile.options.target = "1.6"
manifest["Implementation-Vendor"] = "Apache Software Foundation"
meta_inf << file("NOTICE")
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
Thu Nov 15 18:56:14 2012
@@ -194,7 +194,7 @@ public class ProcessAndInstanceManagemen
}
}
try {
- fillProcessInfoSummary(conn,
procInfoList.getProcessInfoList(), custom);
+ fillProcessInfoSummary(conn,
procInfoList.getProcessInfoArray(), custom);
} catch (Exception e) {
failIfSQLException(e);
__log.error("Exception fetching instances summary", e);
@@ -774,7 +774,7 @@ public class ProcessAndInstanceManagemen
if (pconf == null)
throw new ProcessNotFoundException("ProcessNotFound:" +
procid);
fillProcessInfo(pi, pconf, custom);
- fillProcessInfoSummary(conn, Collections.singletonList(pi),
custom);
+ fillProcessInfoSummary(conn, new TProcessInfo[]{pi}, custom);
} catch (ManagementException me) {
throw me;
} catch (Exception e) {
@@ -846,7 +846,7 @@ public class ProcessAndInstanceManagemen
return ret;
}
- private void fillProcessInfoSummary(BpelDAOConnection conn,
List<TProcessInfo> infos, ProcessInfoCustomizer custom) {
+ private void fillProcessInfoSummary(BpelDAOConnection conn, TProcessInfo[]
infos, ProcessInfoCustomizer custom) {
if (custom.includeInstanceSummary()) {
Set<String> pids = new HashSet<String>();
for (TProcessInfo i : infos) {
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java
Thu Nov 15 18:56:14 2012
@@ -21,9 +21,9 @@ package org.apache.ode.bpel.engine.cron;
import java.io.File;
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,6 +38,7 @@ import org.apache.ode.store.ProcessClean
import org.apache.ode.utils.CronExpression;
import org.apache.xmlbeans.XmlOptions;
+
public class SystemSchedulesConfig {
private final static Log __log =
LogFactory.getLog(SystemSchedulesConfig.class);
@@ -73,15 +74,15 @@ public class SystemSchedulesConfig {
List<CronJob> jobs = new ArrayList<CronJob>();
if( schedulesFile != null && schedulesFile.exists() ) {
- for(TSchedule schedule :
getSystemSchedulesDocument().getSchedules().getScheduleList()) {
+ for(TSchedule schedule :
getSystemSchedulesDocument().getSchedules().getScheduleArray()) {
CronJob job = new CronJob();
try {
job.setCronExpression(new
CronExpression(schedule.getWhen()));
- for(final TCleanup aCleanup : schedule.getCleanupList()) {
+ for(final TCleanup aCleanup : schedule.getCleanupArray()) {
CleanupInfo cleanupInfo = new CleanupInfo();
- assert !aCleanup.getFilterList().isEmpty();
- cleanupInfo.setFilters(aCleanup.getFilterList());
-
ProcessCleanupConfImpl.processACleanup(cleanupInfo.getCategories(),
aCleanup.getCategoryList());
+ assert aCleanup.getFilterArray().length > 0;
+
cleanupInfo.setFilters(Arrays.asList(aCleanup.getFilterArray()));
+
ProcessCleanupConfImpl.processACleanup(cleanupInfo.getCategories(),
Arrays.asList(aCleanup.getCategoryArray()));
JobDetails runnableDetails = new JobDetails();
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java
Thu Nov 15 18:56:14 2012
@@ -19,17 +19,15 @@
package org.apache.ode.bpel.engine.replayer;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import javax.xml.namespace.QName;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.dao.BpelDAOConnection;
@@ -41,25 +39,25 @@ import org.apache.ode.bpel.engine.BpelPr
import org.apache.ode.bpel.engine.MyRoleMessageExchangeImpl;
import org.apache.ode.bpel.engine.PartnerLinkMyRoleImpl;
import org.apache.ode.bpel.engine.PartnerLinkMyRoleImpl.RoutingInfo;
-import org.apache.ode.bpel.evt.CorrelationMatchEvent;
import org.apache.ode.bpel.iapi.BpelEngine;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
import org.apache.ode.bpel.iapi.MessageExchange.Status;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
import org.apache.ode.bpel.iapi.ProcessConf.CLEANUP_CATEGORY;
import org.apache.ode.bpel.iapi.Scheduler.JobDetails;
import org.apache.ode.bpel.iapi.Scheduler.JobType;
import org.apache.ode.bpel.pmapi.CommunicationType;
+import org.apache.ode.bpel.pmapi.CommunicationType.Exchange;
import org.apache.ode.bpel.pmapi.ExchangeType;
import org.apache.ode.bpel.pmapi.FaultType;
import org.apache.ode.bpel.pmapi.GetCommunication;
import org.apache.ode.bpel.pmapi.GetCommunicationResponse;
import org.apache.ode.bpel.pmapi.Replay;
-import org.apache.ode.bpel.pmapi.CommunicationType.Exchange;
import org.apache.ode.bpel.runtime.PROCESS;
import org.apache.xmlbeans.XmlCalendar;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
+
/**
* Main class used for replaying. It's invoked from InstanceManagement API.
* Receives request and sets up replaying contexts for each instance to replay.
@@ -87,13 +85,15 @@ public class Replayer {
List<Long> toDelete = new ArrayList<Long>();
List<CommunicationType> toRestore = new
ArrayList<CommunicationType>();
- toDelete.addAll(request.getReplaceInstanceList());
+ for (Long iid : request.getReplaceInstanceArray()) {
+ toDelete.add(iid);
+ }
- for (Long iid : request.getUpgradeInstanceList()) {
+ for (Long iid : request.getUpgradeInstanceArray()) {
toDelete.add(iid);
toRestore.add(CommunicationType.Factory.parse(getCommunication(iid,
conn).toString()));
}
- toRestore.addAll(request.getRestoreInstanceList());
+
toRestore.addAll(Arrays.asList(request.getRestoreInstanceArray()));
{
Set<CLEANUP_CATEGORY> cleanupCategory = new
HashSet<CLEANUP_CATEGORY>();
@@ -141,7 +141,7 @@ public class Replayer {
public GetCommunicationResponse getCommunication(GetCommunication request,
BpelDAOConnection conn) throws Exception {
GetCommunicationResponse response =
GetCommunicationResponse.Factory.newInstance();
- for (Long iid : request.getIidList()) {
+ for (Long iid : request.getIidArray()) {
response.addNewRestoreInstance().set(getCommunication(iid, conn));
}
return response;
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java
Thu Nov 15 18:56:14 2012
@@ -225,23 +225,21 @@ public class ReplayerContext {
replayerConfig = r;
- for (ServiceConfig s : r.getServiceConfigList()) {
+ for (ServiceConfig s : r.getServiceConfigArray()) {
servicesConfig.put(s.getService(), s);
}
- final List<Exchange> exchangeList = r.getExchangeList();
+ final Exchange[] exchanges = r.getExchangeArray();
- for (int i = 1; i < exchangeList.size(); i++) {
- Exchange e = exchangeList.get(i);
- // We skip failures, because INVOKE_CHECK job is not handled by
- // replayer
+ for (Exchange e : exchanges) {
+ // We skip failures, because INVOKE_CHECK job is not handled by
replayer
if (e.getType() == ExchangeType.P && !e.isSetFailure()) {
answers.add(e);
}
}
{
- final Exchange e = exchangeList.get(0);
+ final Exchange e = exchanges[0];
final Date time = e.getCreateTime().getTime();
scheduler.scheduleReplayerJob(new Callable<Void>() {
@@ -275,12 +273,11 @@ public class ReplayerContext {
}
}, true);
- for (int i = 1; i < exchangeList.size(); i++) {
- Exchange e2 = exchangeList.get(i);
- if (e2.getType() == ExchangeType.M) {
- MyRoleMessageExchangeImpl mex2 =
ReplayerBpelRuntimeContextImpl.createMyRoleMex(e2, bpelEngine);
+ for (Exchange e : exchanges) {
+ if (e.getType() == ExchangeType.M) {
+ MyRoleMessageExchangeImpl mex2 =
ReplayerBpelRuntimeContextImpl.createMyRoleMex(e, bpelEngine);
runtimeContext.updateMyRoleMex(mex2);
- scheduleInvoke(e2, mex2);
+ scheduleInvoke(e, mex2);
}
}
return null;
Modified:
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
(original)
+++
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
Thu Nov 15 18:56:14 2012
@@ -209,7 +209,7 @@ public class ActivityRecoveryTest extend
// Stay active, awaiting recovery.
TInstanceSummary summary =
_management.getProcessInfo(_processId).getProcessInfo().getInstanceSummary();
- for (TInstanceSummary.Instances instances :
summary.getInstancesList()) {
+ for (TInstanceSummary.Instances instances :
summary.getInstancesArray()) {
switch (instances.getState().intValue()) {
case TInstanceStatus.INT_COMPLETED:
assertTrue(instances.getCount() == 1);
@@ -446,7 +446,7 @@ public class ActivityRecoveryTest extend
} else
assertNull(activity.getFailure());
}
- for (TScopeRef ref : scope.getChildren().getChildRefList()) {
+ for (TScopeRef ref : scope.getChildren().getChildRefArray()) {
TScopeInfo child =
_management.getScopeInfoWithActivity(ref.getSiid(), true).getScopeInfo();
if (child != null)
getRecoveriesInScope(instance, child, recoveries);
Modified:
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ProcessManagementTest.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ProcessManagementTest.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ProcessManagementTest.java
(original)
+++
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ProcessManagementTest.java
Thu Nov 15 18:56:14 2012
@@ -43,52 +43,52 @@ public class ProcessManagementTest exten
public void testFilterProcessesByName() throws Exception {
- List<TProcessInfo> pilist =
_management.listProcesses(null,null).getProcessInfoList().getProcessInfoList();
- assertEquals(6,pilist.size());
+ TProcessInfo[] pilist =
_management.listProcesses(null,null).getProcessInfoList().getProcessInfoArray();
+ assertEquals(6,pilist.length);
- pilist =
_management.listProcesses("name=FailureInh*",null).getProcessInfoList().getProcessInfoList();
- assertEquals(1,pilist.size());
+ pilist =
_management.listProcesses("name=FailureInh*",null).getProcessInfoList().getProcessInfoArray();
+ assertEquals(1,pilist.length);
- pilist =
_management.listProcesses("name=FailureToRecovery*",null).getProcessInfoList().getProcessInfoList();
- assertEquals(1,pilist.size());
+ pilist =
_management.listProcesses("name=FailureToRecovery*",null).getProcessInfoList().getProcessInfoArray();
+ assertEquals(1,pilist.length);
- pilist =
_management.listProcesses("name=foobaz*",null).getProcessInfoList().getProcessInfoList();
- assertEquals(0,pilist.size());
+ pilist =
_management.listProcesses("name=foobaz*",null).getProcessInfoList().getProcessInfoArray();
+ assertEquals(0,pilist.length);
- pilist =
_management.listProcesses("namespace="+NAMESPACE,null).getProcessInfoList().getProcessInfoList();
- assertEquals(6,pilist.size());
+ pilist =
_management.listProcesses("namespace="+NAMESPACE,null).getProcessInfoList().getProcessInfoArray();
+ assertEquals(6,pilist.length);
- pilist =
_management.listProcesses("namespace=http:*",null).getProcessInfoList().getProcessInfoList();
- assertEquals(6,pilist.size());
+ pilist =
_management.listProcesses("namespace=http:*",null).getProcessInfoList().getProcessInfoArray();
+ assertEquals(6,pilist.length);
- pilist =
_management.listProcesses("namespace=foo:*",null).getProcessInfoList().getProcessInfoList();
- assertEquals(0,pilist.size());
+ pilist =
_management.listProcesses("namespace=foo:*",null).getProcessInfoList().getProcessInfoArray();
+ assertEquals(0,pilist.length);
}
public void testListProcessesOrder() {
- List<TProcessInfo> pilist =
-
_management.listProcesses(null,"name").getProcessInfoList().getProcessInfoList();
+ TProcessInfo[] pilist =
+
_management.listProcesses(null,"name").getProcessInfoList().getProcessInfoArray();
- for (int i = 1 ; i < pilist.size(); ++i) {
- QName qname = QName.valueOf(pilist.get(i).getPid());
- QName qnamePrev = QName.valueOf(pilist.get(i-1).getPid());
+ for (int i = 1 ; i < pilist.length; ++i) {
+ QName qname = QName.valueOf(pilist[i].getPid());
+ QName qnamePrev = QName.valueOf(pilist[i-1].getPid());
assertTrue(0<=qname.getLocalPart().compareTo(qnamePrev.getLocalPart()));
}
pilist =
-
_management.listProcesses(null,"-name").getProcessInfoList().getProcessInfoList();
+
_management.listProcesses(null,"-name").getProcessInfoList().getProcessInfoArray();
- for (int i = 1 ; i < pilist.size(); ++i) {
- QName qname = QName.valueOf(pilist.get(i).getPid());
- QName qnamePrev = QName.valueOf(pilist.get(i-1).getPid());
+ for (int i = 1 ; i < pilist.length; ++i) {
+ QName qname = QName.valueOf(pilist[i].getPid());
+ QName qnamePrev = QName.valueOf(pilist[i-1].getPid());
assertTrue(0>=qname.getLocalPart().compareTo(qnamePrev.getLocalPart()));
}
}
public void testListProcessCustom() {
- List<TProcessInfo> pilist =
- _management.listProcessesCustom(null,"name",
ProcessInfoCustomizer.ALL).getProcessInfoList().getProcessInfoList();
- assertEquals(6,pilist.size());
+ TProcessInfo[] pilist =
+ _management.listProcessesCustom(null,"name",
ProcessInfoCustomizer.ALL).getProcessInfoList().getProcessInfoArray();
+ assertEquals(6, pilist.length);
}
protected void setUp() throws Exception {
Modified:
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
(original)
+++
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
Thu Nov 15 18:56:14 2012
@@ -176,7 +176,7 @@ class DeploymentUnitDir {
_processes = processes;
HashMap<QName, Process> processInfo = new HashMap<QName,
TDeployment.Process>();
- for (TDeployment.Process p :
getDeploymentDescriptor().getDeploy().getProcessList()) {
+ for (TDeployment.Process p :
getDeploymentDescriptor().getDeploy().getProcessArray()) {
processInfo.put(p.getName(), p);
}
_processInfo = processInfo;
@@ -359,8 +359,7 @@ class DeploymentUnitDir {
}
private Map<String, Object> prepareCompileProperties(File bpelFile) {
- List<Process> plist =
getDeploymentDescriptor().getDeploy().getProcessList();
- for (Process process : plist) {
+ for (Process process :
getDeploymentDescriptor().getDeploy().getProcessArray()) {
if (process.getFileName() == null ||
"".equals(process.getFileName()))
continue;
@@ -382,8 +381,7 @@ class DeploymentUnitDir {
* @return file name of the WSDL, or null if none specified.
*/
private File findBpel11Wsdl(File bpelFile) {
- List<Process> plist =
getDeploymentDescriptor().getDeploy().getProcessList();
- for (Process process : plist) {
+ for (Process process :
getDeploymentDescriptor().getDeploy().getProcessArray()) {
if (process.getFileName() == null ||
"".equals(process.getFileName()))
continue;
if (!bpelFile.getName().equals(process.getFileName()))
Modified:
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java
(original)
+++
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java
Thu Nov 15 18:56:14 2012
@@ -19,6 +19,7 @@
package org.apache.ode.store;
+import java.util.Arrays;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
@@ -38,12 +39,12 @@ public class ProcessCleanupConfImpl {
// package default
ProcessCleanupConfImpl(TDeployment.Process pinfo) {
- for( TCleanup cleanup : pinfo.getCleanupList() ) {
+ for( TCleanup cleanup : pinfo.getCleanupArray() ) {
if( cleanup.getOn() == TCleanup.On.SUCCESS || cleanup.getOn() ==
TCleanup.On.ALWAYS ) {
- processACleanup(successCategories, cleanup.getCategoryList());
+ processACleanup(successCategories,
Arrays.asList(cleanup.getCategoryArray()));
}
if( cleanup.getOn() == TCleanup.On.FAILURE || cleanup.getOn() ==
TCleanup.On.ALWAYS ) {
- processACleanup(failureCategories, cleanup.getCategoryList());
+ processACleanup(failureCategories,
Arrays.asList(cleanup.getCategoryArray()));
}
}
Modified:
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
(original)
+++
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
Thu Nov 15 18:56:14 2012
@@ -163,15 +163,15 @@ public class ProcessConfImpl implements
private void initMexInterceptors() {
if (_pinfo.getMexInterceptors() != null) {
- for (TMexInterceptor mexInterceptor :
_pinfo.getMexInterceptors().getMexInterceptorList()) {
+ for (TMexInterceptor mexInterceptor :
_pinfo.getMexInterceptors().getMexInterceptorArray()) {
_mexi.add(mexInterceptor.getClassName());
}
}
}
private void initLinks() {
- if (_pinfo.getInvokeList() != null) {
- for (TInvoke invoke : _pinfo.getInvokeList()) {
+ if (_pinfo.getInvokeArray() != null) {
+ for (TInvoke invoke : _pinfo.getInvokeArray()) {
String plinkName = invoke.getPartnerLink();
TService service = invoke.getService();
// NOTE: service can be null for partner links
@@ -204,8 +204,8 @@ public class ProcessConfImpl implements
}
}
- if (_pinfo.getProvideList() != null) {
- for (TProvide provide : _pinfo.getProvideList()) {
+ if (_pinfo.getProvideArray() != null) {
+ for (TProvide provide : _pinfo.getProvideArray()) {
String plinkName = provide.getPartnerLink();
TService service = provide.getService();
if (service == null) {
@@ -424,20 +424,19 @@ public class ProcessConfImpl implements
}
// Events filtered at the process level
- if (processEvents.getEnableEventList() != null &&
!processEvents.getEnableEventList().isEmpty()) {
- List<String> enabled = processEvents.getEnableEventList();
+ if (processEvents.getEnableEventArray() != null &&
processEvents.getEnableEventArray().length > 0) {
HashSet<BpelEvent.TYPE> evtSet = new HashSet<BpelEvent.TYPE>();
- for (String enEvt : enabled) {
+ for (String enEvt : processEvents.getEnableEventArray()) {
evtSet.add(BpelEvent.TYPE.valueOf(enEvt));
}
_events.put(null, evtSet);
}
// Events filtered at the scope level
- if (processEvents.getScopeEventsList() != null) {
- for (TScopeEvents tScopeEvents :
processEvents.getScopeEventsList()) {
+ if (processEvents.getScopeEventsArray() != null) {
+ for (TScopeEvents tScopeEvents :
processEvents.getScopeEventsArray()) {
HashSet<BpelEvent.TYPE> evtSet = new HashSet<BpelEvent.TYPE>();
- for (String enEvt : tScopeEvents.getEnableEventList()) {
+ for (String enEvt : tScopeEvents.getEnableEventArray()) {
evtSet.add(BpelEvent.TYPE.valueOf(enEvt));
}
_events.put(tScopeEvents.getName(), evtSet);
@@ -534,9 +533,9 @@ public class ProcessConfImpl implements
}
private void initSchedules() {
- for(TSchedule schedule : _pinfo.getScheduleList()) {
- for(TCleanup cleanup : schedule.getCleanupList()) {
- assert !cleanup.getFilterList().isEmpty();
+ for(TSchedule schedule : _pinfo.getScheduleArray()) {
+ for(TCleanup cleanup : schedule.getCleanupArray()) {
+ assert cleanup.getFilterArray().length > 0;
}
}
}
@@ -544,15 +543,15 @@ public class ProcessConfImpl implements
public List<CronJob> getCronJobs() {
List<CronJob> jobs = new ArrayList<CronJob>();
- for(TSchedule schedule : _pinfo.getScheduleList()) {
+ for(TSchedule schedule : _pinfo.getScheduleArray()) {
CronJob job = new CronJob();
try {
job.setCronExpression(new CronExpression(schedule.getWhen()));
- for(final TCleanup aCleanup : schedule.getCleanupList()) {
+ for(final TCleanup aCleanup : schedule.getCleanupArray()) {
CleanupInfo cleanupInfo = new CleanupInfo();
- assert !aCleanup.getFilterList().isEmpty();
- cleanupInfo.setFilters(aCleanup.getFilterList());
-
ProcessCleanupConfImpl.processACleanup(cleanupInfo.getCategories(),
aCleanup.getCategoryList());
+ assert aCleanup.getFilterArray().length > 0;
+
cleanupInfo.setFilters(Arrays.asList(aCleanup.getFilterArray()));
+
ProcessCleanupConfImpl.processACleanup(cleanupInfo.getCategories(),
Arrays.asList(aCleanup.getCategoryArray()));
JobDetails runnableDetails = new JobDetails();
runnableDetails.getDetailsExt().put("cleanupInfo",
cleanupInfo);
Modified:
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
(original)
+++
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Thu Nov 15 18:56:14 2012
@@ -224,7 +224,7 @@ public class ProcessStoreImpl implements
retirePreviousPackageVersions(du);
- for (TDeployment.Process processDD :
dd.getDeploy().getProcessList()) {
+ for (TDeployment.Process processDD :
dd.getDeploy().getProcessArray()) {
QName pid = toPid(processDD.getName(), version);
if (_processes.containsKey(pid)) {
@@ -641,18 +641,16 @@ public class ProcessStoreImpl implements
ret.put(new QName(key), doc.getDocumentElement());
}
- if (dd.getPropertyList().size() > 0) {
- for (TDeployment.Process.Property property : dd.getPropertyList())
{
- Element elmtContent =
DOMUtils.getElementContent(property.getDomNode());
- if (elmtContent != null) {
- // We'll need DOM Level 3
- Document doc = DOMUtils.newDocument();
- doc.appendChild(doc.importNode(elmtContent, true));
- ret.put(property.getName(), doc.getDocumentElement());
- } else
- ret.put(property.getName(),
property.getDomNode().getFirstChild());
+ for (TDeployment.Process.Property property : dd.getPropertyArray()) {
+ Element elmtContent =
DOMUtils.getElementContent(property.getDomNode());
+ if (elmtContent != null) {
+ // We'll need DOM Level 3
+ Document doc = DOMUtils.newDocument();
+ doc.appendChild(doc.importNode(elmtContent, true));
+ ret.put(property.getName(), doc.getDocumentElement());
+ } else
+ ret.put(property.getName(),
property.getDomNode().getFirstChild());
- }
}
return ret;
}
Modified:
ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
(original)
+++
ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
Thu Nov 15 18:56:14 2012
@@ -19,6 +19,7 @@
package org.apache.ode.karaf.commands;
+import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -98,7 +99,7 @@ public abstract class OdeCommandsBase ex
new String[] {String.class.getName(), String.class.getName(),
int.class.getName()},
timeoutInSeconds);
if (instances != null) {
- return instances.getInstanceInfoList().getInstanceInfoList();
+ return
Arrays.asList(instances.getInstanceInfoList().getInstanceInfoArray());
}
return null;
}
@@ -108,7 +109,7 @@ public abstract class OdeCommandsBase ex
InstanceInfoListDocument instances = invoke(LIST_ALL_INSTANCES, null,
null, timeoutInSeconds);
if (instances != null) {
- return instances.getInstanceInfoList().getInstanceInfoList();
+ return
Arrays.asList(instances.getInstanceInfoList().getInstanceInfoArray());
}
return null;
}
@@ -117,7 +118,7 @@ public abstract class OdeCommandsBase ex
throws Exception {
ProcessInfoListDocument result = invoke(LIST_ALL_PROCESSES, null,
null, timeoutInSeconds);
if (result != null) {
- return result.getProcessInfoList().getProcessInfoList();
+ return
Arrays.asList(result.getProcessInfoList().getProcessInfoArray());
}
return null;
}
Modified:
ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java?rev=1409927&r1=1409926&r2=1409927&view=diff
==============================================================================
---
ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
(original)
+++
ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
Thu Nov 15 18:56:14 2012
@@ -139,7 +139,7 @@ public class OdeListCommand extends OdeC
private void collectFailedActivities(TScopeInfo scopeInfo,
List<TActivityInfo> bin) {
Activities acts = scopeInfo.getActivities();
if (acts != null) {
- for (TActivityInfo actInfo : acts.getActivityInfoList()) {
+ for (TActivityInfo actInfo : acts.getActivityInfoArray()) {
if (actInfo.getStatus() == TActivityStatus.FAILURE) {
bin.add(actInfo);
}
@@ -147,7 +147,7 @@ public class OdeListCommand extends OdeC
}
TScopeInfo.Children children = scopeInfo.getChildren();
if (children != null) {
- for (TScopeRef child : children.getChildRefList()) {
+ for (TScopeRef child : children.getChildRefArray()) {
TScopeInfo childScopeInfo = getScopeInfo(child);
if (childScopeInfo != null) {
collectFailedActivities(childScopeInfo, bin);
