Repository: ode Updated Branches: refs/heads/ode-1.3.x 308599d8d -> 0cfcfa036
ODE-1070: Upgraded axis2 to 1.7.6 Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/0cfcfa03 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/0cfcfa03 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/0cfcfa03 Branch: refs/heads/ode-1.3.x Commit: 0cfcfa036c6cdc970c6d75db0b90e466b118d4de Parents: 308599d Author: sathwik <[email protected]> Authored: Tue Nov 21 14:27:14 2017 +0530 Committer: sathwik <[email protected]> Committed: Tue Nov 21 14:27:14 2017 +0530 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/conf/axis2.xml | 19 +++++++ .../apache/ode/axis2/MessageStructureTest.java | 6 ++- .../org/apache/ode/axis2/SoapHeaderTest.java | 4 +- .../ode/axis2/hydration/InstanceCountTest.java | 1 - .../ode/axis2/hydration/ProcessCountTest.java | 17 +----- .../ode/axis2/hydration/ProcessSizeTest.java | 16 ------ .../ode/axis2/management/DeploymentTest.java | 4 +- .../management/InstanceManagementTest.java | 4 +- .../apache/ode/axis2/AuthenticationHelper.java | 4 +- .../apache/ode/axis2/hooks/ODEAxisService.java | 2 +- .../axis2/hooks/ODEAxisServiceDispatcher.java | 5 +- .../ode/axis2/service/DeploymentWebService.java | 3 +- .../org/apache/ode/axis2/util/AxisUtils.java | 2 +- .../ode/axis2/management/ExecutionPathTest.java | 4 +- .../axis2/management/ProcessManagementTest.java | 4 +- .../java/org/apache/ode/il/DynamicService.java | 1 - dependencies.rb | 54 ++++++++++---------- 17 files changed, 71 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml ---------------------------------------------------------------------- diff --git a/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml b/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml index 5241cc3..515bc70 100644 --- a/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml +++ b/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml @@ -91,6 +91,25 @@ <!-- </listener>--> <!-- ================================================= --> + <!-- Deployers --> + <!-- ================================================= --> + + <!--Service deployer , this will alow users to deploy AAR or exploded AAR as axis2 services--> + <deployer extension=".aar" directory="services" class="org.apache.axis2.deployment.ServiceDeployer"> + <serviceBuilderExtension name ="jwsbuilderExt" class="org.apache.axis2.jaxws.framework.JAXWSServiceBuilderExtension"/> + <serviceBuilderExtension name ="wsdlbuilderExt" class="org.apache.axis2.deployment.WSDLServiceBuilderExtension"/> + </deployer> + + <!--POJO deployer , this will alow users to drop .class file and make that into a service--> + <deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/> + + <deployer extension=".jar" directory="servicejars" + class="org.apache.axis2.jaxws.framework.JAXWSDeployer"/> + + <deployer extension=".jar" directory="transports" + class="org.apache.axis2.deployment.TransportDeployer"/> + + <!-- ================================================= --> <!-- Message Receivers --> <!-- ================================================= --> <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for --> http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2-war/src/test/java/org/apache/ode/axis2/MessageStructureTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/MessageStructureTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/MessageStructureTest.java index 1ab1436..04f63d1 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/MessageStructureTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/MessageStructureTest.java @@ -21,6 +21,9 @@ package org.apache.ode.axis2; import org.apache.ode.utils.DOMUtils; import static org.testng.AssertJUnit.assertTrue; + +import javax.xml.namespace.QName; + import org.testng.annotations.Test; import org.w3c.dom.Element; @@ -36,7 +39,8 @@ public class MessageStructureTest extends Axis2TestBase { String response = server.sendRequestFile("http://localhost:8888/processes/attrNSWorld";, bundleName, "testRequest.soap"); Element domResponse = DOMUtils.stringToDOM(response); - Element out = DOMUtils.getFirstChildElement(DOMUtils.getFirstChildElement(DOMUtils.getFirstChildElement(domResponse))); + Element soapBody = DOMUtils.findChildByName(domResponse, new QName("http://schemas.xmlsoap.org/soap/envelope/";, "Body")); + Element out = DOMUtils.getFirstChildElement(DOMUtils.getFirstChildElement(soapBody)); String nsAttr = out.getAttribute("xmlns:myns"); System.out.println("=> " + response); assertTrue(nsAttr != null); http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java index 5a833a0..700d1c7 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java @@ -30,7 +30,7 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.axis2.engine.AxisEngine; import org.apache.axis2.engine.MessageReceiver; -import org.apache.axis2.util.Utils; +import org.apache.axis2.util.MessageContextBuilder; import org.apache.ode.utils.DOMUtils; import static org.testng.AssertJUnit.assertEquals; import org.testng.annotations.Test; @@ -55,7 +55,7 @@ public class SoapHeaderTest extends Axis2TestBase { assertEquals("ConversationId", cidElmt.getLocalName()); assertEquals("ZZZXYZ", cidElmt.getText()); - MessageContext outMsgContext = Utils.createOutMessageContext(messageCtx); + MessageContext outMsgContext = MessageContextBuilder.createOutMessageContext(messageCtx); outMsgContext.getOperationContext().addMessageContext(outMsgContext); // Far too many lines of code... http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2-war/src/test/java/org/apache/ode/axis2/hydration/InstanceCountTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/hydration/InstanceCountTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/hydration/InstanceCountTest.java index 30cbf69..33dd7d2 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/hydration/InstanceCountTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/hydration/InstanceCountTest.java @@ -27,7 +27,6 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.OMText; -import org.apache.axiom.om.util.Base64; import org.apache.ode.axis2.Axis2TestBase; import org.apache.ode.axis2.DummyService; http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessCountTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessCountTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessCountTest.java index 2f984ba..2b65a77 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessCountTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessCountTest.java @@ -21,37 +21,22 @@ package org.apache.ode.axis2.hydration; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import static org.testng.AssertJUnit.assertTrue; + import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMNamespace; -import org.apache.axiom.om.OMText; -import org.apache.axiom.om.util.Base64; import org.apache.ode.axis2.Axis2TestBase; import org.apache.ode.axis2.DummyService; import org.apache.ode.axis2.service.ServiceClientUtil; -import org.apache.ode.tools.sendsoap.cline.HttpSoapSender; -import org.apache.ode.utils.DOMUtils; -import org.apache.ode.utils.Namespaces; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.w3c.dom.Element; - -import java.io.ByteArrayOutputStream; -import java.io.InputStream; - -import java.net.URL; import java.text.DateFormat; import java.text.SimpleDateFormat; -import javax.xml.namespace.QName; - /** * Test the limit on the number of process instances. http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessSizeTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessSizeTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessSizeTest.java index 1badb1d..09d6db5 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessSizeTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessSizeTest.java @@ -21,37 +21,21 @@ package org.apache.ode.axis2.hydration; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import static org.testng.AssertJUnit.assertTrue; import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMNamespace; -import org.apache.axiom.om.OMText; -import org.apache.axiom.om.util.Base64; import org.apache.ode.axis2.Axis2TestBase; import org.apache.ode.axis2.DummyService; import org.apache.ode.axis2.service.ServiceClientUtil; -import org.apache.ode.tools.sendsoap.cline.HttpSoapSender; -import org.apache.ode.utils.DOMUtils; -import org.apache.ode.utils.Namespaces; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.w3c.dom.Element; - -import java.io.ByteArrayOutputStream; -import java.io.InputStream; - -import java.net.URL; import java.text.DateFormat; import java.text.SimpleDateFormat; -import javax.xml.namespace.QName; - /** * Test the limit on the number of process instances. http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java index 3337311..cd91562 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java @@ -24,7 +24,7 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.OMText; -import org.apache.axiom.om.util.Base64; +import org.apache.axiom.util.base64.Base64Utils; import org.apache.axis2.AxisFault; import org.apache.ode.axis2.Axis2TestBase; import org.apache.ode.axis2.service.ServiceClientUtil; @@ -195,7 +195,7 @@ public class DeploymentTest extends Axis2TestBase { while((len = is.read(buffer)) >= 0) { outputStream.write(buffer, 0, len); } - String base64Enc = Base64.encode(outputStream.toByteArray()); + String base64Enc = Base64Utils.encode(outputStream.toByteArray()); OMText zipContent = _factory.createOMText(base64Enc, "application/zip", true); root.addChild(namePart); root.addChild(zipPart); http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java index f1d6ca5..3c3da86 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java @@ -24,7 +24,7 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.OMText; -import org.apache.axiom.om.util.Base64; +import org.apache.axiom.util.base64.Base64Utils; import org.apache.axis2.AxisFault; import org.apache.ode.axis2.Axis2TestBase; import org.apache.ode.axis2.service.ServiceClientUtil; @@ -220,7 +220,7 @@ public class InstanceManagementTest extends Axis2TestBase implements ODEConfigDi for (int b = is.read(); b >= 0; b = is.read()) { outputStream.write((byte) b); } - String base64Enc = Base64.encode(outputStream.toByteArray()); + String base64Enc = Base64Utils.encode(outputStream.toByteArray()); OMText zipContent = _factory.createOMText(base64Enc, "application/zip", true); root.addChild(namePart); root.addChild(zipPart); http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2/src/main/java/org/apache/ode/axis2/AuthenticationHelper.java ---------------------------------------------------------------------- diff --git a/axis2/src/main/java/org/apache/ode/axis2/AuthenticationHelper.java b/axis2/src/main/java/org/apache/ode/axis2/AuthenticationHelper.java index d29c58e..2e2c60c 100644 --- a/axis2/src/main/java/org/apache/ode/axis2/AuthenticationHelper.java +++ b/axis2/src/main/java/org/apache/ode/axis2/AuthenticationHelper.java @@ -21,7 +21,7 @@ package org.apache.ode.axis2; import org.apache.axis2.client.Options; import org.apache.axis2.transport.http.HTTPConstants; -import org.apache.axis2.transport.http.HttpTransportProperties; +import org.apache.axis2.transport.http.impl.httpclient3.HttpTransportPropertiesImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange; @@ -91,7 +91,7 @@ public class AuthenticationHelper { e = DOMUtils.getNextSiblingElement(e); } - HttpTransportProperties.Authenticator authenticator = new HttpTransportProperties.Authenticator(); + HttpTransportPropertiesImpl.Authenticator authenticator = new HttpTransportPropertiesImpl.Authenticator(); authenticator.setUsername(username); authenticator.setPassword(password); authenticator.setDomain(domain); http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/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 c14441e..b83c465 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 @@ -80,7 +80,7 @@ public class ODEAxisService { WSDL11ToAxisServiceBuilder serviceBuilder = new WSDL11ToAxisPatchedBuilder(is, wsdlServiceName, portName); serviceBuilder.setBaseUri(baseUri.toString()); serviceBuilder.setCustomResolver(new Axis2UriResolver()); - serviceBuilder.setCustomWSLD4JResolver(new Axis2WSDLLocator(baseUri)); + serviceBuilder.setCustomWSDLResolver(new Axis2WSDLLocator(baseUri)); serviceBuilder.setServerSide(true); String axisServiceName = ODEAxisService.extractServiceName(pconf, wsdlServiceName, portName); http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java ---------------------------------------------------------------------- diff --git a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java index 4e3037a..03c1961 100644 --- a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java +++ b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java @@ -20,12 +20,12 @@ package org.apache.ode.axis2.hooks; import java.util.ArrayList; - import javax.xml.namespace.QName; import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.context.MessageContext; +import org.apache.axis2.description.AxisDescription; import org.apache.axis2.description.AxisOperation; import org.apache.axis2.description.AxisService; import org.apache.axis2.description.HandlerDescription; @@ -80,7 +80,8 @@ public class ODEAxisServiceDispatcher extends AbstractDispatcher { // Axis2 >1.3 is less clever than 1.3. See ODE-509 // We have to do additional work for him. // TODO: Check if there is a better workaround possible. - Policy policy = PolicyUtil.getMergedPolicy(new ArrayList<PolicyComponent>(service.getPolicySubject().getAttachedPolicyComponents()), service); + ArrayList<PolicyComponent> policyComponents = new ArrayList<PolicyComponent>(service.getPolicySubject().getAttachedPolicyComponents()); + Policy policy = PolicyUtil.getMergedPolicy(policyComponents, (AxisDescription)service); if (policy != null) { if (log.isDebugEnabled()) log.debug("Apply policy: " + policy.getName()); messageContext.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy); http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java ---------------------------------------------------------------------- diff --git a/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java b/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java index 87eebd9..efa12fe 100644 --- a/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java +++ b/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java @@ -51,6 +51,7 @@ import org.apache.axis2.description.AxisOperation; import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.engine.AxisEngine; import org.apache.axis2.receivers.AbstractMessageReceiver; +import org.apache.axis2.util.MessageContextBuilder; import org.apache.axis2.util.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -307,7 +308,7 @@ public class DeploymentWebService { private void sendResponse(SOAPFactory factory, MessageContext messageContext, String op, OMElement response) throws AxisFault { - MessageContext outMsgContext = Utils.createOutMessageContext(messageContext); + MessageContext outMsgContext = MessageContextBuilder.createOutMessageContext(messageContext); outMsgContext.getOperationContext().addMessageContext(outMsgContext); SOAPEnvelope envelope = factory.getDefaultEnvelope(); http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2/src/main/java/org/apache/ode/axis2/util/AxisUtils.java ---------------------------------------------------------------------- diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/AxisUtils.java b/axis2/src/main/java/org/apache/ode/axis2/util/AxisUtils.java index c3eaa4b..f305edf 100644 --- a/axis2/src/main/java/org/apache/ode/axis2/util/AxisUtils.java +++ b/axis2/src/main/java/org/apache/ode/axis2/util/AxisUtils.java @@ -104,7 +104,7 @@ public class AxisUtils { log.error(msg); throw new IllegalArgumentException(msg); } - service.getPolicyInclude().addPolicyElement(PolicyInclude.AXIS_SERVICE_POLICY, policyDoc); + service.getPolicySubject().attachPolicy(policyDoc); // make sure the proper modules are engaged, if they are available engageModules(service, "rampart", "rahas"); } finally { http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java ---------------------------------------------------------------------- diff --git a/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java b/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java index 4d0320a..abfe4bd 100644 --- a/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java +++ b/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java @@ -25,7 +25,7 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.OMText; -import org.apache.axiom.om.util.Base64; +import org.apache.axiom.util.base64.Base64Utils; import org.apache.axis2.AxisFault; import org.apache.ode.axis2.service.ServiceClientUtil; import org.apache.ode.tools.sendsoap.cline.HttpSoapSender; @@ -102,7 +102,7 @@ public class ExecutionPathTest extends TestCase { for (int b = is.read(); b >= 0; b = is.read()) { outputStream.write((byte) b); } - String base64Enc = Base64.encode(outputStream.toByteArray()); + String base64Enc = Base64Utils.encode(outputStream.toByteArray()); OMText zipContent = _factory.createOMText(base64Enc, "application/zip", true); root.addChild(namePart); root.addChild(zipPart); http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java ---------------------------------------------------------------------- diff --git a/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java b/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java index 40301de..c309ffe 100644 --- a/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java +++ b/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java @@ -25,7 +25,7 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.OMText; -import org.apache.axiom.om.util.Base64; +import org.apache.axiom.util.base64.Base64Utils; import org.apache.axis2.AxisFault; import org.apache.ode.axis2.service.ServiceClientUtil; import org.apache.ode.utils.Namespaces; @@ -144,7 +144,7 @@ public class ProcessManagementTest extends TestCase { for (int b = is.read(); b >= 0; b = is.read()) { outputStream.write((byte) b); } - String base64Enc = Base64.encode(outputStream.toByteArray()); + String base64Enc = Base64Utils.encode(outputStream.toByteArray()); OMText zipContent = _factory.createOMText(base64Enc, "application/zip", true); root.addChild(namePart); root.addChild(zipPart); http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java ---------------------------------------------------------------------- diff --git a/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java b/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java index 343cf28..05414af 100644 --- a/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java +++ b/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java @@ -35,7 +35,6 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.impl.builder.StAXOMBuilder; -import org.apache.axiom.om.impl.dom.NamespaceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.ode.bpel.pmapi.ProcessInfoCustomizer; http://git-wip-us.apache.org/repos/asf/ode/blob/0cfcfa03/dependencies.rb ---------------------------------------------------------------------- diff --git a/dependencies.rb b/dependencies.rb index 538d6e1..c7950c5 100644 --- a/dependencies.rb +++ b/dependencies.rb @@ -16,53 +16,53 @@ 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.13") ] + :under=>"org.apache.ws.commons.axiom", :version=>"1.2.20") ] AXIS2_ALL = [ group("axis2-adb", "axis2-codegen", "axis2-kernel", "axis2-java2wsdl", "axis2-jibx", "axis2-saaj", "axis2-xmlbeans", - :under=>"org.apache.axis2", :version=>"1.6.2"), - group("woden-api", "woden-impl-dom", + :under=>"org.apache.axis2", :version=>"1.7.6"), + group("woden-core", :under=>"org.apache.woden", - :version=>"1.0M9"), + :version=>"1.0M10"), "org.apache.axis2:axis2-transports:jar:1.0-i6", - "org.apache.axis2:axis2-transport-http:jar:1.6.2", - "org.apache.axis2:axis2-transport-local:jar:1.6.2", - "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"] + "org.apache.axis2:axis2-transport-http:jar:1.7.6", + "org.apache.axis2:axis2-transport-local:jar:1.7.6", + "org.apache.axis2:axis2-transport-tcp:jar:1.7.6", + "org.apache.axis2:axis2-transport-jms:jar:1.7.6", + "org.apache.httpcomponents:httpcore:jar:4.4.4"] AXIS2_TEST = group("httpcore", "httpcore-nio", - :under=>"org.apache.httpcomponents", :version=>"4.0") + :under=>"org.apache.httpcomponents", :version=>"4.4.4") AXIS2_MODULES = struct( - :mods => ["org.apache.rampart:rampart:mar:1.6.2", - "org.apache.rampart:rahas:mar:1.6.2", - "org.apache.axis2:addressing:mar:1.6.2", - "org.apache.axis2:mex:mar:1.6.2"], + :mods => ["org.apache.rampart:rampart:mar:1.7.1", + "org.apache.rampart:rahas:mar:1.7.1", + "org.apache.axis2:addressing:mar:1.7.6", + "org.apache.axis2:mex:mar:1.7.6"], :libs => [group("rampart-core", "rampart-policy", "rampart-trust", :under=>"org.apache.rampart", - :version=>"1.6.2"), - "org.apache.ws.security:wss4j:jar:1.6.4", - "org.apache.santuario:xmlsec:jar:1.4.6", - "org.apache.axis2:mex:jar:impl:1.6.2", + :version=>"1.7.1"), + "org.apache.ws.security:wss4j:jar:1.6.16", + "org.apache.santuario:xmlsec:jar:1.5.7", + "org.apache.axis2:mex:jar:impl:1.7.6", "org.opensaml:opensaml1:jar:1.1", "org.opensaml:opensaml:jar:2.5.1-1", "org.opensaml:openws:jar:1.4.2-1", "org.opensaml:xmltooling:jar:1.3.2-1", - "bouncycastle:bcprov-jdk15:jar:140", + "org.bouncycastle:bcprov-jdk15on:jar:1.49", "velocity:velocity:jar:1.5", "joda-time:joda-time:jar:2.5", "org.owasp.esapi:esapi:jar:2.0GA", "org.apache.james:apache-mime4j-core:jar:0.7.2"] ) -AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.6.2" +AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.7.6" BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.1" COMMONS = struct( :codec =>"commons-codec:commons-codec:jar:1.3", :collections =>"commons-collections:commons-collections:jar:3.2.2", :dbcp =>"commons-dbcp:commons-dbcp:jar:1.4", - :fileupload =>"commons-fileupload:commons-fileupload:jar:1.2", + :fileupload =>"commons-fileupload:commons-fileupload:jar:1.3.3", :httpclient =>"commons-httpclient:commons-httpclient:jar:3.1", :lang =>"commons-lang:commons-lang:jar:2.6", :logging =>"commons-logging:commons-logging:jar:1.1.1", - :io =>"commons-io:commons-io:jar:1.4", + :io =>"commons-io:commons-io:jar:2.1", :pool =>"commons-pool:commons-pool:jar:1.6", :primitives =>"commons-primitives:commons-primitives:jar:1.0", :beanutils =>"commons-beanutils:commons-beanutils:jar:1.8.2" @@ -90,11 +90,11 @@ JAVAX = struct( :jms =>"org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1.1", :persistence =>"org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar:1.1", :servlet =>"org.apache.geronimo.specs:geronimo-servlet_2.4_spec:jar:1.0", - :stream =>"stax:stax-api:jar:1.0.1", + :stream =>"org.codehaus.woodstox:stax2-api:jar:4.0.0", :transaction =>"org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1.1", :resource =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.6_spec:jar:1.0" ) -JAXEN = "jaxen:jaxen:jar:1.1.4" +JAXEN = "jaxen:jaxen:jar:1.1.6" 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:2.2" JIBX = "org.jibx:jibx-run:jar:1.2.1" @@ -144,14 +144,14 @@ SPRING = ["org.springframework:spring:jar:2.5.6"] SPRING_OSGI = ["org.springframework.osgi:spring-osgi-core:jar:1.2.0"] SPRING_TEST = ["org.springframework:spring-test:jar:2.5.6"] TRANQL = [ "org.tranql:tranql-connector:jar:1.8", COMMONS.primitives ] -WOODSTOX = "woodstox:wstx-asl:jar:3.2.4" +WOODSTOX = "org.codehaus.woodstox:woodstox-core-asl:jar:4.2.0" WSDL4J = "wsdl4j:wsdl4j:jar:1.6.3" XALAN = "xalan:xalan:jar:2.7.1" XERCES = ["xerces:xercesImpl:jar:2.11.0", "xml-apis:xml-apis:jar:1.4.01"] WS_COMMONS = struct( :axiom =>AXIOM, - :neethi =>"org.apache.neethi:neethi:jar:3.0.2", - :xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.4.7" + :neethi =>"org.apache.neethi:neethi:jar:3.0.3", + :xml_schema =>"org.apache.ws.xmlschema:xmlschema-core:jar:2.2.1" ) XBEAN = [ "org.apache.xbean:xbean-kernel:jar:3.3",
