From 4140d84ab1259cc7500e36fb761f21c5ee01fba9 Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 19 Sep 2008 06:38:53 +0000 Subject: Upgrade to Axis2 1.4.1 and its transitive dependencies such as XmlSchema and Axiom based on the patches from Ram for TUSCANY-2606 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@696937 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/modules/assembly-xml/pom.xml | 2 +- java/sca/modules/binding-atom-abdera/pom.xml | 4 +- java/sca/modules/binding-atom/pom.xml | 2 +- .../corba/testing/CorbaServantTestCase.java | 2 +- .../binding/corba/testing/CorbaTypesTestCase.java | 2 +- java/sca/modules/binding-dwr/pom.xml | 2 +- java/sca/modules/binding-ejb-runtime/pom.xml | 2 +- java/sca/modules/binding-ejb/pom.xml | 2 +- java/sca/modules/binding-feed/pom.xml | 6 +- java/sca/modules/binding-gdata-gsoc/pom.xml | 2 +- .../sca/modules/binding-gdata-runtime-gsoc/pom.xml | 6 +- java/sca/modules/binding-gdata-runtime/pom.xml | 6 +- java/sca/modules/binding-gdata/pom.xml | 2 +- java/sca/modules/binding-http-runtime/pom.xml | 2 +- java/sca/modules/binding-http/pom.xml | 2 +- java/sca/modules/binding-jms-runtime/pom.xml | 2 +- java/sca/modules/binding-jms/pom.xml | 2 +- java/sca/modules/binding-jsonrpc-runtime/pom.xml | 4 +- java/sca/modules/binding-jsonrpc/pom.xml | 2 +- java/sca/modules/binding-notification/pom.xml | 8 +- java/sca/modules/binding-rss-rome/pom.xml | 6 +- java/sca/modules/binding-rss/pom.xml | 2 +- java/sca/modules/binding-sca-axis2/pom.xml | 7 - .../sca/corba/impl/CorbaSCAInvocationProxy.java | 3 +- .../binding/sca/corba/impl/CorbaSCAInvoker.java | 21 ++- java/sca/modules/binding-ws-axis2-policy/pom.xml | 10 +- java/sca/modules/binding-ws-axis2/pom.xml | 162 +++++---------------- .../policy/mixed/AbstractHelloWorldOMTestCase.java | 15 +- java/sca/modules/binding-ws-wsdlgen/pom.xml | 2 +- java/sca/modules/contribution-groovy/pom.xml | 2 +- java/sca/modules/contribution-impl/pom.xml | 2 +- java/sca/modules/contribution-java/pom.xml | 2 +- java/sca/modules/contribution-namespace/pom.xml | 2 +- java/sca/modules/contribution-osgi/pom.xml | 2 +- java/sca/modules/contribution-resource/pom.xml | 2 +- java/sca/modules/contribution-xml/pom.xml | 2 +- java/sca/modules/core-databinding/pom.xml | 2 +- java/sca/modules/core-spi/pom.xml | 2 +- java/sca/modules/core/pom.xml | 2 +- java/sca/modules/databinding-axiom/pom.xml | 8 +- java/sca/modules/databinding-jaxb-axiom/pom.xml | 4 +- java/sca/modules/databinding-json/pom.xml | 8 +- java/sca/modules/databinding-sdo-axiom/pom.xml | 6 +- java/sca/modules/databinding-xmlbeans/pom.xml | 2 +- java/sca/modules/databinding-xstream/pom.xml | 8 +- java/sca/modules/databinding/pom.xml | 2 +- java/sca/modules/extension-helper/pom.xml | 2 +- java/sca/modules/host-webapp-junit/pom.xml | 2 +- java/sca/modules/implementation-data-xml/pom.xml | 2 +- java/sca/modules/implementation-ejb/pom.xml | 2 +- .../modules/implementation-node-runtime/pom.xml | 2 +- java/sca/modules/implementation-node/pom.xml | 2 +- .../modules/implementation-notification/pom.xml | 2 +- java/sca/modules/implementation-osgi/pom.xml | 2 +- .../implementation-resource-runtime/pom.xml | 2 +- java/sca/modules/implementation-resource/pom.xml | 2 +- java/sca/modules/implementation-script/pom.xml | 8 +- .../sca/modules/implementation-web-runtime/pom.xml | 2 +- java/sca/modules/implementation-web/pom.xml | 2 +- .../modules/implementation-widget-runtime/pom.xml | 2 +- java/sca/modules/implementation-widget/pom.xml | 2 +- java/sca/modules/implementation-xquery/pom.xml | 2 +- java/sca/modules/interface-java-jaxws/pom.xml | 2 +- java/sca/modules/interface-wsdl/pom.xml | 2 +- .../sca/node/osgi/launcher/NodeLauncherUtil.java | 12 ++ java/sca/modules/node-manager/pom.xml | 2 +- java/sca/modules/policy-security-ws/pom.xml | 10 +- java/sca/modules/policy-security/pom.xml | 6 +- java/sca/modules/policy-xml-ws/pom.xml | 10 +- java/sca/modules/policy-xml/pom.xml | 2 +- java/sca/modules/pom.xml | 4 +- java/sca/modules/workspace-xml/pom.xml | 2 +- .../tuscany/sca/xsd/xml/XSDModelResolver.java | 24 ++- java/sca/modules/xsd/pom.xml | 2 +- 74 files changed, 210 insertions(+), 254 deletions(-) (limited to 'java/sca/modules') diff --git a/java/sca/modules/assembly-xml/pom.xml b/java/sca/modules/assembly-xml/pom.xml index cd439d3216..246f89619b 100644 --- a/java/sca/modules/assembly-xml/pom.xml +++ b/java/sca/modules/assembly-xml/pom.xml @@ -74,7 +74,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/binding-atom-abdera/pom.xml b/java/sca/modules/binding-atom-abdera/pom.xml index f10497c9c5..9c9c204dcc 100644 --- a/java/sca/modules/binding-atom-abdera/pom.xml +++ b/java/sca/modules/binding-atom-abdera/pom.xml @@ -161,7 +161,7 @@ junit junit - 4.2 + 4.5 test @@ -180,7 +180,7 @@ commons-logging commons-logging - 1.1 + 1.1.1 javax.servlet diff --git a/java/sca/modules/binding-atom/pom.xml b/java/sca/modules/binding-atom/pom.xml index 388f203e1d..961d564af6 100644 --- a/java/sca/modules/binding-atom/pom.xml +++ b/java/sca/modules/binding-atom/pom.xml @@ -53,7 +53,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java index 93256d7381..7fc58c9b96 100644 --- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java +++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java @@ -551,7 +551,7 @@ public class CorbaServantTestCase { for (int i = 0; i < struct.threeDimArray.length; i++) { for (int j = 0; j < struct.threeDimArray[i].length; j++) { for (int k = 0; k < struct.threeDimArray[i][j].length; k++) { - assertEquals(struct.threeDimArray[i][j][k], structResult.threeDimArray[i][j][k]); + assertEquals(struct.threeDimArray[i][j][k], structResult.threeDimArray[i][j][k], 0.0); } } } diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java index 927f43652b..6521255d3b 100644 --- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java +++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java @@ -713,7 +713,7 @@ public class CorbaTypesTestCase { for (int i = 0; i < arg.field2.length; i++) { for (int j = 0; j < arg.field2[i].length; j++) { for (int k = 0; k < arg.field3[i][j].length; k++) { - assertEquals(arg.field3[i][j][k], result.field3[i][j][k]); + assertEquals(arg.field3[i][j][k], result.field3[i][j][k], 0.0); } } } diff --git a/java/sca/modules/binding-dwr/pom.xml b/java/sca/modules/binding-dwr/pom.xml index dd91356a21..1595daa5bf 100644 --- a/java/sca/modules/binding-dwr/pom.xml +++ b/java/sca/modules/binding-dwr/pom.xml @@ -60,7 +60,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-ejb-runtime/pom.xml b/java/sca/modules/binding-ejb-runtime/pom.xml index 38a6d9b19d..c89585c95c 100644 --- a/java/sca/modules/binding-ejb-runtime/pom.xml +++ b/java/sca/modules/binding-ejb-runtime/pom.xml @@ -60,7 +60,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-ejb/pom.xml b/java/sca/modules/binding-ejb/pom.xml index 0a3b0c5967..be8ca05164 100644 --- a/java/sca/modules/binding-ejb/pom.xml +++ b/java/sca/modules/binding-ejb/pom.xml @@ -58,7 +58,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-feed/pom.xml b/java/sca/modules/binding-feed/pom.xml index 1adffb5a84..046bee6acb 100644 --- a/java/sca/modules/binding-feed/pom.xml +++ b/java/sca/modules/binding-feed/pom.xml @@ -69,7 +69,7 @@ commons-httpclient commons-httpclient - 3.0.1 + 3.1 @@ -109,7 +109,7 @@ junit junit - 4.2 + 4.5 test @@ -128,7 +128,7 @@ commons-logging commons-logging - 1.1 + 1.1.1 javax.servlet diff --git a/java/sca/modules/binding-gdata-gsoc/pom.xml b/java/sca/modules/binding-gdata-gsoc/pom.xml index 173dcbe0b8..f09f835f8e 100644 --- a/java/sca/modules/binding-gdata-gsoc/pom.xml +++ b/java/sca/modules/binding-gdata-gsoc/pom.xml @@ -51,7 +51,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-gdata-runtime-gsoc/pom.xml b/java/sca/modules/binding-gdata-runtime-gsoc/pom.xml index 2f216faa55..f09be65efa 100644 --- a/java/sca/modules/binding-gdata-runtime-gsoc/pom.xml +++ b/java/sca/modules/binding-gdata-runtime-gsoc/pom.xml @@ -88,7 +88,7 @@ commons-httpclient commons-httpclient - 3.0.1 + 3.1 @@ -146,7 +146,7 @@ junit junit - 4.2 + 4.5 test @@ -165,7 +165,7 @@ commons-logging commons-logging - 1.1 + 1.1.1 javax.servlet diff --git a/java/sca/modules/binding-gdata-runtime/pom.xml b/java/sca/modules/binding-gdata-runtime/pom.xml index ec29af0b0f..2bd2ac6060 100644 --- a/java/sca/modules/binding-gdata-runtime/pom.xml +++ b/java/sca/modules/binding-gdata-runtime/pom.xml @@ -81,7 +81,7 @@ commons-httpclient commons-httpclient - 3.0.1 + 3.1 @@ -139,7 +139,7 @@ commons-logging commons-logging - 1.1 + 1.1.1 servlet-api @@ -155,7 +155,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-gdata/pom.xml b/java/sca/modules/binding-gdata/pom.xml index 96f43ffeb0..cf918652a6 100644 --- a/java/sca/modules/binding-gdata/pom.xml +++ b/java/sca/modules/binding-gdata/pom.xml @@ -45,7 +45,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-http-runtime/pom.xml b/java/sca/modules/binding-http-runtime/pom.xml index cd3d0e7c99..106afac21f 100644 --- a/java/sca/modules/binding-http-runtime/pom.xml +++ b/java/sca/modules/binding-http-runtime/pom.xml @@ -86,7 +86,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-http/pom.xml b/java/sca/modules/binding-http/pom.xml index 919f4c3d2b..676492413f 100644 --- a/java/sca/modules/binding-http/pom.xml +++ b/java/sca/modules/binding-http/pom.xml @@ -58,7 +58,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-jms-runtime/pom.xml b/java/sca/modules/binding-jms-runtime/pom.xml index 18085ccebf..e8527eda7f 100644 --- a/java/sca/modules/binding-jms-runtime/pom.xml +++ b/java/sca/modules/binding-jms-runtime/pom.xml @@ -114,7 +114,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-jms/pom.xml b/java/sca/modules/binding-jms/pom.xml index 21535235fb..e7dd413a78 100644 --- a/java/sca/modules/binding-jms/pom.xml +++ b/java/sca/modules/binding-jms/pom.xml @@ -39,7 +39,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-jsonrpc-runtime/pom.xml b/java/sca/modules/binding-jsonrpc-runtime/pom.xml index 598f92f324..8ec5e52a0f 100644 --- a/java/sca/modules/binding-jsonrpc-runtime/pom.xml +++ b/java/sca/modules/binding-jsonrpc-runtime/pom.xml @@ -89,7 +89,7 @@ commons-logging commons-logging - 1.1 + 1.1.1 commons-logging @@ -121,7 +121,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-jsonrpc/pom.xml b/java/sca/modules/binding-jsonrpc/pom.xml index e3198d3726..f479b2e07c 100644 --- a/java/sca/modules/binding-jsonrpc/pom.xml +++ b/java/sca/modules/binding-jsonrpc/pom.xml @@ -45,7 +45,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-notification/pom.xml b/java/sca/modules/binding-notification/pom.xml index 43ae0a2552..98cc576864 100644 --- a/java/sca/modules/binding-notification/pom.xml +++ b/java/sca/modules/binding-notification/pom.xml @@ -63,7 +63,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime @@ -93,7 +93,7 @@ xercesImpl - 1.2.5 + 1.2.7 @@ -112,7 +112,7 @@ junit junit - 4.2 + 4.5 test @@ -124,7 +124,7 @@ org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 test diff --git a/java/sca/modules/binding-rss-rome/pom.xml b/java/sca/modules/binding-rss-rome/pom.xml index d0027caef6..19796b37f1 100644 --- a/java/sca/modules/binding-rss-rome/pom.xml +++ b/java/sca/modules/binding-rss-rome/pom.xml @@ -75,7 +75,7 @@ commons-httpclient commons-httpclient - 3.0.1 + 3.1 @@ -115,7 +115,7 @@ junit junit - 4.2 + 4.5 test @@ -134,7 +134,7 @@ commons-logging commons-logging - 1.1 + 1.1.1 javax.servlet diff --git a/java/sca/modules/binding-rss/pom.xml b/java/sca/modules/binding-rss/pom.xml index aeed176e8a..cd51de1088 100644 --- a/java/sca/modules/binding-rss/pom.xml +++ b/java/sca/modules/binding-rss/pom.xml @@ -71,7 +71,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/binding-sca-axis2/pom.xml b/java/sca/modules/binding-sca-axis2/pom.xml index 2314c139c8..3ca3e1f76b 100644 --- a/java/sca/modules/binding-sca-axis2/pom.xml +++ b/java/sca/modules/binding-sca-axis2/pom.xml @@ -51,13 +51,6 @@ provided - - org.easymock - easymock - 2.2 - test - - org.apache.tuscany.sca tuscany-host-jetty diff --git a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java index 40f55ddb71..a9cc890616 100644 --- a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java +++ b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import javax.xml.stream.XMLStreamException; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.llom.util.AXIOMUtil; import org.apache.tuscany.sca.binding.corba.impl.exceptions.RequestConfigurationException; import org.apache.tuscany.sca.binding.corba.impl.service.InvocationException; import org.apache.tuscany.sca.binding.corba.impl.service.InvocationProxy; @@ -69,7 +68,7 @@ public class CorbaSCAInvocationProxy implements InvocationProxy { public Object invoke(String operationName, List arguments) throws InvocationException { try { - OMElement omContent = AXIOMUtil.stringToOM((String)arguments.get(0)); + OMElement omContent = CorbaSCAInvoker.stringToOM((String)arguments.get(0)); String componentOperationName = omContent.getQName().getLocalPart(); Operation componentOperation = null; for (Operation operation : componentInterface.getOperations()) { diff --git a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java index 60c93d5548..32d5650f37 100644 --- a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java +++ b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java @@ -19,13 +19,14 @@ package org.apache.tuscany.sca.binding.sca.corba.impl; +import java.io.ByteArrayInputStream; import java.lang.reflect.Method; import java.util.Map; import javax.xml.stream.XMLStreamException; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.llom.util.AXIOMUtil; +import org.apache.axiom.om.impl.builder.StAXOMBuilder; import org.apache.tuscany.sca.binding.corba.impl.exceptions.RequestConfigurationException; import org.apache.tuscany.sca.binding.corba.impl.reference.DynaCorbaRequest; import org.apache.tuscany.sca.binding.corba.impl.reference.DynaCorbaResponse; @@ -62,11 +63,11 @@ public class CorbaSCAInvoker implements Invoker { String arg = omElement.toStringWithConsume(); request.addArgument(arg); DynaCorbaResponse response = request.invoke(); - OMElement responseOM = AXIOMUtil.stringToOM((String)response.getContent()); + OMElement responseOM = stringToOM((String)response.getContent()); msg.setBody(responseOM); } catch (WrappedSCAException e) { try { - OMElement exceptionOM = AXIOMUtil.stringToOM(e.getFault()); + OMElement exceptionOM = stringToOM(e.getFault()); // AxisFault axisFault = new AxisFault(""); // axisFault.setDetail(exceptionOM); FaultException f = new FaultException(e.getMessage(), exceptionOM, e); @@ -81,4 +82,18 @@ public class CorbaSCAInvoker implements Invoker { } return msg; } + + /** + * This will help you to create an OMElement from an xml fragment which you have as a string. + * + * @param xmlFragment - the well-formed xml fragment + * @return The OMElement created out of the string xml fragment. + * @throws XMLStreamException + */ + static OMElement stringToOM(String xmlFragment) throws XMLStreamException { + if (xmlFragment != null) { + return new StAXOMBuilder(new ByteArrayInputStream(xmlFragment.getBytes())).getDocumentElement(); + } + return null; + } } diff --git a/java/sca/modules/binding-ws-axis2-policy/pom.xml b/java/sca/modules/binding-ws-axis2-policy/pom.xml index 7b3627c170..643a00030c 100644 --- a/java/sca/modules/binding-ws-axis2-policy/pom.xml +++ b/java/sca/modules/binding-ws-axis2-policy/pom.xml @@ -68,19 +68,19 @@ xml-apis - 1.2.5 + 1.2.7 org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 org.apache.axis2 axis2-kernel - 1.3 + 1.4.1 backport-util-concurrent @@ -100,14 +100,14 @@ backport-util-concurrent backport-util-concurrent - 3.0 + 3.1 test org.apache.neethi neethi - 2.0.2 + 2.0.4 wsdl4j diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml index 519f9d681a..b593e8075f 100644 --- a/java/sca/modules/binding-ws-axis2/pom.xml +++ b/java/sca/modules/binding-ws-axis2/pom.xml @@ -104,7 +104,7 @@ org.apache.axis2 axis2-kernel - 1.3 + 1.4.1 org.apache.ant @@ -128,7 +128,7 @@ org.apache.axis2 axis2-java2wsdl - 1.3 + 1.4.1 org.apache.ant @@ -160,7 +160,7 @@ org.apache.axis2 axis2-adb - 1.3 + 1.4.1 runtime @@ -177,7 +177,7 @@ org.apache.axis2 axis2-codegen - 1.3 + 1.4.1 runtime @@ -212,13 +212,13 @@ xml-apis - 1.2.5 + 1.2.7 org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 stax @@ -227,17 +227,17 @@ - + commons-logging commons-logging - 1.1 + 1.1.1 javax.servlet @@ -262,7 +262,7 @@ org.apache.neethi neethi - 2.0.2 + 2.0.4 wsdl4j @@ -278,13 +278,13 @@ org.apache.ws.commons.schema XmlSchema - 1.3.2 + 1.4.2 commons-httpclient commons-httpclient - 3.0.1 + 3.1 @@ -296,7 +296,7 @@ backport-util-concurrent backport-util-concurrent - 2.2 + 3.1 runtime @@ -330,7 +330,7 @@ org.apache.axis2 axis2-mtompolicy - 1.3 + 1.4.1 xalan @@ -371,143 +371,49 @@ org.apache.rampart rampart-core - 1.3 + 1.4 org.apache.ant ant-nodeps + + org.apache.axis2 + axis2-kernel + org.apache.axis2 axis2-xmlbeans - - xmlbeans - xbean - - - javax.servlet - servlet-api + + org.apache.axis2 + axis2-codegen - - - org.apache.ws.commons.schema - XmlSchema - - - stax - stax-api - - - xalan - xalan - - - xml-apis - xml-apis - - - xerces - xercesImpl - - - - - - org.apache.rampart - rampart-policy - 1.3 - + + org.apache.axis2 + axis2-mex + - org.apache.ant - ant-nodeps + org.apache.axis2 + axis2-adb-codegen - org.apache.axis2 - axis2-xmlbeans + xmlbeans + xbean - - xmlbeans - xbean - javax.servlet servlet-api - - backport-util-concurrent - backport-util-concurrent - - - stax - stax-api - org.apache.ws.commons.schema XmlSchema - - - xalan - xalan - - - xml-apis - xml-apis - - - xerces - xercesImpl - - - - - - - org.apache.rampart - rampart-trust - 1.3 - - - org.apache.ant - ant-nodeps - - - org.apache.axis2 - axis2-xmlbeans - - - log4j - log4j - - - wsdl4j - wsdl4j - - - xmlbeans - xbean - - - javax.servlet - servlet-api - - - backport-util-concurrent - backport-util-concurrent - stax stax-api - - - - - org.apache.ws.commons.schema - XmlSchema - xalan xalan @@ -520,19 +426,21 @@ xerces xercesImpl - + + javax.servlet servlet-api diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java index 395cfe28d6..458a472479 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed; import junit.framework.Assert; -import junit.framework.TestCase; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; @@ -28,12 +27,16 @@ import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMText; import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM; import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -public abstract class AbstractHelloWorldOMTestCase extends TestCase { +public abstract class AbstractHelloWorldOMTestCase { private SCADomain domain; private HelloWorldOM helloWorld; + @Test public void testHelloWorld() throws Exception { OMFactory fac = OMAbstractFactory.getOMFactory(); OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld"); @@ -45,14 +48,14 @@ public abstract class AbstractHelloWorldOMTestCase extends TestCase { Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText()); } - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { domain = SCADomain.newInstance(getCompositeName()); helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent"); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { domain.close(); } diff --git a/java/sca/modules/binding-ws-wsdlgen/pom.xml b/java/sca/modules/binding-ws-wsdlgen/pom.xml index fbc6dc4082..3afa296bc1 100644 --- a/java/sca/modules/binding-ws-wsdlgen/pom.xml +++ b/java/sca/modules/binding-ws-wsdlgen/pom.xml @@ -74,7 +74,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/contribution-groovy/pom.xml b/java/sca/modules/contribution-groovy/pom.xml index dafcf42628..9a9f709346 100644 --- a/java/sca/modules/contribution-groovy/pom.xml +++ b/java/sca/modules/contribution-groovy/pom.xml @@ -58,7 +58,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/contribution-impl/pom.xml b/java/sca/modules/contribution-impl/pom.xml index ff83cff49c..c971f1390d 100644 --- a/java/sca/modules/contribution-impl/pom.xml +++ b/java/sca/modules/contribution-impl/pom.xml @@ -44,7 +44,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/contribution-java/pom.xml b/java/sca/modules/contribution-java/pom.xml index 153a4f7c5e..8e57661a84 100644 --- a/java/sca/modules/contribution-java/pom.xml +++ b/java/sca/modules/contribution-java/pom.xml @@ -44,7 +44,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/contribution-namespace/pom.xml b/java/sca/modules/contribution-namespace/pom.xml index 39e011dbe2..c2c4c51bfb 100644 --- a/java/sca/modules/contribution-namespace/pom.xml +++ b/java/sca/modules/contribution-namespace/pom.xml @@ -44,7 +44,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/contribution-osgi/pom.xml b/java/sca/modules/contribution-osgi/pom.xml index 5622978bd9..284d70ca21 100644 --- a/java/sca/modules/contribution-osgi/pom.xml +++ b/java/sca/modules/contribution-osgi/pom.xml @@ -64,7 +64,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/contribution-resource/pom.xml b/java/sca/modules/contribution-resource/pom.xml index da19a5249c..5a2422ed4c 100644 --- a/java/sca/modules/contribution-resource/pom.xml +++ b/java/sca/modules/contribution-resource/pom.xml @@ -44,7 +44,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/contribution-xml/pom.xml b/java/sca/modules/contribution-xml/pom.xml index b1a06c2d11..4fb3e06a57 100644 --- a/java/sca/modules/contribution-xml/pom.xml +++ b/java/sca/modules/contribution-xml/pom.xml @@ -38,7 +38,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/core-databinding/pom.xml b/java/sca/modules/core-databinding/pom.xml index cb88bcd176..b665593aca 100644 --- a/java/sca/modules/core-databinding/pom.xml +++ b/java/sca/modules/core-databinding/pom.xml @@ -77,7 +77,7 @@ org.codehaus.woodstox wstx-asl runtime - 3.2.1 + 3.2.4 stax diff --git a/java/sca/modules/core-spi/pom.xml b/java/sca/modules/core-spi/pom.xml index 6246686d08..e8cb583819 100644 --- a/java/sca/modules/core-spi/pom.xml +++ b/java/sca/modules/core-spi/pom.xml @@ -82,7 +82,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/core/pom.xml b/java/sca/modules/core/pom.xml index b71f001d06..17da5a4d2b 100644 --- a/java/sca/modules/core/pom.xml +++ b/java/sca/modules/core/pom.xml @@ -68,7 +68,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/databinding-axiom/pom.xml b/java/sca/modules/databinding-axiom/pom.xml index f602ad3519..6e0d634419 100644 --- a/java/sca/modules/databinding-axiom/pom.xml +++ b/java/sca/modules/databinding-axiom/pom.xml @@ -49,7 +49,7 @@ org.apache.ws.commons.axiom axiom-api - 1.2.5 + 1.2.7 xerces @@ -69,7 +69,7 @@ org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 runtime @@ -82,14 +82,14 @@ commons-logging commons-logging - 1.1 + 1.1.1 runtime org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/databinding-jaxb-axiom/pom.xml b/java/sca/modules/databinding-jaxb-axiom/pom.xml index 12150abb7e..c4dd61571a 100644 --- a/java/sca/modules/databinding-jaxb-axiom/pom.xml +++ b/java/sca/modules/databinding-jaxb-axiom/pom.xml @@ -42,7 +42,7 @@ org.apache.ws.commons.axiom axiom-api - 1.2.5 + 1.2.7 xerces @@ -66,7 +66,7 @@ org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 runtime diff --git a/java/sca/modules/databinding-json/pom.xml b/java/sca/modules/databinding-json/pom.xml index bc4a149b91..7609df06aa 100644 --- a/java/sca/modules/databinding-json/pom.xml +++ b/java/sca/modules/databinding-json/pom.xml @@ -63,7 +63,7 @@ org.apache.ws.commons.axiom axiom-api - 1.2.5 + 1.2.7 xerces @@ -87,20 +87,20 @@ org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 runtime junit junit - 4.2 + 4.5 commons-logging commons-logging - 1.1 + 1.1.1 commons-logging diff --git a/java/sca/modules/databinding-sdo-axiom/pom.xml b/java/sca/modules/databinding-sdo-axiom/pom.xml index b63e362616..e64e99fa9f 100644 --- a/java/sca/modules/databinding-sdo-axiom/pom.xml +++ b/java/sca/modules/databinding-sdo-axiom/pom.xml @@ -44,7 +44,7 @@ org.apache.ws.commons.axiom axiom-api - 1.2.5 + 1.2.7 xerces @@ -68,14 +68,14 @@ org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 runtime commons-logging commons-logging - 1.1 + 1.1.1 commons-logging diff --git a/java/sca/modules/databinding-xmlbeans/pom.xml b/java/sca/modules/databinding-xmlbeans/pom.xml index 3e92649675..29f215641a 100644 --- a/java/sca/modules/databinding-xmlbeans/pom.xml +++ b/java/sca/modules/databinding-xmlbeans/pom.xml @@ -49,7 +49,7 @@ junit junit - 4.2 + 4.5 diff --git a/java/sca/modules/databinding-xstream/pom.xml b/java/sca/modules/databinding-xstream/pom.xml index 34faa5c8bb..2bd126b2eb 100644 --- a/java/sca/modules/databinding-xstream/pom.xml +++ b/java/sca/modules/databinding-xstream/pom.xml @@ -61,7 +61,7 @@ xercesImpl - 1.2.5 + 1.2.7 @@ -74,20 +74,20 @@ org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 runtime commons-logging commons-logging - 1.1 + 1.1.1 runtime org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/databinding/pom.xml b/java/sca/modules/databinding/pom.xml index 890abcc2ea..8021c62970 100644 --- a/java/sca/modules/databinding/pom.xml +++ b/java/sca/modules/databinding/pom.xml @@ -68,7 +68,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/extension-helper/pom.xml b/java/sca/modules/extension-helper/pom.xml index e35504caab..a54e9e43a3 100644 --- a/java/sca/modules/extension-helper/pom.xml +++ b/java/sca/modules/extension-helper/pom.xml @@ -59,7 +59,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/host-webapp-junit/pom.xml b/java/sca/modules/host-webapp-junit/pom.xml index 27c8359414..fb5f29df22 100644 --- a/java/sca/modules/host-webapp-junit/pom.xml +++ b/java/sca/modules/host-webapp-junit/pom.xml @@ -34,7 +34,7 @@ junit junit - 4.2 + 4.5 diff --git a/java/sca/modules/implementation-data-xml/pom.xml b/java/sca/modules/implementation-data-xml/pom.xml index 29b53a6d86..44c92f164e 100644 --- a/java/sca/modules/implementation-data-xml/pom.xml +++ b/java/sca/modules/implementation-data-xml/pom.xml @@ -119,7 +119,7 @@ junit junit - 4.2 + 4.5 compile diff --git a/java/sca/modules/implementation-ejb/pom.xml b/java/sca/modules/implementation-ejb/pom.xml index ef77f2df2b..31da4af3c2 100644 --- a/java/sca/modules/implementation-ejb/pom.xml +++ b/java/sca/modules/implementation-ejb/pom.xml @@ -53,7 +53,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-node-runtime/pom.xml b/java/sca/modules/implementation-node-runtime/pom.xml index bc4f0ae7bf..7d61a1b972 100644 --- a/java/sca/modules/implementation-node-runtime/pom.xml +++ b/java/sca/modules/implementation-node-runtime/pom.xml @@ -77,7 +77,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-node/pom.xml b/java/sca/modules/implementation-node/pom.xml index 2027eb7e30..69488e1fc9 100644 --- a/java/sca/modules/implementation-node/pom.xml +++ b/java/sca/modules/implementation-node/pom.xml @@ -65,7 +65,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-notification/pom.xml b/java/sca/modules/implementation-notification/pom.xml index 505db519c5..a2ebb4289c 100644 --- a/java/sca/modules/implementation-notification/pom.xml +++ b/java/sca/modules/implementation-notification/pom.xml @@ -70,7 +70,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-osgi/pom.xml b/java/sca/modules/implementation-osgi/pom.xml index 55e61fda93..c3615148a9 100644 --- a/java/sca/modules/implementation-osgi/pom.xml +++ b/java/sca/modules/implementation-osgi/pom.xml @@ -122,7 +122,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-resource-runtime/pom.xml b/java/sca/modules/implementation-resource-runtime/pom.xml index cf63fd5766..33270149b5 100644 --- a/java/sca/modules/implementation-resource-runtime/pom.xml +++ b/java/sca/modules/implementation-resource-runtime/pom.xml @@ -58,7 +58,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-resource/pom.xml b/java/sca/modules/implementation-resource/pom.xml index ec8c6638ac..a68a08cd18 100644 --- a/java/sca/modules/implementation-resource/pom.xml +++ b/java/sca/modules/implementation-resource/pom.xml @@ -51,7 +51,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-script/pom.xml b/java/sca/modules/implementation-script/pom.xml index 60cfa5abd8..0d61f8c58f 100644 --- a/java/sca/modules/implementation-script/pom.xml +++ b/java/sca/modules/implementation-script/pom.xml @@ -78,20 +78,20 @@ xml-apis - 1.2.5 + 1.2.7 org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 runtime junit junit - 4.2 + 4.5 test @@ -119,7 +119,7 @@ commons-logging commons-logging - 1.1 + 1.1.1 commons-logging diff --git a/java/sca/modules/implementation-web-runtime/pom.xml b/java/sca/modules/implementation-web-runtime/pom.xml index ba296fefcd..f48eedc6d4 100644 --- a/java/sca/modules/implementation-web-runtime/pom.xml +++ b/java/sca/modules/implementation-web-runtime/pom.xml @@ -74,7 +74,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-web/pom.xml b/java/sca/modules/implementation-web/pom.xml index 8bb8546f26..68dffedcc5 100644 --- a/java/sca/modules/implementation-web/pom.xml +++ b/java/sca/modules/implementation-web/pom.xml @@ -60,7 +60,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-widget-runtime/pom.xml b/java/sca/modules/implementation-widget-runtime/pom.xml index 79d6d10ee4..d374057fd8 100644 --- a/java/sca/modules/implementation-widget-runtime/pom.xml +++ b/java/sca/modules/implementation-widget-runtime/pom.xml @@ -94,7 +94,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-widget/pom.xml b/java/sca/modules/implementation-widget/pom.xml index ec717b9b35..f9aca74872 100644 --- a/java/sca/modules/implementation-widget/pom.xml +++ b/java/sca/modules/implementation-widget/pom.xml @@ -51,7 +51,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/implementation-xquery/pom.xml b/java/sca/modules/implementation-xquery/pom.xml index c094de3c7e..10a35783e7 100644 --- a/java/sca/modules/implementation-xquery/pom.xml +++ b/java/sca/modules/implementation-xquery/pom.xml @@ -77,7 +77,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/interface-java-jaxws/pom.xml b/java/sca/modules/interface-java-jaxws/pom.xml index 1a738e0f16..e3a72f6fec 100644 --- a/java/sca/modules/interface-java-jaxws/pom.xml +++ b/java/sca/modules/interface-java-jaxws/pom.xml @@ -48,7 +48,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/interface-wsdl/pom.xml b/java/sca/modules/interface-wsdl/pom.xml index 4d39d9e6f7..bb1e630b0a 100644 --- a/java/sca/modules/interface-wsdl/pom.xml +++ b/java/sca/modules/interface-wsdl/pom.xml @@ -56,7 +56,7 @@ org.apache.ws.commons.schema XmlSchema - 1.3.2 + 1.4.2 diff --git a/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java b/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java index 4a13c0a589..adba1e2da7 100644 --- a/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java +++ b/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java @@ -182,5 +182,17 @@ final class NodeLauncherUtil { static void stopOSGi(OSGiHost host) { host.stop(); } + + /* + static OSGiHost getOSGiHost() throws Exception { + ServiceDiscovery discovery = ServiceDiscovery.getInstance(Thread.currentThread().getContextClassLoader()); + Class hostClass = discovery.loadFirstServiceClass(OSGiHost.class); + if (hostClass != null) { + return (OSGiHost) hostClass.newInstance(); + } else { + return null; + } + } + */ } diff --git a/java/sca/modules/node-manager/pom.xml b/java/sca/modules/node-manager/pom.xml index 08152a6344..73dcfae7ea 100644 --- a/java/sca/modules/node-manager/pom.xml +++ b/java/sca/modules/node-manager/pom.xml @@ -110,7 +110,7 @@ junit junit - 4.2 + 4.5 test diff --git a/java/sca/modules/policy-security-ws/pom.xml b/java/sca/modules/policy-security-ws/pom.xml index f733f7f4c6..580e649ccf 100644 --- a/java/sca/modules/policy-security-ws/pom.xml +++ b/java/sca/modules/policy-security-ws/pom.xml @@ -68,19 +68,19 @@ xml-apis - 1.2.5 + 1.2.7 org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 org.apache.axis2 axis2-kernel - 1.3 + 1.4.1 backport-util-concurrent @@ -100,14 +100,14 @@ backport-util-concurrent backport-util-concurrent - 3.0 + 3.1 test org.apache.neethi neethi - 2.0.2 + 2.0.4 wsdl4j diff --git a/java/sca/modules/policy-security/pom.xml b/java/sca/modules/policy-security/pom.xml index 640d131642..e9d952cd31 100644 --- a/java/sca/modules/policy-security/pom.xml +++ b/java/sca/modules/policy-security/pom.xml @@ -60,7 +60,11 @@ ${tuscany.version} org.apache.tuscany.sca.policy.security ${pom.name} - org.apache.tuscany.sca.policy.security* + + org.apache.tuscany.sca.policy.identity, + org.apache.tuscany.sca.policy.authorization, + org.apache.tuscany.sca.policy.security* + diff --git a/java/sca/modules/policy-xml-ws/pom.xml b/java/sca/modules/policy-xml-ws/pom.xml index f6d8a884ec..039dc83538 100644 --- a/java/sca/modules/policy-xml-ws/pom.xml +++ b/java/sca/modules/policy-xml-ws/pom.xml @@ -50,7 +50,7 @@ org.apache.ws.commons.axiom axiom-api - 1.2.5 + 1.2.7 xerces @@ -74,7 +74,7 @@ org.apache.neethi neethi - 2.0.2 + 2.0.4 wsdl4j @@ -90,7 +90,7 @@ org.apache.ws.commons.axiom axiom-impl - 1.2.5 + 1.2.7 runtime @@ -103,14 +103,14 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime commons-logging commons-logging - 1.1 + 1.1.1 runtime diff --git a/java/sca/modules/policy-xml/pom.xml b/java/sca/modules/policy-xml/pom.xml index 178648c7a3..0934c768df 100644 --- a/java/sca/modules/policy-xml/pom.xml +++ b/java/sca/modules/policy-xml/pom.xml @@ -44,7 +44,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml index b4b3b292c5..3d668f068e 100644 --- a/java/sca/modules/pom.xml +++ b/java/sca/modules/pom.xml @@ -193,14 +193,14 @@ junit junit - 4.2 + 4.5 test org.easymock easymock - 2.2 + 2.4 test diff --git a/java/sca/modules/workspace-xml/pom.xml b/java/sca/modules/workspace-xml/pom.xml index 21024de0d3..0fce4fa60e 100644 --- a/java/sca/modules/workspace-xml/pom.xml +++ b/java/sca/modules/workspace-xml/pom.xml @@ -38,7 +38,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 runtime diff --git a/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java index 652d9e8d83..3e22b49d31 100644 --- a/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java +++ b/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java @@ -49,6 +49,7 @@ import org.xml.sax.InputSource; * @version $Rev$ $Date$ */ public class XSDModelResolver implements ModelResolver { + private static final String AGGREGATED_XSD = "http://tuscany.apache.org/aggregated.xsd"; private XSDFactory factory; private Contribution contribution; private Map> map = new HashMap>(); @@ -166,6 +167,12 @@ public class XSDModelResolver implements ModelResolver { } // Read an XSD document InputSource xsd = XMLDocumentHelper.getInputSource(definition.getLocation().toURL()); + for (XmlSchema d : schemaCollection.getXmlSchemas()) { + if (d.getTargetNamespace().equals(definition.getNamespace())) { + if (d.getSourceURI().equals(definition.getLocation().toString())) + return; + } + } XmlSchema schema = schemaCollection.read(xsd, null); definition.setSchemaCollection(schemaCollection); definition.setSchema(schema); @@ -193,10 +200,25 @@ public class XSDModelResolver implements ModelResolver { loadOnDemand(d); } String ns = definitions.get(0).getNamespace(); - XmlSchema facade = new XmlSchema(ns, schemaCollection); + + XmlSchema facade = null; + // Check if the facade XSD is already in the collection + for (XmlSchema s : schemaCollection.getXmlSchema(AGGREGATED_XSD)) { + if (ns.equals(s.getTargetNamespace())) { + facade = s; + break; + } + } + if (facade == null) { + // This will add the facade into the collection + facade = new XmlSchema(ns, AGGREGATED_XSD, schemaCollection); + } for (XmlSchema d : schemaCollection.getXmlSchemas()) { if (ns.equals(d.getTargetNamespace())) { + if (d == facade) { + continue; + } XmlSchemaInclude include = new XmlSchemaInclude(); include.setSchema(d); include.setSourceURI(d.getSourceURI()); diff --git a/java/sca/modules/xsd/pom.xml b/java/sca/modules/xsd/pom.xml index 0ef1e7ed99..c8a9e21576 100644 --- a/java/sca/modules/xsd/pom.xml +++ b/java/sca/modules/xsd/pom.xml @@ -38,7 +38,7 @@ org.apache.ws.commons.schema XmlSchema - 1.3.2 + 1.4.2 -- cgit v1.2.3