http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml
b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml
index 6a22a25..09d7bdd 100644
--- a/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml
+++ b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml
@@ -1,23 +1,5 @@
<?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. 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. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<!--
!
! Copyright 2006 The Apache Software Foundation.
!
@@ -40,7 +22,7 @@
<wsp:Policy>
<sp:TransportToken>
<wsp:Policy>
- <sp:HttpsToken RequireClientCertificate="false"/>
+ <!--<sp:HttpsToken RequireClientCertificate="false"/>-->
</wsp:Policy>
</sp:TransportToken>
<sp:AlgorithmSuite>
@@ -61,12 +43,12 @@
<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient"
/>
</wsp:Policy>
</sp:SignedSupportingTokens>
-
- <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+
+ <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
<ramp:user>alice</ramp:user>
<ramp:passwordCallbackClass>org.apache.rampart.samples.policy.sample01.PWCBHandler</ramp:passwordCallbackClass>
</ramp:RampartConfig>
-
+
</wsp:All>
</wsp:ExactlyOne>
</wsp:Policy>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml
b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml
index 76aac2c..4ef2063 100644
--- a/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml
+++ b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml
@@ -1,23 +1,5 @@
<?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. 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. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<!--
!
! Copyright 2006 The Apache Software Foundation.
!
@@ -33,7 +15,7 @@
! See the License for the specific language governing permissions and
! limitations under the License.
!-->
-
+
<wsp:Policy wsu:Id="SigEncr" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
<wsp:ExactlyOne>
<wsp:All>
@@ -43,7 +25,8 @@
<wsp:Policy>
<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
<wsp:Policy>
- <sp:WssX509V3Token10/>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V1Token10/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -52,6 +35,7 @@
<wsp:Policy>
<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
<wsp:Policy>
+ <sp:RequireThumbprintReference/>
<sp:WssX509V3Token10/>
</wsp:Policy>
</sp:X509Token>
@@ -84,11 +68,11 @@
<sp:Body/>
</sp:EncryptedParts>
- <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+ <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
<ramp:user>client</ramp:user>
<ramp:encryptionUser>service</ramp:encryptionUser>
<ramp:passwordCallbackClass>org.apache.rampart.samples.policy.sample03.PWCBHandler</ramp:passwordCallbackClass>
-
+
<ramp:signatureCrypto>
<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample01-policy.aar
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample01-policy.aar
b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample01-policy.aar
index 9335a39..e4a0f49 100644
Binary files a/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample01-policy.aar
and b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample01-policy.aar
differ
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample02-policy.aar
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample02-policy.aar
b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample02-policy.aar
index 1a42deb..6d4f9f7 100644
Binary files a/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample02-policy.aar
and b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample02-policy.aar
differ
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample03-policy.aar
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample03-policy.aar
b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample03-policy.aar
index 1f32b4d..15cbe0e 100644
Binary files a/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample03-policy.aar
and b/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample03-policy.aar
differ
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint b/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint
index 94cf0a1..0d582f7 100644
--- a/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint
+++ b/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint
@@ -1,7 +1,3 @@
-t/resources/TestRampartBasic/secured-services/process-template/config.endpoint test/resources/TestRampartPolicy/secured-services/process-template/config.endpoint
test/resources/TestRampartPolicy/secured-services/process-sample04_policy_in_service.xml/config.endpoint
-test/resources/TestSoapHeader/location.endpoint
-
-
alias.dummy-ns=http://axis2.ode.apache.org
dummy-ns.DummyService.ode.address=http://localhost:${system.test.port.0}/processes/DummyService
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java b/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
index 1d248cc..b5a198c 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
@@ -49,8 +49,8 @@ import javax.transaction.xa.XAResource;
import org.apache.axis2.AxisFault;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.util.IdleConnectionTimeoutThread;
import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
+import org.apache.commons.httpclient.util.IdleConnectionTimeoutThread;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.axis2.deploy.DeploymentPoller;
@@ -279,7 +279,7 @@ public class ODEServer {
*
* @throws AxisFault if the engine is unable to shut down.
*/
- public void shutDown() throws AxisFault {
+ public void shutDown() {
ClassLoader old = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java b/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
index cbd4a51..f7a5e05 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
@@ -371,7 +371,7 @@ public class SoapExternalService implements ExternalService {
}
if (address != null) {
String url = address.getTextContent();
- String jmsDestination = (String) options.getProperty(JMSConstants.REPLY_PARAM);
+ String jmsDestination = (String) options.getProperty(JMSConstants.PARAM_REPLY_DESTINATION);
if (__log.isDebugEnabled()) {
__log.debug("The user-defined JMS replyTo destination is: "
+ jmsDestination);
@@ -394,7 +394,7 @@ public class SoapExternalService implements ExternalService {
jmsEndIndex = url.length();
}
jmsDestination = url.substring(startIndex, jmsEndIndex);
- options.setProperty(JMSConstants.REPLY_PARAM, jmsDestination);
+ options.setProperty(JMSConstants.PARAM_REPLY_DESTINATION, jmsDestination);
replyEPR = new EndpointReference(url);
} else {
startIndex = url.indexOf("http://");
@@ -403,7 +403,7 @@ public class SoapExternalService implements ExternalService {
if (startIndex != -1) {
startIndex += "/processes/".length();
jmsDestination = url.substring(startIndex);
- options.setProperty(JMSConstants.REPLY_PARAM, jmsDestination);
+ options.setProperty(JMSConstants.PARAM_REPLY_DESTINATION,
jmsDestination);
}
}
}
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
index ba2a5fc..f2bed5b 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
@@ -132,7 +132,7 @@ public class ODEAxisService {
// Set the JMS destination name on the Axis Service
if (isJmsEndpoint(pconf, wsdlServiceName, portName)) {
- axisService.addParameter(new Parameter(JMSConstants.DEST_PARAM,
+ axisService.addParameter(new Parameter(JMSConstants.PARAM_DESTINATION,
extractJMSDestinationName(axisServiceName, deriveBaseServiceUri(pconf))));
}
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServlet.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServlet.java b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServlet.java
index 4d4d11c..bb6cf71 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServlet.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServlet.java
@@ -63,8 +63,8 @@ public class ODEAxisServlet extends AxisServlet {
}
- public void stop() throws AxisFault {
- super.stop();
+ public void destroy() {
+ super.destroy();
_odeServer.shutDown();
}
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2/src/main/java/org/apache/ode/axis2/service/ServiceClientUtil.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/service/ServiceClientUtil.java b/axis2/src/main/java/org/apache/ode/axis2/service/ServiceClientUtil.java
index e73f489..21e4ecc 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/service/ServiceClientUtil.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/service/ServiceClientUtil.java
@@ -64,9 +64,16 @@ public class ServiceClientUtil {
options.setTimeOutInMilliSeconds(timeout);
ServiceClient serviceClient = new ServiceClient();
- serviceClient.setOptions(options);
-
- return serviceClient.sendReceive(msg);
+ try {
+ serviceClient.setOptions(options);
+
+ OMElement response = serviceClient.sendReceive(msg);
+ // build response to materialize lazy information
+ response.build();
+ return response;
+ } finally {
+ serviceClient.cleanupTransport();
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java b/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
index d6c22b1..6d18326 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
@@ -256,8 +256,11 @@ public class SoapMessageConverter {
}
OMElement omPart = OMUtils.toOM(srcPartEl, _soapFactory);
- for (Iterator<OMNode> i = omPart.getChildren(); i.hasNext();)
- soaphdr.addChild(i.next());
+ for (Iterator<OMNode> i = omPart.getChildren(); i.hasNext();) {
+ OMNode node = i.next();
+ i.remove();
+ soaphdr.addChild(node);
+ }
}
public SOAPFault createSoapFault(Element message, QName faultName, Operation op) throws
AxisFault {
@@ -361,7 +364,11 @@ public class SoapMessageConverter {
OMElement omPart = OMUtils.toOM(srcPartEl, _soapFactory);
if (_isRPC) partHolder.addChild(omPart);
- else for (Iterator<OMNode> i = omPart.getChildren(); i.hasNext();) partHolder.addChild(i.next());
+ else for (Iterator<OMNode> i = omPart.getChildren(); i.hasNext();) {
+ OMNode node = i.next();
+ i.remove();
+ partHolder.addChild(node);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/dependencies.rb
----------------------------------------------------------------------
diff --git a/dependencies.rb b/dependencies.rb
index 7288387..3e734be 100644
--- a/dependencies.rb
+++ b/dependencies.rb
@@ -16,25 +16,39 @@
ANNONGEN = "annogen:annogen:jar:0.1.0"
ANT = "ant:ant:jar:1.6.5"
AXIOM = [ group("axiom-api", "axiom-impl", "axiom-dom",
- :under=>"org.apache.ws.commons.axiom", :version=>"1.2.7") ]
-AXIS2_ALL = group("axis2-adb", "axis2-codegen", "axis2-kernel",
+ :under=>"org.apache.ws.commons.axiom", :version=>"1.2.12")
]
+AXIS2_ALL = [ group("axis2-adb", "axis2-codegen", "axis2-kernel",
"axis2-java2wsdl", "axis2-jibx", "axis2-saaj", "axis2-xmlbeans",
- :under=>"org.apache.axis2", :version=>"1.3")
-AXIS2_TEST = group("httpcore", "httpcore-nio", "httpcore-niossl",
- :under=>"org.apache.httpcomponents", :version=>"4.0-alpha5")
+ :under=>"org.apache.axis2", :version=>"1.5.6"),
+ group("woden-api", "woden-impl-dom",
+ :under=>"org.apache.woden",
+ :version=>"1.0M9"),
+ "org.apache.axis2:axis2-transports:jar:1.0-i6",
+ "org.apache.axis2:axis2-transport-http:jar:1.5.6",
+ "org.apache.axis2:axis2-transport-local:jar:1.5.6",
+ "org.apache.axis2:axis2-transport-tcp:jar:1.0.0",
+ "org.apache.axis2:axis2-transport-jms:jar:1.0.0",
+ "org.apache.httpcomponents:httpcore:jar:4.0"]
+AXIS2_TEST = group("httpcore", "httpcore-nio",
+ :under=>"org.apache.httpcomponents", :version=>"4.0")
AXIS2_MODULES = struct(
- :mods => ["org.apache.rampart:rampart:mar:1.3",
- "org.apache.rampart:rahas:mar:1.3",
- "org.apache.axis2:addressing:mar:1.3"],
+ :mods => ["org.apache.rampart:rampart:mar:1.5.2",
+ "org.apache.rampart:rahas:mar:1.5.2",
+ "org.apache.axis2:addressing:mar:1.5.6",
+ "org.apache.axis2:mex:mar:1.5.6"],
:libs => [group("rampart-core", "rampart-policy", "rampart-trust",
:under=>"org.apache.rampart",
- :version=>"1.3"),
- "org.apache.ws.security:wss4j:jar:1.5.3",
- "org.apache.santuario:xmlsec:jar:1.4.0",
- "org.opensaml:opensaml:jar:1.1",
+ :version=>"1.5.2"),
+ "org.apache.ws.security:wss4j:jar:1.5.12",
+ "org.apache.santuario:xmlsec:jar:1.4.2",
+ "org.apache.axis2:mex:jar:impl:1.5.6",
+ "org.opensaml:opensaml1:jar:1.1",
+ "org.opensaml:opensaml:jar:2.2.3",
+ "org.opensaml:openws:jar:1.2.2",
+ "org.opensaml:xmltooling:jar:1.2.0",
"bouncycastle:bcprov-jdk15:jar:140"]
)
-AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.3"
+AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.5.6"
BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.1"
COMMONS = struct(
:codec =>"commons-codec:commons-codec:jar:1.3",
@@ -43,7 +57,7 @@ COMMONS = struct(
:fileupload =>"commons-fileupload:commons-fileupload:jar:1.2",
:httpclient =>"commons-httpclient:commons-httpclient:jar:3.1",
:lang =>"commons-lang:commons-lang:jar:2.4",
- :logging =>"commons-logging:commons-logging:jar:1.1",
+ :logging =>"commons-logging:commons-logging:jar:1.1.1",
:io =>"commons-io:commons-io:jar:1.4",
:pool =>"commons-pool:commons-pool:jar:1.4",
:primitives =>"commons-primitives:commons-primitives:jar:1.0",
@@ -65,7 +79,7 @@ JAVAX = struct(
#:activation =>"geronimo-spec:geronimo-spec-activation:jar:1.0.2-rc4",
:connector =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0",
:ejb =>"org.apache.geronimo.specs:geronimo-ejb_2.1_spec:jar:1.1",
- :javamail =>"org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.2",
+ :javamail =>"org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.7.1",
:jms =>"geronimo-spec:geronimo-spec-jms:jar:1.1-rc4",
:persistence =>"javax.persistence:persistence-api:jar:1.0",
:servlet =>"org.apache.geronimo.specs:geronimo-servlet_2.4_spec:jar:1.0",
@@ -73,10 +87,10 @@ JAVAX = struct(
:transaction =>"org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1",
:resource =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0"
)
-JAXEN = "jaxen:jaxen:jar:1.1.1"
+JAXEN = "jaxen:jaxen:jar:1.1.3"
JBI = group("org.apache.servicemix.specs.jbi-api-1.0", :under=>"org.apache.servicemix.specs",
:version=>"1.1.0")
JENCKS = "org.jencks:jencks:jar:all:1.3"
-JIBX = "org.jibx:jibx-run:jar:1.1.5"
+JIBX = "org.jibx:jibx-run:jar:1.2.1"
KARAF = [
"org.apache.felix:org.osgi.core:jar:1.4.0",
"org.apache.felix:org.osgi.compendium:jar:1.4.0",
@@ -123,11 +137,11 @@ TRANQL = [ "tranql:tranql-connector:jar:1.1", COMMONS.primitives
]
WOODSTOX = "woodstox:wstx-asl:jar:3.2.4"
WSDL4J = "wsdl4j:wsdl4j:jar:1.6.2"
XALAN = "xalan:xalan:jar:2.7.1"
-XERCES = "xerces:xercesImpl:jar:2.9.0"
+XERCES = "xerces:xercesImpl:jar:2.9.1"
WS_COMMONS = struct(
:axiom =>AXIOM,
- :neethi =>"org.apache.neethi:neethi:jar:2.0.4",
- :xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.3.2"
+ :neethi =>"org.apache.neethi:neethi:jar:2.0.5",
+ :xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.4.7"
)
XBEAN = [
"org.apache.xbean:xbean-kernel:jar:3.3",
http://git-wip-us.apache.org/repos/asf/ode/blob/6234715b/utils/src/main/java/org/apache/ode/utils/Properties.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/org/apache/ode/utils/Properties.java b/utils/src/main/java/org/apache/ode/utils/Properties.java
index 7ada2fb..63c91e8 100644
--- a/utils/src/main/java/org/apache/ode/utils/Properties.java
+++ b/utils/src/main/java/org/apache/ode/utils/Properties.java
@@ -191,7 +191,7 @@ public class Properties {
if (log.isWarnEnabled()) log.warn("Property Not Supported: " + PROP_HTTP_MAX_REDIRECTS);
}
if (properties.containsKey(PROP_JMS_REPLY_DESTINATION)) {
- options.setProperty(JMSConstants.REPLY_PARAM, properties.get(PROP_JMS_REPLY_DESTINATION));
+ options.setProperty(JMSConstants.PARAM_REPLY_DESTINATION, properties.get(PROP_JMS_REPLY_DESTINATION));
}
if (properties.containsKey(PROP_JMS_REPLY_TIMEOUT)) {
String value = properties.get(PROP_JMS_REPLY_TIMEOUT);
@@ -207,7 +207,7 @@ public class Properties {
if (properties.containsKey(PROP_JMS_DESTINATION_TYPE)) {
String value = properties.get(PROP_JMS_DESTINATION_TYPE);
try {
- options.setProperty(JMSConstants.DEST_TYPE_PARAM, Long.valueOf(value));
+ options.setProperty(JMSConstants.PARAM_DEST_TYPE, Long.valueOf(value));
} catch (NumberFormatException e) {
if (log.isWarnEnabled())
log.warn("Mal-formatted Property: [" + Properties.PROP_JMS_DESTINATION_TYPE
+ "=" + value + "]. Long expected. Property will be skipped.");
|