You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by bo...@apache.org on 2007/11/15 22:37:16 UTC
svn commit: r595466 - in /ode/branches/APACHE_ODE_1.1:
bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/
bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/
bpel-runtime/src/main/java/org/apache/ode/bpel/evar/jdbc/ bpel-runtime/sr...
Author: boisvert
Date: Thu Nov 15 13:37:13 2007
New Revision: 595466
URL: http://svn.apache.org/viewvc?rev=595466&view=rev
Log:
Update external variable namespaces
Modified:
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ExtensibilityQNames.java
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableConf.java
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/evar/jdbc/JdbcExternalVariableEngine.java
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/test/resources/org/apache/ode/bpel/extvar/jdbc/evardeploy.xml
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/ExtVar.xsd
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.bpel
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/deploy.xml
Modified: ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ExtensibilityQNames.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ExtensibilityQNames.java?rev=595466&r1=595465&r2=595466&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ExtensibilityQNames.java (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ExtensibilityQNames.java Thu Nov 15 13:37:13 2007
@@ -38,10 +38,10 @@
//
/** Namespace for external variables. */
- private static final String EXTVAR_NS = "http://www.apache.org/ode/extensions/externalVariables";
+ private static final String EXTVAR_NS = "http://ode.apache.org/externalVariables";
/** Attribute name for external variable id. */
- public static final QName EXTVAR_ATTR = new QName(EXTVAR_NS, "ext-var-id");
+ public static final QName EXTVAR_ATTR = new QName(EXTVAR_NS, "id");
/** Element name of external variable key mapping. */
public static final QName EXTVAR_MAPPING = new QName(EXTVAR_NS, "key-map");
Modified: ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableConf.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableConf.java?rev=595466&r1=595465&r2=595466&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableConf.java (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableConf.java Thu Nov 15 13:37:13 2007
@@ -29,7 +29,7 @@
import org.w3c.dom.Element;
public class ExternalVariableConf {
- public final static QName EXTVARCONF_ELEMENT = new QName("http://www.apache.org/ode/extensions/externalVariables",
+ public final static QName EXTVARCONF_ELEMENT = new QName("http://ode.apache.org/externalVariables",
"externalVariable");
Modified: ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/evar/jdbc/JdbcExternalVariableEngine.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/evar/jdbc/JdbcExternalVariableEngine.java?rev=595466&r1=595465&r2=595466&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/evar/jdbc/JdbcExternalVariableEngine.java (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/evar/jdbc/JdbcExternalVariableEngine.java Thu Nov 15 13:37:13 2007
@@ -28,7 +28,7 @@
private static final Log __log = LogFactory.getLog(JdbcExternalVariableEngine.class);
/** Unique QName for the engine, this should be the element used for the external-variable configuration. */
- public static final QName NAME = new QName("http://www.apache.org/ode/extensions/externalVariables", "jdbc");
+ public static final QName NAME = new QName("http://ode.apache.org/externalVariables/jdbc", "jdbc");
/** Manually configured data sources. */
private final HashMap<String, DataSource> _dataSources = new HashMap<String, DataSource>();
Modified: ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java?rev=595466&r1=595465&r2=595466&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java Thu Nov 15 13:37:13 2007
@@ -45,8 +45,10 @@
private static final Log __log = LogFactory.getLog(JdbcExternalVariableModule.class);
+ public static final String JDBC_NS = "http://ode.apache.org/externalVariables/jdbc";
+
/** Unique QName for the engine, this should be the element used for the external-variable configuration. */
- public static final QName NAME = new QName("http://www.apache.org/ode/extensions/externalVariables", "jdbc");
+ public static final QName NAME = new QName(JDBC_NS, "jdbc");
/** Manually configured data sources. */
private final HashMap<String, DataSource> _dataSources = new HashMap<String, DataSource>();
@@ -58,9 +60,9 @@
EVarId evarId = new EVarId(pid, extVarId);
DataSource ds = null;
- Element jndiDs = DOMUtils.findChildByName(config, new QName(null, "datasource-jndi"));
- Element jndiRef = DOMUtils.findChildByName(config, new QName(null, "datasource-ref"));
- Element initMode = DOMUtils.findChildByName(config, new QName(null, "init-mode"));
+ Element jndiDs = DOMUtils.findChildByName(config, new QName(JDBC_NS, "datasource-jndi"));
+ Element jndiRef = DOMUtils.findChildByName(config, new QName(JDBC_NS, "datasource-ref"));
+ Element initMode = DOMUtils.findChildByName(config, new QName(JDBC_NS, "init-mode"));
if (jndiRef != null) {
String refname = jndiRef.getTextContent().trim();
ds = _dataSources.get(refname);
@@ -122,7 +124,7 @@
throw new ExternalVariableModuleException("Invalid <init-mode> value: " + initMode.getTextContent().trim());
}
- Element tableName = DOMUtils.findChildByName(config, new QName(null, "table"));
+ Element tableName = DOMUtils.findChildByName(config, new QName(JDBC_NS, "table"));
if (tableName == null || tableName.getTextContent().trim().equals(""))
throw new ExternalVariableModuleException("Must specify <table> for external variable " + evarId);
String table = tableName.getTextContent().trim();
@@ -152,7 +154,7 @@
tables.close();
- List<Element> columns = DOMUtils.findChildrenByName(config, new QName(null, "column"));
+ List<Element> columns = DOMUtils.findChildrenByName(config, new QName(JDBC_NS, "column"));
for (Element col : columns) {
String name = col.getAttribute("name");
Modified: ode/branches/APACHE_ODE_1.1/bpel-runtime/src/test/resources/org/apache/ode/bpel/extvar/jdbc/evardeploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/test/resources/org/apache/ode/bpel/extvar/jdbc/evardeploy.xml?rev=595466&r1=595465&r2=595466&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-runtime/src/test/resources/org/apache/ode/bpel/extvar/jdbc/evardeploy.xml (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-runtime/src/test/resources/org/apache/ode/bpel/extvar/jdbc/evardeploy.xml Thu Nov 15 13:37:13 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -17,41 +18,32 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:pns="http://ode/bpel/unit-test"
- xmlns:wns="http://ode/bpel/unit-test.wsdl"
- xmlns:evar="http://www.apache.org/ode/extensions/externalVariables">
+ 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" >
-
- <process name="pns:HelloWorld2">
- <active>true</active>
- <provide partnerLink="helloPartnerLink">
- <service name="wns:HelloService" port="HelloPort"/>
- </provide>
-
- <evar:externalVariable id="evar1" >
- <evar:jdbc xmlns="">
- <datasource-ref>testds</datasource-ref>
- <table>extvartable1</table>
- <init mode="insert"/>
- <column name="id1"
- key="yes"
- generator="uuid" />
- <column name="id2"
- column-name="_id2_"
- key="yes"
- generator="uuid" />
- <column name="pid"
- generator="pid" />
- <column name="iid"
- generator="iid" />
- <column name="cts"
- generator="ctimestamp" />
- <column name="uts"
- generator="utimestamp" />
- <column name="foo" />
- <column name="bar" />
- </evar:jdbc>
- </evar:externalVariable>
-
- </process>
+ <process name="pns:HelloWorld2">
+ <active>true</active>
+ <provide partnerLink="helloPartnerLink">
+ <service name="wns:HelloService" port="HelloPort"/>
+ </provide>
+
+ <xvar:externalVariable id="evar1" >
+ <jdbc:jdbc>
+ <jdbc:datasource-ref>testds</jdbc:datasource-ref>
+ <jdbc:table>extvartable1</jdbc:table>
+ <jdbc:init mode="insert"/>
+ <jdbc:column name="id1" key="yes" generator="uuid" />
+ <jdbc:column name="id2" column-name="_id2_" key="yes" generator="uuid" />
+ <jdbc:column name="pid" generator="pid" />
+ <jdbc:column name="iid" generator="iid" />
+ <jdbc:column name="cts" generator="ctimestamp" />
+ <jdbc:column name="uts" generator="utimestamp" />
+ <jdbc:column name="foo" />
+ <jdbc:column name="bar" />
+ </jdbc:jdbc>
+ </xvar:externalVariable>
+
+ </process>
</deploy>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/ExtVar.xsd
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/ExtVar.xsd?rev=595466&r1=595465&r2=595466&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/ExtVar.xsd (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/ExtVar.xsd Thu Nov 15 13:37:13 2007
@@ -18,15 +18,15 @@
~ under the License.
-->
<schema
- xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://foo/extvar"
- xmlns:tns="http://foo/extvar" elementFormDefault="qualified">
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://foo/extvar"
+ xmlns:tns="http://foo/extvar" elementFormDefault="qualified">
<complexType name="tRow">
- <sequence>
- <element name="pid" type="string"></element>
- <element name="foo" type="string"></element>
- </sequence>
+ <sequence>
+ <element name="pid" type="string"></element>
+ <element name="foo" type="string"></element>
+ </sequence>
</complexType>
<element name="row" type="tns:tRow" />
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.bpel?rev=595466&r1=595465&r2=595466&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.bpel (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/HelloWorld2.bpel Thu Nov 15 13:37:13 2007
@@ -24,7 +24,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:test="http://ode/bpel/unit-test.wsdl"
xmlns:foo="http://foo/extvar"
- xmlns:evar="http://www.apache.org/ode/extensions/externalVariables"
+ 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">
@@ -48,8 +48,7 @@
<variable name="myVar" messageType="test:HelloMessage"/>
<variable name="tmpVar" type="xsd:string"/>
<variable name="tmpDate" type="xsd:dateTime"/>
- <variable name="external" element="foo:row" evar:ext-var-id="evar1" />
-
+ <variable name="external" element="foo:row" xvar:id="evar1" />
</variables>
<sequence>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/deploy.xml?rev=595466&r1=595465&r2=595466&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/deploy.xml (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ExtVar/deploy.xml Thu Nov 15 13:37:13 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -19,8 +20,8 @@
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
xmlns:pns="http://ode/bpel/unit-test"
xmlns:wns="http://ode/bpel/unit-test.wsdl"
- xmlns:evar="http://www.apache.org/ode/extensions/externalVariables">
-
+ xmlns:xvar="http://ode.apache.org/externalVariables"
+ xmlns:jdbc="http://ode.apache.org/externalVariables/jdbc" >
<process name="pns:HelloWorld2">
<active>true</active>
@@ -28,19 +29,16 @@
<service name="wns:HelloService" port="HelloPort"/>
</provide>
- <evar:externalVariable id="evar1" >
- <evar:jdbc xmlns="">
- <datasource-ref>testds</datasource-ref>
- <table>extvartable1</table>
- <column name="pid"
- key="yes"
- generator="pid" />
- <column name="cts"
- generator="ctimestamp" />
- <column name="uts"
- generator="utimestamp" />
- </evar:jdbc>
- </evar:externalVariable>
+ <xvar:externalVariable id="evar1" >
+ <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="cts" generator="ctimestamp" />
+ <jdbc:column name="uts" generator="utimestamp" />
+ </jdbc:jdbc>
+ </xvar:externalVariable>
</process>
</deploy>
+