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 17:52:38 UTC
svn commit: r948869 [19/20] - in /ode/trunk: ./
agents/src/main/java/org/apache/ode/agents/memory/ axis2-war/
axis2-war/src/main/assembly/ axis2-war/src/main/webapp/WEB-INF/conf/
axis2-war/src/main/webapp/js/ axis2-war/src/test/java/org/apache/ode/axis...
Modified: ode/trunk/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java (original)
+++ ode/trunk/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java Thu May 27 15:52:24 2010
@@ -167,34 +167,34 @@ public class JbiTestBase extends SpringT
}
}
{
- String httpUrl = testProperties.getProperty(prefix + "http.url");
- if (httpUrl != null && request != null) {
+ String httpUrl = testProperties.getProperty(prefix + "http.url");
+ if (httpUrl != null && request != null) {
loop = true;
- log.debug(getTestName() + " sending http request to " + httpUrl + " request: " + request);
- URLConnection connection = new URL(httpUrl).openConnection();
- connection.setDoOutput(true);
- connection.setDoInput(true);
- //Send request
- OutputStream os = connection.getOutputStream();
- PrintWriter wt = new PrintWriter(os);
- wt.print(request);
- wt.flush();
- wt.close();
- // Read the response.
- String result = inputStreamToString(connection.getInputStream());
-
- log.debug(getTestName() + " have result: " + result);
- matchResponse(expectedResponse, result, true);
- }
+ log.debug(getTestName() + " sending http request to " + httpUrl + " request: " + request);
+ URLConnection connection = new URL(httpUrl).openConnection();
+ connection.setDoOutput(true);
+ connection.setDoInput(true);
+ //Send request
+ OutputStream os = connection.getOutputStream();
+ PrintWriter wt = new PrintWriter(os);
+ wt.print(request);
+ wt.flush();
+ wt.close();
+ // Read the response.
+ String result = inputStreamToString(connection.getInputStream());
+
+ log.debug(getTestName() + " have result: " + result);
+ matchResponse(expectedResponse, result, true);
+ }
}
{
- if (testProperties.getProperty(prefix + "nmr.service") != null && request != null) {
+ if (testProperties.getProperty(prefix + "nmr.service") != null && request != null) {
loop = true;
- InOut io = smxClient.createInOutExchange();
- io.setService(QName.valueOf(testProperties.getProperty(prefix + "nmr.service")));
- io.setOperation(QName.valueOf(testProperties.getProperty(prefix + "nmr.operation")));
- io.getInMessage().setContent(new StreamSource(new ByteArrayInputStream(request.getBytes())));
- smxClient.sendSync(io,20000);
+ InOut io = smxClient.createInOutExchange();
+ io.setService(QName.valueOf(testProperties.getProperty(prefix + "nmr.service")));
+ io.setOperation(QName.valueOf(testProperties.getProperty(prefix + "nmr.operation")));
+ io.getInMessage().setContent(new StreamSource(new ByteArrayInputStream(request.getBytes())));
+ smxClient.sendSync(io,20000);
if (io.getStatus() == ExchangeStatus.ACTIVE) {
assertNotNull(io.getOutMessage());
String result = new SourceTransformer().contentToString(io.getOutMessage());
@@ -203,7 +203,7 @@ public class JbiTestBase extends SpringT
} else {
matchResponse(expectedResponse, "", false);
}
- }
+ }
}
i++;
Modified: ode/trunk/jbi/src/test/resources/EmptyRespJbiTest/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/EmptyRespJbiTest/deploy.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/EmptyRespJbiTest/deploy.xml (original)
+++ ode/trunk/jbi/src/test/resources/EmptyRespJbiTest/deploy.xml Thu May 27 15:52:24 2010
@@ -23,20 +23,20 @@
xmlns:ping="urn:/Ping.wsdl"
xmlns:pong="urn:/Pong.wsdl">
- <process name="pingProcess:Ping">
- <active>true</active>
- <provide partnerLink="PingPartnerLink">
- <service name="ping:PingService" port="PingPort"/>
- </provide>
- <invoke partnerLink="PongPartnerLink">
- <service name="pong:PongServiceFwd" port="PongPort"/>
- </invoke>
- </process>
- <process name="pongProcess:Pong">
- <active>true</active>
- <provide partnerLink="PongPartnerLink">
- <service name="pong:PongService" port="PongPort"/>
- </provide>
- </process>
+ <process name="pingProcess:Ping">
+ <active>true</active>
+ <provide partnerLink="PingPartnerLink">
+ <service name="ping:PingService" port="PingPort"/>
+ </provide>
+ <invoke partnerLink="PongPartnerLink">
+ <service name="pong:PongServiceFwd" port="PongPort"/>
+ </invoke>
+ </process>
+ <process name="pongProcess:Pong">
+ <active>true</active>
+ <provide partnerLink="PongPartnerLink">
+ <service name="pong:PongService" port="PongPort"/>
+ </provide>
+ </process>
</deploy>
Modified: ode/trunk/jbi/src/test/resources/EmptyRespJbiTest/smx.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/EmptyRespJbiTest/smx.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/EmptyRespJbiTest/smx.xml (original)
+++ ode/trunk/jbi/src/test/resources/EmptyRespJbiTest/smx.xml Thu May 27 15:52:24 2010
@@ -27,7 +27,7 @@
<util:map id="jndiEntries">
<entry key="java:comp/env/jdbc/ode" value-ref="odeDS"/>
- </util:map>
+ </util:map>
<sm:container
id="jbi"
@@ -41,15 +41,15 @@
<sm:component>
<eip:component>
<eip:endpoints>
- <eip:content-based-router service="pong:PongServiceFwd" endpoint="PongPort" forwardOperation="true">
- <eip:rules>
- <eip:routing-rule>
- <eip:target>
- <eip:exchange-target service="pong:PongService"/>
- </eip:target>
- </eip:routing-rule>
- </eip:rules>
- </eip:content-based-router>
+ <eip:content-based-router service="pong:PongServiceFwd" endpoint="PongPort" forwardOperation="true">
+ <eip:rules>
+ <eip:routing-rule>
+ <eip:target>
+ <eip:exchange-target service="pong:PongService"/>
+ </eip:target>
+ </eip:routing-rule>
+ </eip:rules>
+ </eip:content-based-router>
</eip:endpoints>
</eip:component>
</sm:component>
@@ -61,14 +61,14 @@
<http:endpoint
service="ping:PingService"
endpoint="http"
- targetService="ping:PingService"
- targetEndpoint="PingPort"
+ targetService="ping:PingService"
+ targetEndpoint="PingPort"
defaultOperation="Ping"
role="consumer"
locationURI="http://localhost:8198/PingHttp/"
defaultMep="http://www.w3.org/2004/08/wsdl/in-out"
- wsdlResource="classpath:EmptyRespJbiTest/Ping.wsdl"
- soapVersion="1.1"
+ wsdlResource="classpath:EmptyRespJbiTest/Ping.wsdl"
+ soapVersion="1.1"
soap="true" />
</http:endpoints>
</http:component>
Modified: ode/trunk/jbi/src/test/resources/ExtVarJbiTest/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ExtVarJbiTest/HelloWorld2.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ExtVarJbiTest/HelloWorld2.bpel (original)
+++ ode/trunk/jbi/src/test/resources/ExtVarJbiTest/HelloWorld2.bpel Thu May 27 15:52:24 2010
@@ -30,9 +30,9 @@
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
<import
- namespace="http://foo/extvar"
- location="ExtVar.xsd"
- importType="http://www.w3.org/2001/XMLSchema"/>
+ namespace="http://foo/extvar"
+ location="ExtVar.xsd"
+ importType="http://www.w3.org/2001/XMLSchema"/>
<import location="HelloWorld2.wsdl"
namespace="http://ode/bpel/unit-test.wsdl"
@@ -72,12 +72,12 @@
<element name="bar" type="string"/>
-->
- <assign>
- <copy>
- <from><literal><whatever><foo:pid2>{http://ode/bpel/unit-test}HelloWorld2-1</foo:pid2></whatever></literal></from>
- <to variable="idx" />
- </copy>
- </assign>
+ <assign>
+ <copy>
+ <from><literal><whatever><foo:pid2>{http://ode/bpel/unit-test}HelloWorld2-1</foo:pid2></whatever></literal></from>
+ <to variable="idx" />
+ </copy>
+ </assign>
<assign name="assign1">
<copy>
<from variable="myVar" part="TestPart"/>
Modified: ode/trunk/jbi/src/test/resources/ExtVarJbiTest/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ExtVarJbiTest/HelloWorld2.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ExtVarJbiTest/HelloWorld2.wsdl (original)
+++ ode/trunk/jbi/src/test/resources/ExtVarJbiTest/HelloWorld2.wsdl Thu May 27 15:52:24 2010
@@ -57,9 +57,9 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="HelloService">
- <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
- <soap:address location="http://localhost:8080/ode/processes/helloWorld"/>
- </wsdl:port>
+ <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
+ <soap:address location="http://localhost:8080/ode/processes/helloWorld"/>
+ </wsdl:port>
</wsdl:service>
<plnk:partnerLinkType name="HelloPartnerLinkType">
Modified: ode/trunk/jbi/src/test/resources/ExtVarJbiTest/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ExtVarJbiTest/deploy.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ExtVarJbiTest/deploy.xml (original)
+++ ode/trunk/jbi/src/test/resources/ExtVarJbiTest/deploy.xml Thu May 27 15:52:24 2010
@@ -18,29 +18,29 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:pns="http://ode/bpel/unit-test"
- xmlns:wns="http://ode/bpel/unit-test.wsdl"
+ xmlns:pns="http://ode/bpel/unit-test"
+ xmlns:wns="http://ode/bpel/unit-test.wsdl"
xmlns:xvar="http://ode.apache.org/externalVariables"
xmlns:jdbc="http://ode.apache.org/externalVariables/jdbc" >
- <process name="pns:HelloWorld2">
- <active>true</active>
- <provide partnerLink="helloPartnerLink">
- <service name="wns:HelloService" port="HelloPort"/>
- </provide>
-
- <xvar:externalVariable id="evar1" >
- <jdbc:jdbc>
- <jdbc:datasource-jndi>testds</jdbc:datasource-jndi>
- <jdbc:table>extvartable1</jdbc:table>
- <jdbc:column name="pid2" key="yes"/>
- <jdbc:column name="id1"/>
- <jdbc:column name="cts" generator="ctimestamp" />
- <jdbc:column name="uts" generator="utimestamp" />
- <jdbc:column name="foo"/>
- </jdbc:jdbc>
- </xvar:externalVariable>
-
- </process>
+ <process name="pns:HelloWorld2">
+ <active>true</active>
+ <provide partnerLink="helloPartnerLink">
+ <service name="wns:HelloService" port="HelloPort"/>
+ </provide>
+
+ <xvar:externalVariable id="evar1" >
+ <jdbc:jdbc>
+ <jdbc:datasource-jndi>testds</jdbc:datasource-jndi>
+ <jdbc:table>extvartable1</jdbc:table>
+ <jdbc:column name="pid2" key="yes"/>
+ <jdbc:column name="id1"/>
+ <jdbc:column name="cts" generator="ctimestamp" />
+ <jdbc:column name="uts" generator="utimestamp" />
+ <jdbc:column name="foo"/>
+ </jdbc:jdbc>
+ </xvar:externalVariable>
+
+ </process>
</deploy>
Modified: ode/trunk/jbi/src/test/resources/ExtVarJbiTest/smx.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ExtVarJbiTest/smx.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ExtVarJbiTest/smx.xml (original)
+++ ode/trunk/jbi/src/test/resources/ExtVarJbiTest/smx.xml Thu May 27 15:52:24 2010
@@ -18,11 +18,11 @@
-->
<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
- xmlns:http="http://servicemix.apache.org/http/1.0"
- xmlns:eip="http://servicemix.apache.org/eip/1.0"
+ xmlns:http="http://servicemix.apache.org/http/1.0"
+ xmlns:eip="http://servicemix.apache.org/eip/1.0"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:jencks="http://jencks.org/2.0"
- >
+ >
<jencks:poolingSupport
id="poolingSupport2"
connectionMaxIdleMinutes="5"
@@ -38,27 +38,27 @@
connectionTracker="#connectionTracker"
/>
<bean id="localDerbyMCF" class="org.tranql.connector.derby.EmbeddedLocalMCF">
- <property name="databaseName" value="target/test/testdb"/>
- <property name="createDatabase" value="true"/>
- <property name="userName" value = "sa"/>
+ <property name="databaseName" value="target/test/testdb"/>
+ <property name="createDatabase" value="true"/>
+ <property name="userName" value = "sa"/>
<property name="password" value = ""/>
- </bean>
- <bean id="localDerbyDataSource" class="org.jencks.factory.ConnectionFactoryFactoryBean">
- <property name="managedConnectionFactory" ref="localDerbyMCF"/>
- <property name="connectionManager" ref="connectionManager2"/>
- </bean>
-
+ </bean>
+ <bean id="localDerbyDataSource" class="org.jencks.factory.ConnectionFactoryFactoryBean">
+ <property name="managedConnectionFactory" ref="localDerbyMCF"/>
+ <property name="connectionManager" ref="connectionManager2"/>
+ </bean>
+
<util:map id="jndiEntries">
<entry key="java:comp/env/jdbc/ode" value-ref="odeDS"/>
<entry key="testds" value-ref="localDerbyDataSource"/>
- </util:map>
-
- <sm:container
- id="jbi"
- embedded="true"
- rootDir="target/test/smx"
- transactionManager="#transactionManager"
- depends-on="jndi"
- >
- </sm:container>
+ </util:map>
+
+ <sm:container
+ id="jbi"
+ embedded="true"
+ rootDir="target/test/smx"
+ transactionManager="#transactionManager"
+ depends-on="jndi"
+ >
+ </sm:container>
</beans>
Modified: ode/trunk/jbi/src/test/resources/HelloWorldJbiTest/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/HelloWorldJbiTest/deploy.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/HelloWorldJbiTest/deploy.xml (original)
+++ ode/trunk/jbi/src/test/resources/HelloWorldJbiTest/deploy.xml Thu May 27 15:52:24 2010
@@ -21,10 +21,10 @@
xmlns:sns="urn:/HelloWorld2.wsdl" >
- <process name="pns:HelloWorld2">
- <active>true</active>
- <provide partnerLink="helloPartnerLink">
- <service name="sns:HelloService" port="HelloPort"/>
- </provide>
- </process>
+ <process name="pns:HelloWorld2">
+ <active>true</active>
+ <provide partnerLink="helloPartnerLink">
+ <service name="sns:HelloService" port="HelloPort"/>
+ </provide>
+ </process>
</deploy>
Modified: ode/trunk/jbi/src/test/resources/MagicSessionExternalJbiTest/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/MagicSessionExternalJbiTest/deploy.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/MagicSessionExternalJbiTest/deploy.xml (original)
+++ ode/trunk/jbi/src/test/resources/MagicSessionExternalJbiTest/deploy.xml Thu May 27 15:52:24 2010
@@ -17,25 +17,25 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:main="http://ode/bpel/unit-test"
- xmlns:mws="http://ode/bpel/unit-test.wsdl"
- xmlns:resp="http://ode/bpel/responder">
+ xmlns:main="http://ode/bpel/unit-test"
+ xmlns:mws="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder">
- <process name="main:MagicSessionMain">
- <provide partnerLink="executePartnerLink">
- <service name="mws:MSMainExecuteService" port="MSExecutePort"/>
- </provide>
- <provide partnerLink="responderPartnerLink">
- <service name="mws:MSMainService" port="MSMainPort"/>
- </provide>
- <invoke partnerLink="responderPartnerLink">
- <service name="mws:MSResponderService2" port="MSResponderPort"/>
- </invoke>
- </process>
- <process name="resp:MagicSessionResponder">
+ <process name="main:MagicSessionMain">
+ <provide partnerLink="executePartnerLink">
+ <service name="mws:MSMainExecuteService" port="MSExecutePort"/>
+ </provide>
+ <provide partnerLink="responderPartnerLink">
+ <service name="mws:MSMainService" port="MSMainPort"/>
+ </provide>
+ <invoke partnerLink="responderPartnerLink">
+ <service name="mws:MSResponderService2" port="MSResponderPort"/>
+ </invoke>
+ </process>
+ <process name="resp:MagicSessionResponder">
<type>resp:MagicSessionResponder</type>
- <provide partnerLink="mainPartnerLink">
- <service name="mws:MSResponderService" port="MSResponderPort"/>
- </provide>
- </process>
+ <provide partnerLink="mainPartnerLink">
+ <service name="mws:MSResponderService" port="MSResponderPort"/>
+ </provide>
+ </process>
</deploy>
Modified: ode/trunk/jbi/src/test/resources/MagicSessionJbiTest/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/MagicSessionJbiTest/deploy.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/MagicSessionJbiTest/deploy.xml (original)
+++ ode/trunk/jbi/src/test/resources/MagicSessionJbiTest/deploy.xml Thu May 27 15:52:24 2010
@@ -17,28 +17,28 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:main="http://ode/bpel/unit-test"
- xmlns:mws="http://ode/bpel/unit-test.wsdl"
- xmlns:resp="http://ode/bpel/responder">
+ xmlns:main="http://ode/bpel/unit-test"
+ xmlns:mws="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder">
- <process name="main:MagicSessionMain">
- <provide partnerLink="executePartnerLink">
- <service name="mws:MSMainExecuteService" port="MSExecutePort"/>
- </provide>
- <provide partnerLink="responderPartnerLink">
- <service name="mws:MSMainService" port="MSMainPort"/>
- </provide>
- <invoke partnerLink="responderPartnerLink">
- <service name="mws:MSResponderService" port="MSResponderPort"/>
- </invoke>
- </process>
- <process name="resp:MagicSessionResponder">
+ <process name="main:MagicSessionMain">
+ <provide partnerLink="executePartnerLink">
+ <service name="mws:MSMainExecuteService" port="MSExecutePort"/>
+ </provide>
+ <provide partnerLink="responderPartnerLink">
+ <service name="mws:MSMainService" port="MSMainPort"/>
+ </provide>
+ <invoke partnerLink="responderPartnerLink">
+ <service name="mws:MSResponderService" port="MSResponderPort"/>
+ </invoke>
+ </process>
+ <process name="resp:MagicSessionResponder">
<type>resp:MagicSessionResponder</type>
- <provide partnerLink="mainPartnerLink">
- <service name="mws:MSResponderService" port="MSResponderPort"/>
- </provide>
- <invoke partnerLink="mainPartnerLink">
- <service name="mws:MSMainService" port="MSMainPort"/>
- </invoke>
- </process>
+ <provide partnerLink="mainPartnerLink">
+ <service name="mws:MSResponderService" port="MSResponderPort"/>
+ </provide>
+ <invoke partnerLink="mainPartnerLink">
+ <service name="mws:MSMainService" port="MSMainPort"/>
+ </invoke>
+ </process>
</deploy>
Modified: ode/trunk/jbi/src/test/resources/MagicSessionJbiTest/smx.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/MagicSessionJbiTest/smx.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/MagicSessionJbiTest/smx.xml (original)
+++ ode/trunk/jbi/src/test/resources/MagicSessionJbiTest/smx.xml Thu May 27 15:52:24 2010
@@ -18,22 +18,22 @@
-->
<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
- xmlns:http="http://servicemix.apache.org/http/1.0"
- xmlns:eip="http://servicemix.apache.org/eip/1.0"
+ xmlns:http="http://servicemix.apache.org/http/1.0"
+ xmlns:eip="http://servicemix.apache.org/eip/1.0"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:jencks="http://jencks.org/2.0"
- >
+ >
<util:map id="jndiEntries">
<entry key="java:comp/env/jdbc/ode" value-ref="odeDS"/>
</util:map>
-
- <sm:container
- id="jbi"
- embedded="true"
- rootDir="target/test/smx"
- transactionManager="#transactionManager"
- depends-on="jndi"
- >
- </sm:container>
+
+ <sm:container
+ id="jbi"
+ embedded="true"
+ rootDir="target/test/smx"
+ transactionManager="#transactionManager"
+ depends-on="jndi"
+ >
+ </sm:container>
</beans>
Modified: ode/trunk/jbi/src/test/resources/OnEventAlarmJbiTest/smx.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/OnEventAlarmJbiTest/smx.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/OnEventAlarmJbiTest/smx.xml (original)
+++ ode/trunk/jbi/src/test/resources/OnEventAlarmJbiTest/smx.xml Thu May 27 15:52:24 2010
@@ -42,15 +42,15 @@
<sm:component>
<eip:component>
<eip:endpoints>
- <eip:content-based-router service="bpel:OnEventCorrelation2Fwd" endpoint="OnEventCorrelation2" forwardOperation="true">
- <eip:rules>
- <eip:routing-rule>
- <eip:target>
- <eip:exchange-target service="bpel:OnEventCorrelation2"/>
- </eip:target>
- </eip:routing-rule>
- </eip:rules>
- </eip:content-based-router>
+ <eip:content-based-router service="bpel:OnEventCorrelation2Fwd" endpoint="OnEventCorrelation2" forwardOperation="true">
+ <eip:rules>
+ <eip:routing-rule>
+ <eip:target>
+ <eip:exchange-target service="bpel:OnEventCorrelation2"/>
+ </eip:target>
+ </eip:routing-rule>
+ </eip:rules>
+ </eip:content-based-router>
</eip:endpoints>
</eip:component>
</sm:component>
Modified: ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRequest.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRequest.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRequest.xml (original)
+++ ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRequest.xml Thu May 27 15:52:24 2010
@@ -18,13 +18,13 @@
~ under the License.
-->
<pmap:replay xmlns:ns="http://www.apache.org/ode/pmapi/types/2006/08/02/" xmlns:pmap="http://www.apache.org/ode/pmapi">
- <replay>
+ <replay>
<!--
<ns:replaceInstance>454277</ns:replaceInstance>
<ns:upgradeInstance>?</ns:upgradeInstance>
-->
<ns:restoreInstance>
- <ns:processType xmlns:p="http://sample.bpel.org/bpel/sample">p:OnEventCorrelation</ns:processType>
+ <ns:processType xmlns:p="http://sample.bpel.org/bpel/sample">p:OnEventCorrelation</ns:processType>
<exchange xmlns="http://www.apache.org/ode/pmapi/types/2006/08/02/">
<type>M</type>
<createTime>2009-04-01T16:41:29.873+02:00</createTime>
@@ -81,6 +81,6 @@
</out>
</exchange>
</ns:restoreInstance>
- </replay>
+ </replay>
</pmap:replay>
Modified: ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRollbackOnFault.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRollbackOnFault.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRollbackOnFault.xml (original)
+++ ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRollbackOnFault.xml Thu May 27 15:52:24 2010
@@ -18,13 +18,13 @@
~ under the License.
-->
<pmap:replay xmlns:ns="http://www.apache.org/ode/pmapi/types/2006/08/02/" xmlns:pmap="http://www.apache.org/ode/pmapi">
- <replay>
+ <replay>
<!--
<ns:replaceInstance>454277</ns:replaceInstance>
<ns:upgradeInstance>?</ns:upgradeInstance>
-->
<ns:restoreInstance>
- <ns:processType xmlns:p="http://sample.bpel.org/bpel/sample">p:OnEventCorrelation</ns:processType>
+ <ns:processType xmlns:p="http://sample.bpel.org/bpel/sample">p:OnEventCorrelation</ns:processType>
<rollbackOnFault xmlns="http://www.apache.org/ode/pmapi/types/2006/08/02/">true</rollbackOnFault>
<exchange xmlns="http://www.apache.org/ode/pmapi/types/2006/08/02/">
<type>M</type>
@@ -65,7 +65,7 @@
</exchange>
</ns:restoreInstance>
- </replay>
+ </replay>
<balancerKey></balancerKey>
</pmap:replay>
Modified: ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRollbackOnFault2.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRollbackOnFault2.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRollbackOnFault2.xml (original)
+++ ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRollbackOnFault2.xml Thu May 27 15:52:24 2010
@@ -18,13 +18,13 @@
~ under the License.
-->
<pmap:replay xmlns:ns="http://www.apache.org/ode/pmapi/types/2006/08/02/" xmlns:pmap="http://www.apache.org/ode/pmapi">
- <replay>
+ <replay>
<!--
<ns:replaceInstance>454277</ns:replaceInstance>
<ns:upgradeInstance>?</ns:upgradeInstance>
-->
<ns:restoreInstance>
- <ns:processType xmlns:p="http://sample.bpel.org/bpel/sample">p:OnEventCorrelation</ns:processType>
+ <ns:processType xmlns:p="http://sample.bpel.org/bpel/sample">p:OnEventCorrelation</ns:processType>
<rollbackOnFault xmlns="http://www.apache.org/ode/pmapi/types/2006/08/02/">false</rollbackOnFault>
<exchange xmlns="http://www.apache.org/ode/pmapi/types/2006/08/02/">
<type>M</type>
@@ -65,7 +65,7 @@
</exchange>
</ns:restoreInstance>
- </replay>
+ </replay>
<balancerKey></balancerKey>
</pmap:replay>
Modified: ode/trunk/jbi/src/test/resources/ReplayerJbiTest/smx.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ReplayerJbiTest/smx.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ReplayerJbiTest/smx.xml (original)
+++ ode/trunk/jbi/src/test/resources/ReplayerJbiTest/smx.xml Thu May 27 15:52:24 2010
@@ -42,15 +42,15 @@
<sm:component>
<eip:component>
<eip:endpoints>
- <eip:content-based-router service="bpel:OnEventCorrelation2Fwd" endpoint="OnEventCorrelation2" forwardOperation="true">
- <eip:rules>
- <eip:routing-rule>
- <eip:target>
- <eip:exchange-target service="bpel:OnEventCorrelation2"/>
- </eip:target>
- </eip:routing-rule>
- </eip:rules>
- </eip:content-based-router>
+ <eip:content-based-router service="bpel:OnEventCorrelation2Fwd" endpoint="OnEventCorrelation2" forwardOperation="true">
+ <eip:rules>
+ <eip:routing-rule>
+ <eip:target>
+ <eip:exchange-target service="bpel:OnEventCorrelation2"/>
+ </eip:target>
+ </eip:routing-rule>
+ </eip:rules>
+ </eip:content-based-router>
</eip:endpoints>
</eip:component>
</sm:component>
Modified: ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml (original)
+++ ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml Thu May 27 15:52:24 2010
@@ -42,15 +42,15 @@
<sm:component>
<eip:component>
<eip:endpoints>
- <eip:content-based-router service="bpel:OnEventCorrelation2Fwd" endpoint="OnEventCorrelation2" forwardOperation="true">
- <eip:rules>
- <eip:routing-rule>
- <eip:target>
- <eip:exchange-target service="bpel:OnEventCorrelation2"/>
- </eip:target>
- </eip:routing-rule>
- </eip:rules>
- </eip:content-based-router>
+ <eip:content-based-router service="bpel:OnEventCorrelation2Fwd" endpoint="OnEventCorrelation2" forwardOperation="true">
+ <eip:rules>
+ <eip:routing-rule>
+ <eip:target>
+ <eip:exchange-target service="bpel:OnEventCorrelation2"/>
+ </eip:target>
+ </eip:routing-rule>
+ </eip:rules>
+ </eip:content-based-router>
</eip:endpoints>
</eip:component>
</sm:component>
Modified: ode/trunk/jca-rar/etc/ra.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jca-rar/etc/ra.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/jca-rar/etc/ra.xml (original)
+++ ode/trunk/jca-rar/etc/ra.xml Thu May 27 15:52:24 2010
@@ -44,7 +44,7 @@
<connectionfactory-interface>
org.apache.ode.ra.OdeConnectionFactory</connectionfactory-interface>
<connectionfactory-impl-class>
- org.apache.ode.ra.OdeConnectionFactoryImpl </connectionfactory-impl-class>
+ org.apache.ode.ra.OdeConnectionFactoryImpl </connectionfactory-impl-class>
<connection-interface> org.apache.ode.ra.OdeConnection</connection-interface>
<connection-impl-class> org.apache.ode.ra.OdeConnectionImpl</connection-impl-class>
</connection-definition>
Modified: ode/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/pom.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/pom.xml (original)
+++ ode/trunk/pom.xml Thu May 27 15:52:24 2010
@@ -39,42 +39,42 @@
<ode.version>1.3.5-SNAPSHOT</ode.version>
<activation.version>1.1</activation.version>
<annogen.version>0.1.0</annogen.version>
- <antlr.version>2.7.7</antlr.version>
- <axiom.version>1.2.7</axiom.version>
- <axis2.version>1.5</axis2.version>
+ <antlr.version>2.7.7</antlr.version>
+ <axiom.version>1.2.7</axiom.version>
+ <axis2.version>1.5</axis2.version>
<rampart.version>1.4</rampart.version>
<commons.codec.version>1.3</commons.codec.version>
- <backport.concurrent.version>3.1</backport.concurrent.version>
+ <backport.concurrent.version>3.1</backport.concurrent.version>
<commons.fileupload.version>1.2</commons.fileupload.version>
<commons.collections.version>3.2.1</commons.collections.version>
<commons.httpclient.version>3.1</commons.httpclient.version>
- <commons.io.version>1.4</commons.io.version>
+ <commons.io.version>1.4</commons.io.version>
<commons.lang.version>2.4</commons.lang.version>
<commons.logging.version>1.1</commons.logging.version>
<commons.pool.version>1.4</commons.pool.version>
<commons.primitives.version>1.0</commons.primitives.version>
- <commons.dbcp.version>1.2.1</commons.dbcp.version>
- <httpcomponents.version>4.0-beta1</httpcomponents.version>
- <jaxb-api.version>2.1</jaxb-api.version>
- <jaxb.version>2.1.6</jaxb.version>
- <jaxen.version>1.1.1</jaxen.version>
- <jettison.version>1.0-RC2</jettison.version>
- <jibx.version>1.1.5</jibx.version>
- <neethi.version>2.0.4</neethi.version>
- <woden.version>1.0M8</woden.version>
+ <commons.dbcp.version>1.2.1</commons.dbcp.version>
+ <httpcomponents.version>4.0-beta1</httpcomponents.version>
+ <jaxb-api.version>2.1</jaxb-api.version>
+ <jaxb.version>2.1.6</jaxb.version>
+ <jaxen.version>1.1.1</jaxen.version>
+ <jettison.version>1.0-RC2</jettison.version>
+ <jibx.version>1.1.5</jibx.version>
+ <neethi.version>2.0.4</neethi.version>
+ <woden.version>1.0M8</woden.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
- <woodstox.version>3.2.4</woodstox.version>
- <javax.mail.version>1.4</javax.mail.version>
+ <woodstox.version>3.2.4</woodstox.version>
+ <javax.mail.version>1.4</javax.mail.version>
<hibernate.version>3.2.5.ga</hibernate.version>
- <spring.version>2.5.6</spring.version>
+ <spring.version>2.5.6</spring.version>
<geronimo.specs.version>1.0</geronimo.specs.version>
<geronimo.version>2.0.1</geronimo.version>
- <geronimo.activation.version>1.0.1</geronimo.activation.version>
- <geronimo.annotation.version>1.1</geronimo.annotation.version>
- <geronimo.javamail.version>1.2</geronimo.javamail.version>
- <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
+ <geronimo.activation.version>1.0.1</geronimo.activation.version>
+ <geronimo.annotation.version>1.1</geronimo.annotation.version>
+ <geronimo.javamail.version>1.2</geronimo.javamail.version>
+ <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
<geronimo.specs.jta.version>1.1</geronimo.specs.jta.version>
- <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
+ <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
<jetty.version>6.1.12rc1</jetty.version>
<jencks.version>2.1</jencks.version>
<jasper.version>4.2.20RC0</jasper.version>
@@ -87,14 +87,14 @@
<xmlresolver.version>1.2</xmlresolver.version>
<xmlbeans.version>2.3.0</xmlbeans.version>
<xstream.version>1.2</xstream.version>
- <junit.version>4.4</junit.version>
+ <junit.version>4.4</junit.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
- <persistence-api.version>1.0</persistence-api.version>
- <xalan.version>2.7.1</xalan.version>
+ <persistence-api.version>1.0</persistence-api.version>
+ <xalan.version>2.7.1</xalan.version>
<ant.version>1.6.5</ant.version>
- <openjpa.version>1.2.1</openjpa.version>
+ <openjpa.version>1.2.1</openjpa.version>
<serp.version>1.13.1</serp.version>
- <dom4j.version>1.6.1</dom4j.version>
+ <dom4j.version>1.6.1</dom4j.version>
<derby.version>10.5.3.0_1</derby.version>
<jmock.version>1.2.0</jmock.version>
<xml.parser.version>2.6.2</xml.parser.version>
@@ -125,18 +125,18 @@
<module>dao-hibernate</module>
<module>tools</module>
<module>bpel-store</module>
- <module>dao-jpa-ojpa-derby</module>
+ <module>dao-jpa-ojpa-derby</module>
<module>dao-hibernate-db</module>
<module>bpel-runtime</module>
<module>bpel-connector</module>
- <module>bpel-test</module>
- <module>axis2</module>
- <module>jbi</module>
- <module>jbi-bundle</module>
- <module>jbi-karaf</module>
+ <module>bpel-test</module>
+ <module>axis2</module>
+ <module>jbi</module>
+ <module>jbi-bundle</module>
+ <module>jbi-karaf</module>
<module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
- <module>axis2-war</module>
- <module>distro</module>
+ <module>axis2-war</module>
+ <module>distro</module>
</modules>
<build>
@@ -151,7 +151,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -189,23 +189,23 @@
<version>${xmlbeans.version}</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <version>1.2</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- </dependencies>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <version>1.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<!-- Allows direct usage of the javadoc:javadoc goal. -->
<plugin>
@@ -320,8 +320,8 @@
-->
<!-- |
- | Repository for distributing new releases.
- |
+ | Repository for distributing new releases.
+ |
-->
<distributionManagement>
<repository>
@@ -505,7 +505,7 @@
<artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
<version>${axiom.version}</version>
@@ -555,11 +555,11 @@
<artifactId>commons-dbcp</artifactId>
<version>${commons.dbcp.version}</version>
</dependency>
- <dependency>
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- <version>${commons.primitives.version}</version>
- </dependency>
+ <dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>${commons.primitives.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
@@ -697,26 +697,26 @@
<artifactId>mail</artifactId>
<version>${javax.mail.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.serp</groupId>
- <artifactId>serp</artifactId>
- <version>${serp.version}</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>${dom4j.version}</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml-apis.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.serp</groupId>
+ <artifactId>serp</artifactId>
+ <version>${serp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>${dom4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml-apis.version}</version>
+ </dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
Modified: ode/trunk/scheduler-simple/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/pom.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/pom.xml (original)
+++ ode/trunk/scheduler-simple/pom.xml Thu May 27 15:52:24 2010
@@ -54,32 +54,32 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>tranql</groupId>
@@ -88,12 +88,12 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java (original)
+++ ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java Thu May 27 15:52:24 2010
@@ -40,11 +40,11 @@ public class DelegateSupport {
protected JdbcDelegate _del;
public DelegateSupport() throws Exception {
- this(null);
+ this(null);
}
public DelegateSupport(TransactionManager txm) throws Exception {
- initialize(txm);
+ initialize(txm);
}
protected void initialize(TransactionManager txm) throws Exception {
Modified: ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java (original)
+++ ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java Thu May 27 15:52:24 2010
@@ -40,8 +40,8 @@ public class GeronimoDelegateSupport ext
private GenericConnectionManager _connectionManager;
public GeronimoDelegateSupport(TransactionManager txm) throws Exception {
- super(txm);
- }
+ super(txm);
+ }
@Override
protected void initialize(TransactionManager txm) throws Exception {
Modified: ode/trunk/tasks/headers.rake
URL: http://svn.apache.org/viewvc/ode/trunk/tasks/headers.rake?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/tasks/headers.rake (original)
+++ ode/trunk/tasks/headers.rake Thu May 27 15:52:24 2010
@@ -92,7 +92,7 @@ EOF
if license
content = File.read(filename)
if (content =~ /<\?xml .*\?>/)
- modified = content.sub(/(<\?xml .*\?>\n?)(.*)/m) { "#{$1}#{license}#{$2}" }
+ modified = content.sub(/(<\?xml .*\?>\n?)(.*)/m) { "#{$1}#{license}#{$2}" }
else
modified = license + "\n" + content
end
Modified: ode/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/utils/pom.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/pom.xml (original)
+++ ode/trunk/utils/pom.xml Thu May 27 15:52:24 2010
@@ -37,12 +37,12 @@
<artifactId>axiom-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -121,13 +121,13 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*TestResources.java</exclude>
- <exclude>**/*HierarchicalPropertiesTest.java</exclude>
- </excludes>
- </configuration>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*TestResources.java</exclude>
+ <exclude>**/*HierarchicalPropertiesTest.java</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/DOMUtils.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/DOMUtils.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/DOMUtils.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/DOMUtils.java Thu May 27 15:52:24 2010
@@ -695,29 +695,29 @@ public class DOMUtils {
}
public static QName getNodeQName(Node el) {
- String localName = el.getLocalName();
- String namespaceUri = el.getNamespaceURI();
- if (localName == null) {
- String nodeName = el.getNodeName();
- int colonIndex = nodeName.indexOf(":");
- if (colonIndex > 0) {
- localName = nodeName.substring(0, colonIndex);
- namespaceUri = nodeName.substring(colonIndex + 1);
- } else {
- localName = nodeName;
- namespaceUri = null;
- }
- }
+ String localName = el.getLocalName();
+ String namespaceUri = el.getNamespaceURI();
+ if (localName == null) {
+ String nodeName = el.getNodeName();
+ int colonIndex = nodeName.indexOf(":");
+ if (colonIndex > 0) {
+ localName = nodeName.substring(0, colonIndex);
+ namespaceUri = nodeName.substring(colonIndex + 1);
+ } else {
+ localName = nodeName;
+ namespaceUri = null;
+ }
+ }
return new QName(namespaceUri, localName);
}
public static QName getNodeQName(String qualifiedName) {
- int index = qualifiedName.indexOf(":");
- if (index >= 0) {
- return new QName(qualifiedName.substring(0, index), qualifiedName.substring(index + 1));
- } else {
- return new QName(qualifiedName);
- }
+ int index = qualifiedName.indexOf(":");
+ if (index >= 0) {
+ return new QName(qualifiedName.substring(0, index), qualifiedName.substring(index + 1));
+ } else {
+ return new QName(qualifiedName);
+ }
}
/**
@@ -1073,13 +1073,13 @@ public class DOMUtils {
return ll;
}
- public static Document getDocument(Node contextNode) {
- return (contextNode == null) ? DOMUtils.newDocument() : contextNode.getOwnerDocument();
+ public static Document getDocument(Node contextNode) {
+ return (contextNode == null) ? DOMUtils.newDocument() : contextNode.getOwnerDocument();
}
public static String getQualifiedName(QName qName) {
- String prefix = qName.getPrefix(), localPart = qName.getLocalPart();
- return (prefix == null || "".equals(prefix)) ? localPart : (prefix + ":" + localPart);
+ String prefix = qName.getPrefix(), localPart = qName.getLocalPart();
+ return (prefix == null || "".equals(prefix)) ? localPart : (prefix + ":" + localPart);
}
/**
@@ -1095,112 +1095,112 @@ public class DOMUtils {
* @return a clone of node
*/
public static Node cloneNode(Document document, Node sourceNode) {
- Node clonedNode = null;
+ Node clonedNode = null;
- // what is my name?
- QName sourceQName = getNodeQName(sourceNode);
- String nodeName = sourceQName.getLocalPart();
- String namespaceURI = sourceQName.getNamespaceURI();
-
- // if the node is unqualified, don't assume that it inherits the WS-BPEL target namespace
- if (Namespaces.WSBPEL2_0_FINAL_EXEC.equals(namespaceURI)) {
- namespaceURI = null;
- }
-
- switch (sourceNode.getNodeType()) {
- case Node.ATTRIBUTE_NODE:
- if (namespaceURI == null) {
- clonedNode = document.createAttribute(nodeName);
- } else {
- String prefix = ((Attr) sourceNode).lookupPrefix(namespaceURI);
- // the prefix for the XML namespace can't be looked up, hence this...
- if (prefix == null && namespaceURI.equals(NS_URI_XMLNS)) {
- prefix = "xmlns";
- }
- // if a prefix exists, qualify the name with it
- if (prefix != null && !"".equals(prefix)) {
- nodeName = prefix + ":" + nodeName;
- }
- // create the appropriate type of attribute
- if (prefix != null) {
- clonedNode = document.createAttributeNS(namespaceURI, nodeName);
- } else {
- clonedNode = document.createAttribute(nodeName);
- }
- }
- break;
- case Node.CDATA_SECTION_NODE:
- clonedNode = document.createCDATASection(((CDATASection) sourceNode).getData());
- break;
- case Node.COMMENT_NODE:
- clonedNode = document.createComment(((Comment) sourceNode).getData());
- break;
- case Node.DOCUMENT_FRAGMENT_NODE:
- clonedNode = document.createDocumentFragment();
- break;
- case Node.DOCUMENT_NODE:
- clonedNode = document;
- break;
- case Node.ELEMENT_NODE:
- // create the appropriate type of element
- if (namespaceURI == null) {
- clonedNode = document.createElement(nodeName);
- } else {
- String prefix = namespaceURI.equals(Namespaces.XMLNS_URI) ?
- "xmlns" : ((Element) sourceNode).lookupPrefix(namespaceURI);
- if (prefix != null && !"".equals(prefix)) {
- nodeName = prefix + ":" + nodeName;
- clonedNode = document.createElementNS(namespaceURI, nodeName);
- } else {
- clonedNode = document.createElement(nodeName);
- }
- }
- // attributes are not treated as child nodes, so copy them explicitly
- NamedNodeMap attributes = ((Element) sourceNode).getAttributes();
- for (int i = 0; i < attributes.getLength(); i++) {
- Attr attributeClone = (Attr) cloneNode(document, attributes.item(i));
- if (attributeClone.getNamespaceURI() == null) {
- ((Element) clonedNode).setAttributeNode(attributeClone);
- } else {
- ((Element) clonedNode).setAttributeNodeNS(attributeClone);
- }
- }
- break;
- case Node.ENTITY_NODE:
- // TODO
- break;
- case Node.ENTITY_REFERENCE_NODE:
- clonedNode = document.createEntityReference(nodeName);
- // TODO
- break;
- case Node.NOTATION_NODE:
- // TODO
- break;
- case Node.PROCESSING_INSTRUCTION_NODE:
- clonedNode = document.createProcessingInstruction(((ProcessingInstruction) sourceNode).getData(), nodeName);
- break;
- case Node.TEXT_NODE:
- clonedNode = document.createTextNode(((Text) sourceNode ).getData());
- break;
- default:
- break;
- }
-
- // clone children of element and attribute nodes
- NodeList sourceChildren = sourceNode.getChildNodes();
- if (sourceChildren != null) {
- for (int i = 0; i < sourceChildren.getLength(); i++) {
- Node sourceChild = sourceChildren.item(i);
- Node clonedChild = cloneNode(document, sourceChild);
- clonedNode.appendChild(clonedChild);
- // if the child has a textual value, parse it for any embedded prefixes
- if (clonedChild.getNodeType() == Node.TEXT_NODE ||
- clonedChild.getNodeType() == Node.CDATA_SECTION_NODE) {
- parseEmbeddedPrefixes(sourceNode, clonedNode, clonedChild);
- }
- }
- }
- return clonedNode;
+ // what is my name?
+ QName sourceQName = getNodeQName(sourceNode);
+ String nodeName = sourceQName.getLocalPart();
+ String namespaceURI = sourceQName.getNamespaceURI();
+
+ // if the node is unqualified, don't assume that it inherits the WS-BPEL target namespace
+ if (Namespaces.WSBPEL2_0_FINAL_EXEC.equals(namespaceURI)) {
+ namespaceURI = null;
+ }
+
+ switch (sourceNode.getNodeType()) {
+ case Node.ATTRIBUTE_NODE:
+ if (namespaceURI == null) {
+ clonedNode = document.createAttribute(nodeName);
+ } else {
+ String prefix = ((Attr) sourceNode).lookupPrefix(namespaceURI);
+ // the prefix for the XML namespace can't be looked up, hence this...
+ if (prefix == null && namespaceURI.equals(NS_URI_XMLNS)) {
+ prefix = "xmlns";
+ }
+ // if a prefix exists, qualify the name with it
+ if (prefix != null && !"".equals(prefix)) {
+ nodeName = prefix + ":" + nodeName;
+ }
+ // create the appropriate type of attribute
+ if (prefix != null) {
+ clonedNode = document.createAttributeNS(namespaceURI, nodeName);
+ } else {
+ clonedNode = document.createAttribute(nodeName);
+ }
+ }
+ break;
+ case Node.CDATA_SECTION_NODE:
+ clonedNode = document.createCDATASection(((CDATASection) sourceNode).getData());
+ break;
+ case Node.COMMENT_NODE:
+ clonedNode = document.createComment(((Comment) sourceNode).getData());
+ break;
+ case Node.DOCUMENT_FRAGMENT_NODE:
+ clonedNode = document.createDocumentFragment();
+ break;
+ case Node.DOCUMENT_NODE:
+ clonedNode = document;
+ break;
+ case Node.ELEMENT_NODE:
+ // create the appropriate type of element
+ if (namespaceURI == null) {
+ clonedNode = document.createElement(nodeName);
+ } else {
+ String prefix = namespaceURI.equals(Namespaces.XMLNS_URI) ?
+ "xmlns" : ((Element) sourceNode).lookupPrefix(namespaceURI);
+ if (prefix != null && !"".equals(prefix)) {
+ nodeName = prefix + ":" + nodeName;
+ clonedNode = document.createElementNS(namespaceURI, nodeName);
+ } else {
+ clonedNode = document.createElement(nodeName);
+ }
+ }
+ // attributes are not treated as child nodes, so copy them explicitly
+ NamedNodeMap attributes = ((Element) sourceNode).getAttributes();
+ for (int i = 0; i < attributes.getLength(); i++) {
+ Attr attributeClone = (Attr) cloneNode(document, attributes.item(i));
+ if (attributeClone.getNamespaceURI() == null) {
+ ((Element) clonedNode).setAttributeNode(attributeClone);
+ } else {
+ ((Element) clonedNode).setAttributeNodeNS(attributeClone);
+ }
+ }
+ break;
+ case Node.ENTITY_NODE:
+ // TODO
+ break;
+ case Node.ENTITY_REFERENCE_NODE:
+ clonedNode = document.createEntityReference(nodeName);
+ // TODO
+ break;
+ case Node.NOTATION_NODE:
+ // TODO
+ break;
+ case Node.PROCESSING_INSTRUCTION_NODE:
+ clonedNode = document.createProcessingInstruction(((ProcessingInstruction) sourceNode).getData(), nodeName);
+ break;
+ case Node.TEXT_NODE:
+ clonedNode = document.createTextNode(((Text) sourceNode ).getData());
+ break;
+ default:
+ break;
+ }
+
+ // clone children of element and attribute nodes
+ NodeList sourceChildren = sourceNode.getChildNodes();
+ if (sourceChildren != null) {
+ for (int i = 0; i < sourceChildren.getLength(); i++) {
+ Node sourceChild = sourceChildren.item(i);
+ Node clonedChild = cloneNode(document, sourceChild);
+ clonedNode.appendChild(clonedChild);
+ // if the child has a textual value, parse it for any embedded prefixes
+ if (clonedChild.getNodeType() == Node.TEXT_NODE ||
+ clonedChild.getNodeType() == Node.CDATA_SECTION_NODE) {
+ parseEmbeddedPrefixes(sourceNode, clonedNode, clonedChild);
+ }
+ }
+ }
+ return clonedNode;
}
/**
@@ -1211,36 +1211,36 @@ public class DOMUtils {
* @param clonedChild
*/
private static void parseEmbeddedPrefixes(Node sourceNode, Node clonedNode, Node clonedChild) {
- Element clonedElement = null;
- if (clonedNode instanceof Attr) {
- clonedElement = ((Attr) clonedNode).getOwnerElement();
- } else if (clonedNode instanceof Element) {
- clonedElement = (Element) clonedNode;
- }
- if (clonedElement == null) {
- // couldn't find an element to set prefixes on, so bail out
- return;
- }
-
- String text = ((Text) clonedChild).getNodeValue();
- if (text != null && text.indexOf(":") > 0) {
- Name11Checker nameChecker = Name11Checker.getInstance();
- for (int colonIndex = text.indexOf(":"); colonIndex != -1 && colonIndex < text.length(); colonIndex = text.indexOf(":", colonIndex + 1)) {
- StringBuffer prefixString = new StringBuffer();
- for (int prefixIndex = colonIndex - 1;
- prefixIndex >= 0 && nameChecker.isNCNameChar(text.charAt(prefixIndex));
- prefixIndex--) {
- prefixString.append(text.charAt(prefixIndex));
- }
- prefixString.reverse();
- if (prefixString.length() > 0) {
- String uri = sourceNode.lookupNamespaceURI(prefixString.toString());
- if (uri != null) {
- clonedElement.setAttributeNS(NS_URI_XMLNS, "xmlns:" + prefixString, uri);
- }
- }
- }
- }
+ Element clonedElement = null;
+ if (clonedNode instanceof Attr) {
+ clonedElement = ((Attr) clonedNode).getOwnerElement();
+ } else if (clonedNode instanceof Element) {
+ clonedElement = (Element) clonedNode;
+ }
+ if (clonedElement == null) {
+ // couldn't find an element to set prefixes on, so bail out
+ return;
+ }
+
+ String text = ((Text) clonedChild).getNodeValue();
+ if (text != null && text.indexOf(":") > 0) {
+ Name11Checker nameChecker = Name11Checker.getInstance();
+ for (int colonIndex = text.indexOf(":"); colonIndex != -1 && colonIndex < text.length(); colonIndex = text.indexOf(":", colonIndex + 1)) {
+ StringBuffer prefixString = new StringBuffer();
+ for (int prefixIndex = colonIndex - 1;
+ prefixIndex >= 0 && nameChecker.isNCNameChar(text.charAt(prefixIndex));
+ prefixIndex--) {
+ prefixString.append(text.charAt(prefixIndex));
+ }
+ prefixString.reverse();
+ if (prefixString.length() > 0) {
+ String uri = sourceNode.lookupNamespaceURI(prefixString.toString());
+ if (uri != null) {
+ clonedElement.setAttributeNS(NS_URI_XMLNS, "xmlns:" + prefixString, uri);
+ }
+ }
+ }
+ }
}
public static Element stringToDOM(byte[] bytes) throws SAXException, IOException {
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/GUID.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/GUID.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/GUID.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/GUID.java Thu May 27 15:52:24 2010
@@ -51,218 +51,218 @@ import java.util.Set;
* </pre>
*/
public final class GUID implements Cloneable, Comparable, java.io.Serializable {
- static final long serialVersionUID = -7977671257884186039L;
+ static final long serialVersionUID = -7977671257884186039L;
- static String PROP_PORT = "org.apache.ode.uid.port";
+ static String PROP_PORT = "org.apache.ode.uid.port";
- static int port = Integer.getInteger(PROP_PORT, 33666);
-
- // 32 bits
- private static final byte[] ipadd = {127,0,0,1};
-
- // 64 bits
- private static byte[] baseId = getSystemUniqId();
-
- // 32 bits
- private static short cnt = Short.MIN_VALUE;
-
- private static GUID _VM_GUID;
-
- static {
- _VM_GUID = new GUID();
- }
-
- private final byte[] id;
-
- private transient String guidstring = null;
-
- /**
- * Create a new unique GUID
- */
- public GUID() {
- short c;
- byte[] b;
-
- synchronized (GUID.class) {
- c = ++cnt;
- b = baseId;
-
- if (cnt == Short.MAX_VALUE) {
- cnt = Short.MIN_VALUE;
- baseId = getSystemUniqId();
- }
- }
-
- id = new byte[] { ipadd[0], ipadd[1], ipadd[2], ipadd[3], b[7], b[6],
- b[5], b[4], b[3], b[2], b[1], b[0], (byte) ((c >>> 8) & 0xff),
- (byte) (c & 0xff) };
- }
-
- /**
- * Reconstitute a GUID from it's string representation
- *
- * @param str
- * DOCUMENTME
- *
- * @throws MalformedGuidException
- * DOCUMENTME
- */
- public GUID(String str) throws MalformedGuidException {
- if (str == null) {
- throw new MalformedGuidException(str);
- }
-
- id = new byte[14];
- stringToBytes(str);
- }
-
- /**
- * Get the GUID bytes.
- */
- public byte[] getGuid() {
- return id;
- }
-
- public static GUID getVMGUID() {
- return _VM_GUID;
- }
-
- public int compareTo(Object o) {
- if (o == this) {
-
- return 0;
- }
-
- GUID o1 = (GUID) o;
-
- for (short i = 0; i < id.length; ++i) {
- if (o1.id[i] < id[i]) {
-
- return -1;
- } else if (o1.id[i] > id[i]) {
-
- return 1;
- }
- }
-
- return 0;
- }
-
- public boolean equals(Object o) {
- try {
- return compareTo(o) == 0;
- } catch (ClassCastException ce) {
- return false;
- }
- }
-
- public int hashCode() {
- int ret = 0;
-
- for (short i = 0; i < id.length; ++i) {
- ret ^= (id[i] << (i % 4));
- }
-
- return ret;
- }
-
- public static void main(String[] argv) throws Exception {
- Set<GUID> set = new HashSet<GUID>();
-
- for (int i = 0; i < 100000; ++i) {
- GUID g = new GUID();
-
- if (set.contains(g)) {
- System.out.println("CONFLICT>>>");
- }
-
- set.add(g);
-
- GUID ng = new GUID(g.toString());
-
- if (!ng.toString().equals(g.toString()) || !ng.equals(g)) {
- System.out.println("INEQUALITY>>>");
- System.out.println(ng.toString());
- System.out.println(g.toString());
- } else {
- System.out.println(g.toString());
- }
- }
- }
-
- /**
- * Convert a GUID to it's string representation. This will return a string
- * of at most 32 bytes.
- *
- * @return DOCUMENTME
- */
- public String toString() {
- if (guidstring == null) {
- guidstring = mapBytesToChars();
- }
-
- return guidstring;
- }
-
- private static byte[] getSystemUniqId() {
- ProcessMutex pm = new ProcessMutex(port);
-
- try {
- pm.lock();
- } catch (InterruptedException ie) {
- System.err
- .println("ERROR: Could not establish unique starttime using\n"
- + " TCP port "
- + port
- + " for synchronization. \n"
- + " Perhaps this port is used by anotherprocess? \n"
- + " Check the '"
- + PROP_PORT
- + "' JAVA system property. \n");
- throw new RuntimeException("GUID.getSystemUniqId() FAILED!!!");
- }
-
- long uid = System.currentTimeMillis();
- pm.unlock();
-
- return new byte[] { (byte) (uid & 0xff), (byte) ((uid >>> 8) & 0xff),
- (byte) ((uid >>> 16) & 0xff), (byte) ((uid >>> 24) & 0xff),
- (byte) ((uid >>> 32) & 0xff), (byte) ((uid >>> 40) & 0xff),
- (byte) ((uid >>> 48) & 0xff), (byte) ((uid >>> 56) & 0xff) };
- }
-
- private String mapBytesToChars() {
- BigInteger bigInt = new BigInteger(id);
- return bigInt.toString(34);
- }
-
- private void stringToBytes(String s) {
- BigInteger bigInt = new BigInteger(s, 34);
- byte[] bytes = bigInt.toByteArray();
- for (int i = 0; i < id.length; ++i)
- id[i] = bytes[i];
- }
-
- public static class MalformedGuidException extends Exception {
-
- private static final long serialVersionUID = -8922336058603571809L;
-
- public MalformedGuidException(String guid) {
- super("Malformed guid: " + guid);
- }
- }
-
- public static String makeGUID(String digest) {
- String val = "0";
- int maxlen = 32;
- int base = 34;
- int prime = 31;
- for (int i = 0; i < digest.length(); i++) {
- char c = digest.charAt(i);
- val = new BigInteger(val, base).add(BigInteger.valueOf((long) c)).multiply(BigInteger.valueOf(prime)).toString(base);
- if (val.length() > maxlen) val = val.substring(0, maxlen);
- }
-
- return val;
- }
+ static int port = Integer.getInteger(PROP_PORT, 33666);
+
+ // 32 bits
+ private static final byte[] ipadd = {127,0,0,1};
+
+ // 64 bits
+ private static byte[] baseId = getSystemUniqId();
+
+ // 32 bits
+ private static short cnt = Short.MIN_VALUE;
+
+ private static GUID _VM_GUID;
+
+ static {
+ _VM_GUID = new GUID();
+ }
+
+ private final byte[] id;
+
+ private transient String guidstring = null;
+
+ /**
+ * Create a new unique GUID
+ */
+ public GUID() {
+ short c;
+ byte[] b;
+
+ synchronized (GUID.class) {
+ c = ++cnt;
+ b = baseId;
+
+ if (cnt == Short.MAX_VALUE) {
+ cnt = Short.MIN_VALUE;
+ baseId = getSystemUniqId();
+ }
+ }
+
+ id = new byte[] { ipadd[0], ipadd[1], ipadd[2], ipadd[3], b[7], b[6],
+ b[5], b[4], b[3], b[2], b[1], b[0], (byte) ((c >>> 8) & 0xff),
+ (byte) (c & 0xff) };
+ }
+
+ /**
+ * Reconstitute a GUID from it's string representation
+ *
+ * @param str
+ * DOCUMENTME
+ *
+ * @throws MalformedGuidException
+ * DOCUMENTME
+ */
+ public GUID(String str) throws MalformedGuidException {
+ if (str == null) {
+ throw new MalformedGuidException(str);
+ }
+
+ id = new byte[14];
+ stringToBytes(str);
+ }
+
+ /**
+ * Get the GUID bytes.
+ */
+ public byte[] getGuid() {
+ return id;
+ }
+
+ public static GUID getVMGUID() {
+ return _VM_GUID;
+ }
+
+ public int compareTo(Object o) {
+ if (o == this) {
+
+ return 0;
+ }
+
+ GUID o1 = (GUID) o;
+
+ for (short i = 0; i < id.length; ++i) {
+ if (o1.id[i] < id[i]) {
+
+ return -1;
+ } else if (o1.id[i] > id[i]) {
+
+ return 1;
+ }
+ }
+
+ return 0;
+ }
+
+ public boolean equals(Object o) {
+ try {
+ return compareTo(o) == 0;
+ } catch (ClassCastException ce) {
+ return false;
+ }
+ }
+
+ public int hashCode() {
+ int ret = 0;
+
+ for (short i = 0; i < id.length; ++i) {
+ ret ^= (id[i] << (i % 4));
+ }
+
+ return ret;
+ }
+
+ public static void main(String[] argv) throws Exception {
+ Set<GUID> set = new HashSet<GUID>();
+
+ for (int i = 0; i < 100000; ++i) {
+ GUID g = new GUID();
+
+ if (set.contains(g)) {
+ System.out.println("CONFLICT>>>");
+ }
+
+ set.add(g);
+
+ GUID ng = new GUID(g.toString());
+
+ if (!ng.toString().equals(g.toString()) || !ng.equals(g)) {
+ System.out.println("INEQUALITY>>>");
+ System.out.println(ng.toString());
+ System.out.println(g.toString());
+ } else {
+ System.out.println(g.toString());
+ }
+ }
+ }
+
+ /**
+ * Convert a GUID to it's string representation. This will return a string
+ * of at most 32 bytes.
+ *
+ * @return DOCUMENTME
+ */
+ public String toString() {
+ if (guidstring == null) {
+ guidstring = mapBytesToChars();
+ }
+
+ return guidstring;
+ }
+
+ private static byte[] getSystemUniqId() {
+ ProcessMutex pm = new ProcessMutex(port);
+
+ try {
+ pm.lock();
+ } catch (InterruptedException ie) {
+ System.err
+ .println("ERROR: Could not establish unique starttime using\n"
+ + " TCP port "
+ + port
+ + " for synchronization. \n"
+ + " Perhaps this port is used by anotherprocess? \n"
+ + " Check the '"
+ + PROP_PORT
+ + "' JAVA system property. \n");
+ throw new RuntimeException("GUID.getSystemUniqId() FAILED!!!");
+ }
+
+ long uid = System.currentTimeMillis();
+ pm.unlock();
+
+ return new byte[] { (byte) (uid & 0xff), (byte) ((uid >>> 8) & 0xff),
+ (byte) ((uid >>> 16) & 0xff), (byte) ((uid >>> 24) & 0xff),
+ (byte) ((uid >>> 32) & 0xff), (byte) ((uid >>> 40) & 0xff),
+ (byte) ((uid >>> 48) & 0xff), (byte) ((uid >>> 56) & 0xff) };
+ }
+
+ private String mapBytesToChars() {
+ BigInteger bigInt = new BigInteger(id);
+ return bigInt.toString(34);
+ }
+
+ private void stringToBytes(String s) {
+ BigInteger bigInt = new BigInteger(s, 34);
+ byte[] bytes = bigInt.toByteArray();
+ for (int i = 0; i < id.length; ++i)
+ id[i] = bytes[i];
+ }
+
+ public static class MalformedGuidException extends Exception {
+
+ private static final long serialVersionUID = -8922336058603571809L;
+
+ public MalformedGuidException(String guid) {
+ super("Malformed guid: " + guid);
+ }
+ }
+
+ public static String makeGUID(String digest) {
+ String val = "0";
+ int maxlen = 32;
+ int base = 34;
+ int prime = 31;
+ for (int i = 0; i < digest.length(); i++) {
+ char c = digest.charAt(i);
+ val = new BigInteger(val, base).add(BigInteger.valueOf((long) c)).multiply(BigInteger.valueOf(prime)).toString(base);
+ if (val.length() > maxlen) val = val.substring(0, maxlen);
+ }
+
+ return val;
+ }
}
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/InternPool.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/InternPool.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/InternPool.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/InternPool.java Thu May 27 15:52:24 2010
@@ -70,20 +70,20 @@ public class InternPool {
String processId = getProcessId();
if (!cachedBlocks.contains(processId)) {
- return value;
+ return value;
}
synchronized (cachedValues) {
List values = (List) cachedValues.get(processId, key);
if (values == null) {
- cachedValues.put(processId, key, (values = new ArrayList()));
+ cachedValues.put(processId, key, (values = new ArrayList()));
}
Object intern;
if (values.contains(value)) {
- intern = values.get(values.indexOf(value));
+ intern = values.get(values.indexOf(value));
} else {
- values.add(intern = value);
+ values.add(intern = value);
}
return intern;
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java Thu May 27 15:52:24 2010
@@ -65,7 +65,7 @@ public class LoggingInterceptor<T> imple
_delegate = delegate;
}
- public Object invoke(Object proxy, Method method, Object[] args)
+ public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
try {
if (method.getDeclaringClass() == DataSource.class
@@ -89,7 +89,7 @@ public class LoggingInterceptor<T> imple
}
}
- private void print(Method method, Object[] args) {
+ private void print(Method method, Object[] args) {
if (shouldPrint()) {
// JDBC Connection
if ("prepareStatement".equals(method.getName())) {
@@ -136,7 +136,7 @@ public class LoggingInterceptor<T> imple
buf.append("(").append(entry.getKey()).append(",").append(entry.getValue()).append(") ");
} catch (Throwable e) {
// We don't want to mess with the connection just for logging
- return "[e]";
+ return "[e]";
}
}
for (Map.Entry<String, Object> entry : _paramsByName.entrySet()) {
@@ -152,7 +152,7 @@ public class LoggingInterceptor<T> imple
return "w/o params";
}
- private boolean shouldPrint() {
+ private boolean shouldPrint() {
if (_log != null)
return _log.isDebugEnabled();
else return true;
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/NSContext.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/NSContext.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/NSContext.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/NSContext.java Thu May 27 15:52:24 2010
@@ -58,12 +58,12 @@ public class NSContext implements Namesp
/** Prefix-to-URI map. */
private HashMap<String, String> _prefixToUriMap = new HashMap<String, String>() {
- @Override
- public String put(String prefix, String uri) {
+ @Override
+ public String put(String prefix, String uri) {
prefix = (String) InternPool.intern("namespace.prefixes", prefix);
uri = (String) InternPool.intern("namespace.uris", uri);
return super.put(prefix, uri);
- }
+ }
};
public NSContext() {
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/Namespaces.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/Namespaces.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/Namespaces.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/Namespaces.java Thu May 27 15:52:24 2010
@@ -27,9 +27,9 @@ import javax.xml.namespace.QName;
public class Namespaces {
/** XML namespaces */
- public static final String XML_URI = "http://www.w3.org/XML/1998/namespace".intern();
- public static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/".intern();
-
+ public static final String XML_URI = "http://www.w3.org/XML/1998/namespace".intern();
+ public static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/".intern();
+
/** BPEL 2.0 Final namespaces */
public static final String WSBPEL2_0_FINAL_ABSTRACT = "http://docs.oasis-open.org/wsbpel/2.0/process/abstract".intern();
public static final String WSBPEL2_0_FINAL_EXEC = "http://docs.oasis-open.org/wsbpel/2.0/process/executable".intern();
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/Reflect.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/Reflect.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/Reflect.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/Reflect.java Thu May 27 15:52:24 2010
@@ -28,7 +28,7 @@ public class Reflect {
* @param method
* @return
*/
- public static String generateMethodSignature(Method method) {
+ public static String generateMethodSignature(Method method) {
StringBuffer sb = new StringBuffer(64);
sb.append(method.getName());
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/SystemConfigurationException.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/SystemConfigurationException.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/SystemConfigurationException.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/SystemConfigurationException.java Thu May 27 15:52:24 2010
@@ -24,43 +24,43 @@ package org.apache.ode.utils;
*/
public class SystemConfigurationException extends RuntimeException {
- private static final long serialVersionUID = -2330515949287155695L;
+ private static final long serialVersionUID = -2330515949287155695L;
- /**
- * Construct a new instance with the specified message.
- *
- * @param message
- * a descriptive message.
- * @see RuntimeException#RuntimeException(java.lang.String)
- */
- public SystemConfigurationException(String message) {
- super(message);
- }
+ /**
+ * Construct a new instance with the specified message.
+ *
+ * @param message
+ * a descriptive message.
+ * @see RuntimeException#RuntimeException(java.lang.String)
+ */
+ public SystemConfigurationException(String message) {
+ super(message);
+ }
- /**
- * Construct a new instance with the specified message and a
- * {@link Throwable} that triggered this exception.
- *
- * @param message
- * a descriptive message
- * @param cause
- * the cause
- * @see RuntimeException#RuntimeException(java.lang.String,
- * java.lang.Throwable)
- */
- public SystemConfigurationException(String message, Throwable cause) {
- super(message, cause);
- }
+ /**
+ * Construct a new instance with the specified message and a
+ * {@link Throwable} that triggered this exception.
+ *
+ * @param message
+ * a descriptive message
+ * @param cause
+ * the cause
+ * @see RuntimeException#RuntimeException(java.lang.String,
+ * java.lang.Throwable)
+ */
+ public SystemConfigurationException(String message, Throwable cause) {
+ super(message, cause);
+ }
- /**
- * Construct a new instance with the specified {@link Throwable} as the root
- * cause.
- *
- * @param cause
- * the cause
- * @see RuntimeException#RuntimeException(java.lang.Throwable)
- */
- public SystemConfigurationException(Throwable cause) {
- super(cause);
- }
+ /**
+ * Construct a new instance with the specified {@link Throwable} as the root
+ * cause.
+ *
+ * @param cause
+ * the cause
+ * @see RuntimeException#RuntimeException(java.lang.Throwable)
+ */
+ public SystemConfigurationException(Throwable cause) {
+ super(cause);
+ }
}