diff options
Diffstat (limited to 'java/sca/modules/binding-ws-axis2')
2 files changed, 44 insertions, 133 deletions
diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml index 519f9d681a..b593e8075f 100644 --- a/java/sca/modules/binding-ws-axis2/pom.xml +++ b/java/sca/modules/binding-ws-axis2/pom.xml @@ -104,7 +104,7 @@ <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> @@ -262,7 +262,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> @@ -278,13 +278,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> @@ -296,7 +296,7 @@ <dependency> <groupId>backport-util-concurrent</groupId> <artifactId>backport-util-concurrent</artifactId> - <version>2.2</version> + <version>3.1</version> <scope>runtime</scope> </dependency> @@ -330,7 +330,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> @@ -371,143 +371,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> @@ -520,19 +426,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/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java index 395cfe28d6..458a472479 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed; import junit.framework.Assert; -import junit.framework.TestCase; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; @@ -28,12 +27,16 @@ import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMText; import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM; import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -public abstract class AbstractHelloWorldOMTestCase extends TestCase { +public abstract class AbstractHelloWorldOMTestCase { private SCADomain domain; private HelloWorldOM helloWorld; + @Test public void testHelloWorld() throws Exception { OMFactory fac = OMAbstractFactory.getOMFactory(); OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld"); @@ -45,14 +48,14 @@ public abstract class AbstractHelloWorldOMTestCase extends TestCase { Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText()); } - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { domain = SCADomain.newInstance(getCompositeName()); helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent"); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { domain.close(); } |