You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2006/10/24 06:43:18 UTC
svn commit: r467239 [7/7] - in /incubator/ode/trunk: ./ axis2-examples/
axis2-war/ axis2/ axis2/src/main/java/org/apache/ode/axis2/ bpel-api-jca/
bpel-api/ bpel-api/src/main/java/org/apache/ode/bpel/capi/
bpel-api/src/main/java/org/apache/ode/bpel/xsl/...
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java Mon Oct 23 21:43:09 2006
@@ -22,7 +22,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.FaultException;
-import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression;
import org.apache.ode.bpel.explang.EvaluationException;
import org.apache.ode.bpel.o.OExpression;
import org.apache.ode.bpel.o.OForEach;
@@ -184,10 +183,7 @@
evaluateAsNumber(condition, getEvaluationContext()).intValue();
} catch (EvaluationException e) {
String msg;
- if (condition instanceof OXPath10Expression)
- msg = "ForEach counter value " + ((OXPath10Expression)condition).xpath +
- " couldn't be evaluated as xs:unsignedInt.";
- else msg = "ForEach counter value couldn't be evaluated as xs:unsignedInt.";
+ msg = "ForEach counter value couldn't be evaluated as xs:unsignedInt.";
__log.error(msg, e);
throw new FaultException(_oforEach.getOwner().constants.qnForEachCounterError,msg);
}
Propchange: incubator/ode/trunk/bpel-scheduler-quartz/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/bpel-scheduler-quartz/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-scheduler-quartz/.classpath?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/bpel-scheduler-quartz/.classpath (original)
+++ incubator/ode/trunk/bpel-scheduler-quartz/.classpath Mon Oct 23 21:43:09 2006
@@ -1,23 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
- <classpathentry kind="src" path="/ode-bpel-dd"/>
- <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="src" path="/ode-bpel-bom"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
- <classpathentry kind="src" path="/ode-bpel-obj"/>
- <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.5.1/quartz-1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
- <classpathentry kind="src" path="/ode-utils"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/xmlbeans/xmlpublic/2.1.0/xmlpublic-2.1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="src" path="/ode-bpel-api"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-dd"/>
+ <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-obj"/>
+ <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.5.1/quartz-1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
+ <classpathentry kind="src" path="/ode-utils"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xmlbeans/xmlpublic/2.1.0/xmlpublic-2.1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Propchange: incubator/ode/trunk/bpel-schemas/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/bpel-scripts/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/bpel-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -1,2 +1,5 @@
-
target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel (original)
+++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel Mon Oct 23 21:43:09 2006
@@ -67,10 +67,6 @@
<to>$intVar2</to>
</copy>
<copy>
- <from>bpws:getVariableData('intVar')</from>
- <to>$intVar2</to>
- </copy>
- <copy>
<from>$intVar + 1</from>
<to variable="intVar"/>
</copy>
Modified: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel (original)
+++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel Mon Oct 23 21:43:09 2006
@@ -71,8 +71,11 @@
<scope name="scopeOne">
<eventHandlers>
- <onEvent partnerLink="request1" messageType="wns:requestMessage"
- portType="wns:TestStaticOnMessage1PT" operation="event1" variable="request">
+ <onEvent partnerLink="request1"
+ messageType="wns:requestMessage"
+ portType="wns:TestStaticOnMessage1PT"
+ operation="event1"
+ variable="request">
<correlations>
<correlation set="testCorr1"/>
Propchange: incubator/ode/trunk/dao-hibernate/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/dao-hibernate-db-derby/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/dao-hibernate/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/.classpath?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/dao-hibernate/.classpath (original)
+++ incubator/ode/trunk/dao-hibernate/.classpath Mon Oct 23 21:43:09 2006
@@ -1,55 +1,41 @@
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="target/generated-resources/xdoclet"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/1.2.6/spring-core-1.2.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/>
- <classpathentry kind="src" path="/ode-jacob"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="src" path="/ode-utils"/>
- <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
- <classpathentry kind="src" path="/ode-bpel-api"/>
- <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
- <classpathentry kind="src" path="/ode-bpel-compiler"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="src" path="/ode-bpel-dd"/>
- <classpathentry kind="src" path="/ode-bpel-el-xpath10"/>
- <classpathentry kind="var" path="M2_REPO/xom/xom/1.0b3/xom-1.0b3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/howl/howl-logger/0.1.11/howl-logger-0.1.11.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jotm/jotm_jrmp_stubs/2.0.10/jotm_jrmp_stubs-2.0.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-dom/8.7/saxon-dom-8.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/objectweb/carol/carol/2.0.5/carol-2.0.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/1.2.6/spring-beans-1.2.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon/8.7/saxon-8.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar"/>
- <classpathentry kind="src" path="/ode-bpel-schemas"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xmlbeans/xmlpublic/2.1.0/xmlpublic-2.1.0.jar"/>
- <classpathentry kind="src" path="/ode-bpel-el-xpath20"/>
- <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jotm/jotm/2.0.10/jotm-2.0.10.jar"/>
- <classpathentry kind="src" path="/ode-bpel-parser"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
- <classpathentry kind="src" path="/ode-bpel-bom"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.2/hibernate-3.1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
- <classpathentry kind="src" path="/ode-bpel-ql"/>
- <classpathentry kind="src" path="/ode-bpel-dao"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-xpath/8.7/saxon-xpath-8.7.jar"/>
- <classpathentry kind="src" path="/ode-bpel-obj"/>
- <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry output="target/test-classes" kind="src" path="src/test/java"/>
+ <classpathentry kind="src" path="target/generated-resources/xdoclet"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xom/xom/1.0b3/xom-1.0b3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/saxon/saxon-dom/8.4/saxon-dom-8.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-dd"/>
+ <classpathentry kind="src" path="/ode-utils"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.2/hibernate-3.1.2.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-obj"/>
+ <classpathentry kind="src" path="/ode-bpel-ql"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-schemas"/>
+ <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/saxon/saxon/8.4/saxon-8.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xmlbeans/xmlpublic/2.1.0/xmlpublic-2.1.0.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-dao"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java (original)
+++ incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java Mon Oct 23 21:43:09 2006
@@ -329,7 +329,7 @@
List<HBpelEvent> hevents = crit.list();
List<BpelEvent> ret = new ArrayList<BpelEvent>(hevents.size());
try {
- CollectionsX.transform(ret, hevents, new UnaryFunctionEx<HBpelEvent, BpelEvent>() {
+ CollectionsX.transformEx(ret, hevents, new UnaryFunctionEx<HBpelEvent, BpelEvent>() {
public BpelEvent apply(HBpelEvent x) throws Exception {
return (BpelEvent) SerializableUtils.toObject(x.getData().getBinary(), BpelEvent.class
.getClassLoader());
Modified: incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java (original)
+++ incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java Mon Oct 23 21:43:09 2006
@@ -247,7 +247,7 @@
List<HBpelEvent> hevents = crit.list();
List<BpelEvent> ret = new ArrayList<BpelEvent>(hevents.size());
try {
- CollectionsX.transform(ret,hevents,new UnaryFunctionEx<HBpelEvent,BpelEvent>() {
+ CollectionsX.transformEx(ret,hevents,new UnaryFunctionEx<HBpelEvent,BpelEvent>() {
public BpelEvent apply(HBpelEvent x) throws Exception{
return (BpelEvent) SerializableUtils.toObject(x.getData().getBinary(),BpelEvent.class.getClassLoader());
}
Propchange: incubator/ode/trunk/dao-memory/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/distro-axis2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/distro-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/distro-axis2/pom.xml?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/distro-axis2/pom.xml (original)
+++ incubator/ode/trunk/distro-axis2/pom.xml Mon Oct 23 21:43:09 2006
@@ -29,10 +29,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-bom</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-api</artifactId>
</dependency>
<dependency>
@@ -46,10 +42,6 @@
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-obj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-parser</artifactId>
</dependency>
<dependency>
Propchange: incubator/ode/trunk/distro-jbi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/distro-jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/distro-jbi/pom.xml?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/distro-jbi/pom.xml (original)
+++ incubator/ode/trunk/distro-jbi/pom.xml Mon Oct 23 21:43:09 2006
@@ -28,10 +28,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-bom</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-api</artifactId>
</dependency>
<dependency>
@@ -46,11 +42,6 @@
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-obj</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-parser</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-jbi</artifactId>
Propchange: incubator/ode/trunk/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/foo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/integration/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/jacob/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/jbi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/jbi-examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java Mon Oct 23 21:43:09 2006
@@ -45,7 +45,6 @@
import org.apache.ode.bpel.connector.BpelServerConnector;
import org.apache.ode.bpel.engine.BpelServerImpl;
import org.apache.ode.bpel.scheduler.quartz.QuartzSchedulerImpl;
-import org.apache.ode.bpel.xsl.XslTransformHandler;
import org.apache.ode.daohib.DataSourceConnectionProvider;
import org.apache.ode.daohib.HibernateTransactionManagerLookup;
import org.apache.ode.daohib.SessionManager;
@@ -128,8 +127,6 @@
__log.debug("Starting JCA connector.");
initConnector();
- initXslt();
-
_suManager = new OdeSUManager(_ode);
_initSuccess = true;
__log.info(__msgs.msgOdeInitialized());
@@ -331,11 +328,6 @@
__log.error("Failed to initialize JCA connector.",e);
}
}
- }
-
- private void initXslt() {
- TransformerFactory trsf = new net.sf.saxon.TransformerFactoryImpl();
- XslTransformHandler.getInstance().setTransformerFactory(trsf);
}
Propchange: incubator/ode/trunk/jca-ra/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/jca-ra/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jca-ra/.classpath?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/jca-ra/.classpath (original)
+++ incubator/ode/trunk/jca-ra/.classpath Mon Oct 23 21:43:09 2006
@@ -2,13 +2,13 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/ode-utils"/>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-utils/2.0-SNAPSHOT/ode-utils-2.0-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
</classpath>
Modified: incubator/ode/trunk/jca-ra/.project
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jca-ra/.project?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/jca-ra/.project (original)
+++ incubator/ode/trunk/jca-ra/.project Mon Oct 23 21:43:09 2006
@@ -1,9 +1,7 @@
<projectDescription>
<name>ode-jca-ra</name>
<comment/>
- <projects>
- <project>ode-utils</project>
- </projects>
+ <projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
Propchange: incubator/ode/trunk/jca-rar/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/jca-server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/jca-server/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jca-server/.classpath?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/jca-server/.classpath (original)
+++ incubator/ode/trunk/jca-server/.classpath Mon Oct 23 21:43:09 2006
@@ -2,14 +2,14 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
- <classpathentry kind="src" path="/ode-jca-ra"/>
- <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-utils/2.0-SNAPSHOT/ode-utils-2.0-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
- <classpathentry kind="src" path="/ode-utils"/>
+ <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-jca-ra/2.0-SNAPSHOT/ode-jca-ra-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
</classpath>
Modified: incubator/ode/trunk/jca-server/.project
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jca-server/.project?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/jca-server/.project (original)
+++ incubator/ode/trunk/jca-server/.project Mon Oct 23 21:43:09 2006
@@ -1,10 +1,7 @@
<projectDescription>
<name>ode-jca-server</name>
<comment>Server-side implementation of a JCA connector.</comment>
- <projects>
- <project>ode-jca-ra</project>
- <project>ode-utils</project>
- </projects>
+ <projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
Propchange: incubator/ode/trunk/minerva/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/minerva/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/minerva/.classpath?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/minerva/.classpath (original)
+++ incubator/ode/trunk/minerva/.classpath Mon Oct 23 21:43:09 2006
@@ -2,8 +2,8 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
</classpath>
Propchange: incubator/ode/trunk/naming/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/pom.xml?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/pom.xml (original)
+++ incubator/ode/trunk/pom.xml Mon Oct 23 21:43:09 2006
@@ -114,10 +114,8 @@
<module>bpel-scripts</module>
<module>bpel-schemas</module>
- <module>bpel-bom</module>
<module>bpel-obj</module>
<module>bpel-dd</module>
- <module>bpel-parser</module>
<module>bpel-api</module>
<module>bpel-dao</module>
<module>bpel-api-jca</module>
@@ -329,11 +327,6 @@
<dependencies>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-bom</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-runtime</artifactId>
<version>${project.version}</version>
</dependency>
@@ -390,11 +383,6 @@
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-obj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-parser</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Propchange: incubator/ode/trunk/soap/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/soap/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/soap/.classpath?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/soap/.classpath (original)
+++ incubator/ode/trunk/soap/.classpath Mon Oct 23 21:43:09 2006
@@ -3,12 +3,12 @@
<classpathentry kind="src" path="test/junit" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
- <classpathentry kind="src" path="/ode-utils"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-utils/2.0-SNAPSHOT/ode-utils-2.0-SNAPSHOT.jar"/>
</classpath>
Modified: incubator/ode/trunk/soap/.project
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/soap/.project?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/soap/.project (original)
+++ incubator/ode/trunk/soap/.project Mon Oct 23 21:43:09 2006
@@ -1,9 +1,7 @@
<projectDescription>
<name>ode-soap</name>
<comment/>
- <projects>
- <project>ode-utils</project>
- </projects>
+ <projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
Propchange: incubator/ode/trunk/tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Propchange: incubator/ode/trunk/tools-bin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/tools/pom.xml?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/tools/pom.xml (original)
+++ incubator/ode/trunk/tools/pom.xml Mon Oct 23 21:43:09 2006
@@ -33,10 +33,6 @@
<dependencies>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-bom</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-api</artifactId>
</dependency>
<dependency>
@@ -46,10 +42,6 @@
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-obj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-parser</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
Modified: incubator/ode/trunk/tools/src/main/java/org/apache/ode/tools/bpelc/BpelCompileCommand.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/tools/src/main/java/org/apache/ode/tools/bpelc/BpelCompileCommand.java?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/tools/src/main/java/org/apache/ode/tools/bpelc/BpelCompileCommand.java (original)
+++ incubator/ode/trunk/tools/src/main/java/org/apache/ode/tools/bpelc/BpelCompileCommand.java Mon Oct 23 21:43:09 2006
@@ -19,10 +19,10 @@
package org.apache.ode.tools.bpelc;
-import org.apache.ode.bpel.capi.CompilationException;
-import org.apache.ode.bpel.capi.CompilationMessage;
-import org.apache.ode.bpel.capi.CompileListener;
import org.apache.ode.bpel.compiler.BpelC;
+import org.apache.ode.bpel.compiler.api.CompilationException;
+import org.apache.ode.bpel.compiler.api.CompilationMessage;
+import org.apache.ode.bpel.compiler.api.CompileListener;
import org.apache.ode.tools.Command;
import org.apache.ode.tools.CommandContext;
import org.apache.ode.tools.ExecutionException;
Propchange: incubator/ode/trunk/utils/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 23 21:43:09 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+~*
+*~
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/NSContext.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/NSContext.java?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/NSContext.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/NSContext.java Mon Oct 23 21:43:09 2006
@@ -42,151 +42,152 @@
* @see NamespaceContext
*/
public class NSContext implements NamespaceContext, Externalizable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- /** Class-level logger. */
- private static final Log __log = LogFactory.getLog(NSContext.class);
+ /** Class-level logger. */
+ private static final Log __log = LogFactory.getLog(NSContext.class);
- /** Prefix-to-URI map. */
- private HashMap<String, String> _prefixToUriMap = new HashMap<String, String>();
+ /** Prefix-to-URI map. */
+ private HashMap<String, String> _prefixToUriMap = new HashMap<String, String>();
- public NSContext() {
- }
-
- public NSContext(NSContext map) {
- _prefixToUriMap.putAll(map._prefixToUriMap);
- }
-
- /**
- * @see NamespaceContext#getNamespaceURI(java.lang.String)
- */
- public String getNamespaceURI(String prefix) {
- return _prefixToUriMap.get(prefix);
- }
-
- /**
- * @see NamespaceContext#getPrefix(java.lang.String)
- */
- public String getPrefix(String uri) {
- Iterator i = getPrefixes(uri);
-
- if (i.hasNext()) {
- return (String)i.next();
- }
-
- return null;
- }
-
- /**
- * @see NamespaceContext#getPrefixes
- */
- @SuppressWarnings("unchecked")
- public Iterator getPrefixes(final String uri) {
- return new TransformIterator(new FilterIterator(_prefixToUriMap.entrySet().iterator(),
- new CompositeUnaryFunction(new EqualsUnaryFunction(uri), CollectionsX.ufnMapEntry_getValue)),
- CollectionsX.ufnMapEntry_getKey);
- }
-
- /**
- * Get all the prefixes with a URI mapping in this context
- *
- * @return{@link Set} of prefix {@link String}s with a URI mapping in this
- * context
- */
- public Set<String> getPrefixes() {
- return Collections.unmodifiableSet(_prefixToUriMap.keySet());
- }
-
- /**
- * Get all the URIs with a prefix mapping in this context
- *
- * @return{@link Set} of URI {@link String}s with a prefix mapping in this
- * context
- */
- public Set<String> getUriSet() {
- return new HashSet<String>(_prefixToUriMap.values());
- }
-
- /**
- * @see Externalizable#readExternal(java.io.ObjectInput)
- */
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- int numKeys = in.readInt();
-
- for (int i = 0; i < numKeys; ++i) {
- String prefix = in.readUTF();
- String uri = in.readUTF();
- _prefixToUriMap.put(prefix, uri);
- }
-
- if (__log.isTraceEnabled()) {
- __log.trace("readExternal: contents=" + _prefixToUriMap);
- }
- }
-
- /**
- * Add a prefix to URI mapping to this context.
- *
- * @param prefix
- * prefix
- * @param uri
- * URI
- */
- public void register(String prefix, String uri) {
- if (__log.isTraceEnabled()) {
- __log.trace("register(prefix=" + prefix + ", uri=" + uri + ")");
- }
-
- _prefixToUriMap.put(prefix, uri);
- }
-
- /**
- * Register a set of URI mappings at once.
- *
- * @param prefixMapping
- * set (map rather) of prefix-to-URI mappings.
- */
- public void register(Map<String, String> prefixMapping) {
- if (__log.isTraceEnabled()) {
- __log.trace("register(prefixmappings=" + prefixMapping + ")");
- }
-
- _prefixToUriMap.putAll(prefixMapping);
- }
-
- /**
- * @see Externalizable#writeExternal(java.io.ObjectOutput)
- */
- public void writeExternal(ObjectOutput out) throws IOException {
- if (__log.isTraceEnabled()) {
- __log.trace("writeExternal: contents=" + _prefixToUriMap);
- }
-
- out.writeInt(_prefixToUriMap.size());
-
- for (Iterator i = _prefixToUriMap.entrySet().iterator(); i.hasNext();) {
- Map.Entry me = (Map.Entry)i.next();
- out.writeUTF((String)me.getKey());
- out.writeUTF((String)me.getValue());
- }
- }
-
- public QName derefQName(String qname) {
- int idx = qname.indexOf(':');
-
- if (idx == -1) {
- return new QName(getNamespaceURI(null), qname);
- }
- else {
- String prefix = qname.substring(0, idx);
- String localname = qname.substring(idx + 1);
- String uri = getNamespaceURI(prefix);
+ public NSContext() {
+ }
+
+ public NSContext(NSContext map) {
+ _prefixToUriMap.putAll(map._prefixToUriMap);
+ }
+
+ /**
+ * @see NamespaceContext#getNamespaceURI(java.lang.String)
+ */
+ public String getNamespaceURI(String prefix) {
+ return _prefixToUriMap.get(prefix == null ? "" : prefix);
+ }
+
+ /**
+ * @see NamespaceContext#getPrefix(java.lang.String)
+ */
+ public String getPrefix(String uri) {
+ Iterator i = getPrefixes(uri);
+
+ if (i.hasNext()) {
+ return (String) i.next();
+ }
- if (uri == null) {
return null;
- }
+ }
+
+ /**
+ * @see NamespaceContext#getPrefixes
+ */
+ @SuppressWarnings("unchecked")
+ public Iterator getPrefixes(final String uri) {
+ return new TransformIterator(new FilterIterator(_prefixToUriMap.entrySet().iterator(),
+ new CompositeUnaryFunction(new EqualsUnaryFunction(uri), CollectionsX.ufnMapEntry_getValue)),
+ CollectionsX.ufnMapEntry_getKey);
+ }
+
+ /**
+ * Get all the prefixes with a URI mapping in this context
+ *
+ * @return{@link Set} of prefix {@link String}s with a URI mapping in this
+ * context
+ */
+ public Set<String> getPrefixes() {
+ return Collections.unmodifiableSet(_prefixToUriMap.keySet());
+ }
+
+ /**
+ * Get all the URIs with a prefix mapping in this context
+ *
+ * @return{@link Set} of URI {@link String}s with a prefix mapping in this
+ * context
+ */
+ public Set<String> getUriSet() {
+ return new HashSet<String>(_prefixToUriMap.values());
+ }
+
+ /**
+ * @see Externalizable#readExternal(java.io.ObjectInput)
+ */
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ int numKeys = in.readInt();
+
+ for (int i = 0; i < numKeys; ++i) {
+ String prefix = in.readUTF();
+ String uri = in.readUTF();
+ _prefixToUriMap.put(prefix, uri);
+ }
+
+ if (__log.isTraceEnabled()) {
+ __log.trace("readExternal: contents=" + _prefixToUriMap);
+ }
+ }
+
+ /**
+ * Add a prefix to URI mapping to this context.
+ *
+ * @param prefix
+ * prefix
+ * @param uri
+ * URI
+ */
+ public void register(String prefix, String uri) {
+ if (__log.isTraceEnabled()) {
+ __log.trace("register(prefix=" + prefix + ", uri=" + uri + ")");
+ }
+
+ _prefixToUriMap.put(prefix, uri);
+ }
+
+ /**
+ * Register a set of URI mappings at once.
+ *
+ * @param prefixMapping
+ * set (map rather) of prefix-to-URI mappings.
+ */
+ public void register(Map<String, String> prefixMapping) {
+ if (__log.isTraceEnabled()) {
+ __log.trace("register(prefixmappings=" + prefixMapping + ")");
+ }
+
+ _prefixToUriMap.putAll(prefixMapping);
+ }
+
+ /**
+ * @see Externalizable#writeExternal(java.io.ObjectOutput)
+ */
+ public void writeExternal(ObjectOutput out) throws IOException {
+ if (__log.isTraceEnabled()) {
+ __log.trace("writeExternal: contents=" + _prefixToUriMap);
+ }
+
+ out.writeInt(_prefixToUriMap.size());
+
+ for (Iterator i = _prefixToUriMap.entrySet().iterator(); i.hasNext();) {
+ Map.Entry me = (Map.Entry) i.next();
+ out.writeUTF((String) me.getKey());
+ out.writeUTF((String) me.getValue());
+ }
+ }
+
+ public QName derefQName(String qname) {
+ if (qname == null)
+ return null;
+ int idx = qname.indexOf(':');
+
+ if (idx == -1) {
+ return new QName(getNamespaceURI(null), qname);
+ }
+ String prefix = qname.substring(0, idx);
+ String localname = qname.substring(idx + 1);
+ String uri = getNamespaceURI(prefix);
+
+ if (uri == null) {
+ return null;
+ }
+
+ return new QName(uri, localname);
- return new QName(uri, localname);
}
- }
}
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/stl/CollectionsX.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/stl/CollectionsX.java?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/stl/CollectionsX.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/stl/CollectionsX.java Mon Oct 23 21:43:09 2006
@@ -21,200 +21,217 @@
import java.util.*;
-
/**
* Useful extensions to the java.util.Collections class.
*/
public class CollectionsX {
- public static UnaryFunction<Map.Entry,Object> ufnMapEntry_getKey = new UnaryFunction<Map.Entry,Object>() {
- public Object apply(Map.Entry x) {
- return x.getKey();
- }
- };
-
- public static UnaryFunction<Map.Entry,Object> ufnMapEntry_getValue = new UnaryFunction<Map.Entry,Object>() {
- public Object apply(Map.Entry x) {
- return x.getValue();
- }
- };
-
- public static <T> void apply(Collection<T> coll, UnaryFunction<T, ?> f) {
- apply(coll.iterator(), f);
- }
-
- public static <T> void apply(Iterator<T> i, UnaryFunction<T,?> f) {
- while (i.hasNext()) {
- f.apply(i.next());
- }
- }
-
- public static <T> void apply(Collection<T> coll, UnaryFunctionEx<T,?> f) throws Exception {
- apply(coll.iterator(), f);
- }
-
- public static <T> void apply(Iterator<T> i, UnaryFunctionEx<T, ?> f) throws Exception {
- while (i.hasNext()) {
- f.apply(i.next());
- }
- }
-
- /**
- * Find an element in a colletion satisfying a condition. The condition is
- * given in the form of a unary function which returns a non-<code>false</code>
- * value when the condition is satisfied. The first object in the collection
- * matching the condition is returned.
- *
- * @param coll
- * the collection to search through
- * @param f
- * the test to apply to the collection elements
- *
- * @return the first object in the collection (coll) which, satisfies the
- * condition (f)
- */
- public static <T> T find_if(Collection<T> coll, MemberOfFunction<T> f) {
- return find_if(coll.iterator(), f);
- }
-
- /**
- * Find an element in a collection satisfying a condition.
- *
- * @param i the iterator to iterate with
- * @param f the test to apply to the elements
- *
- * @return the first object enumerated by the iterator (i) which satisfies
- * the condition (f)
- *
- * @see #find_if(java.util.Collection, org.apache.ode.utils.stl.MemberOfFunction)
- */
- public static <T> T find_if(Iterator<T> i, MemberOfFunction<T> f) {
- while (i.hasNext()) {
- T x = i.next();
-
- if (f.isMember(x)) {
- return x;
- }
- }
-
- return null;
- }
-
- public static <T> Collection<T> insert(Collection<T> coll, Enumeration<? extends T> e) {
- while (e.hasMoreElements()) {
- coll.add(e.nextElement());
- }
- return coll;
- }
-
- public static <T> Collection<T> insert(Collection<T> coll, Iterator<? extends T> i) {
- while (i.hasNext()) {
- coll.add(i.next());
- }
- return coll;
- }
-
- public static <T> Collection<T> insert(Collection<T> coll, Collection<? extends T> src) {
- return insert(coll, src.iterator());
- }
-
- /**
- * Remove elements from collection based on the results of specified unary
- * function. An element will be deleted if <code>f.isMember(element)
- * </code> returns <code>true</code>. So: <em>coll' = { x : x el-of coll
- * AND f(x) == false }</em>
- *
- * @param coll the collection from which to remove elements
- * @param f the function to apply
- *
- * @return coll, for convenience
- */
- public static <T> Collection<T> remove_if(Collection<T> coll, MemberOfFunction<T> f) {
- Iterator<T> i = coll.iterator();
-
- while (i.hasNext()) {
- if (f.isMember(i.next())) {
- i.remove();
- }
- }
-
- return coll;
- }
-
- /**
- * Transform a collection with a unary function. Roughly speaking dest = {
- * f(a) : a el-of src }
- *
- * @param dest the empty (mutable) collection to transform into
- * @param src the collection to transform from
- * @param f the unary function to apply
- *
- * @return dest, for convenience
- */
- public static <T,V extends T,E> Collection<T> transform(Collection<T> dest, Collection<E> src,
- UnaryFunction<E,V> f) {
- Iterator<E> i = src.iterator();
-
- while (i.hasNext()) {
- dest.add(f.apply(i.next()));
- }
-
- return dest;
- }
-
- public static <T,V extends T,E> Collection<T> transform(Collection<T> dest, Collection<E> src,
- UnaryFunctionEx<E,V> f) throws Exception {
- Iterator<E> i = src.iterator();
-
- while (i.hasNext()) {
- dest.add(f.apply(i.next()));
- }
-
- return dest;
- }
-
- public static <T,V extends T, E> Collection<T> transform(Collection<T> dest, Enumeration<E> i,
- UnaryFunction<E,V> f) {
- while (i.hasMoreElements()) {
- dest.add(f.apply(i.nextElement()));
- }
- return dest;
- }
-
- public static <T, S extends T> Collection filter(Collection<T> dest, Collection<S> source, MemberOfFunction<S> function) {
- return filter(dest, source.iterator(), function);
- }
-
- public static <T, S extends T> Collection<T> filter(Collection<T> dest, Iterator<S> source, MemberOfFunction<S> function) {
- while (source.hasNext()) {
- S next = source.next();
- if (function.isMember(next)) {
- dest.add(next);
- }
- }
- return dest;
- }
-
- @SuppressWarnings("unchecked")
- public static <S, T extends S> Collection<T> filter(Collection<T> newList, Iterator<S> iterator, Class<T> t) {
- while (iterator.hasNext()) {
- S next = iterator.next();
- if (t.isAssignableFrom(next.getClass())){
- newList.add((T)next);
- }
- }
- return newList;
- }
-
- /**
- * Filter a collection by member class.
- * @param src source collection
- * @param aClass requested class
- * @return collection consisting of the members of the input that are assignable to the given class
- */
- @SuppressWarnings("unchecked")
- public static <T> Collection<T> filter(Collection src, final Class<T> aClass) {
- return filter(new ArrayList<T>(src.size()), src.iterator(), aClass);
- }
+ public static UnaryFunction<Map.Entry, Object> ufnMapEntry_getKey = new UnaryFunction<Map.Entry, Object>() {
+ public Object apply(Map.Entry x) {
+ return x.getKey();
+ }
+ };
+
+ public static UnaryFunction<Map.Entry, Object> ufnMapEntry_getValue = new UnaryFunction<Map.Entry, Object>() {
+ public Object apply(Map.Entry x) {
+ return x.getValue();
+ }
+ };
+
+ public static <T> void apply(Collection<T> coll, UnaryFunction<T, ?> f) {
+ apply(coll.iterator(), f);
+ }
+
+ public static <T> void apply(Iterator<T> i, UnaryFunction<T, ?> f) {
+ while (i.hasNext()) {
+ f.apply(i.next());
+ }
+ }
+
+ public static <T> void apply(Collection<T> coll, UnaryFunctionEx<T, ?> f) throws Exception {
+ apply(coll.iterator(), f);
+ }
+
+ public static <T> void apply(Iterator<T> i, UnaryFunctionEx<T, ?> f) throws Exception {
+ while (i.hasNext()) {
+ f.apply(i.next());
+ }
+ }
+
+ /**
+ * Find an element in a colletion satisfying a condition. The condition is
+ * given in the form of a unary function which returns a non-<code>false</code>
+ * value when the condition is satisfied. The first object in the collection
+ * matching the condition is returned.
+ *
+ * @param coll
+ * the collection to search through
+ * @param f
+ * the test to apply to the collection elements
+ *
+ * @return the first object in the collection (coll) which, satisfies the
+ * condition (f)
+ */
+ public static <T> T find_if(Collection<T> coll, MemberOfFunction<T> f) {
+ return find_if(coll.iterator(), f);
+ }
+
+ /**
+ * Find an element in a collection satisfying a condition.
+ *
+ * @param i
+ * the iterator to iterate with
+ * @param f
+ * the test to apply to the elements
+ *
+ * @return the first object enumerated by the iterator (i) which satisfies
+ * the condition (f)
+ *
+ * @see #find_if(java.util.Collection,
+ * org.apache.ode.utils.stl.MemberOfFunction)
+ */
+ public static <T> T find_if(Iterator<T> i, MemberOfFunction<T> f) {
+ while (i.hasNext()) {
+ T x = i.next();
+
+ if (f.isMember(x)) {
+ return x;
+ }
+ }
+
+ return null;
+ }
+
+ public static <T> Collection<T> insert(Collection<T> coll, Enumeration<? extends T> e) {
+ while (e.hasMoreElements()) {
+ coll.add(e.nextElement());
+ }
+ return coll;
+ }
+
+ public static <T> Collection<T> insert(Collection<T> coll, Iterator<? extends T> i) {
+ while (i.hasNext()) {
+ coll.add(i.next());
+ }
+ return coll;
+ }
+
+ public static <T> Collection<T> insert(Collection<T> coll, Collection<? extends T> src) {
+ return insert(coll, src.iterator());
+ }
+
+ /**
+ * Remove elements from collection based on the results of specified unary
+ * function. An element will be deleted if <code>f.isMember(element)
+ * </code>
+ * returns <code>true</code>. So: <em>coll' = { x : x el-of coll
+ * AND f(x) == false }</em>
+ *
+ * @param coll
+ * the collection from which to remove elements
+ * @param f
+ * the function to apply
+ *
+ * @return coll, for convenience
+ */
+ public static <T> Collection<T> remove_if(Collection<T> coll, MemberOfFunction<T> f) {
+ Iterator<T> i = coll.iterator();
+
+ while (i.hasNext()) {
+ if (f.isMember(i.next())) {
+ i.remove();
+ }
+ }
+
+ return coll;
+ }
+
+ /**
+ * Transform a collection with a unary function. Roughly speaking dest = {
+ * f(a) : a el-of src }
+ *
+ * @param dest
+ * the empty (mutable) collection to transform into
+ * @param src
+ * the collection to transform from
+ * @param f
+ * the unary function to apply
+ *
+ * @return dest, for convenience
+ */
+ public static <C extends Collection<T>, T, V extends T, E> C transform(C dest, Collection<E> src,
+ UnaryFunction<E, V> f) {
+ Iterator<E> i = src.iterator();
+
+ while (i.hasNext()) {
+ dest.add(f.apply(i.next()));
+ }
+
+ return dest;
+ }
+
+ public static <C extends Collection<T>, T, V extends T, E> C transformEx(C dest, Collection<E> src,
+ UnaryFunctionEx<E, V> f) throws Exception {
+ Iterator<E> i = src.iterator();
+
+ while (i.hasNext()) {
+ dest.add(f.apply(i.next()));
+ }
+
+ return dest;
+ }
+
+ public static <C extends Collection<T>, T, V extends T, E> C transform(C dest, Enumeration<E> i,
+ UnaryFunction<E, V> f) {
+ while (i.hasMoreElements()) {
+ dest.add(f.apply(i.nextElement()));
+ }
+ return dest;
+ }
+
+ public static <C extends Collection<T>, T, S extends T> C filter(C dest, Collection<S> source,
+ MemberOfFunction<S> function) {
+ return filter(dest, source.iterator(), function);
+ }
+
+ public static <C extends Collection<T>, T, S extends T> C filter(C dest, Iterator<S> source,
+ MemberOfFunction<S> function) {
+ while (source.hasNext()) {
+ S next = source.next();
+ if (function.isMember(next)) {
+ dest.add(next);
+ }
+ }
+ return dest;
+ }
+
+ public static <C extends Collection<T>, S, T extends S> C filter(C dest, Collection<S> src, Class<T> t) {
+ return filter(dest, src.iterator(), t);
+ }
+
+ public static <C extends Collection<T>, S, T extends S> C filter(C newList, Iterator<S> iterator, Class<T> t) {
+ while (iterator.hasNext()) {
+ S next = iterator.next();
+ if (t.isAssignableFrom(next.getClass())) {
+ newList.add((T) next);
+ }
+ }
+ return newList;
+ }
+
+ /**
+ * Filter a collection by member class.
+ *
+ * @param src
+ * source collection
+ * @param aClass
+ * requested class
+ * @return collection consisting of the members of the input that are
+ * assignable to the given class
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> Collection<T> filter(Collection src, final Class<T> aClass) {
+ return filter(new ArrayList<T>(src.size()), src.iterator(), aClass);
+ }
}
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/stl/MemberOfFunction.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/stl/MemberOfFunction.java?view=diff&rev=467239&r1=467238&r2=467239
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/stl/MemberOfFunction.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/stl/MemberOfFunction.java Mon Oct 23 21:43:09 2006
@@ -25,27 +25,43 @@
* <p>
* Created on Feb 4, 2004 at 4:48:55 PM.
* </p>
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
-public abstract class MemberOfFunction<E> implements UnaryFunction<E,Boolean> {
- /**
- * A unary function that tests whether an element is the member of a set.
- * @param o element to test
- * @return <code>true</code> if element is a member
- */
- public abstract boolean isMember(E o);
+public abstract class MemberOfFunction<E> implements UnaryFunction<E, Boolean> {
- /**
- * Implementation of {@link UnaryFunction} method defering to
- * {@link #isMember(E)}.
- * @param x element to test
- * @return {@link Boolean.TRUE} if isMemeber returns <code>true</code>,
- * <code>false</code> otherwise
- */
- public final Boolean apply(E x) {
- return isMember(x)
- ? Boolean.TRUE
- : Boolean.FALSE;
- }
+ /**
+ * A unary function that tests whether an element is the member of a set.
+ *
+ * @param o
+ * element to test
+ * @return <code>true</code> if element is a member
+ */
+ public abstract boolean isMember(E o);
+
+ /**
+ * Implementation of {@link UnaryFunction} method defering to
+ * {@link #isMember(E)}.
+ *
+ * @param x
+ * element to test
+ * @return {@link Boolean.TRUE} if isMemeber returns <code>true</code>,
+ * <code>false</code> otherwise
+ */
+ public final Boolean apply(E x) {
+ return isMember(x) ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+
+ public static class InstanceOf extends MemberOfFunction {
+ private Class _cls;
+ public InstanceOf(Class cls) { _cls = cls; }
+
+ @Override
+ public boolean isMember(Object o) {
+ return _cls.isInstance(o);
+ }
+
+ }
+
}