You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/09/29 03:09:30 UTC
svn commit: r699937 [2/2] - in /tuscany/branches/sca-equinox:
demos/alert-aggregator-webapp/ demos/bigbank-calculator/
demos/bigbank-stockquote/ demos/bigbank/ demos/mortgage-creditcheck/
demos/xml-bigbank/ itest/ itest/bpel/helloworld-reference/ itest...
Modified: tuscany/branches/sca-equinox/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/core/pom.xml Sun Sep 28 18:09:22 2008
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
+ <version>3.2.4</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: tuscany/branches/sca-equinox/modules/databinding-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-axiom/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-axiom/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/databinding-axiom/pom.xml Sun Sep 28 18:09:22 2008
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -82,14 +82,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
+ <version>3.2.4</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml Sun Sep 28 18:09:22 2008
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/modules/databinding-json/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-json/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-json/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/databinding-json/pom.xml Sun Sep 28 18:09:22 2008
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -87,20 +87,20 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: tuscany/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml Sun Sep 28 18:09:22 2008
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -68,14 +68,14 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: tuscany/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml Sun Sep 28 18:09:22 2008
@@ -49,7 +49,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/modules/databinding/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/databinding/pom.xml Sun Sep 28 18:09:22 2008
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
+ <version>3.2.4</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: tuscany/branches/sca-equinox/modules/extension-helper/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extension-helper/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/extension-helper/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/extension-helper/pom.xml Sun Sep 28 18:09:22 2008
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/host-webapp-junit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/host-webapp-junit/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/host-webapp-junit/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/host-webapp-junit/pom.xml Sun Sep 28 18:09:22 2008
@@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
</dependency>
<dependency>
Modified: tuscany/branches/sca-equinox/modules/implementation-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-ejb/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-ejb/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-ejb/pom.xml Sun Sep 28 18:09:22 2008
@@ -53,7 +53,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/implementation-node-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-node-runtime/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-node-runtime/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-node-runtime/pom.xml Sun Sep 28 18:09:22 2008
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/modules/implementation-node/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-node/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-node/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-node/pom.xml Sun Sep 28 18:09:22 2008
@@ -65,7 +65,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/implementation-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-osgi/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-osgi/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-osgi/pom.xml Sun Sep 28 18:09:22 2008
@@ -122,7 +122,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml Sun Sep 28 18:09:22 2008
@@ -58,7 +58,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/implementation-resource/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-resource/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-resource/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-resource/pom.xml Sun Sep 28 18:09:22 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/implementation-script-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-script-runtime/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-script-runtime/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-script-runtime/pom.xml Sun Sep 28 18:09:22 2008
@@ -88,20 +88,20 @@
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
@@ -136,7 +136,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: tuscany/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml Sun Sep 28 18:09:22 2008
@@ -93,7 +93,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/implementation-widget/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-widget/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-widget/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-widget/pom.xml Sun Sep 28 18:09:22 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/implementation-xquery/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-xquery/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-xquery/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-xquery/pom.xml Sun Sep 28 18:09:22 2008
@@ -77,7 +77,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/interface-java-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-java-jaxws/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-java-jaxws/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/interface-java-jaxws/pom.xml Sun Sep 28 18:09:22 2008
@@ -48,7 +48,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/interface-wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-wsdl/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-wsdl/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/interface-wsdl/pom.xml Sun Sep 28 18:09:22 2008
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
Modified: tuscany/branches/sca-equinox/modules/node-manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-manager/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-manager/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/node-manager/pom.xml Sun Sep 28 18:09:22 2008
@@ -109,7 +109,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/policy-security-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security-ws/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-security-ws/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/policy-security-ws/pom.xml Sun Sep 28 18:09:22 2008
@@ -68,19 +68,19 @@
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
+ <version>1.4.1</version>
<exclusions>
<exclusion>
<groupId>backport-util-concurrent</groupId>
@@ -100,14 +100,14 @@
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
Modified: tuscany/branches/sca-equinox/modules/policy-xml-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-xml-ws/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-xml-ws/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/policy-xml-ws/pom.xml Sun Sep 28 18:09:22 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -103,14 +103,14 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
+ <version>3.2.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: tuscany/branches/sca-equinox/modules/policy-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-xml/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-xml/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/policy-xml/pom.xml Sun Sep 28 18:09:22 2008
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
+ <version>3.2.4</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: tuscany/branches/sca-equinox/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/pom.xml Sun Sep 28 18:09:22 2008
@@ -173,14 +173,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/modules/workspace-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/workspace-xml/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/workspace-xml/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/workspace-xml/pom.xml Sun Sep 28 18:09:22 2008
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
+ <version>3.2.4</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java (original)
+++ tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java Sun Sep 28 18:09:22 2008
@@ -49,6 +49,7 @@
* @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<String, List<XSDefinition>> map = new HashMap<String, List<XSDefinition>>();
@@ -166,6 +167,12 @@
}
// 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 @@
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());
Modified: tuscany/branches/sca-equinox/modules/xsd/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/xsd/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/xsd/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/xsd/pom.xml Sun Sep 28 18:09:22 2008
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
+ <version>1.4.2</version>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/samples/binding-echo-extension/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/binding-echo-extension/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/binding-echo-extension/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/binding-echo-extension/pom.xml Sun Sep 28 18:09:22 2008
@@ -65,7 +65,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/binding-echo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/binding-echo/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/binding-echo/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/binding-echo/pom.xml Sun Sep 28 18:09:22 2008
@@ -58,7 +58,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/calculator-distributed/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-distributed/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-distributed/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-distributed/pom.xml Sun Sep 28 18:09:22 2008
@@ -107,7 +107,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml Sun Sep 28 18:09:22 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/calculator-lean/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-lean/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-lean/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-lean/pom.xml Sun Sep 28 18:09:22 2008
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml Sun Sep 28 18:09:22 2008
@@ -152,7 +152,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml Sun Sep 28 18:09:22 2008
@@ -56,7 +56,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/samples/calculator-rmi-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-rmi-service/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-rmi-service/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-rmi-service/pom.xml Sun Sep 28 18:09:22 2008
@@ -56,7 +56,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/samples/calculator-script/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-script/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-script/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-script/pom.xml Sun Sep 28 18:09:22 2008
@@ -66,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/calculator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-webapp/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-webapp/pom.xml Sun Sep 28 18:09:22 2008
@@ -69,7 +69,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml Sun Sep 28 18:09:22 2008
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml Sun Sep 28 18:09:22 2008
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator/pom.xml Sun Sep 28 18:09:22 2008
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/callback-ws-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/callback-ws-client/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/callback-ws-client/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/callback-ws-client/pom.xml Sun Sep 28 18:09:22 2008
@@ -66,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/callback-ws-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/callback-ws-service/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/callback-ws-service/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/callback-ws-service/pom.xml Sun Sep 28 18:09:22 2008
@@ -66,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/customer-dojo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/customer-dojo/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/customer-dojo/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/customer-dojo/pom.xml Sun Sep 28 18:09:22 2008
@@ -109,7 +109,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/databinding-echo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/databinding-echo/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/databinding-echo/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/databinding-echo/pom.xml Sun Sep 28 18:09:22 2008
@@ -70,7 +70,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/samples/domain-management/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/domain-management/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/domain-management/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/domain-management/pom.xml Sun Sep 28 18:09:22 2008
@@ -172,7 +172,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml Sun Sep 28 18:09:22 2008
@@ -81,7 +81,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/feed-aggregator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/feed-aggregator/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/feed-aggregator/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/feed-aggregator/pom.xml Sun Sep 28 18:09:22 2008
@@ -71,7 +71,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-bpel/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-bpel/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-bpel/pom.xml Sun Sep 28 18:09:22 2008
@@ -71,7 +71,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
<!-- dependencies that must be present in order that the build scripts work -->
Modified: tuscany/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml Sun Sep 28 18:09:22 2008
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml Sun Sep 28 18:09:22 2008
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml Sun Sep 28 18:09:22 2008
@@ -66,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-service-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-service-jms/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-service-jms/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-service-jms/pom.xml Sun Sep 28 18:09:22 2008
@@ -60,7 +60,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml Sun Sep 28 18:09:22 2008
@@ -66,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml Sun Sep 28 18:09:22 2008
@@ -66,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml Sun Sep 28 18:09:22 2008
@@ -72,7 +72,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml Sun Sep 28 18:09:22 2008
@@ -66,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml Sun Sep 28 18:09:22 2008
@@ -114,7 +114,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml Sun Sep 28 18:09:22 2008
@@ -83,7 +83,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml Sun Sep 28 18:09:22 2008
@@ -74,7 +74,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml Sun Sep 28 18:09:22 2008
@@ -72,7 +72,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-service/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-service/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-service/pom.xml Sun Sep 28 18:09:22 2008
@@ -67,7 +67,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/samples/implementation-composite/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/implementation-composite/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/implementation-composite/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/implementation-composite/pom.xml Sun Sep 28 18:09:22 2008
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/implementation-crud-extension/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/implementation-crud-extension/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/implementation-crud-extension/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/implementation-crud-extension/pom.xml Sun Sep 28 18:09:22 2008
@@ -64,7 +64,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/implementation-crud/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/implementation-crud/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/implementation-crud/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/implementation-crud/pom.xml Sun Sep 28 18:09:22 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml Sun Sep 28 18:09:22 2008
@@ -64,7 +64,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/loanapplication/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/loanapplication/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/loanapplication/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/loanapplication/pom.xml Sun Sep 28 18:09:22 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/osgi-supplychain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/osgi-supplychain/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/osgi-supplychain/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/osgi-supplychain/pom.xml Sun Sep 28 18:09:22 2008
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-equinox/samples/photo-gallery/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/photo-gallery/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/photo-gallery/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/photo-gallery/pom.xml Sun Sep 28 18:09:22 2008
@@ -135,7 +135,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/quote-xquery/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/quote-xquery/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/quote-xquery/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/quote-xquery/pom.xml Sun Sep 28 18:09:22 2008
@@ -103,7 +103,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>compile</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml Sun Sep 28 18:09:22 2008
@@ -178,7 +178,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/simple-bigbank/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/simple-bigbank/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/simple-bigbank/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/simple-bigbank/pom.xml Sun Sep 28 18:09:22 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/simple-callback-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/simple-callback-ws/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/simple-callback-ws/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/simple-callback-ws/pom.xml Sun Sep 28 18:09:22 2008
@@ -66,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/simple-callback/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/simple-callback/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/simple-callback/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/simple-callback/pom.xml Sun Sep 28 18:09:22 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml Sun Sep 28 18:09:22 2008
@@ -80,7 +80,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml Sun Sep 28 18:09:22 2008
@@ -85,7 +85,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml Sun Sep 28 18:09:22 2008
@@ -80,7 +80,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/store-distributed/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/store-distributed/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/store-distributed/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/store-distributed/pom.xml Sun Sep 28 18:09:22 2008
@@ -106,7 +106,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/store/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/store/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/store/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/store/pom.xml Sun Sep 28 18:09:22 2008
@@ -93,7 +93,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/supplychain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/supplychain/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/supplychain/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/supplychain/pom.xml Sun Sep 28 18:09:22 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/web-resource/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/web-resource/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/web-resource/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/web-resource/pom.xml Sun Sep 28 18:09:22 2008
@@ -66,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/zipcode-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/zipcode-jaxws/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/zipcode-jaxws/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/zipcode-jaxws/pom.xml Sun Sep 28 18:09:22 2008
@@ -61,7 +61,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/tools/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/java2wsdl/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tools/java2wsdl/pom.xml (original)
+++ tuscany/branches/sca-equinox/tools/java2wsdl/pom.xml Sun Sep 28 18:09:22 2008
@@ -27,42 +27,42 @@
</parent>
<artifactId>tuscany-java2wsdl</artifactId>
<name>Apache Tuscany SCA Java2WSDL Tool</name>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0-2</version>
</dependency>
-
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>1.6.2</version>
</dependency>
-
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
@@ -74,51 +74,11 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- <version>1.2.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.3</version>
+ <version>1.4.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
@@ -126,11 +86,10 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>1.3</version>
+ <version>1.4.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -138,13 +97,11 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen</artifactId>
<version>2.2.3</version>
</dependency>
-
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen-ecore</artifactId>
@@ -152,26 +109,12 @@
</dependency>
<dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>0.1.0</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
- <scope>runtime</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
</dependency>
-
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -192,7 +135,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
@@ -202,7 +145,8 @@
<id>generate-sdo</id>
<phase>generate-sources</phase>
<configuration>
- <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl</schemaFile>
+ <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl
+ </schemaFile>
<javaPackage>org.example.creditscore.doclit</javaPackage>
<noNotification>true</noNotification>
<noContainer>true</noContainer>
@@ -216,20 +160,15 @@
</plugin>
</plugins>
</build>
-
<repositories>
<repository>
- <!-- <id>eclipse.emf</id>
- <url>http://download.eclipse.org/tools/emf/maven2</url> -->
- <!-- <id>osuosl.org</id>
- <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
<!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment -->
<id>indiana</id>
- <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
+ <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/
+ </url>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</snapshots>
</repository>
</repositories>
-
-</project>
+</project>
\ No newline at end of file
Modified: tuscany/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml (original)
+++ tuscany/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml Sun Sep 28 18:09:22 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>compile</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/tools/wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/wsdl2java/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tools/wsdl2java/pom.xml (original)
+++ tuscany/branches/sca-equinox/tools/wsdl2java/pom.xml Sun Sep 28 18:09:22 2008
@@ -27,7 +27,6 @@
</parent>
<artifactId>tuscany-wsdl2java</artifactId>
<name>Apache Tuscany SCA WSDL2Java Tool</name>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -35,31 +34,36 @@
<version>1.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-tools</artifactId>
<version>1.1.1</version>
</dependency>
-
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.1.7</version>
</dependency>
-
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
@@ -72,23 +76,20 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0-2</version>
</dependency>
-
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>1.6.2</version>
</dependency>
-
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
@@ -100,51 +101,11 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- <version>1.2.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.3</version>
+ <version>1.4.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
@@ -152,11 +113,10 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>1.3</version>
+ <version>1.4.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -164,42 +124,24 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen</artifactId>
<version>2.2.3</version>
</dependency>
-
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen-ecore</artifactId>
<version>2.2.3</version>
</dependency>
-
+
<dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>0.1.0</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
- <scope>runtime</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
</dependency>
-
-
-
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -230,7 +172,8 @@
<id>generate-sdo</id>
<phase>generate-test-sources</phase>
<configuration>
- <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl</schemaFile>
+ <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl
+ </schemaFile>
<javaPackage>org.example.creditscore.doclit</javaPackage>
<noNotification>true</noNotification>
<noContainer>true</noContainer>
@@ -244,7 +187,6 @@
</plugin>
</plugins>
</build>
-
<repositories>
<repository>
<snapshots>
@@ -256,17 +198,13 @@
<layout>legacy</layout>
</repository>
<repository>
- <!-- <id>eclipse.emf</id>
- <url>http://download.eclipse.org/tools/emf/maven2</url> -->
- <!-- <id>osuosl.org</id>
- <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
<!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment -->
<id>indiana</id>
- <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
+ <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/
+ </url>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</snapshots>
</repository>
</repositories>
-
-</project>
+</project>
\ No newline at end of file
Modified: tuscany/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java (original)
+++ tuscany/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java Sun Sep 28 18:09:22 2008
@@ -26,6 +26,7 @@
import javax.xml.namespace.QName;
+import org.apache.axis2.description.AxisBindingOperation;
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.util.FileWriter;
@@ -129,20 +130,20 @@
}
@Override
- protected Element getInputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
+ protected Element getInputElement(Document doc, AxisBindingOperation operation, List headerParameterQNameList) {
return getElement(doc,
"input",
- operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE),
- operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).isWrapped(),
+ operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE),
+ operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).isWrapped(),
headerParameterQNameList);
}
@Override
- protected Element getOutputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
+ protected Element getOutputElement(Document doc, AxisBindingOperation operation, List headerParameterQNameList) {
return getElement(doc,
"output",
- operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE),
- operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE).isWrapped(),
+ operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE),
+ operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE).isWrapped(),
headerParameterQNameList);
}
Modified: tuscany/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml (original)
+++ tuscany/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml Sun Sep 28 18:09:22 2008
@@ -42,7 +42,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/tutorials/store/store-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tutorials/store/store-test/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tutorials/store/store-test/pom.xml (original)
+++ tuscany/branches/sca-equinox/tutorials/store/store-test/pom.xml Sun Sep 28 18:09:22 2008
@@ -154,7 +154,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/vtest/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/vtest/pom.xml?rev=699937&r1=699936&r2=699937&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/vtest/pom.xml (original)
+++ tuscany/branches/sca-equinox/vtest/pom.xml Sun Sep 28 18:09:22 2008
@@ -33,7 +33,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>compile</scope>
</dependency>
</dependencies>