ODE-1070: Upgraded axis2 to 1.7.6
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 f47ebfc..517cd11 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 -->
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 c4ce3b8..ef58ada 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,7 @@
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 +37,8 @@
String response = 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);
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 5fdf6bc..e6dea4e 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.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 @@
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...
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 c734e8d..1e7cffd 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.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;
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 0586d7c..1757565 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,21 @@
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.
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 c7bcd60..1786180 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,23 @@
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.
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 c23f927..f5977a0 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.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 @@
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);
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 a0ad6de..5d8d747 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.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;
@@ -233,7 +233,7 @@
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);
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 @@
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 @@
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);
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 4468bdc..f9153e3 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
@@ -122,7 +122,7 @@
File fileToWatch = new File(_pconf.getBaseURI().resolve(_serviceName.getLocalPart() + ".axis2"));
_axisServiceWatchDog = WatchDog.watchFile(fileToWatch, new ServiceFileObserver(fileToWatch));
_axisOptionsWatchDog = new WatchDog<Map, OptionsObserver>(new EndpointPropertiesMutable(), new OptionsObserver());
- _configContext.setProperty(HTTPConstants.MUTTITHREAD_HTTP_CONNECTION_MANAGER, connManager);
+ _configContext.setProperty(HTTPConstants.MULTITHREAD_HTTP_CONNECTION_MANAGER, connManager);
// make sure the client is not shared, see also org.apache.ode.axis2.Properties.Axis2
_configContext.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, "false");
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 5d83c81..b9afb6b 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
@@ -84,7 +84,7 @@
WSDL11ToAxisPatchedBuilder 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);
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 00c55a7..f26775d 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
@@ -24,6 +24,7 @@
import org.apache.axis2.util.PolicyUtil;
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;
@@ -35,7 +36,7 @@
import org.slf4j.LoggerFactory;
import org.apache.rampart.RampartMessageData;
import org.apache.neethi.Policy;
-
+import org.apache.neethi.PolicyComponent;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -83,7 +84,8 @@
// Axis2 >1.3 is less clever than 1.3. See ODE-509
// We have to do additional work for him.
- Policy policy = PolicyUtil.getMergedPolicy(new ArrayList(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);
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 1fbd1f2..6784170 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
@@ -32,6 +32,7 @@
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.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -342,7 +343,7 @@
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();
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 8e6b149..204a63d 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
@@ -108,7 +108,7 @@
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 {
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.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 @@
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);
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.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 @@
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);
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 feb6ff0..81b3c28 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.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;
diff --git a/dependencies.rb b/dependencies.rb
index 4ee4ea9..b45d659 100644
--- a/dependencies.rb
+++ b/dependencies.rb
@@ -17,52 +17,52 @@
ANT = "ant:ant:jar:1.6.5"
BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.1"
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",
+ :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_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",
BACKPORT]
)
-AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.6.2"
+AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.7.6"
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"
@@ -96,11 +96,11 @@
: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"
@@ -151,14 +151,14 @@
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",
