Merged from trunk. 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@699937 13f79535-47bb-0310-9956-ffa450edef68

63 files changed, 176 insertions, 235 deletions

diff --git a/branches/sca-equinox/modules/assembly-xml/pom.xml b/branches/sca-equinox/modules/assembly-xml/pom.xml
index cd439d3216..246f89619b 100644
--- a/branches/sca-equinox/modules/assembly-xml/pom.xml
+++ b/branches/sca-equinox/modules/assembly-xml/pom.xml
@@ -74,7 +74,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>
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/pom.xml b/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
index 42a484bde6..be9b94b6a6 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
+++ b/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
         
@@ -179,7 +179,7 @@
         <dependency>
            <groupId>commons-logging</groupId>
            <artifactId>commons-logging</artifactId>
-           <version>1.1</version>
+           <version>1.1.1</version>
            <exclusions>
                <exclusion>
                    <groupId>javax.servlet</groupId>
diff --git a/branches/sca-equinox/modules/binding-atom/pom.xml b/branches/sca-equinox/modules/binding-atom/pom.xml
index 8c8aad875a..f687828ba5 100644
--- a/branches/sca-equinox/modules/binding-atom/pom.xml
+++ b/branches/sca-equinox/modules/binding-atom/pom.xml
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
index b431ba0303..38891340f9 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
+++ b/branches/sca-equinox/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/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
index 3a22f86d9e..1b1754f347 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
+++ b/branches/sca-equinox/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/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml b/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml
index 38a6d9b19d..c89585c95c 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml
+++ b/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/binding-ejb/pom.xml b/branches/sca-equinox/modules/binding-ejb/pom.xml
index 0a3b0c5967..be8ca05164 100644
--- a/branches/sca-equinox/modules/binding-ejb/pom.xml
+++ b/branches/sca-equinox/modules/binding-ejb/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml b/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml
index 173dcbe0b8..f09f835f8e 100644
--- a/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml
+++ b/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml
index 85506087e5..fef1854daf 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml
+++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml
@@ -88,7 +88,7 @@
 		<dependency>
 			<groupId>commons-httpclient</groupId>
 			<artifactId>commons-httpclient</artifactId>
-			<version>3.0.1</version>
+			<version>3.1</version>
 		</dependency>
 
 		<dependency>
@@ -145,7 +145,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.2</version>
+			<version>4.5</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -164,7 +164,7 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.1</version>
+			<version>1.1.1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.servlet</groupId>
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml b/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
index b5d4ac94fd..d40351d722 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
+++ b/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
@@ -81,7 +81,7 @@
         <dependency>
            <groupId>commons-httpclient</groupId>
            <artifactId>commons-httpclient</artifactId>
-           <version>3.0.1</version>
+           <version>3.1</version>
         </dependency>
 
         <dependency>
@@ -138,7 +138,7 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
             <exclusions>
                 <exclusion>
                     <artifactId>servlet-api</artifactId>
@@ -154,7 +154,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/binding-gdata/pom.xml b/branches/sca-equinox/modules/binding-gdata/pom.xml
index 96f43ffeb0..cf918652a6 100644
--- a/branches/sca-equinox/modules/binding-gdata/pom.xml
+++ b/branches/sca-equinox/modules/binding-gdata/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/branches/sca-equinox/modules/binding-http-runtime/pom.xml b/branches/sca-equinox/modules/binding-http-runtime/pom.xml
index bb6f671dd1..7174cf44a0 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/pom.xml
+++ b/branches/sca-equinox/modules/binding-http-runtime/pom.xml
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/binding-http/pom.xml b/branches/sca-equinox/modules/binding-http/pom.xml
index 1ad2168669..ddeedfe249 100644
--- a/branches/sca-equinox/modules/binding-http/pom.xml
+++ b/branches/sca-equinox/modules/binding-http/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/pom.xml b/branches/sca-equinox/modules/binding-jms-runtime/pom.xml
index 62eb3de60d..d3db03d1df 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/pom.xml
+++ b/branches/sca-equinox/modules/binding-jms-runtime/pom.xml
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/branches/sca-equinox/modules/binding-jms/pom.xml b/branches/sca-equinox/modules/binding-jms/pom.xml
index 21535235fb..e7dd413a78 100644
--- a/branches/sca-equinox/modules/binding-jms/pom.xml
+++ b/branches/sca-equinox/modules/binding-jms/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml b/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml
index 598f92f324..8ec5e52a0f 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml
+++ b/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml
@@ -89,7 +89,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>
@@ -121,7 +121,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/pom.xml b/branches/sca-equinox/modules/binding-jsonrpc/pom.xml
index 3790e5bb3f..4b3e2c3788 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/pom.xml
+++ b/branches/sca-equinox/modules/binding-jsonrpc/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/branches/sca-equinox/modules/binding-rss-rome/pom.xml b/branches/sca-equinox/modules/binding-rss-rome/pom.xml
index 9babfb8cb7..3fa097cfb4 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/pom.xml
+++ b/branches/sca-equinox/modules/binding-rss-rome/pom.xml
@@ -75,7 +75,7 @@
         <dependency>
            <groupId>commons-httpclient</groupId>
            <artifactId>commons-httpclient</artifactId>
