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 [28/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/distro/src/examples-jbi/ant/PingPong/pong/Pong.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/Pong.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/Pong.bpel (original)
+++ ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/Pong.bpel Thu May 27 18:09:53 2010
@@ -77,7 +77,7 @@
<to>$pongResponse.body/pong:text</to>
</copy>
</assign>
-
+
<reply name="pongReply"
partnerLink="PongPartnerLink"
portType="pong:PongPortType"
Modified: ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/Pong.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/Pong.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/Pong.wsdl (original)
+++ ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/Pong.wsdl Thu May 27 18:09:53 2010
@@ -62,10 +62,10 @@
<plnk:partnerLinkType name="PongPartnerLinkType">
<plnk:role name="Provider" portType="tns:PongPortType"/>
</plnk:partnerLinkType>
-
+
<!--
-
- This is an abstract interface/portType definition. Note the lack of
+
+ This is an abstract interface/portType definition. Note the lack of
binding and service. Since Pong is only exposed on the JBI bus, the
JBI endpoint is defined in Pong.dd.
Modified: ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/deploy.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/deploy.xml (original)
+++ ode/trunk/distro/src/examples-jbi/ant/PingPong/pong/deploy.xml Thu May 27 18:09:53 2010
@@ -27,5 +27,5 @@
<service name="pong:PongService" port="PongPort"/>
</provide>
</process>
-
+
</deploy>
Modified: ode/trunk/distro/src/examples-jbi/ant/ProcessManagement/ProcessManagement-HTTP/build.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/ant/ProcessManagement/ProcessManagement-HTTP/build.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/ant/ProcessManagement/ProcessManagement-HTTP/build.xml (original)
+++ ode/trunk/distro/src/examples-jbi/ant/ProcessManagement/ProcessManagement-HTTP/build.xml Thu May 27 18:09:53 2010
@@ -18,7 +18,7 @@
~ under the License.
-->
<project name="ProcessManagement-HTTP" default="service-unit">
-
+
<import file="../../base-su.xml" />
</project>
Modified: ode/trunk/distro/src/examples-jbi/ant/ProcessManagement/ProcessManagement-HTTP/pmapi.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/ant/ProcessManagement/ProcessManagement-HTTP/pmapi.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/ant/ProcessManagement/ProcessManagement-HTTP/pmapi.wsdl (original)
+++ ode/trunk/distro/src/examples-jbi/ant/ProcessManagement/ProcessManagement-HTTP/pmapi.wsdl Thu May 27 18:09:53 2010
@@ -29,14 +29,14 @@
xmlns="http://schemas.xmlsoap.org/wsdl/">
<types>
-
+
<!--
<xsd:schema>
<xsd:import namespace="http://www.apache.org/ode/pmapi/types/2006/08/02/" schemaLocation="pmapi.xsd"/>
</xsd:schema>
-->
-<!-- Note: Schema is inlined because import does not resolve .xsd file from inside service unit's directory -->
+<!-- Note: Schema is inlined because import does not resolve .xsd file from inside service unit's directory -->
<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:pmapi="http://www.apache.org/ode/pmapi/types/2006/08/02/"
xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.apache.org/ode/pmapi/types/2006/08/02/"
elementFormDefault="qualified">
@@ -738,9 +738,9 @@
</sequence>
</complexType>
-</xsd:schema>
-
-
+</xsd:schema>
+
+
<xsd:schema targetNamespace="http://www.apache.org/ode/pmapi">
<xsd:complexType name="aidsType">
<xsd:all>
@@ -1397,7 +1397,7 @@
<port name="ProcessManagementPort" binding="tns:ProcessManagementBinding">
<soap:address location="http://localhost:8080/ode/processes/ProcessManagement"/>
<smix:endpoint role="consumer" defaultMep="in-out"/>
-
+
</port>
</service>
<service name="InstanceManagementService">
Modified: ode/trunk/distro/src/examples-jbi/ant/base-sa.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/ant/base-sa.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/ant/base-sa.xml (original)
+++ ode/trunk/distro/src/examples-jbi/ant/base-sa.xml Thu May 27 18:09:53 2010
@@ -34,7 +34,7 @@
<fileset dir="${basedir}" includes="*/build.xml"/>
</subant>
</target>
-
+
<target name="service-units" depends="init" >
<subant target="service-unit">
<property name="dist.dir" value="${sus.dir}" />
Modified: ode/trunk/distro/src/examples-jbi/ant/base-su.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/ant/base-su.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/ant/base-su.xml (original)
+++ ode/trunk/distro/src/examples-jbi/ant/base-su.xml Thu May 27 18:09:53 2010
@@ -19,7 +19,7 @@
<project name="base-su" >
<import file="base.xml" />
-
+
<property name="sufilename" value="${ant.project.name}.zip" />
<property name="stage.dir" location="${build.dir}/stage" />
@@ -29,7 +29,7 @@
<delete dir="${build.dir}"/>
</target>
-
+
<target name="build" depends="init" >
<copy todir="${stage.dir}">
<fileset dir="${basedir}" includes="*" excludes="build.xml,build" />
Modified: ode/trunk/distro/src/examples-jbi/ant/base.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/ant/base.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/ant/base.xml (original)
+++ ode/trunk/distro/src/examples-jbi/ant/base.xml Thu May 27 18:09:53 2010
@@ -30,7 +30,7 @@
</condition>
<property file="${basedir}/../example.properties"/>
-
+
<!-- pick up environmental ode.xxx properties -->
<property file="${ode.home}/etc/ode.properties"/>
@@ -58,9 +58,9 @@
<os family="unix"/>
</condition>
</target>
-
+
<!-- if example.properties has ode.java.home assigned it has highest priority
- and overrides the system environment JAVA_HOME
+ and overrides the system environment JAVA_HOME
if ode.java.home not set in example.properties and system environment
JAVA_HOME is set then ode.java.home becomes JAVA_HOME -->
@@ -103,12 +103,12 @@
<target name="init" depends="init-extensions,fail-invalid-ode-home,fail-invalid-ode-java-home">
<echo message="ode.home = ${ode.home}"/>
<echo message="ode.java.home = ${ode.java.home}"/>
-
+
<!-- Ant Env Takes gets first crack at basic ode properties override -->
<!-- example.properties gets second crack at basic ode properties override -->
<!-- ode.properties is default authority -->
<property file="${ode.home}/etc/ode.properties"/>
-
+
<property name="ode.default.javaopts"
value=""/>
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/META-INF/spring/xbean.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/META-INF/spring/xbean.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/META-INF/spring/xbean.xml (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/META-INF/spring/xbean.xml Thu May 27 18:09:53 2010
@@ -27,18 +27,18 @@
http://www.springframework.org/schema/beans/spring-beans.xsd
http://servicemix.apache.org/http/1.0
http://servicemix.apache.org/http/1.0/servicemix-http.xsd">
- <http:endpoint
+ <http:endpoint
service="ping:PingService"
- endpoint="http"
+ endpoint="http"
targetService="ping:PingService"
targetEndpoint="PingPort"
defaultOperation="Ping"
role="consumer"
locationURI="http://localhost:8192/PingHttp/"
- defaultMep="http://www.w3.org/2004/08/wsdl/in-out"
+ defaultMep="http://www.w3.org/2004/08/wsdl/in-out"
wsdlResource="classpath:Ping.wsdl"
soapVersion="1.1"
soap="true" />
-
+
<bean class="org.apache.servicemix.common.osgi.EndpointExporter" />
</beans>
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Ping.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Ping.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Ping.bpel (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Ping.bpel Thu May 27 18:09:53 2010
@@ -81,14 +81,14 @@
<to>$pongRequest.body/pong:text</to>
</copy>
</assign>
-
+
<invoke name="invokePong"
operation="Pong"
inputVariable="pongRequest"
outputVariable="pongResponse"
partnerLink="PongPartnerLink"
portType="pong:PongPortType"/>
-
+
<assign name="assignPingResponse">
<copy>
<from>$pongResponse.body/pong:text</from>
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Ping.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Ping.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Ping.wsdl (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Ping.wsdl Thu May 27 18:09:53 2010
@@ -48,13 +48,13 @@
<plnk:partnerLinkType name="PingPartnerLinkType">
<plnk:role name="Provider" portType="tns:PingPortType"/>
</plnk:partnerLinkType>
-
+
<!--
-
- This is an abstract interface/portType definition. Note the lack of
+
+ This is an abstract interface/portType definition. Note the lack of
binding and service: these are defined by the HTTP binding component.
See ping-http/Ping.wsdl for details.
-
+
-->
</definitions>
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Pong.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Pong.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Pong.bpel (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Pong.bpel Thu May 27 18:09:53 2010
@@ -73,7 +73,7 @@
<to>$pongResponse.body/pong:text</to>
</copy>
</assign>
-
+
<reply name="pongReply"
partnerLink="PongPartnerLink"
portType="pong:PongPortType"
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Pong.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Pong.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Pong.wsdl (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/Pong.wsdl Thu May 27 18:09:53 2010
@@ -48,10 +48,10 @@
<plnk:partnerLinkType name="PongPartnerLinkType">
<plnk:role name="Provider" portType="tns:PongPortType"/>
</plnk:partnerLinkType>
-
+
<!--
-
- This is an abstract interface/portType definition. Note the lack of
+
+ This is an abstract interface/portType definition. Note the lack of
binding and service. Since Pong is only exposed on the JBI bus, the
JBI endpoint is defined in Pong.dd.
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/deploy.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/deploy.xml (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/src/main/resources/deploy.xml Thu May 27 18:09:53 2010
@@ -38,5 +38,5 @@
<service name="pong:PongService" port="PongPort"/>
</provide>
</process>
-
+
</deploy>
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong/README.txt
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong/README.txt?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong/README.txt (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong/README.txt Thu May 27 18:09:53 2010
@@ -1,4 +1,4 @@
-This example demonstrates particularly a feature, which enables adding java code inside JBI Service Unit and invoking it from BPEL using Saxon.
+This example demonstrates particularly a feature, which enables adding java code inside JBI Service Unit and invoking it from BPEL using Saxon.
An invoked method is AttachPing.attachPing(String).
More detailed information is here: http://issues.apache.org/jira/browse/ODE-709
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong/common/src/main/resources/Ping.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong/common/src/main/resources/Ping.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong/common/src/main/resources/Ping.wsdl (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong/common/src/main/resources/Ping.wsdl Thu May 27 18:09:53 2010
@@ -48,13 +48,13 @@
<plnk:partnerLinkType name="PingPartnerLinkType">
<plnk:role name="Provider" portType="tns:PingPortType"/>
</plnk:partnerLinkType>
-
+
<!--
-
- This is an abstract interface/portType definition. Note the lack of
+
+ This is an abstract interface/portType definition. Note the lack of
binding and service: these are defined by the HTTP binding component.
See ping-http/Ping.wsdl for details.
-
+
-->
</definitions>
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong/common/src/main/resources/Pong.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong/common/src/main/resources/Pong.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong/common/src/main/resources/Pong.wsdl (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong/common/src/main/resources/Pong.wsdl Thu May 27 18:09:53 2010
@@ -48,10 +48,10 @@
<plnk:partnerLinkType name="PongPartnerLinkType">
<plnk:role name="Provider" portType="tns:PongPortType"/>
</plnk:partnerLinkType>
-
+
<!--
-
- This is an abstract interface/portType definition. Note the lack of
+
+ This is an abstract interface/portType definition. Note the lack of
binding and service. Since Pong is only exposed on the JBI bus, the
JBI endpoint is defined in Pong.dd.
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong/http-su/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong/http-su/src/main/resources/xbean.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong/http-su/src/main/resources/xbean.xml (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong/http-su/src/main/resources/xbean.xml Thu May 27 18:09:53 2010
@@ -21,15 +21,15 @@
xmlns:ping="urn:/Ping.wsdl"
xmlns:pong="urn:/Pong.wsdl"
>
- <http:endpoint
+ <http:endpoint
service="ping:PingService"
- endpoint="http"
+ endpoint="http"
targetService="ping:PingService"
targetEndpoint="PingPort"
defaultOperation="Ping"
role="consumer"
locationURI="http://localhost:8192/PingHttp/"
- defaultMep="http://www.w3.org/2004/08/wsdl/in-out"
+ defaultMep="http://www.w3.org/2004/08/wsdl/in-out"
wsdlResource="classpath:Ping.wsdl"
soapVersion="1.1"
soap="true" />
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/Ping.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/Ping.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/Ping.bpel (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/Ping.bpel Thu May 27 18:09:53 2010
@@ -81,14 +81,14 @@
<to>$pongRequest.body/pong:text</to>
</copy>
</assign>
-
+
<invoke name="invokePong"
operation="Pong"
inputVariable="pongRequest"
outputVariable="pongResponse"
partnerLink="PongPartnerLink"
portType="pong:PongPortType"/>
-
+
<assign name="assignPingResponse">
<copy>
<from>$pongResponse.body/pong:text</from>
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/Pong.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/Pong.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/Pong.bpel (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/Pong.bpel Thu May 27 18:09:53 2010
@@ -73,7 +73,7 @@
<to>$pongResponse.body/pong:text</to>
</copy>
</assign>
-
+
<reply name="pongReply"
partnerLink="PongPartnerLink"
portType="pong:PongPortType"
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/deploy.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/deploy.xml (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong/ode-su/src/main/resources/deploy.xml Thu May 27 18:09:53 2010
@@ -38,5 +38,5 @@
<service name="pong:PongService" port="PongPort"/>
</provide>
</process>
-
+
</deploy>
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong/pom.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong/pom.xml (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong/pom.xml Thu May 27 18:09:53 2010
@@ -23,7 +23,7 @@
<artifactId>pom</artifactId>
<packaging>pom</packaging>
<version>1.0.0</version>
-
+
<properties>
<jbi-maven-plugin-version>4.0</jbi-maven-plugin-version>
<processRevision>1</processRevision>
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong/sa/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong/sa/pom.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong/sa/pom.xml (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong/sa/pom.xml Thu May 27 18:09:53 2010
@@ -23,13 +23,13 @@
<artifactId>pom</artifactId>
<version>1.0.0</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ode.ping-pong</groupId>
<artifactId>ping-pong-sa</artifactId>
<packaging>jbi-service-assembly</packaging>
-
+
<dependencies>
<dependency>
<groupId>org.apache.ode.ping-pong</groupId>
@@ -42,7 +42,7 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -61,5 +61,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
Modified: ode/trunk/distro/src/examples-war/DynPartner/Main.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-war/DynPartner/Main.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-war/DynPartner/Main.wsdl (original)
+++ ode/trunk/distro/src/examples-war/DynPartner/Main.wsdl Thu May 27 18:09:53 2010
@@ -75,6 +75,6 @@
<prop:propertyAlias propertyName="tns:dummyProp" messageType="resp:DummyMessage"
part="payload"/>
<prop:propertyAlias propertyName="tns:dummyProp" messageType="resp:Dummy2Message"
- part="payload"/>
+ part="payload"/>
</wsdl:definitions>
\ No newline at end of file
Modified: ode/trunk/distro/src/examples-war/DynPartner/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-war/DynPartner/deploy.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-war/DynPartner/deploy.xml (original)
+++ ode/trunk/distro/src/examples-war/DynPartner/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:main="http://ode/bpel/unit-test"
+ xmlns:main="http://ode/bpel/unit-test"
xmlns:mws="http://ode/bpel/unit-test.wsdl"
xmlns:resp="http://ode/bpel/responder"
xmlns:rws="http://ode/bpel/responder.wsdl">
Modified: ode/trunk/distro/src/examples-war/HelloWorld2/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-war/HelloWorld2/HelloWorld2.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-war/HelloWorld2/HelloWorld2.bpel (original)
+++ ode/trunk/distro/src/examples-war/HelloWorld2/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="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"
@@ -30,11 +30,11 @@
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"/>
@@ -59,9 +59,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/distro/src/examples-war/HelloWorld2/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-war/HelloWorld2/HelloWorld2.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-war/HelloWorld2/HelloWorld2.wsdl (original)
+++ ode/trunk/distro/src/examples-war/HelloWorld2/HelloWorld2.wsdl Thu May 27 18:09:53 2010
@@ -18,26 +18,26 @@
~ 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: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">
@@ -49,7 +49,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>
@@ -59,7 +59,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/distro/src/examples-war/HelloWorld2/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-war/HelloWorld2/deploy.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-war/HelloWorld2/deploy.xml (original)
+++ ode/trunk/distro/src/examples-war/HelloWorld2/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/distro/src/examples-war/MagicSession/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-war/MagicSession/deploy.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-war/MagicSession/deploy.xml (original)
+++ ode/trunk/distro/src/examples-war/MagicSession/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:main="http://ode/bpel/unit-test"
+ xmlns:main="http://ode/bpel/unit-test"
xmlns:mws="http://ode/bpel/unit-test.wsdl"
xmlns:resp="http://ode/bpel/responder">
Modified: ode/trunk/distro/src/examples-war/readme.txt
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-war/readme.txt?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-war/readme.txt (original)
+++ ode/trunk/distro/src/examples-war/readme.txt Thu May 27 18:09:53 2010
@@ -21,7 +21,7 @@ process with the command:
sendsoap http://localhost:8080/ode/processes/helloWorld testRequest.soap
-Please make sure that you execute the command from the example
+Please make sure that you execute the command from the example
directory. The response should be a SOAP message containing the
'hello world' string.
@@ -38,7 +38,7 @@ After deployment, start a process with t
sendsoap http://localhost:8080/ode/processes/DynMainService testRequest.soap
-Please make sure that you execute the command from the example
+Please make sure that you execute the command from the example
directory. The response should be an 'OK' SOAP message, showing
that all invocations have been successful.
@@ -54,6 +54,6 @@ After deployment, start a process with t
sendsoap http://localhost:8080/ode/processes/MSMainExecuteService testRequest.soap
-Please make sure that you execute the command from the example
+Please make sure that you execute the command from the example
directory. The response should be an 'OK' SOAP message, showing
that all invocations have been successful.
Modified: ode/trunk/distro/src/main/assembly/jbi.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/main/assembly/jbi.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/main/assembly/jbi.xml (original)
+++ ode/trunk/distro/src/main/assembly/jbi.xml Thu May 27 18:09:53 2010
@@ -133,16 +133,16 @@
<include>org.apache.ode:ode-bpel-schemas</include>
<include>commons-logging:commons-logging</include>
<include>org.apache.ode:ode-utils</include>
- <include>commons-codec:commons-codec</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-httpclient:commons-httpclient</include>
<include>commons-pool:commons-pool</include>
<include>net.sf.saxon:saxon</include>
<include>net.sf.saxon:saxon-xpath</include>
<include>net.sf.saxon:saxon-dom</include>
<include>net.sf.saxon:saxon-xqj</include>
- <include>jaxen:jaxen</include>
- <include>log4j:log4j</include>
+ <include>jaxen:jaxen</include>
+ <include>log4j:log4j</include>
<include>wsdl4j:wsdl4j</include>
<include>xalan:xalan</include>
<include>xerces:xercesImpl</include>
Modified: ode/trunk/distro/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/main/assembly/war.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/distro/src/main/assembly/war.xml (original)
+++ ode/trunk/distro/src/main/assembly/war.xml Thu May 27 18:09:53 2010
@@ -131,16 +131,16 @@
<include>org.apache.ode:ode-bpel-schemas</include>
<include>commons-logging:commons-logging</include>
<include>org.apache.ode:ode-utils</include>
- <include>commons-codec:commons-codec</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-httpclient:commons-httpclient</include>
<include>commons-pool:commons-pool</include>
<include>net.sf.saxon:saxon</include>
<include>net.sf.saxon:saxon-xpath</include>
<include>net.sf.saxon:saxon-dom</include>
<include>net.sf.saxon:saxon-xqj</include>
- <include>jaxen:jaxen</include>
- <include>log4j:log4j</include>
+ <include>jaxen:jaxen</include>
+ <include>log4j:log4j</include>
<include>wsdl4j:wsdl4j</include>
<include>xalan:xalan</include>
<include>xerces:xercesImpl</include>
Modified: ode/trunk/doap_ODE.rdf
URL: http://svn.apache.org/viewvc/ode/trunk/doap_ODE.rdf?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/doap_ODE.rdf (original)
+++ ode/trunk/doap_ODE.rdf Thu May 27 18:09:53 2010
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:asfext="http://projects.apache.org/ns/asfext#"
xmlns:foaf="http://xmlns.com/foaf/0.1/">
<!--
=======================================================================
- Copyright (c) 2006 The Apache Software Foundation.
+ Copyright (c) 2006 The Apache Software Foundation.
All rights reserved.
=======================================================================
Modified: ode/trunk/jacob-ap/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jacob-ap/pom.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob-ap/pom.xml (original)
+++ ode/trunk/jacob-ap/pom.xml Thu May 27 18:09:53 2010
@@ -39,7 +39,7 @@
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
- </dependencies>
-
+ </dependencies>
+
</project>
Modified: ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java (original)
+++ ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java Thu May 27 18:09:53 2010
@@ -34,12 +34,12 @@ class ChannelTypeAnnotationProcessor imp
AnnotationProcessorEnvironment _env;
AnnotationTypeDeclaration _atd;
-
+
ChannelTypeAnnotationProcessor(AnnotationTypeDeclaration atd, AnnotationProcessorEnvironment env) {
_atd = atd;
- _env = env;
+ _env = env;
}
-
+
public void process() {
Collection<InterfaceDeclaration> channels = DeclarationFilter.getFilter(InterfaceDeclaration.class).filter(_env.getDeclarationsAnnotatedWith(_atd),InterfaceDeclaration.class);
for (InterfaceDeclaration c : channels) {
@@ -53,7 +53,7 @@ class ChannelTypeAnnotationProcessor imp
if (pw != null) pw.close();
pw = null;
}
-
+
try {
pw = _env.getFiler().createSourceFile(c.getQualifiedName() + "ChannelListener");
writeChannelListenerClass(pw, c);
@@ -63,11 +63,11 @@ class ChannelTypeAnnotationProcessor imp
if (pw != null) pw.close();
pw = null;
}
-
+
}
}
-
-
+
+
private void writeChannelClass(PrintWriter pw, InterfaceDeclaration c) {
pw.println("/*");
pw.println(" * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR");
@@ -80,7 +80,7 @@ class ChannelTypeAnnotationProcessor imp
pw.println();
pw.println("package " + c.getPackage().getQualifiedName() + ";");
pw.println();
-
+
pw.println("/**");
pw.println(" * An auto-generated channel interface for the channel type");
pw.println(" * {@link " + c.getQualifiedName() + "}.");
@@ -88,17 +88,17 @@ class ChannelTypeAnnotationProcessor imp
pw.println(" * @see " + c.getQualifiedName() + "ChannelListener");
pw.println(" */");
pw.println("public interface " + c.getSimpleName() + "Channel");
-
+
Collection<InterfaceType> supers = c.getSuperinterfaces();
if (supers.isEmpty()) {
pw.println(" extends org.apache.ode.jacob.Channel, ");
} else {
pw.print(" extends ");
- for (InterfaceType s : supers)
+ for (InterfaceType s : supers)
pw.println(" "+ s.getDeclaration().getQualifiedName() + "Channel, ");
pw.println (" org.apache.ode.jacob.Channel, ");
}
-
+
pw.println(" " + c.getQualifiedName());
pw.println("{}");
pw.flush();
Modified: ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/JacobAnnotationProcessorFactory.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/JacobAnnotationProcessorFactory.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/JacobAnnotationProcessorFactory.java (original)
+++ ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/JacobAnnotationProcessorFactory.java Thu May 27 18:09:53 2010
@@ -33,8 +33,8 @@ import com.sun.mirror.declaration.Annota
public class JacobAnnotationProcessorFactory implements AnnotationProcessorFactory {
private static final List<String> __supported = Arrays.asList(
- new String[] { ChannelType.class.getName() });
-
+ new String[] { ChannelType.class.getName() });
+
public Collection<String> supportedOptions() {
return Collections.emptyList();
}
@@ -44,15 +44,15 @@ public class JacobAnnotationProcessorFac
}
public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atd, AnnotationProcessorEnvironment ape) {
-
+
if (atd.isEmpty())
return AnnotationProcessors.NO_OP;
-
+
for (AnnotationTypeDeclaration a: atd) {
if (a.getQualifiedName().equals(ChannelType.class.getName()))
return new ChannelTypeAnnotationProcessor(a,ape);
}
return AnnotationProcessors.NO_OP;
}
-
+
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java Thu May 27 18:09:53 2010
@@ -92,7 +92,7 @@ public abstract class ChannelListener<CT
/**
* Get a description of the object for debugging purposes.
- *
+ *
* @return human-readable description.
*/
public String toString() {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/DebugInfo.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/DebugInfo.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/DebugInfo.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/DebugInfo.java Thu May 27 18:09:53 2010
@@ -24,7 +24,7 @@ import java.io.Serializable;
/**
* Standard debug information for channels, objects (channel reads), and
* messages (channel writes).
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
public class DebugInfo implements Serializable {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/IndexedObject.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/IndexedObject.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/IndexedObject.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/IndexedObject.java Thu May 27 18:09:53 2010
@@ -23,8 +23,8 @@ package org.apache.ode.jacob;
* can be retrieved from the execution queue by their index key. This is handy for introspecting the state of
* the execution queue. Note that indexed objects are made available so long as they are referenced in some way by
* objects in the queue. The reference does not need to be direct; e.g. if a {@link org.apache.ode.jacob.ChannelListener}
- * in the execution queue references an indexed object, that indexed object will be indexed.
- *
+ * in the execution queue references an indexed object, that indexed object will be indexed.
+ *
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
*
*/
@@ -35,5 +35,5 @@ public interface IndexedObject {
* @return
*/
public Object getKey();
-
+
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java Thu May 27 18:09:53 2010
@@ -50,7 +50,7 @@ public abstract class JacobObject implem
/**
* Instantiation; the Java code <code>instance(new F(x,y,z))</code> is
* equivalent to <code>F(x,y,z)</code> in the process calculus.
- *
+ *
* @param concretion the concretion of a process template
*/
protected static void instance(JacobRunnable concretion) {
@@ -77,7 +77,7 @@ public abstract class JacobObject implem
/**
* Object; the Java code "object(x, ChannelListener)" is equivalent to
* <code>x ? ChannelListener</code> in the process algebra.
- *
+ *
* @param methodList method list for the communication reduction
* @see JacobThread#object
*/
@@ -106,7 +106,7 @@ public abstract class JacobObject implem
/**
* Obtain a replicated channel broadcaster.
- *
+ *
* @param channel target channel
* @return replicated channel broadcaster
*/
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java Thu May 27 18:09:53 2010
@@ -36,14 +36,14 @@ import org.apache.ode.utils.CollectionUt
* <pre>
* public class Cell extends JacobRunnable {
* private CellChannel s;
- *
+ *
* private Object v;
- *
+ *
* public Cell(CellChannel s, Object v) {
* this.s = s;
* this.v = v;
* }
- *
+ *
* public void run() {
* object(new CellChannelListener(s) { read(...) {...}
* write(...) {...} } );
@@ -63,12 +63,12 @@ import org.apache.ode.utils.CollectionUt
* .
* </pre>
* </code>
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com" />
*/
public abstract class JacobRunnable extends JacobObject {
private static final Set<Method> IMPLEMENTED_METHODS;
-
+
static {
try {
Method m = JacobRunnable.class.getMethod("run", CollectionUtils.EMPTY_CLASS_ARRAY);
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java Thu May 27 18:09:53 2010
@@ -21,12 +21,12 @@ package org.apache.ode.jacob;
import java.lang.reflect.Method;
/**
- * Class exposing the JACOB operations.
+ * Class exposing the JACOB operations.
* <p>
- * Note: these operations represent a subset of a process algebra mapped into
+ * Note: these operations represent a subset of a process algebra mapped into
* Java invocations; other aspects of the syntax are represented natively in Java.
- * In particular, parallel composition is modelled as sequential Java invocation
- * and if-else are modelled using Java's if-else statement. Note also that the
+ * In particular, parallel composition is modelled as sequential Java invocation
+ * and if-else are modelled using Java's if-else statement. Note also that the
* scoping rules for channel names are simply the Java object visibility rules.
*/
public interface JacobThread {
@@ -44,7 +44,7 @@ public interface JacobThread {
/**
* Send a message (object invocation). This method shouldn't really be used
* as {@link Channel} objects may be used as proxies in this respect.
- *
+ *
* @param channel
* channel on which to send the message
* @param method
@@ -68,7 +68,7 @@ public interface JacobThread {
* messages on the channel (depending on the value of the
* <code>replicate</code> argument.
* </p>
- *
+ *
* <p>
* With respect to process terms, the Java expression <code>object(false, x,
* ChannelListener)</code>
@@ -77,7 +77,7 @@ public interface JacobThread {
* were instead set to <code>true</code>, corresponding term would be
* <code> ! x ? { ChannelListener }</code>.
* </p>
- *
+ *
* @param replicate
* if set the a replication operator is present
* @param methodList
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Synch.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Synch.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Synch.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Synch.java Thu May 27 18:09:53 2010
@@ -24,7 +24,7 @@ import org.apache.ode.jacob.ap.ChannelTy
* Synch represents a synchronous invocation callback notification.
* <p>
* It is the only allowable return type (other than "void") for JACOB objects.
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
@ChannelType
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CELL_.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CELL_.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CELL_.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CELL_.java Thu May 27 18:09:53 2010
@@ -23,9 +23,9 @@ import org.apache.ode.jacob.Val;
/**
* Cell process template Java representation. This class is equivalent to the
- * following process calculus expression:
- * <code>
- * Cell(self, val) = self ? [ read(r) = { Cell(self, val) | r ! val(val) } & write(newVal) = { Cell(self, newVal) } ]
+ * following process calculus expression:
+ * <code>
+ * Cell(self, val) = self ? [ read(r) = { Cell(self, val) | r ! val(val) } & write(newVal) = { Cell(self, newVal) } ]
* </code>
*/
public class CELL_<T> extends JacobRunnable {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/Cell.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/Cell.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/Cell.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/Cell.java Thu May 27 18:09:53 2010
@@ -23,7 +23,7 @@ import org.apache.ode.jacob.ap.ChannelTy
/**
* Channel type for a cell. The channel allows reading of and setting the values of a cell.
- *
+ *
* @jacob.kind
*/
@ChannelType
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java Thu May 27 18:09:53 2010
@@ -33,12 +33,12 @@ import org.apache.ode.jacob.vpu.JacobVPU
* </em></pre>
*
* <p>Created on Feb 12, 2004 at 6:32:49 PM.</p>
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
public class Sieve extends JacobRunnable {
private static final long serialVersionUID = -1303509567096202776L;
-
+
private static int _cnt = 0;
private static int _last = 0;
@@ -60,7 +60,7 @@ public class Sieve extends JacobRunnable
*/
private static class Counter extends JacobRunnable {
private static final long serialVersionUID = 4739323750438991003L;
-
+
private NaturalNumberStreamChannel _out;
private int _n;
@@ -92,7 +92,7 @@ public class Sieve extends JacobRunnable
*/
private static final class Head extends JacobRunnable {
private static final long serialVersionUID = 1791641314141082728L;
-
+
NaturalNumberStreamChannel _in;
NaturalNumberStreamChannel _primes;
@@ -123,7 +123,7 @@ public class Sieve extends JacobRunnable
private static final class Print extends JacobRunnable {
private static final long serialVersionUID = -3134193737519487672L;
-
+
private NaturalNumberStreamChannel _in;
public Print(NaturalNumberStreamChannel in) {
_in = in;
@@ -152,7 +152,7 @@ public class Sieve extends JacobRunnable
*/
private static class PrimeFilter extends JacobRunnable {
private static final long serialVersionUID = 1569523200422202448L;
-
+
private int _prime;
private NaturalNumberStreamChannel _in;
private NaturalNumberStreamChannel _out;
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/sequence/Sequence.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/sequence/Sequence.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/sequence/Sequence.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/sequence/Sequence.java Thu May 27 18:09:53 2010
@@ -32,7 +32,7 @@ public abstract class Sequence extends J
/**
* Create a {@link Sequence} with a number of steps.
- *
+ *
* @param steps number of steps
* @param done synchronous callback
*/
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java Thu May 27 18:09:53 2010
@@ -25,8 +25,8 @@ import org.apache.ode.jacob.vpu.Executio
import org.apache.ode.jacob.vpu.JacobVPU;
/**
- * Example JACOB process illustrating the use of {@link SynchPrint}
- *
+ * Example JACOB process illustrating the use of {@link SynchPrint}
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
public class SynchPrinter {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/Comm.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/Comm.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/Comm.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/Comm.java Thu May 27 18:09:53 2010
@@ -25,7 +25,7 @@ import org.apache.ode.utils.ObjectPrinte
* <p>
* Created on Feb 16, 2004 at 8:44:27 PM.
* </p>
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
public abstract class Comm extends ExecutionQueueObject {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommChannel.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommChannel.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommChannel.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommChannel.java Thu May 27 18:09:53 2010
@@ -22,7 +22,7 @@ import org.apache.ode.utils.ObjectPrinte
/**
* DOCUMENTME.
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommGroup.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommGroup.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommGroup.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommGroup.java Thu May 27 18:09:53 2010
@@ -23,15 +23,15 @@ import java.util.Iterator;
import java.util.List;
/**
- *
+ *
* DOCUMENTME.
- *
+ *
* <p>
* Created on Feb 16, 2004 at 9:13:39 PM.
* </p>
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
- *
+ *
*/
public class CommGroup extends ExecutionQueueObject {
@@ -47,7 +47,7 @@ public class CommGroup extends Execution
/**
* Read the value of the replication operator flag. CommRecv (channel reads)
* with the replication flag set are left in the queue indefinately.
- *
+ *
* @return true or false
*/
public boolean isReplicated() {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java Thu May 27 18:09:53 2010
@@ -45,7 +45,7 @@ public class CommRecv extends Comm {
* JACOB VPU to determine what is placed here, but it will generally consist
* of some serialized representation of an appropriate ChannelListener
* object (see {@link ChannelListener}.
- *
+ *
* @return byte array representing the serialized form of the continuation
*/
public ChannelListener getContinuation() {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommSend.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommSend.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommSend.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommSend.java Thu May 27 18:09:53 2010
@@ -26,7 +26,7 @@ import java.lang.reflect.Method;
* structure consists of a label identifying the method that should be applied
* to the object once it is available, and the arguments that should be applied
* to said method.
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
public class CommSend extends Comm {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/Continuation.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/Continuation.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/Continuation.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/Continuation.java Thu May 27 18:09:53 2010
@@ -26,7 +26,7 @@ import java.lang.reflect.Method;
/**
* DOCUMENTME.
* <p>Created on Feb 16, 2004 at 9:23:40 PM.</p>
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
public class Continuation extends ExecutionQueueObject {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/ExecutionQueue.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/ExecutionQueue.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/ExecutionQueue.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/ExecutionQueue.java Thu May 27 18:09:53 2010
@@ -24,7 +24,7 @@ import java.io.PrintStream;
* The soup, the reactive "broth" that underlies the JACOB system. The {@link ExecutionQueue}
* implementation is responsible for implementing the JACOB reactive rules and
* maintaining the state of the reactive broth.
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
public interface ExecutionQueue {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/ExecutionQueueObject.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/ExecutionQueueObject.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/ExecutionQueueObject.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/ExecutionQueueObject.java Thu May 27 18:09:53 2010
@@ -20,7 +20,7 @@ package org.apache.ode.jacob.soup;
/**
* Base class for items we find in the {@link ExecutionQueue}.
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
public class ExecutionQueueObject {
@@ -30,7 +30,7 @@ public class ExecutionQueueObject {
*/
private Object _id;
- /**
+ /**
* A human-readable description of the object.
*/
private String _description;
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java Thu May 27 18:09:53 2010
@@ -423,7 +423,7 @@ public class ExecutionQueueImpl implemen
/**
* Verify that a {@link ExecutionQueueObject} is new, that is it has not
* already been added to the soup.
- *
+ *
* @param so object to check.
* @throws IllegalArgumentException in case the object is not new
*/
@@ -585,7 +585,7 @@ public class ExecutionQueueImpl implemen
private static class ObjectFrame extends CommFrame implements Externalizable {
private static final long serialVersionUID = -7212430608484116919L;
-
+
ChannelListener _continuation;
public ObjectFrame() {
@@ -649,7 +649,7 @@ public class ExecutionQueueImpl implemen
* <p>
* Created on Feb 16, 2004 at 8:09:48 PM.
* </p>
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
private class ExecutionQueueOutputStream extends ObjectOutputStream {
@@ -677,7 +677,7 @@ public class ExecutionQueueImpl implemen
/**
* Use this method to spy on any channels that are being serialized to
* this stream.
- *
+ *
* @param obj
* @return
* @throws IOException
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobMessages.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobMessages.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobMessages.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobMessages.java Thu May 27 18:09:53 2010
@@ -23,7 +23,7 @@ import org.apache.ode.utils.msg.MessageB
/**
* Messages for the Jacob VPU.
- *
+ *
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
public class JacobMessages extends MessageBundle {
@@ -31,12 +31,12 @@ public class JacobMessages extends Messa
/**
* Error indicating that client-code (i.e. not the VPU kernel) threw an
* unexpected exception.
- *
+ *
* @param methodName
* name of offending method
* @param className
* name of offending class
- *
+ *
* Method "{0}" in class "{1}" threw an unexpected exception.
*/
public String msgClientMethodException(String methodName, String className) {
@@ -52,12 +52,12 @@ public class JacobMessages extends Messa
/**
* Error indicating that a re-hydration of a saved _continuation object could
* not be completed.
- *
+ *
* @param channel
* channel with the dangling _continuation
* @param mlClassName
* name of de-hydrated {@link org.apache.ode.jacob.ChannelListener} object
- *
+ *
*/
public String msgContHydrationErr(String channel, String mlClassName) {
throw new UnsupportedOperationException();
@@ -67,7 +67,7 @@ public class JacobMessages extends Messa
* Internal error indicating that a required client method was not accessible
* due to security protections errors. This may be caused by a change to the
* client class definitions.
- *
+ *
* Method "{0}" in class "{1}" is not accessible.
*/
public String msgMethodNotAccessible(String methodName, String className) {
Modified: ode/trunk/jacob/src/xdt/org/apache/ode/jacob/channel.xdt
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/channel.xdt?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jacob/src/xdt/org/apache/ode/jacob/channel.xdt (original)
+++ ode/trunk/jacob/src/xdt/org/apache/ode/jacob/channel.xdt Thu May 27 18:09:53 2010
@@ -21,13 +21,13 @@
*/
package <XDtPackage:packageOf><XDtClass:fullClassName/></XDtPackage:packageOf>;
-public interface <XDtClass:classOf><XDtClass:fullClassName/>Channel</XDtClass:classOf>
+public interface <XDtClass:classOf><XDtClass:fullClassName/>Channel</XDtClass:classOf>
extends <XDtClass:ifHasClassTag tagName="jacob.parent">
<XDtClass:classTagValue tagName="jacob.parent"/>,
</XDtClass:ifHasClassTag>
<XDtClass:ifDoesntHaveClassTag tagName="jacob.parent">
- org.apache.ode.jacob.Channel,
+ org.apache.ode.jacob.Channel,
</XDtClass:ifDoesntHaveClassTag>
- <XDtClass:classOf><XDtClass:fullClassName/></XDtClass:classOf>
+ <XDtClass:classOf><XDtClass:fullClassName/></XDtClass:classOf>
{
}
Modified: ode/trunk/jbi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi-bundle/pom.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jbi-bundle/pom.xml (original)
+++ ode/trunk/jbi-bundle/pom.xml Thu May 27 18:09:53 2010
@@ -48,25 +48,25 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.ode*;version=${ode.version};-split-package:=merge-first</Export-Package>
<Import-Package>
- !com.sun.mirror*,
- !junit.framework*,
- !org.apache.axis2.client*,
- !org.apache.tools.ant*,
- javax.jbi*;version="1.0",
- javax.transaction*;version="1.1",
+ !com.sun.mirror*,
+ !junit.framework*,
+ !org.apache.axis2.client*,
+ !org.apache.tools.ant*,
+ javax.jbi*;version="1.0",
+ javax.transaction*;version="1.1",
org.tranql.connector.jdbc,
- org.apache.commons.httpclient*;version="3.0",
- org.apache.commons.logging*;version="1.1",
- org.apache.commons*,
- org.apache.geronimo.transaction.manager;version="2.0",
- org.osgi.service.command;version="[0.2,1)",
- org.springframework.beans.factory.xml;version="2.5",
+ org.apache.commons.httpclient*;version="3.0",
+ org.apache.commons.logging*;version="1.1",
+ org.apache.commons*,
+ org.apache.geronimo.transaction.manager;version="2.0",
+ org.osgi.service.command;version="[0.2,1)",
+ org.springframework.beans.factory.xml;version="2.5",
org.apache.geronimo.transaction.manager,
org.tranql.connector.jdbc,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers,
+ org.w3c.dom,
+ org.xml.sax,
+ org.xml.sax.ext,
+ org.xml.sax.helpers,
org.jaxen.saxpath,
net.sf.saxon.xpath,
*;resolution:=optional
Modified: ode/trunk/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/ServiceUnitActivator.java
URL: http://svn.apache.org/viewvc/ode/trunk/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/ServiceUnitActivator.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/ServiceUnitActivator.java (original)
+++ ode/trunk/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/ServiceUnitActivator.java Thu May 27 18:09:53 2010
@@ -36,7 +36,7 @@ import org.osgi.framework.ServiceReferen
/**
* @author mproch
- *
+ *
*/
public class ServiceUnitActivator implements BundleActivator {
Modified: ode/trunk/jbi-bundle/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi-bundle/src/main/resources/META-INF/persistence.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jbi-bundle/src/main/resources/META-INF/persistence.xml (original)
+++ ode/trunk/jbi-bundle/src/main/resources/META-INF/persistence.xml Thu May 27 18:09:53 2010
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.0">
<persistence-unit name="ode-dao">
- <!--
+ <!--
This properties file is used specifically by the
OpenJPA Enhancer.
-->
@@ -44,7 +44,7 @@
<class>org.apache.ode.dao.jpa.XmlDataProperty</class>
</persistence-unit>
<persistence-unit name="ode-store">
- <!--
+ <!--
This properties file is used specifically by the
OpenJPA Enhancer.
-->
Modified: ode/trunk/jbi-bundle/src/main/resources/META-INF/spring/ode-jbi.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi-bundle/src/main/resources/META-INF/spring/ode-jbi.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jbi-bundle/src/main/resources/META-INF/spring/ode-jbi.xml (original)
+++ ode/trunk/jbi-bundle/src/main/resources/META-INF/spring/ode-jbi.xml Thu May 27 18:09:53 2010
@@ -1,6 +1,6 @@
<?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 distributed with
this work for additional information regarding copyright ownership.
@@ -44,7 +44,7 @@
</bean>
<bean id="ode-jbi-component" class="org.apache.ode.jbi.OdeComponent">
- <constructor-arg ref="ode-component-lifecycle"/>
+ <constructor-arg ref="ode-component-lifecycle"/>
</bean>
<osgi:service ref="ode-jbi-component" interface="javax.jbi.component.Component">
@@ -63,5 +63,5 @@
<prop key="ode-jbi.jca.port">0</prop>
<prop key="javax.persistence.provider">org.apache.openjpa.persistence.PersistenceProviderImpl</prop>
</osgix:cm-properties>
-
+
</beans>
Modified: ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
URL: http://svn.apache.org/viewvc/ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java (original)
+++ ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java Thu May 27 18:09:53 2010
@@ -50,7 +50,7 @@ public abstract class OdeCommandsBase ex
/**
* Invokes an operation on the ODE MBean server
- *
+ *
* @param <T>
* @param operationName
* @param args
Modified: ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
URL: http://svn.apache.org/viewvc/ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java (original)
+++ ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java Thu May 27 18:09:53 2010
@@ -33,7 +33,7 @@ import org.apache.ode.bpel.pmapi.TProces
/**
* Lists the deployed process as well as the active instances
- *
+ *
* @author daniel
*/
@Command(scope = "ode", name = "list", description = "Lists ode processes and active instances")
Modified: ode/trunk/jbi-karaf/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi-karaf/pom.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jbi-karaf/pom.xml (original)
+++ ode/trunk/jbi-karaf/pom.xml Thu May 27 18:09:53 2010
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: ode/trunk/jbi/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/pom.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jbi/pom.xml (original)
+++ ode/trunk/jbi/pom.xml Thu May 27 18:09:53 2010
@@ -28,7 +28,7 @@
<artifactId>ode</artifactId>
<version>1.3.5-SNAPSHOT</version>
</parent>
-
+
<properties>
<jbi.version>1.1.0</jbi.version>
<spring.version>2.5.6</spring.version>
@@ -38,12 +38,12 @@
<tranql.version>1.1</tranql.version>
<geronimo.specs.jms.version>1.1-rc4</geronimo.specs.jms.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-compiler</artifactId>
@@ -93,7 +93,7 @@
<exclusion>
<groupId>org.jencks</groupId>
<artifactId>jencks</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_1.0_spec</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -173,7 +173,7 @@
<exclusion>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-saaj</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-xmlbeans</artifactId>
@@ -197,8 +197,8 @@
<exclusion>
<groupId>xpp3</groupId>
<artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
@@ -207,7 +207,7 @@
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-jacob-ap</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
@@ -221,13 +221,13 @@
<exclusion>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-dao-hibernate</artifactId>
@@ -347,15 +347,15 @@
<exclusion>
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
- </exclusion>
- </exclusions>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql-connector-derby-common</artifactId>
<version>${tranql.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
@@ -383,7 +383,7 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
</dependency>
-
+
<!-- This is a way to specify the global exclusion in the dependency tree -->
<dependency>
<groupId>commons-httpclient</groupId>
@@ -394,7 +394,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
@@ -422,9 +422,9 @@
<description>ODE JBI Integration Layer</description>
</configuration>
</execution>
- </executions>
+ </executions>
</plugin>
-
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -437,7 +437,7 @@
<name>java.naming.factory.initial</name>
<value>org.apache.xbean.spring.jndi.SpringInitialContextFactory</value>
</property>
- </systemProperties>
+ </systemProperties>
</configuration>
</plugin>
<plugin>
@@ -461,7 +461,7 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.2</version>
@@ -474,15 +474,15 @@
</goals>
<configuration>
<outputDirectory>target/test/smx/ode</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>${basedir}/../dao-jpa-ojpa-derby/target/derby</directory>
</resource>
<resource>
<directory>${basedir}/../dao-hibernate-db/target/derby</directory>
</resource>
- </resources>
- </configuration>
+ </resources>
+ </configuration>
</execution>
<execution>
<id>copy-resources2</id>
@@ -492,17 +492,17 @@
</goals>
<configuration>
<outputDirectory>target/test/resources</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>src/test/resources</directory>
</resource>
- </resources>
- </configuration>
+ </resources>
+ </configuration>
</execution>
</executions>
</plugin>
</plugins>
-
+
<testResources>
<testResource>
<directory>src/test/resources</directory>
Modified: ode/trunk/jbi/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/assembly/bin.xml?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jbi/src/main/assembly/bin.xml (original)
+++ ode/trunk/jbi/src/main/assembly/bin.xml Thu May 27 18:09:53 2010
@@ -34,7 +34,7 @@
<include>ode-jbi.properties</include>
</includes>
</fileSet>
-
+
<fileSet>
<directory>target</directory>
<outputDirectory>/META-INF</outputDirectory>
@@ -42,7 +42,7 @@
<include>jbi.xml</include>
</includes>
</fileSet>
-
+
<fileSet>
<directory>${basedir}/../dao-jpa-ojpa-derby/target/derby</directory>
<outputDirectory>/</outputDirectory>
@@ -51,12 +51,12 @@
<fileSet>
<directory>${basedir}/../dao-hibernate-db/target/derby</directory>
<outputDirectory>/</outputDirectory>
- </fileSet>
+ </fileSet>
</fileSets>
<dependencySets>
-
+
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<includes>
@@ -82,30 +82,30 @@
<include>org.apache.ode:ode-utils</include>
<include>org.apache.ode:ode-agents</include>
<include>org.apache.ode:ode-bpel-obj</include>
- <include>org.apache.ws.commons.axiom:axiom-api</include>
+ <include>org.apache.ws.commons.axiom:axiom-api</include>
<include>org.apache.ws.commons.axiom:axiom-impl</include>
<include>org.apache.ws.commons.axiom:axiom-dom</include>
<include>backport-util-concurrent:backport-util-concurrent</include>
- <include>commons-codec:commons-codec</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-dbcp:commons-dbcp</include>
- <include>commons-lang:commons-lang</include>
- <include>commons-pool:commons-pool</include>
- <include>commons-beanutils:commons-beanutils</include>
- <include>commons-primitives:commons-primitives</include>
- <include>org.apache.derby:derby</include>
- <include>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
- <include>org.apache.geronimo.components:geronimo-connector</include>
- <include>org.apache.geronimo.components:geronimo-transaction</include>
- <include>geronimo-spec:geronimo-spec-jms</include>
- <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
- <include>jaxen:jaxen</include>
- <include>log4j:log4j</include>
- <include>org.apache.openjpa:openjpa</include>
- <include>javax.persistence:persistence-api</include>
- <include>net.sourceforge.serp:serp</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>commons-lang:commons-lang</include>
+ <include>commons-pool:commons-pool</include>
+ <include>commons-beanutils:commons-beanutils</include>
+ <include>commons-primitives:commons-primitives</include>
+ <include>org.apache.derby:derby</include>
+ <include>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+ <include>org.apache.geronimo.components:geronimo-connector</include>
+ <include>org.apache.geronimo.components:geronimo-transaction</include>
+ <include>geronimo-spec:geronimo-spec-jms</include>
+ <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
+ <include>jaxen:jaxen</include>
+ <include>log4j:log4j</include>
+ <include>org.apache.openjpa:openjpa</include>
+ <include>javax.persistence:persistence-api</include>
+ <include>net.sourceforge.serp:serp</include>
<include>net.sf.saxon:saxon</include>
<include>net.sf.saxon:saxon-xpath</include>
<include>net.sf.saxon:saxon-dom</include>
@@ -114,13 +114,13 @@
<include>tranql:tranql-connector</include>
<include>xalan:xalan</include>
<include>org.apache.xmlbeans:xmlbeans</include>
- <include>axion:axion</include>
- <include>xerces:xercesImpl</include>
- <include>org.objectweb.howl:howl</include>
- <include>com.thoughtworks.xstream:xstream</include>
- <include>xalan:serializer</include>
- <include>xml-apis:xml-apis</include>
- <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
+ <include>axion:axion</include>
+ <include>xerces:xercesImpl</include>
+ <include>org.objectweb.howl:howl</include>
+ <include>com.thoughtworks.xstream:xstream</include>
+ <include>xalan:serializer</include>
+ <include>xml-apis:xml-apis</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
</includes>
</dependencySet>
Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/BaseMessageExchangeProcessor.java
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/BaseMessageExchangeProcessor.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/jbi/src/main/java/org/apache/ode/jbi/BaseMessageExchangeProcessor.java (original)
+++ ode/trunk/jbi/src/main/java/org/apache/ode/jbi/BaseMessageExchangeProcessor.java Thu May 27 18:09:53 2010
@@ -37,7 +37,7 @@ public abstract class BaseMessageExchang
final Log LOG = LogFactory.getLog(getClass());
DeliveryChannel _channel;
-
+
public BaseMessageExchangeProcessor(DeliveryChannel channel) {
_channel = channel;
}
@@ -91,14 +91,14 @@ public abstract class BaseMessageExchang
LOG.error("Unexpected error invoking ODE.", t);
err = new RuntimeException(t);
} finally {
- // If we got an error that wasn't sent.
+ // If we got an error that wasn't sent.
if (jbiMex.getStatus() == ExchangeStatus.ACTIVE && !success) {
if (err != null && jbiMex.getError() == null) {
jbiMex.setError(err);
}
- jbiMex.setStatus(ExchangeStatus.ERROR);
+ jbiMex.setStatus(ExchangeStatus.ERROR);
_channel.send(jbiMex);
- }
+ }
}
} else {
LOG.error("JBI MessageExchange " + jbiMex.getExchangeId() + " is of an unsupported pattern "
@@ -110,7 +110,7 @@ public abstract class BaseMessageExchang
}
/**
- * Invoke with an In-Out message exchange pattern.
+ * Invoke with an In-Out message exchange pattern.
*/
public abstract NormalizedMessage invoke(InOut mex) throws MessagingException;
@@ -118,5 +118,5 @@ public abstract class BaseMessageExchang
* Invoke with an In-Only message exchange pattern.
*/
public abstract void invoke(InOnly mex) throws MessagingException;
-
+
}