You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2010/05/27 20:10:26 UTC
svn commit: r948937 [22/33] - in /ode/trunk: ./
agents/src/main/java/org/apache/ode/agents/memory/ axis2-war/
axis2-war/src/main/assembly/ axis2-war/src/main/webapp/
axis2-war/src/main/webapp/WEB-INF/
axis2-war/src/main/webapp/WEB-INF/classes/ axis2-wa...
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData4-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData4-2.0.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData4-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData4-2.0.bpel Thu May 27 18:09:53 2010
@@ -31,11 +31,11 @@ bpws:getVariableData(varname, partname,q
xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:test="uri:testing">
-
+
<import importType="http://schemas.xmlsoap.org/wsdl/"
location="../test.wsdl"
namespace="uri:testing" />
-
+
<partnerLinks>
<partnerLink name="testPartnerLink"
partnerLinkType="test:PartnerLinkType1"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableProperty1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableProperty1-2.0.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableProperty1-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableProperty1-2.0.bpel Thu May 27 18:09:53 2010
@@ -28,11 +28,11 @@ bpws:getVariableProperty Test Case
xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:test="uri:testing">
-
+
<import importType="http://schemas.xmlsoap.org/wsdl/"
location="../test.wsdl"
namespace="uri:testing" />
-
+
<partnerLinks>
<partnerLink name="testPartnerLink"
partnerLinkType="test:PartnerLinkType1"
Modified: ode/trunk/bpel-store/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/pom.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/pom.xml (original)
+++ ode/trunk/bpel-store/pom.xml Thu May 27 18:09:53 2010
@@ -205,7 +205,7 @@
<goals>
<goal>xdoclet</goal>
</goals>
-
+
<configuration>
<tasks>
<hibernatedoclet excludedTags="@version,@author,@todo" verbose="true"
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnectionFactory.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnectionFactory.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnectionFactory.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnectionFactory.java Thu May 27 18:09:53 2010
@@ -19,7 +19,7 @@
package org.apache.ode.store;
/**
- * Connection factory for DB store.
+ * Connection factory for DB store.
* @author mszefler
*/
public interface ConfStoreConnectionFactory extends ProcessStoreTransactionProvider {
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java Thu May 27 18:09:53 2010
@@ -25,7 +25,7 @@ import java.util.Date;
/**
* DAO interface for a "deployment unit", a collection of processes deployed as a single
* unit.
- *
+ *
* @author mszefler
*
*/
@@ -36,16 +36,16 @@ public interface DeploymentUnitDAO {
* @return du name
*/
String getName();
-
+
/**
- * Get the deployment unit directory path.
+ * Get the deployment unit directory path.
* @return deployment unit directory path
*/
String getDeploymentUnitDir();
-
-
+
+
void setDeploymentUnitDir(String dir);
-
+
/**
* Get the collection of processes that are deployed as part of this deployment unit.
* @return
@@ -64,7 +64,7 @@ public interface DeploymentUnitDAO {
*/
String getDeployer();
-
+
/**
* Delete this deployment unit (deletes all the children).
*/
@@ -73,5 +73,5 @@ public interface DeploymentUnitDAO {
ProcessConfDAO createProcess(QName pid, QName type, long version);
ProcessConfDAO getProcess(QName pid);
-
+
}
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=948937&r1=948936&r2=948937&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 May 27 18:09:53 2010
@@ -165,7 +165,7 @@ class DeploymentUnitDir {
throw new IllegalArgumentException("Directory " + _duDirectory.getName() + " does not contain any process!");
for (File bpel : bpels) {
String b = bpel.getAbsolutePath();
- File cbp = new File(b.substring(0,b.lastIndexOf(".bpel")) + ".cbp");
+ File cbp = new File(b.substring(0,b.lastIndexOf(".bpel")) + ".cbp");
if (!cbp.exists()) {
__log.debug("compiling " + bpel);
compile(bpel);
@@ -408,7 +408,7 @@ class DeploymentUnitDir {
public long getVersion() {
return _version;
}
-
+
/**
* @return Static DU version number generated from DU name. -1 when package doesn't use versioning.
*/
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java Thu May 27 18:09:53 2010
@@ -35,7 +35,7 @@ public class DocumentRegistry {
private final ArrayList<Definition4BPEL> _definitions = new ArrayList<Definition4BPEL>();
-
+
/**
* Obtains an WSDL definition based on its target namespace.
*
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java Thu May 27 18:09:53 2010
@@ -208,5 +208,5 @@ public class Messages extends MessageBun
return format("Deploy failed; BPEL compilation errors." );
}
}
-
+
}
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=948937&r1=948936&r2=948937&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 May 27 18:09:53 2010
@@ -32,10 +32,10 @@ import org.apache.ode.bpel.iapi.ProcessC
public class ProcessCleanupConfImpl {
protected static Log __log = LogFactory.getLog(ProcessCleanupConfImpl.class);
-
+
private final Set<CLEANUP_CATEGORY> successCategories = EnumSet.noneOf(CLEANUP_CATEGORY.class);
private final Set<CLEANUP_CATEGORY> failureCategories = EnumSet.noneOf(CLEANUP_CATEGORY.class);
-
+
// package default
ProcessCleanupConfImpl(TDeployment.Process pinfo) {
for( TCleanup cleanup : pinfo.getCleanupList() ) {
@@ -46,7 +46,7 @@ public class ProcessCleanupConfImpl {
processACleanup(failureCategories, cleanup.getCategoryList());
}
}
-
+
// validate configurations
Set<CLEANUP_CATEGORY> categories = getCleanupCategories(true);
if( categories.contains(CLEANUP_CATEGORY.INSTANCE) && !categories.containsAll(EnumSet.of(CLEANUP_CATEGORY.CORRELATIONS, CLEANUP_CATEGORY.VARIABLES))) {
@@ -73,7 +73,7 @@ public class ProcessCleanupConfImpl {
}
}
}
-
+
// package default
boolean isCleanupCategoryEnabled(boolean instanceSucceeded, CLEANUP_CATEGORY category) {
if( instanceSucceeded ) {
@@ -82,7 +82,7 @@ public class ProcessCleanupConfImpl {
return failureCategories.contains(category);
}
}
-
+
// package default
Set<CLEANUP_CATEGORY> getCleanupCategories(boolean instanceSucceeded) {
return instanceSucceeded ? successCategories : failureCategories;
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java Thu May 27 18:09:53 2010
@@ -24,11 +24,11 @@ import javax.xml.namespace.QName;
import java.util.Collection;
/**
- * DAO interface for a process configuration.
+ * DAO interface for a process configuration.
* @author mriou <mriou at apache dot org>
*/
public interface ProcessConfDAO {
-
+
QName getPID();
QName getType();
@@ -36,7 +36,7 @@ public interface ProcessConfDAO {
long getVersion();
DeploymentUnitDAO getDeploymentUnit();
-
+
ProcessState getState();
void setState(ProcessState state);
@@ -44,8 +44,8 @@ public interface ProcessConfDAO {
void setProperty(QName name, String content);
String getProperty(QName name);
-
+
Collection<QName> getPropertyNames();
-
+
void delete();
}
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=948937&r1=948936&r2=948937&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 May 27 18:09:53 2010
@@ -106,7 +106,7 @@ public class ProcessConfImpl implements
private EndpointReferenceContext eprContext;
private final ProcessCleanupConfImpl processCleanupConfImpl;
-
+
private final boolean generateProcessEventsAll;
ProcessConfImpl(QName pid, QName type, long version, DeploymentUnitDir du, TDeployment.Process pinfo, Date deployDate,
@@ -131,7 +131,7 @@ public class ProcessConfImpl implements
initEventList();
processCleanupConfImpl = new ProcessCleanupConfImpl(pinfo);
-
+
initSchedules();
}
@@ -180,10 +180,10 @@ public class ProcessConfImpl implements
__log.debug("Processing <invoke> element for process " + _pinfo.getName() + ": partnerlink " + plinkName + " --> "
+ service);
_partnerRoleInitialValues.put(plinkName, new Endpoint(service.getName(), service.getPort()));
-
+
{
OFailureHandling g = null;
-
+
if (invoke.isSetFailureHandling()) {
FailureHandling f = invoke.getFailureHandling();
g = new OFailureHandling();
@@ -191,7 +191,7 @@ public class ProcessConfImpl implements
if (f.isSetRetryDelay()) g.retryDelay = f.getRetryDelay();
if (f.isSetRetryFor()) g.retryFor = f.getRetryFor();
}
-
+
PartnerRoleConfig c = new PartnerRoleConfig(g, invoke.getUsePeer2Peer());
__log.debug("PartnerRoleConfig for " + plinkName + " " + c.failureHandling + " usePeer2Peer: " + c.usePeer2Peer);
_partnerRoleConfig.put(plinkName, c);
@@ -269,7 +269,7 @@ public class ProcessConfImpl implements
throw new ContextException("CBP record not found for type " + getType());
return cbpInfo.cbp.length();
}
-
+
public String getBpelDocument() {
CBPInfo cbpInfo = _du.getCBPInfo(getType());
if (cbpInfo == null)
@@ -525,7 +525,7 @@ public class ProcessConfImpl implements
public Set<CLEANUP_CATEGORY> getCleanupCategories(boolean instanceSucceeded) {
return processCleanupConfImpl.getCleanupCategories(instanceSucceeded);
}
-
+
private void initSchedules() {
for(TSchedule schedule : _pinfo.getScheduleList()) {
for(TCleanup cleanup : schedule.getCleanupList()) {
@@ -533,10 +533,10 @@ public class ProcessConfImpl implements
}
}
}
-
+
public List<CronJob> getCronJobs() {
List<CronJob> jobs = new ArrayList<CronJob>();
-
+
for(TSchedule schedule : _pinfo.getScheduleList()) {
CronJob job = new CronJob();
try {
@@ -546,7 +546,7 @@ public class ProcessConfImpl implements
assert !aCleanup.getFilterList().isEmpty();
cleanupInfo.setFilters(aCleanup.getFilterList());
ProcessCleanupConfImpl.processACleanup(cleanupInfo.getCategories(), aCleanup.getCategoryList());
-
+
JobDetails runnableDetails = new JobDetails();
runnableDetails.getDetailsExt().put("cleanupInfo", cleanupInfo);
runnableDetails.getDetailsExt().put("pid", _pid);
@@ -558,7 +558,7 @@ public class ProcessConfImpl implements
__log.error("Exception during parsing the schedule cron expression: " + schedule.getWhen() + ", skipped the scheduled job.", pe);
}
}
-
+
return jobs;
}
}
\ No newline at end of file
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=948937&r1=948936&r2=948937&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 May 27 18:09:53 2010
@@ -81,7 +81,7 @@ public class ProcessStoreImpl implements
private ConfStoreConnectionFactory _cf;
private EndpointReferenceContext eprContext;
-
+
private boolean generateProcessEventsAll;
protected File _deployDir;
@@ -182,7 +182,7 @@ public class ProcessStoreImpl implements
// Override the package name if given from the parameter
du.setName(duName);
}
-
+
long version;
if (autoincrementVersion || du.getStaticVersion() == -1) {
// Process and DU use a monotonically increased single version number by default.
@@ -195,7 +195,7 @@ public class ProcessStoreImpl implements
version = du.getStaticVersion();
}
du.setVersion(version);
-
+
try {
du.compile();
} catch (CompilationException ce) {
@@ -298,7 +298,7 @@ public class ProcessStoreImpl implements
}
});
-
+
// We want the events to be fired outside of the bounds of the writelock.
try {
for (ProcessConfImpl process : processes) {
@@ -373,12 +373,12 @@ public class ProcessStoreImpl implements
if (du != null) {
undeployed = toPids(du.getProcessNames(), du.getVersion());
}
-
+
for (QName pn : undeployed) {
fireEvent(new ProcessStoreEvent(ProcessStoreEvent.Type.UNDEPLOYED, pn, du.getName()));
__log.info(__msgs.msgProcessUndeployed(pn));
}
-
+
_processes.keySet().removeAll(undeployed);
} finally {
_rw.writeLock().unlock();
@@ -627,16 +627,16 @@ public class ProcessStoreImpl implements
*/
public static Map<QName, Node> calcInitialProperties(Properties properties, TDeployment.Process dd) {
HashMap<QName, Node> ret = new HashMap<QName, Node>();
-
+
for (Object key1 : properties.keySet()) {
String key = (String) key1;
Document doc = DOMUtils.newDocument();
doc.appendChild(doc.createElementNS(null, "temporary-simple-type-wrapper"));
doc.getDocumentElement().appendChild(doc.createTextNode(properties.getProperty(key)));
-
+
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());
@@ -731,7 +731,7 @@ public class ProcessStoreImpl implements
try {
dudao.setDeploymentUnitDir(f.getCanonicalPath());
} catch (IOException e) {
- __log.warn("Could not update deployment unit directory for " + dudao.getName(), e);
+ __log.warn("Could not update deployment unit directory for " + dudao.getName(), e);
}
return f;
}
@@ -813,7 +813,7 @@ public class ProcessStoreImpl implements
throw new IllegalArgumentException("Deploy directory is not a directory: " + depDir);
}
}
-
+
_deployDir = depDir;
}
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java Thu May 27 18:09:53 2010
@@ -110,7 +110,7 @@ public class DbConfStoreConnectionFactor
properties.put(Environment.HBM2DDL_AUTO, "create-drop");
}
-
+
// Note that we don't allow the following properties to be overriden by the client.
if (properties.containsKey(Environment.CONNECTION_PROVIDER))
__log.warn("Ignoring user-specified Hibernate property: " + Environment.CONNECTION_PROVIDER);
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java Thu May 27 18:09:53 2010
@@ -61,12 +61,12 @@ public class DeploymentUnitDaoImpl exten
public Collection<? extends ProcessConfDAO> getProcesses() {
return _processes;
}
-
-
+
+
public void setProcesses(Collection<ProcessConfDaoImpl> processes) {
_processes = processes;
}
-
+
/**
* The user that deployed the process.
* @hibernate.property
@@ -104,14 +104,14 @@ public class DeploymentUnitDaoImpl exten
public void setName(String name) {
_name = name;
}
-
+
/**
* @hibernate.property column="DIR"
*/
public String getDeploymentUnitDir() {
return _dir;
}
-
+
public void setDeploymentUnitDir(String dir) {
_dir = dir;
}
@@ -119,7 +119,7 @@ public class DeploymentUnitDaoImpl exten
public void delete() {
super.delete();
}
-
+
public ProcessConfDAO createProcess(QName pid, QName type, long version) {
ProcessConfDaoImpl p = new ProcessConfDaoImpl();
p.setPID(pid);
@@ -138,7 +138,7 @@ public class DeploymentUnitDaoImpl exten
public boolean isMember(ProcessConfDAO o) {
return o.getPID().equals(pid);
}
-
+
});
}
}
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/HibObj.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/HibObj.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/HibObj.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/HibObj.java Thu May 27 18:09:53 2010
@@ -26,7 +26,7 @@ public class HibObj {
Session getSession() {
return ConfStoreConnectionHib._current.get();
}
-
+
protected void delete() {
getSession().delete(this);
}
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java Thu May 27 18:09:53 2010
@@ -36,7 +36,7 @@ import java.util.Map;
public class ProcessConfDaoImpl extends HibObj implements ProcessConfDAO {
private DeploymentUnitDaoImpl _du;
-
+
private Map<String,String> _properties = new HashMap<String,String>();
/** Simple name of the process. */
@@ -45,7 +45,7 @@ public class ProcessConfDaoImpl extends
/** Process type. */
private String _type;
-
+
/** Process version. */
private long _version;
@@ -60,14 +60,14 @@ public class ProcessConfDaoImpl extends
public DeploymentUnitDaoImpl getDeploymentUnit() {
return _du;
}
-
+
public void setDeploymentUnit(DeploymentUnitDaoImpl du) {
_du = du;
}
/**
* @hibernate.map table="STORE_PROCESS_PROP" role="properties_"
* @hibernate.collection-key column="propId" foreign-key="none"
- * @hibernate.collection-index column="name" type="string"
+ * @hibernate.collection-index column="name" type="string"
* @hibernate.collection-element column="value" type="string"
*/
public Map<String,String> getProperties_() {
@@ -142,7 +142,7 @@ public class ProcessConfDaoImpl extends
public void setPID(QName pid) {
setPID_(pid.toString());
}
-
+
public void setState(ProcessState state) {
setState_(state.toString());
}
@@ -166,7 +166,7 @@ public class ProcessConfDaoImpl extends
public ProcessState getState() {
return ProcessState.valueOf(getState_());
}
-
+
public String getProperty(QName name) {
return _properties.get(name.toString());
}
@@ -176,7 +176,7 @@ public class ProcessConfDaoImpl extends
public QName apply(String x) {
return QName.valueOf(x);
}
-
+
});
}
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java Thu May 27 18:09:53 2010
@@ -34,7 +34,7 @@ import java.util.List;
*/
public class ConfStoreConnectionJpa implements ConfStoreConnection {
private static Log LOG = LogFactory.getLog(ConfStoreConnectionJpa.class);
-
+
private EntityManager _em;
static final ThreadLocal<EntityManager> _current = new ThreadLocal<EntityManager>();
Modified: ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml (original)
+++ ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml Thu May 27 18:09:53 2010
@@ -22,7 +22,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.0">
<persistence-unit name="ode-store">
- <!--
+ <!--
This properties file is used specifically by the
OpenJPA Enhancer.
-->
Modified: ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java (original)
+++ ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java Thu May 27 18:09:53 2010
@@ -25,28 +25,28 @@ import javax.xml.namespace.QName;
import junit.framework.TestCase;
/**
- * Test for {@link org.apache.ode.store.DeploymentUnitDir}.
+ * Test for {@link org.apache.ode.store.DeploymentUnitDir}.
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
*
*/
public class DeploymentUnitTest extends TestCase {
DeploymentUnitDir du;
-
+
/**
- * Test some complicated xsd/wsdl loading.
+ * Test some complicated xsd/wsdl loading.
*/
public void setUp() throws Exception {
File dir = new File(getClass().getResource("/complexImport/deploy.xml").toURI().getPath()).getParentFile();
du = new DeploymentUnitDir(dir);
}
-
+
public void testRegistry() {
DocumentRegistry dr = du.getDocRegistry();
assertNotNull(dr.getDefinitionForPortType(new QName("http://ode/bpel/unit-test.wsdl","HelloPortType")));
}
-
+
public void testCompile() {
du.compile();
}
-
+
}
Modified: ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java (original)
+++ ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java Thu May 27 18:09:53 2010
@@ -35,31 +35,31 @@ public class ProcessStoreTest extends Te
ProcessStoreImpl _ps;
private File _testdd;
-
+
public void setUp() throws Exception {
System.setProperty("openjpa.properties", "/openjpa.xml");
_ps = new ProcessStoreImpl();
_ps.loadAll();
URI tdd= getClass().getResource("/testdd/deploy.xml").toURI();
_testdd = new File(tdd.getPath()).getParentFile();
- }
-
+ }
+
public void tearDown() throws Exception {
_ps.shutdown();
}
-
+
public void testSanity() {
assertEquals(0,_ps.getProcesses().size());
assertEquals(0,_ps.getPackages().size());
assertNull(_ps.listProcesses("foobar"));
}
-
+
public void testDeploy() {
Collection<QName> deployed = _ps.deploy(_testdd);
assertNotNull(deployed);
assertEquals(1,deployed.size());
}
-
+
public void testGetProcess() {
Collection<QName> deployed = _ps.deploy(_testdd);
QName pname = deployed.iterator().next();
@@ -69,8 +69,8 @@ public class ProcessStoreTest extends Te
assertNotNull(pconf);
assertEquals(_testdd.getName(),pconf.getPackage());
assertEquals(pname, pconf.getProcessId());
- }
-
+ }
+
public void testGetProcesses() {
Collection<QName> deployed = _ps.deploy(_testdd);
QName pname = deployed.iterator().next();
@@ -79,7 +79,7 @@ public class ProcessStoreTest extends Te
List<QName> pconfs = _ps.getProcesses();
assertEquals(pname,pconfs.get(0));
}
-
+
public void testCleanupConfigurations() {
Collection<QName> deployed = _ps.deploy(_testdd);
QName pname = deployed.iterator().next();
@@ -89,10 +89,10 @@ public class ProcessStoreTest extends Te
assertNotNull(pconf);
assertEquals(_testdd.getName(),pconf.getPackage());
assertEquals(pname, pconf.getProcessId());
-
+
assertEquals(EnumSet.allOf(CLEANUP_CATEGORY.class), pconf.getCleanupCategories(true));
assertEquals(EnumSet.of(CLEANUP_CATEGORY.MESSAGES, CLEANUP_CATEGORY.EVENTS), pconf.getCleanupCategories(false));
-
+
assertTrue(pconf.isCleanupCategoryEnabled(true, CLEANUP_CATEGORY.INSTANCE));
assertTrue(pconf.isCleanupCategoryEnabled(true, CLEANUP_CATEGORY.VARIABLES));
assertTrue(pconf.isCleanupCategoryEnabled(true, CLEANUP_CATEGORY.MESSAGES));
@@ -103,9 +103,9 @@ public class ProcessStoreTest extends Te
assertTrue(pconf.isCleanupCategoryEnabled(false, CLEANUP_CATEGORY.MESSAGES));
assertFalse(pconf.isCleanupCategoryEnabled(false, CLEANUP_CATEGORY.CORRELATIONS));
assertTrue(pconf.isCleanupCategoryEnabled(false, CLEANUP_CATEGORY.EVENTS));
-
+
assertEquals(2, pconf.getCronJobs().size());
assertNotNull(pconf.getCronJobs().get(0).getCronExpression());
assertEquals(3, pconf.getCronJobs().get(0).getRunnableDetailList().size());
- }
+ }
}
Modified: ode/trunk/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java (original)
+++ ode/trunk/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java Thu May 27 18:09:53 2010
@@ -100,7 +100,7 @@ public class DaoTest extends TestCase {
cf.commitTransaction();
}
}
-
+
public void testGetDeploymentUnits() {
cf.beginTransaction();
ConfStoreConnection conn = cf.getConnection();
@@ -125,7 +125,7 @@ public class DaoTest extends TestCase {
cf.commitTransaction();
}
}
-
+
public void testCreateProcess() {
QName foobar = new QName("foo","bar");
cf.beginTransaction();
@@ -140,7 +140,7 @@ public class DaoTest extends TestCase {
} finally {
cf.commitTransaction();
}
-
+
cf.beginTransaction();
conn = cf.getConnection();
try {
@@ -148,14 +148,14 @@ public class DaoTest extends TestCase {
ProcessConfDAO p = du.getProcess(foobar);
assertNotNull(p);
assertNotNull(du.getProcesses());
-
+
assertEquals(foobar,p.getPID());
assertEquals(foobar,p.getType());
} finally {
cf.commitTransaction();
}
}
-
+
public void testProcessProperties() {
QName foobar = new QName("foo","bar");
cf.beginTransaction();
@@ -167,7 +167,7 @@ public class DaoTest extends TestCase {
} finally {
cf.commitTransaction();
}
-
+
cf.beginTransaction();
conn = cf.getConnection();
try {
@@ -180,5 +180,5 @@ public class DaoTest extends TestCase {
} finally {
cf.commitTransaction();
}
- }
+ }
}
\ No newline at end of file
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/bar.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/bar.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/bar.wsdl (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/bar.wsdl Thu May 27 18:09:53 2010
@@ -18,27 +18,27 @@
~ under the License.
-->
-<wsdl:definitions
+<wsdl:definitions
targetNamespace="http://ode/bpel/unit-test.wsdl"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/bpel/unit-test.wsdl"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-
+
<wsdl:message name="HelloMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
-
+
<wsdl:portType name="HelloPortType">
<wsdl:operation name="hello">
<wsdl:input message="tns:HelloMessage" name="TestIn"/>
<wsdl:output message="tns:HelloMessage" name="TestOut"/>
- </wsdl:operation>
+ </wsdl:operation>
</wsdl:portType>
-
+
<wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="hello">
@@ -50,7 +50,7 @@
</wsdl:input>
<wsdl:output>
<soap:body
- namespace="http://ode/bpel/unit-test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl"
use="literal"/>
</wsdl:output>
</wsdl:operation>
@@ -60,7 +60,7 @@
<soap:address location="http://localhost:8080/ode/processes/helloWorld"/>
</wsdl:port>
</wsdl:service>
-
+
<plnk:partnerLinkType name="HelloPartnerLinkType">
<plnk:role name="me" portType="tns:HelloPortType"/>
<plnk:role name="you" portType="tns:HelloPortType"/>
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/deploy.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/deploy.xml (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/deploy.xml Thu May 27 18:09:53 2010
@@ -17,7 +17,7 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:pns="http://ode/bpel/unit-test"
+ xmlns:pns="http://ode/bpel/unit-test"
xmlns:wns="http://ode/bpel/unit-test.wsdl">
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/baz.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/baz.xsd?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/baz.xsd (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/baz.xsd Thu May 27 18:09:53 2010
@@ -19,8 +19,8 @@
~ under the License.
-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
- xmlns:wh="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+ xmlns:wh="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd"
targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd">
<xs:simpleType name="CustomerReferenceType">
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/foo.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/foo.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/foo.wsdl (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/foo.wsdl Thu May 27 18:09:53 2010
@@ -18,21 +18,21 @@
~ under the License.
-->
-<wsdl:definitions
+<wsdl:definitions
targetNamespace="http://ode/bpel/unit-test.wsdl"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/bpel/unit-test.wsdl"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-
- <wsdl:import
+
+ <wsdl:import
namespace="http://ode/bpel/unit-test.wsdl"
location="../../bar.wsdl"/>
-
-
+
+
<wsdl:types>
<xsd:schema targetNamespace="http://foo/bar" >
<xsd:import namespace="http://foo.xsd"
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.wsdl (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.wsdl Thu May 27 18:09:53 2010
@@ -18,20 +18,20 @@
~ under the License.
-->
-<wsdl:definitions
+<wsdl:definitions
targetNamespace="http://ode/bpel/unit-test.wsdl"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/bpel/unit-test.wsdl"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-
-
- <wsdl:import
+
+
+ <wsdl:import
namespace="http://ode/bpel/unit-test.wsdl"
location="dir11/foo.wsdl" />
-
+
</wsdl:definitions>
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.xsd?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.xsd (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.xsd Thu May 27 18:09:53 2010
@@ -19,9 +19,9 @@
~ under the License.
-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
targetNamespace="http://foo.xsd">
-
+
<xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd"
schemaLocation="dir11/baz.xsd"/>
</xs:schema>
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/foo.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/foo.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/foo.bpel (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/foo.bpel Thu May 27 18:09:53 2010
@@ -17,7 +17,7 @@
~ under the License.
-->
<process name="HelloWorld2"
- targetNamespace="http://ode/bpel/unit-test"
+ targetNamespace="http://ode/bpel/unit-test"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns:tns="http://ode/bpel/unit-test"
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/foo.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/foo.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/foo.wsdl (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/foo.wsdl Thu May 27 18:09:53 2010
@@ -18,17 +18,17 @@
~ under the License.
-->
-<wsdl:definitions
+<wsdl:definitions
targetNamespace="http://ode/bpel/unit-test.wsdl"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/bpel/unit-test.wsdl"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-
- <wsdl:import
+
+ <wsdl:import
namespace="http://ode/bpel/unit-test.wsdl"
location="dir1/foo.wsdl"/>
</wsdl:definitions>
Modified: ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.bpel (original)
+++ ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.bpel Thu May 27 18:09:53 2010
@@ -17,7 +17,7 @@
~ under the License.
-->
<process name="HelloWorld2"
- targetNamespace="http://ode/bpel/unit-test"
+ targetNamespace="http://ode/bpel/unit-test"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns:tns="http://ode/bpel/unit-test"
@@ -29,18 +29,18 @@
importType="http://schemas.xmlsoap.org/wsdl/" />
<partnerLinks>
- <partnerLink name="helloPartnerLink"
- partnerLinkType="test:HelloPartnerLinkType"
+ <partnerLink name="helloPartnerLink"
+ partnerLinkType="test:HelloPartnerLinkType"
myRole="me" />
</partnerLinks>
-
+
<variables>
<variable name="myVar" messageType="test:HelloMessage"/>
<variable name="tmpVar" type="xsd:string"/>
</variables>
-
- <sequence>
- <receive
+
+ <sequence>
+ <receive
name="start"
partnerLink="helloPartnerLink"
portType="test:HelloPortType"
@@ -58,9 +58,9 @@
<to variable="myVar" part="TestPart"/>
</copy>
</assign>
- <reply name="end"
+ <reply name="end"
partnerLink="helloPartnerLink"
- portType="test:HelloPortType"
+ portType="test:HelloPortType"
operation="hello"
variable="myVar"/>
</sequence>
Modified: ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.wsdl (original)
+++ ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.wsdl Thu May 27 18:09:53 2010
@@ -18,27 +18,27 @@
~ under the License.
-->
-<wsdl:definitions
+<wsdl:definitions
targetNamespace="http://ode/bpel/unit-test.wsdl"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/bpel/unit-test.wsdl"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-
+
<wsdl:message name="HelloMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
-
+
<wsdl:portType name="HelloPortType">
<wsdl:operation name="hello">
<wsdl:input message="tns:HelloMessage" name="TestIn"/>
<wsdl:output message="tns:HelloMessage" name="TestOut"/>
- </wsdl:operation>
+ </wsdl:operation>
</wsdl:portType>
-
+
<wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="hello">
@@ -50,7 +50,7 @@
</wsdl:input>
<wsdl:output>
<soap:body
- namespace="http://ode/bpel/unit-test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl"
use="literal"/>
</wsdl:output>
</wsdl:operation>
@@ -60,7 +60,7 @@
<soap:address location="http://localhost:8080/ode/processes/helloWorld"/>
</wsdl:port>
</wsdl:service>
-
+
<plnk:partnerLinkType name="HelloPartnerLinkType">
<plnk:role name="me" portType="tns:HelloPortType"/>
<plnk:role name="you" portType="tns:HelloPortType"/>
Modified: ode/trunk/bpel-store/src/test/resources/testdd/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/testdd/deploy.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/testdd/deploy.xml (original)
+++ ode/trunk/bpel-store/src/test/resources/testdd/deploy.xml Thu May 27 18:09:53 2010
@@ -17,7 +17,7 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:pns="http://ode/bpel/unit-test"
+ xmlns:pns="http://ode/bpel/unit-test"
xmlns:wns="http://ode/bpel/unit-test.wsdl">
<process name="pns:HelloWorld2">
Modified: ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java (original)
+++ ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java Thu May 27 18:09:53 2010
@@ -63,7 +63,7 @@ import org.w3c.dom.Element;
public abstract class BPELTestAbstract {
public static final long WAIT_BEFORE_INVOKE_TIMEOUT = 2000;
-
+
private static final String SHOW_EVENTS_ON_CONSOLE = "no";
protected BpelServerImpl _server;
@@ -234,7 +234,7 @@ public abstract class BPELTestAbstract {
final String operation = testProps.getProperty("operation");
Boolean sequential = Boolean.parseBoolean(testProps.getProperty("sequential", "false"));
-
+
Invocation last = null;
for (int i = 1; testProps.getProperty("request" + i) != null; i++) {
final String in = testProps.getProperty("request" + i);
@@ -250,7 +250,7 @@ public abstract class BPELTestAbstract {
protected Invocation addInvoke(String id, QName target, String operation, String request, String responsePattern) throws Exception {
return addInvoke(id, target, operation, request, responsePattern, null);
}
-
+
protected Invocation addInvoke(String id, QName target, String operation, String request, String responsePattern, Invocation synchronizeWith)
throws Exception {
@@ -374,7 +374,7 @@ public abstract class BPELTestAbstract {
testThread.join();
}
-
+
protected long getWaitBeforeInvokeTimeout() {
return WAIT_BEFORE_INVOKE_TIMEOUT;
}
@@ -415,7 +415,7 @@ public abstract class BPELTestAbstract {
}
/**
- * Override this to provide configuration properties for Ode extensions
+ * Override this to provide configuration properties for Ode extensions
* like BpelEventListeners.
*
* @return
@@ -495,10 +495,10 @@ public abstract class BPELTestAbstract {
/** for sync invocations */
public Invocation synchronizeWith;
-
+
/** checking completion */
public boolean done = false;
-
+
/** Name of the operation to invoke. */
public String operation;
@@ -569,7 +569,7 @@ public abstract class BPELTestAbstract {
}
}
}
-
+
public void run2() {
final MyRoleMessageExchange mex;
final Future<MessageExchange.Status> running;
@@ -579,7 +579,7 @@ public abstract class BPELTestAbstract {
Thread.sleep(_invocation.invokeDelayMs);
} catch (Exception ex) {
}
-
+
if (_invocation.synchronizeWith != null) {
synchronized (_invocation.synchronizeWith) {
while (!_invocation.synchronizeWith.done) {
Modified: ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BindingContextImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BindingContextImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BindingContextImpl.java (original)
+++ ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BindingContextImpl.java Thu May 27 18:09:53 2010
@@ -49,7 +49,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
public class BindingContextImpl implements BindingContext {
-
+
public EndpointReference activateMyRoleEndpoint(QName processId, Endpoint myRoleEndpoint) {
final Document doc = DOMUtils.newDocument();
Modified: ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java (original)
+++ ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java Thu May 27 18:09:53 2010
@@ -61,24 +61,24 @@ import org.xml.sax.SAXException;
*
*/
public class MessageExchangeContextImpl implements MessageExchangeContext {
-
+
private static final String PROBE_NS = "http://ode/bpel/unit-test/ProbeService.wsdl";
private static final String FAULT_NS = "http://ode/bpel/unit-test/FaultService.wsdl";
// Probe Service is a simple concatination service
private static final QName probePT = new QName(PROBE_NS,"probeMessagePT");
private static final QName faultPT = new QName(FAULT_NS,"faultMessagePT");
-
+
private Message currentResponse;
-
+
public void invokePartner(PartnerRoleMessageExchange mex)
throws ContextException {
QName calledPT = mex.getPortType().getQName();
-
+
if (calledPT.equals(probePT)) {
invokeProbeService(mex);
}
-
+
if (calledPT.equals(faultPT)) {
invokeFaultService(mex);
}
@@ -93,12 +93,12 @@ public class MessageExchangeContextImpl
}
myRoleMex.complete();
}
-
+
private void invokeProbeService(PartnerRoleMessageExchange prmx) {
Message msg = prmx.getRequest();
Element elm1 = prmx.getRequest().getPart("probeName");
Element elm2 = prmx.getRequest().getPart("probeData");
-
+
if ( elm1 != null && elm2 != null ) {
String cat = elm2.getTextContent()+" -> "+elm1.getTextContent();
elm2.setTextContent(cat);
@@ -109,7 +109,7 @@ public class MessageExchangeContextImpl
prmx.reply(response);
}
}
-
+
private void invokeFaultService(PartnerRoleMessageExchange prmx) {
QName errorMsgType = new QName(FAULT_NS,"errorMessage");
QName responseMsgType = new QName(FAULT_NS,"faultMessage");
@@ -119,16 +119,16 @@ public class MessageExchangeContextImpl
String ind1 = prmx.getRequest().getPart("faultIndicator1").getTextContent();
String ind2 = prmx.getRequest().getPart("faultIndicator2").getTextContent();
String inputData = prmx.getRequest().getPart("faultData").getTextContent();
-
+
StringBuffer faultData = new StringBuffer("<message><errorID>FA-1</errorID><errorText>");
faultData.append(inputData);
faultData.append("</errorText></message>");
-
+
StringBuffer responseData = new StringBuffer("<message><faultName>FA-NoFault</faultName><faultData>");
responseData.append(inputData);
responseData.append("</faultData></message>");
-
-
+
+
Element faultResponse = null;
Element response = null;
try {
@@ -141,12 +141,12 @@ public class MessageExchangeContextImpl
// TODO Auto-generated catch block
e.printStackTrace();
}
-
-
+
+
// TODO: Question - how does one set parts that are of a simple xsd type?
faultMsg.setMessage(faultResponse);
responseMsg.setMessage(response);
-
+
if ( ind1.equals("yes")){
prmx.replyWithFault(new QName(FAULT_NS,"FaultMessage1"), faultMsg);
} else {
@@ -158,11 +158,11 @@ public class MessageExchangeContextImpl
}
}
-
+
public Message getCurrentResponse() {
return currentResponse;
}
-
+
public void clearCurrentResponse() {
currentResponse = null;
}
Modified: ode/trunk/bpel-test/src/main/java/org/apache/ode/test/PartnerRoleChannelImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/PartnerRoleChannelImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/main/java/org/apache/ode/test/PartnerRoleChannelImpl.java (original)
+++ ode/trunk/bpel-test/src/main/java/org/apache/ode/test/PartnerRoleChannelImpl.java Thu May 27 18:09:53 2010
@@ -44,7 +44,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
public class PartnerRoleChannelImpl implements PartnerRoleChannel {
-
+
public PartnerRoleChannelImpl() {
}
Modified: ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java (original)
+++ ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java Thu May 27 18:09:53 2010
@@ -29,7 +29,7 @@ import org.apache.ode.bpel.iapi.MessageE
import org.junit.Test;
public class BasicActivities20Test extends BPELTestAbstract {
-
+
@Test public void testHelloWorld2() throws Throwable {
go("/bpel/2.0/HelloWorld2");
}
@@ -41,7 +41,7 @@ public class BasicActivities20Test exten
*/
Deployment deployment = addDeployment("/bpel/2.0/NegativeTargetNSTest1");
deployment.expectedException = ContextException.class;
-
+
go();
}
@@ -52,24 +52,24 @@ public class BasicActivities20Test exten
@Test public void testIf() throws Throwable {
go("/bpel/2.0/TestIf");
}
-
+
/**
* Tests the wait "for" syntax.
* @throws Throwable
*/
@Test public void testWaitFor() throws Throwable {
deploy("/bpel/2.0/TestWait1");
- Invocation inv = addInvoke("Wait1#1", new QName("http://ode/bpel/unit-test.wsdl", "testService"), "testOperation",
+ Invocation inv = addInvoke("Wait1#1", new QName("http://ode/bpel/unit-test.wsdl", "testService"), "testOperation",
"<message><TestPart/><Time/></message>",
null);
inv.minimumWaitMs=5*1000L;
inv.maximumWaitMs=7*1000L;
inv.expectedStatus = MessageExchange.Status.ASYNC;
inv.expectedFinalStatus = MessageExchange.Status.RESPONSE;
-
+
go();
}
-
+
/**
* Test the wait "until" syntax.
*/
@@ -77,14 +77,14 @@ public class BasicActivities20Test exten
deploy("/bpel/2.0/TestWaitUntil");
DateFormat idf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
String isountil = idf.format(new Date(System.currentTimeMillis()+5000));
- Invocation inv = addInvoke("WaitUntil", new QName("http://ode/bpel/unit-test.wsdl", "testService"), "testOperation",
+ Invocation inv = addInvoke("WaitUntil", new QName("http://ode/bpel/unit-test.wsdl", "testService"), "testOperation",
"<message><TestPart/><Time>"+isountil+"</Time></message>",
null);
inv.minimumWaitMs=4*1000L;
inv.maximumWaitMs=7*1000L;
inv.expectedStatus = MessageExchange.Status.ASYNC;
inv.expectedFinalStatus = MessageExchange.Status.RESPONSE;
-
+
go();
}
Modified: ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java (original)
+++ ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java Thu May 27 18:09:53 2010
@@ -44,7 +44,7 @@ public class CompensationHandling20Test
* Message exchange
* org.apache.ode.bpel.engine.MyRoleMessageExchangeImpl$ResponseFuture@ab6dcb
* timed out when waiting for a response!
- *
+ *
* at
* org.apache.ode.test.BPELTestAbstract.checkFailure(BPELTestAbstract.java:278)
* at org.apache.ode.test.BPELTestAbstract.go(BPELTestAbstract.java:267)
@@ -53,7 +53,7 @@ public class CompensationHandling20Test
*/
deploy("/bpel/2.0/TestImplicitFaultHandler");
Invocation inv = addInvoke("Invoke#1", new QName("http://ode/bpel/unit-test/testImplicitFaultHandler.wsdl",
- "testImplicitFaultHandlerService"), "request",
+ "testImplicitFaultHandlerService"), "request",
"<message><requestID>Start TestImplicitFaultHandler</requestID><requestText>Event TestImplicitFaultHandler</requestText><faultIndicator1>yes</faultIndicator1><faultIndicator2>no</faultIndicator2></message>",
null);
inv.expectedFinalStatus = MessageExchange.Status.FAULT;
Modified: ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java (original)
+++ ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java Thu May 27 18:09:53 2010
@@ -50,7 +50,7 @@ public class DataHandling20Test extends
public void testToQuery() throws Throwable {
go("/bpel/2.0/TestToQuery");
}
-
+
@Test
public void testSubTreeAssign() throws Throwable {
go("/bpel/2.0/TestSubTreeAssign");
Modified: ode/trunk/bpel-test/src/test/java/org/apache/ode/test/ExternalVariableTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/ExternalVariableTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/java/org/apache/ode/test/ExternalVariableTest.java (original)
+++ ode/trunk/bpel-test/src/test/java/org/apache/ode/test/ExternalVariableTest.java Thu May 27 18:09:53 2010
@@ -41,7 +41,7 @@ public class ExternalVariableTest extend
public void setUp() throws Exception {
super.setUp();
-
+
EmbeddedConnectionPoolDataSource ds = new EmbeddedConnectionPoolDataSource();
ds.setCreateDatabase("create");
ds.setDatabaseName("target/ExternalVariableTest");
@@ -53,7 +53,7 @@ public class ExternalVariableTest extend
Connection conn = _ds.getConnection();
Statement s = conn.createStatement();
-
+
dropTable(s, "extvartable1");
s.execute("create table extvartable1 (" + "id1 VARCHAR(200) PRIMARY KEY," + " \"_id2_\" VARCHAR(200)," + "pid VARCHAR(250), " + "iid INT,"
+ "cts TIMESTAMP," + "uts TIMESTAMP," + "foo VARCHAR(250)," + "bar VARCHAR(250))");
@@ -64,9 +64,9 @@ public class ExternalVariableTest extend
dropTable(s, "costPerCustomer");
s.execute("CREATE TABLE costPerCustomer (value0 varchar(250), key1 varchar(250) primary key)");
-
+
dropTable(s, "DataTypesTest");
- s.execute("CREATE TABLE DataTypesTest (KEYSTRING VARCHAR(255), STRINGCOL VARCHAR(255), FLOATCOL FLOAT, "
+ s.execute("CREATE TABLE DataTypesTest (KEYSTRING VARCHAR(255), STRINGCOL VARCHAR(255), FLOATCOL FLOAT, "
+ "INTCOL INTEGER, NUMBERCOL NUMERIC, TIMESTAMPCOL TIMESTAMP, BOOLEANCOL SMALLINT)");
dropTable(s, "GenKey");
@@ -74,7 +74,7 @@ public class ExternalVariableTest extend
conn.close();
}
-
+
private static void dropTable(Statement s, String name) {
try {
s.execute("drop table "+name);
@@ -82,7 +82,7 @@ public class ExternalVariableTest extend
// ignore
}
}
-
+
@Test
public void testHelloWorld2() throws Throwable {
go("/bpel/2.0/ExtVar");
Modified: ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java (original)
+++ ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java Thu May 27 18:09:53 2010
@@ -98,9 +98,9 @@ public class MessageRouting20Test extend
* <receive> and a subsequent <pick> that does not define a correlation
* key. The BPEL compiler should throw an exception indicating
* the BPEL code error ( verify with spec ).
- *
+ *
* See JIRA ODE-64
- *
+ *
*/
// TODO fix the bug first
negative("target/test-classes/bpel/2.0/NegativeCorrelationTest");
@@ -114,11 +114,11 @@ public class MessageRouting20Test extend
* compiler should throw an exception indicating
* the BPEL error ( verify with spec ) or at runtime
* a clear initialization exception should be thrown.
- *
+ *
* See JIRA ODE-61.
- *
+ *
* The message exchange should return with a Fault/Failure.
- *
+ *
*/
// TODO fix the bug first
negative("target/test-classes/bpel/2.0/NegativeInitializationTest");
@@ -127,7 +127,7 @@ public class MessageRouting20Test extend
@Test public void testConcurrentSyncMex() throws Throwable {
go("/bpel/2.0/TestConcurrentSyncMex");
}
-
+
@Test public void testIMA() throws Throwable {
go("/bpel/2.0/TestIMA");
}
Modified: ode/trunk/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java (original)
+++ ode/trunk/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java Thu May 27 18:09:53 2010
@@ -68,15 +68,15 @@ public class VersionedRedeployTest exten
// clean up deployment and invocations
_deployments.clear();
_invocations.clear();
-
+
go("/bpel/2.0/TestVersionedRedeploy/HelloWorld-2");
Assert.assertEquals(1, _cf.getConnection().getProcess(qName1).getNumInstances());
Assert.assertEquals(1, _cf.getConnection().getProcess(qName2).getNumInstances());
-
+
// clean up deployment and invocations
_deployments.clear();
_invocations.clear();
-
+
go("/bpel/2.0/TestVersionedRedeploy/HelloWorld-3");
Assert.assertEquals(1, _cf.getConnection().getProcess(qName1).getNumInstances());
Assert.assertEquals(1, _cf.getConnection().getProcess(qName2).getNumInstances());
@@ -94,7 +94,7 @@ public class VersionedRedeployTest exten
// We should have a brand new version 1 with no version 2
Assert.assertNull(store.getProcessConfiguration(qName1));
Assert.assertNull(store.getProcessConfiguration(qName3));
-
+
Assert.assertEquals(1, _cf.getConnection().getProcess(qName2).getNumInstances());
}
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/ExtVar-GenKey.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/ExtVar-GenKey.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/ExtVar-GenKey.bpel (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/ExtVar-GenKey.bpel Thu May 27 18:09:53 2010
@@ -18,33 +18,33 @@
~ under the License.
-->
<bpel:process name="ExtVar-GenKey" targetNamespace="http://example.com/process/ExtVar/GenKey"
- xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
- xmlns:pnlk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
- xmlns:this="http://example.com/process/ExtVar/GenKey"
+ xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
+ xmlns:pnlk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:this="http://example.com/process/ExtVar/GenKey"
xmlns:xvar="http://ode.apache.org/externalVariables"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" >
-
+
<bpel:import namespace="http://example.com/process/ExtVar/GenKey" location="ExtVar-GenKey.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
-
+
<bpel:partnerLinks>
<bpel:partnerLink name="client" partnerLinkType="this:TestPLT" myRole="process"/>
</bpel:partnerLinks>
-
+
<bpel:variables>
<bpel:variable name="StartRequest" messageType="this:StartRequest"/>
<bpel:variable name="keys" element="this:keys"/>
<bpel:variable name="extvar" element="this:extvar" xvar:id="extvar" xvar:relates-to="keys"/>
</bpel:variables>
-
+
<bpel:sequence>
- <bpel:receive partnerLink="client"
- portType="this:Test"
- operation="Start"
- variable="StartRequest"
+ <bpel:receive partnerLink="client"
+ portType="this:Test"
+ operation="Start"
+ variable="StartRequest"
createInstance="yes" />
<bpel:assign name="init-variables-GenKey">
<bpel:copy>
@@ -62,7 +62,7 @@
</bpel:copy>
</bpel:assign>
- <!-- Build response -->
+ <!-- Build response -->
<bpel:assign>
<bpel:copy>
<bpel:from>
@@ -80,9 +80,9 @@
</bpel:copy>
</bpel:assign>
- <bpel:reply partnerLink="client"
- portType="this:Test"
- operation="Start"
+ <bpel:reply partnerLink="client"
+ portType="this:Test"
+ operation="Start"
variable="StartRequest" />
</bpel:sequence>
</bpel:process>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/ExtVar-GenKey.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/ExtVar-GenKey.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/ExtVar-GenKey.wsdl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/ExtVar-GenKey.wsdl Thu May 27 18:09:53 2010
@@ -17,13 +17,13 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<wsdl:definitions xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:pnlk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
- xmlns:this="http://example.com/process/ExtVar/GenKey"
+<wsdl:definitions xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:pnlk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:this="http://example.com/process/ExtVar/GenKey"
targetNamespace="http://example.com/process/ExtVar/GenKey">
<pnlk:partnerLinkType name="TestPLT">
@@ -65,5 +65,5 @@
<soap:address location="http://localhost:8080/ode/processes/ExtVar/GenKey"/>
</wsdl:port>
</wsdl:service>
-
+
</wsdl:definitions>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/deploy.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/deploy.xml (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar-GenKey/deploy.xml Thu May 27 18:09:53 2010
@@ -19,11 +19,11 @@
-->
<dd:deploy xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd">
- <dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:this="http://example.com/process/ExtVar/GenKey"
+ <dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:this="http://example.com/process/ExtVar/GenKey"
name="this:ExtVar-GenKey">
-
+
<xvar:externalVariable xmlns:xvar="http://ode.apache.org/externalVariables" id="extvar">
<xjdbc:jdbc xmlns:xjdbc="http://ode.apache.org/externalVariables/jdbc">
<xjdbc:datasource-ref>testds</xjdbc:datasource-ref>
@@ -33,10 +33,10 @@
<xjdbc:init mode="update-insert" />
</xjdbc:jdbc>
</xvar:externalVariable>
-
+
<dd:provide partnerLink="client">
<dd:service name="this:TestService" port="TestPort" />
</dd:provide>
</dd:process>
-
+
</dd:deploy>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/ExtVar.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/ExtVar.xsd?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/ExtVar.xsd (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/ExtVar.xsd Thu May 27 18:09:53 2010
@@ -17,9 +17,9 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<schema
- xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://foo/extvar"
+<schema
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://foo/extvar"
xmlns:tns="http://foo/extvar" elementFormDefault="qualified">
<complexType name="tRow">
@@ -33,6 +33,6 @@
<element name="bar" type="string"/>
</sequence>
</complexType>
-
+
<element name="row" type="tns:tRow" />
</schema>
\ No newline at end of file
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.bpel (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.bpel Thu May 27 18:09:53 2010
@@ -18,7 +18,7 @@
~ under the License.
-->
<process name="HelloWorld2"
- targetNamespace="http://ode/bpel/unit-test"
+ targetNamespace="http://ode/bpel/unit-test"
xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://ode/bpel/unit-test"
@@ -29,9 +29,9 @@
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
- <import
- namespace="http://foo/extvar"
- location="ExtVar.xsd"
+ <import
+ namespace="http://foo/extvar"
+ location="ExtVar.xsd"
importType="http://www.w3.org/2001/XMLSchema"/>
<import location="HelloWorld2.wsdl"
@@ -40,21 +40,21 @@
<partnerLinks>
- <partnerLink name="helloPartnerLink"
- partnerLinkType="test:HelloPartnerLinkType"
+ <partnerLink name="helloPartnerLink"
+ partnerLinkType="test:HelloPartnerLinkType"
myRole="me" />
</partnerLinks>
-
+
<variables>
<variable name="myVar" messageType="test:HelloMessage"/>
<variable name="tmpVar" type="xsd:string"/>
- <variable name="tmpDate" type="xsd:dateTime"/>
+ <variable name="tmpDate" type="xsd:dateTime"/>
<variable name="idx" type="xsd:string" />
<variable name="external" element="foo:row" xvar:id="evar1" xvar:relates-to="idx"/>
</variables>
-
- <sequence>
- <receive
+
+ <sequence>
+ <receive
name="start"
partnerLink="helloPartnerLink"
portType="test:HelloPortType"
@@ -71,7 +71,7 @@
<element name="foo" type="string"/>
<element name="bar" type="string"/>
-->
-
+
<assign>
<copy>
<from>''</from>
@@ -88,9 +88,9 @@
<to variable="myVar" part="TestPart"/>
</copy>
</assign>
- <reply name="end"
+ <reply name="end"
partnerLink="helloPartnerLink"
- portType="test:HelloPortType"
+ portType="test:HelloPortType"
operation="hello"
variable="myVar"/>
</sequence>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.wsdl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.wsdl Thu May 27 18:09:53 2010
@@ -18,28 +18,28 @@
~ under the License.
-->
-<wsdl:definitions
+<wsdl:definitions
targetNamespace="http://ode/bpel/unit-test.wsdl"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/bpel/unit-test.wsdl"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
-
+
<wsdl:message name="HelloMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
-
+
<wsdl:portType name="HelloPortType">
<wsdl:operation name="hello">
<wsdl:input message="tns:HelloMessage" name="TestIn"/>
<wsdl:output message="tns:HelloMessage" name="TestOut"/>
- </wsdl:operation>
+ </wsdl:operation>
</wsdl:portType>
-
+
<wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="hello">
@@ -51,7 +51,7 @@
</wsdl:input>
<wsdl:output>
<soap:body
- namespace="http://ode/bpel/unit-test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl"
use="literal"/>
</wsdl:output>
</wsdl:operation>
@@ -61,7 +61,7 @@
<soap:address location="http://localhost:8080/ode/processes/helloWorld"/>
</wsdl:port>
</wsdl:service>
-
+
<plnk:partnerLinkType name="HelloPartnerLinkType">
<plnk:role name="me" portType="tns:HelloPortType"/>
<plnk:role name="you" portType="tns:HelloPortType"/>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/deploy.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/deploy.xml (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar/deploy.xml Thu May 27 18:09:53 2010
@@ -18,7 +18,7 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:pns="http://ode/bpel/unit-test"
+ xmlns:pns="http://ode/bpel/unit-test"
xmlns:wns="http://ode/bpel/unit-test.wsdl"
xmlns:xvar="http://ode.apache.org/externalVariables"
xmlns:jdbc="http://ode.apache.org/externalVariables/jdbc" >
@@ -28,19 +28,19 @@
<provide partnerLink="helloPartnerLink">
<service name="wns:HelloService" port="HelloPort"/>
</provide>
-
+
<xvar:externalVariable id="evar1" >
- <jdbc:jdbc>
+ <jdbc:jdbc>
<jdbc:datasource-ref>testds</jdbc:datasource-ref>
<jdbc:table>extvartable1</jdbc:table>
- <jdbc:column name="pid" key="yes" generator="pid" />
- <jdbc:column name="id1"/>
+ <jdbc:column name="pid" key="yes" generator="pid" />
+ <jdbc:column name="id1"/>
<jdbc:column name="cts" generator="ctimestamp" />
<jdbc:column name="uts" generator="utimestamp" />
- <jdbc:column name="foo"/>
- </jdbc:jdbc>
+ <jdbc:column name="foo"/>
+ </jdbc:jdbc>
</xvar:externalVariable>
-
+
</process>
</deploy>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar2/ExtVar2.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar2/ExtVar2.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar2/ExtVar2.bpel (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar2/ExtVar2.bpel Thu May 27 18:09:53 2010
@@ -17,15 +17,15 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<process name="ExtVar2" targetNamespace="http://ode/bpel/unit-test"
- xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- xmlns:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- xmlns:foo="http://foo/extvar"
- xmlns:xvar="http://ode.apache.org/externalVariables"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+<process name="ExtVar2" targetNamespace="http://ode/bpel/unit-test"
+ xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ xmlns:foo="http://foo/extvar"
+ xmlns:xvar="http://ode.apache.org/externalVariables"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
<import namespace="http://foo/extvar" location="ExtVar2.xsd" importType="http://www.w3.org/2001/XMLSchema"/>
@@ -40,17 +40,17 @@
<variables>
<variable name="myVar" messageType="test:ExtVarMessage"/>
<variable name="costPerCustomer-keys" element="foo:costPerCustomer-keys"/>
- <variable name="costPerCustomer" element="foo:costPerCustomer"
+ <variable name="costPerCustomer" element="foo:costPerCustomer"
xvar:id="costPerCustomer" xvar:relates-to="costPerCustomer-keys"/>
</variables>
<sequence>
- <receive name="start" partnerLink="ExtVarPartnerLink" portType="test:ExtVarPortType"
+ <receive name="start" partnerLink="ExtVarPartnerLink" portType="test:ExtVarPortType"
operation="extvar" variable="myVar" createInstance="yes"/>
-
+
<!-- insert new row by assigning directly into the external variable -->
-
+
<assign name="insertNewRow">
<copy>
<from>
@@ -110,7 +110,7 @@
</if>
<!-- update row by assigning into extvar -->
-
+
<assign name="updateRow">
<copy>
<from>
@@ -149,7 +149,7 @@
</copy>
</assign>
-
+
<!-- insert a new row -->
<assign name="insertRow">
@@ -183,7 +183,7 @@
</else>
</if>
-
+
<!-- go back to first row -->
<assign name="goBack1">
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar2/ExtVar2.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar2/ExtVar2.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar2/ExtVar2.wsdl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/ExtVar2/ExtVar2.wsdl Thu May 27 18:09:53 2010
@@ -18,28 +18,28 @@
~ under the License.
-->
-<wsdl:definitions
+<wsdl:definitions
targetNamespace="http://ode/bpel/unit-test.wsdl"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/bpel/unit-test.wsdl"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
-
+
<wsdl:message name="ExtVarMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
-
+
<wsdl:portType name="ExtVarPortType">
<wsdl:operation name="extvar">
<wsdl:input message="tns:ExtVarMessage" name="TestIn"/>
<wsdl:output message="tns:ExtVarMessage" name="TestOut"/>
- </wsdl:operation>
+ </wsdl:operation>
</wsdl:portType>
-
+
<wsdl:binding name="ExtVarSoapBinding" type="tns:ExtVarPortType">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="extvar">
@@ -51,7 +51,7 @@
</wsdl:input>
<wsdl:output>
<soap:body
- namespace="http://ode/bpel/unit-test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl"
use="literal"/>
</wsdl:output>
</wsdl:operation>
@@ -61,7 +61,7 @@
<soap:address location="http://localhost:8080/ode/processes/extvar2"/>
</wsdl:port>
</wsdl:service>
-
+
<plnk:partnerLinkType name="ExtVarPartnerLinkType">
<plnk:role name="me" portType="tns:ExtVarPortType"/>
</plnk:partnerLinkType>