-           <version>3.0.1</version>
+           <version>3.1</version>
         </dependency>
 
         <dependency>
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
         
@@ -133,7 +133,7 @@
         <dependency>
            <groupId>commons-logging</groupId>
            <artifactId>commons-logging</artifactId>
-           <version>1.1</version>
+           <version>1.1.1</version>
            <exclusions>
                <exclusion>
                    <groupId>javax.servlet</groupId>
diff --git a/branches/sca-equinox/modules/binding-rss/pom.xml b/branches/sca-equinox/modules/binding-rss/pom.xml
index aeed176e8a..cd51de1088 100644
--- a/branches/sca-equinox/modules/binding-rss/pom.xml
+++ b/branches/sca-equinox/modules/binding-rss/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/pom.xml b/branches/sca-equinox/modules/binding-sca-axis2/pom.xml
index 9f4fbc6c9e..807a4add70 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/pom.xml
+++ b/branches/sca-equinox/modules/binding-sca-axis2/pom.xml
@@ -51,13 +51,6 @@
         </dependency>       

 

         <dependency>

-            <groupId>org.easymock</groupId>

-            <artifactId>easymock</artifactId>

-            <version>2.2</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-host-jetty</artifactId>

             <version>1.4-SNAPSHOT</version>

diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
index ed0c170b0d..6c742e3e00 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
+++ b/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
@@ -69,7 +69,7 @@ public class CorbaSCAInvocationProxy implements InvocationProxy {
 
     public Object invoke(String operationName, List<Object> 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/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
index 26b1c9e5d6..9132c5d3c8 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
+++ b/branches/sca-equinox/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.provider.exceptions.RequestConfigurationException;
 import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaRequest;
 import org.apache.tuscany.sca.binding.corba.provider.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());
                 FaultException f = new FaultException(e.getMessage(), exceptionOM, e);
                 f.setFaultName(exceptionOM.getQName());
                 msg.setFaultBody(f);
@@ -79,4 +80,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/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml b/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml
index a98e5519f7..3e156f99d0 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml
+++ b/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/pom.xml b/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
index 87e675e16f..5935bf26c1 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
+++ b/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
-            <version>1.3</version>
+            <version>1.4.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ant</groupId>
@@ -128,7 +128,7 @@
         <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>
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-adb</artifactId>
-            <version>1.3</version>
+            <version>1.4.1</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>
@@ -177,7 +177,7 @@
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
-            <version>1.3</version>
+            <version>1.4.1</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>
@@ -212,13 +212,13 @@
                     <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>
             <exclusions>
                 <exclusion>
                     <groupId>stax</groupId>
@@ -227,17 +227,17 @@
             </exclusions>
         </dependency>
 
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.woden</groupId>
             <artifactId>woden</artifactId>
             <version>1.0-incubating-M7b</version>
             <scope>runtime</scope>
-        </dependency>
+        </dependency-->
 
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.servlet</groupId>
@@ -255,7 +255,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>
@@ -271,13 +271,13 @@
         <dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
             <artifactId>XmlSchema</artifactId>
-            <version>1.3.2</version>
+            <version>1.4.2</version>
         </dependency>
 
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <version>3.0.1</version>
+            <version>3.1</version>
         </dependency>
 
         <dependency>
@@ -289,7 +289,7 @@
         <dependency>
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
-            <version>2.2</version>
+            <version>3.1</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -323,7 +323,7 @@
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-mtompolicy</artifactId>
-            <version>1.3</version>
+            <version>1.4.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>xalan</groupId>
@@ -364,143 +364,49 @@
         <dependency>
             <groupId>org.apache.rampart</groupId>
             <artifactId>rampart-core</artifactId>
-            <version>1.3</version>
+            <version>1.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ant</groupId>
                     <artifactId>ant-nodeps</artifactId>
                 </exclusion>
+               <exclusion>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-kernel</artifactId>
+                </exclusion>                
                 <exclusion>
                     <groupId>org.apache.axis2</groupId>
                     <artifactId>axis2-xmlbeans</artifactId>
                 </exclusion>
-				<exclusion>
-					<groupId>xmlbeans</groupId>
-					<artifactId>xbean</artifactId>
-				</exclusion>
-                <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
+               <exclusion>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-codegen</artifactId>
                </exclusion>
-                <!-- Exclude XmlSchema 1.3.1 -->
-                <exclusion>
-                    <groupId>org.apache.ws.commons.schema</groupId>
-                    <artifactId>XmlSchema</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xalan</groupId>
-                    <artifactId>xalan</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.rampart</groupId>
-            <artifactId>rampart-policy</artifactId>
-            <version>1.3</version>
-            <exclusions>
+               <exclusion>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-mex</artifactId>
+                </exclusion>                                
                 <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-adb-codegen</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-xmlbeans</artifactId>
+                    <groupId>xmlbeans</groupId>
+                    <artifactId>xbean</artifactId>
                 </exclusion>
-				<exclusion>
-					<groupId>xmlbeans</groupId>
-					<artifactId>xbean</artifactId>
-				</exclusion>
                 <exclusion>
                    <groupId>javax.servlet</groupId>
                    <artifactId>servlet-api</artifactId>
                </exclusion>
-               <exclusion>
-                    <groupId>backport-util-concurrent</groupId>
-                    <artifactId>backport-util-concurrent</artifactId>
-                </exclusion>                
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
                 <!-- Exclude XmlSchema 1.3.1 -->
                 <exclusion>
                     <groupId>org.apache.ws.commons.schema</groupId>
                     <artifactId>XmlSchema</artifactId>
                 </exclusion>
-
-                <exclusion>
-                    <groupId>xalan</groupId>
-                    <artifactId>xalan</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.rampart</groupId>
-            <artifactId>rampart-trust</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-xmlbeans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>   
-                <exclusion>
-                    <groupId>wsdl4j</groupId>
-                    <artifactId>wsdl4j</artifactId>
-                </exclusion>                                
-				<exclusion>
-					<groupId>xmlbeans</groupId>
-					<artifactId>xbean</artifactId>
-				</exclusion>
-                <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion> 
-               <exclusion>
-                    <groupId>backport-util-concurrent</groupId>
-                    <artifactId>backport-util-concurrent</artifactId>
-                </exclusion>  
                 <exclusion>
                     <groupId>stax</groupId>
                     <artifactId>stax-api</artifactId>
                 </exclusion>
-
-
-                <!-- Exclude XmlSchema 1.3.1 -->
-                <exclusion>
-                    <groupId>org.apache.ws.commons.schema</groupId>
-                    <artifactId>XmlSchema</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>xalan</groupId>
                     <artifactId>xalan</artifactId>
@@ -513,19 +419,21 @@
                     <groupId>xerces</groupId>
                     <artifactId>xercesImpl</artifactId>
                 </exclusion>
-
             </exclusions>
         </dependency>
+
+<!-- 
         <dependency>
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
-            <version>3.0</version>
+            <version>3.1</version>
         </dependency>         
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.12</version>
-        </dependency>  
+        </dependency>
+-->          
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java b/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
index 395cfe28d6..458a472479 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
+++ b/branches/sca-equinox/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/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml b/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml
index a06039d1b4..012076b3b5 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml
+++ b/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/branches/sca-equinox/modules/contribution-impl/pom.xml b/branches/sca-equinox/modules/contribution-impl/pom.xml
index ff83cff49c..c971f1390d 100644
--- a/branches/sca-equinox/modules/contribution-impl/pom.xml
+++ b/branches/sca-equinox/modules/contribution-impl/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/contribution-java/pom.xml b/branches/sca-equinox/modules/contribution-java/pom.xml
index 153a4f7c5e..8e57661a84 100644
--- a/branches/sca-equinox/modules/contribution-java/pom.xml
+++ b/branches/sca-equinox/modules/contribution-java/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/contribution-namespace/pom.xml b/branches/sca-equinox/modules/contribution-namespace/pom.xml
index 39e011dbe2..c2c4c51bfb 100644
--- a/branches/sca-equinox/modules/contribution-namespace/pom.xml
+++ b/branches/sca-equinox/modules/contribution-namespace/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/contribution-osgi/pom.xml b/branches/sca-equinox/modules/contribution-osgi/pom.xml
index 5622978bd9..284d70ca21 100644
--- a/branches/sca-equinox/modules/contribution-osgi/pom.xml
+++ b/branches/sca-equinox/modules/contribution-osgi/pom.xml
@@ -64,7 +64,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>
diff --git a/branches/sca-equinox/modules/contribution-resource/pom.xml b/branches/sca-equinox/modules/contribution-resource/pom.xml
index da19a5249c..5a2422ed4c 100644
--- a/branches/sca-equinox/modules/contribution-resource/pom.xml
+++ b/branches/sca-equinox/modules/contribution-resource/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/contribution-xml/pom.xml b/branches/sca-equinox/modules/contribution-xml/pom.xml
index b1a06c2d11..4fb3e06a57 100644
--- a/branches/sca-equinox/modules/contribution-xml/pom.xml
+++ b/branches/sca-equinox/modules/contribution-xml/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/core-databinding/pom.xml b/branches/sca-equinox/modules/core-databinding/pom.xml
index cb88bcd176..b665593aca 100644
--- a/branches/sca-equinox/modules/core-databinding/pom.xml
+++ b/branches/sca-equinox/modules/core-databinding/pom.xml
@@ -77,7 +77,7 @@
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
             <scope>runtime</scope>
-            <version>3.2.1</version>
+            <version>3.2.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>stax</groupId>
diff --git a/branches/sca-equinox/modules/core-spi/pom.xml b/branches/sca-equinox/modules/core-spi/pom.xml
index 02cb36dc8b..9d077c0594 100644
--- a/branches/sca-equinox/modules/core-spi/pom.xml
+++ b/branches/sca-equinox/modules/core-spi/pom.xml
@@ -81,7 +81,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>
diff --git a/branches/sca-equinox/modules/core/pom.xml b/branches/sca-equinox/modules/core/pom.xml
index b71f001d06..17da5a4d2b 100644
--- a/branches/sca-equinox/modules/core/pom.xml
+++ b/branches/sca-equinox/modules/core/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/databinding-axiom/pom.xml b/branches/sca-equinox/modules/databinding-axiom/pom.xml
index f602ad3519..6e0d634419 100644
--- a/branches/sca-equinox/modules/databinding-axiom/pom.xml
+++ b/branches/sca-equinox/modules/databinding-axiom/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml b/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml
index 12150abb7e..c4dd61571a 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml
+++ b/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/databinding-json/pom.xml b/branches/sca-equinox/modules/databinding-json/pom.xml
index bc4a149b91..7609df06aa 100644
--- a/branches/sca-equinox/modules/databinding-json/pom.xml
+++ b/branches/sca-equinox/modules/databinding-json/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml b/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml
index b63e362616..e64e99fa9f 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml
+++ b/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml b/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml
index 3e92649675..29f215641a 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml
+++ b/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
         </dependency>
     </dependencies>
 
diff --git a/branches/sca-equinox/modules/databinding/pom.xml b/branches/sca-equinox/modules/databinding/pom.xml
index 890abcc2ea..8021c62970 100644
--- a/branches/sca-equinox/modules/databinding/pom.xml
+++ b/branches/sca-equinox/modules/databinding/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/extension-helper/pom.xml b/branches/sca-equinox/modules/extension-helper/pom.xml
index e35504caab..a54e9e43a3 100644
--- a/branches/sca-equinox/modules/extension-helper/pom.xml
+++ b/branches/sca-equinox/modules/extension-helper/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>junit</groupId>                                      
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/host-webapp-junit/pom.xml b/branches/sca-equinox/modules/host-webapp-junit/pom.xml
index 97defa3377..59bb88aa04 100644
--- a/branches/sca-equinox/modules/host-webapp-junit/pom.xml
+++ b/branches/sca-equinox/modules/host-webapp-junit/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
         </dependency>
 
         <dependency>
diff --git a/branches/sca-equinox/modules/implementation-ejb/pom.xml b/branches/sca-equinox/modules/implementation-ejb/pom.xml
index ef77f2df2b..31da4af3c2 100644
--- a/branches/sca-equinox/modules/implementation-ejb/pom.xml
+++ b/branches/sca-equinox/modules/implementation-ejb/pom.xml
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/pom.xml b/branches/sca-equinox/modules/implementation-node-runtime/pom.xml
index ddd26bf2e8..01c2d4ac3a 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/pom.xml
+++ b/branches/sca-equinox/modules/implementation-node-runtime/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/branches/sca-equinox/modules/implementation-node/pom.xml b/branches/sca-equinox/modules/implementation-node/pom.xml
index 2027eb7e30..69488e1fc9 100644
--- a/branches/sca-equinox/modules/implementation-node/pom.xml
+++ b/branches/sca-equinox/modules/implementation-node/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/implementation-osgi/pom.xml b/branches/sca-equinox/modules/implementation-osgi/pom.xml
index 55e61fda93..c3615148a9 100644
--- a/branches/sca-equinox/modules/implementation-osgi/pom.xml
+++ b/branches/sca-equinox/modules/implementation-osgi/pom.xml
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml b/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml
index cf63fd5766..33270149b5 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml
+++ b/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/implementation-resource/pom.xml b/branches/sca-equinox/modules/implementation-resource/pom.xml
index ec8c6638ac..a68a08cd18 100644
--- a/branches/sca-equinox/modules/implementation-resource/pom.xml
+++ b/branches/sca-equinox/modules/implementation-resource/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/pom.xml b/branches/sca-equinox/modules/implementation-script-runtime/pom.xml
index 354a01d4bf..5e5c78ced4 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/pom.xml
+++ b/branches/sca-equinox/modules/implementation-script-runtime/pom.xml
@@ -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>

diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml b/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
index f2703e59c4..43ae9aa3ef 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
+++ b/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/implementation-widget/pom.xml b/branches/sca-equinox/modules/implementation-widget/pom.xml
index ec717b9b35..f9aca74872 100644
--- a/branches/sca-equinox/modules/implementation-widget/pom.xml
+++ b/branches/sca-equinox/modules/implementation-widget/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/implementation-xquery/pom.xml b/branches/sca-equinox/modules/implementation-xquery/pom.xml
index c094de3c7e..10a35783e7 100644
--- a/branches/sca-equinox/modules/implementation-xquery/pom.xml
+++ b/branches/sca-equinox/modules/implementation-xquery/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/pom.xml b/branches/sca-equinox/modules/interface-java-jaxws/pom.xml
index 1a738e0f16..e3a72f6fec 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/pom.xml
+++ b/branches/sca-equinox/modules/interface-java-jaxws/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/interface-wsdl/pom.xml b/branches/sca-equinox/modules/interface-wsdl/pom.xml
index 4d39d9e6f7..bb1e630b0a 100644
--- a/branches/sca-equinox/modules/interface-wsdl/pom.xml
+++ b/branches/sca-equinox/modules/interface-wsdl/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/node-manager/pom.xml b/branches/sca-equinox/modules/node-manager/pom.xml
index 346a6554c4..b5c1e085f4 100644
--- a/branches/sca-equinox/modules/node-manager/pom.xml
+++ b/branches/sca-equinox/modules/node-manager/pom.xml
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/policy-security-ws/pom.xml b/branches/sca-equinox/modules/policy-security-ws/pom.xml
index f733f7f4c6..580e649ccf 100644
--- a/branches/sca-equinox/modules/policy-security-ws/pom.xml
+++ b/branches/sca-equinox/modules/policy-security-ws/pom.xml
@@ -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>

diff --git a/branches/sca-equinox/modules/policy-xml-ws/pom.xml b/branches/sca-equinox/modules/policy-xml-ws/pom.xml
index f6d8a884ec..039dc83538 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/pom.xml
+++ b/branches/sca-equinox/modules/policy-xml-ws/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/policy-xml/pom.xml b/branches/sca-equinox/modules/policy-xml/pom.xml
index 178648c7a3..0934c768df 100644
--- a/branches/sca-equinox/modules/policy-xml/pom.xml
+++ b/branches/sca-equinox/modules/policy-xml/pom.xml
@@ -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>

diff --git a/branches/sca-equinox/modules/pom.xml b/branches/sca-equinox/modules/pom.xml
index 2ee9c9c9c2..f404c65fa5 100644
--- a/branches/sca-equinox/modules/pom.xml
+++ b/branches/sca-equinox/modules/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/workspace-xml/pom.xml b/branches/sca-equinox/modules/workspace-xml/pom.xml
index 21024de0d3..0fce4fa60e 100644
--- a/branches/sca-equinox/modules/workspace-xml/pom.xml
+++ b/branches/sca-equinox/modules/workspace-xml/pom.xml
@@ -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>
diff --git a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
index 652d9e8d83..3e22b49d31 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
+++ b/branches/sca-equinox/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<String, List<XSDefinition>> map = new HashMap<String, List<XSDefinition>>();
@@ -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/branches/sca-equinox/modules/xsd/pom.xml b/branches/sca-equinox/modules/xsd/pom.xml
index 0ef1e7ed99..c8a9e21576 100644
--- a/branches/sca-equinox/modules/xsd/pom.xml
+++ b/branches/sca-equinox/modules/xsd/pom.xml
@@ -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>