diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-29 21:46:14 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-29 21:46:14 +0000 |
| commit | 20a210faaee380f101155ec1a43f0aed47470322 (patch) | |
| tree | d740c5b1c63f08881b1348ba841cd87c5c325f3a | |
| parent | 2233a3deb84510284d08392483672c14c8c25d14 (diff) | |
TUSCANY-2651 - Reverting changes from #708989 and #708992 and fixing compilation error from original TUSCANY-2651 changes.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@709021 13f79535-47bb-0310-9956-ffa450edef68
4 files changed, 4 insertions, 4 deletions
diff --git a/branches/sca-java-1.3.3/distribution/src/main/release/bin/LICENSE b/branches/sca-java-1.3.3/distribution/src/main/release/bin/LICENSE index 50f932b49b..cc6777527c 100644 --- a/branches/sca-java-1.3.3/distribution/src/main/release/bin/LICENSE +++ b/branches/sca-java-1.3.3/distribution/src/main/release/bin/LICENSE @@ -325,7 +325,7 @@ The following components come under Apache Software License 2.0 xmlbeans-2.3.0.jar xml-resolver-1.1.jar xmlsec-1.4.0.jar - XmlSchema-1.4.2.jar + XmlSchema-1.3.2.jar =============================================================================== axion-1.0-M3-dev.jar diff --git a/branches/sca-java-1.3.3/distribution/war/src/main/release/LICENSE b/branches/sca-java-1.3.3/distribution/war/src/main/release/LICENSE index 0397dacd46..815617a23b 100644 --- a/branches/sca-java-1.3.3/distribution/war/src/main/release/LICENSE +++ b/branches/sca-java-1.3.3/distribution/war/src/main/release/LICENSE @@ -338,7 +338,7 @@ The following components come under Apache Software License 2.0 xml-apis-1.3.03.jar xml-resolver-1.1.jar xmlsec-1.4.0.jar - XmlSchema-1.4.2.jar + XmlSchema-1.3.2.jar =============================================================================== diff --git a/branches/sca-java-1.3.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/branches/sca-java-1.3.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java index 3e22b49d31..8039d3929a 100644 --- a/branches/sca-java-1.3.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java +++ b/branches/sca-java-1.3.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java @@ -211,7 +211,7 @@ public class XSDModelResolver implements ModelResolver { } if (facade == null) { // This will add the facade into the collection - facade = new XmlSchema(ns, AGGREGATED_XSD, schemaCollection); + facade = new XmlSchema(ns, schemaCollection); } for (XmlSchema d : schemaCollection.getXmlSchemas()) { diff --git a/branches/sca-java-1.3.3/modules/xsd/pom.xml b/branches/sca-java-1.3.3/modules/xsd/pom.xml index a0713cb94b..f47f19f8be 100644 --- a/branches/sca-java-1.3.3/modules/xsd/pom.xml +++ b/branches/sca-java-1.3.3/modules/xsd/pom.xml @@ -38,7 +38,7 @@ <dependency> <groupId>org.apache.ws.commons.schema</groupId> <artifactId>XmlSchema</artifactId> - <version>1.4.2</version> + <version>1.3.2</version> </dependency> </dependencies> |