You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/09/19 08:38:59 UTC
svn commit: r696937 [2/3] - in /tuscany/java/sca:
demos/alert-aggregator-webapp/ demos/bigbank-calculator/
demos/bigbank-stockquote/ demos/bigbank/ demos/mortgage-creditcheck/
demos/xml-bigbank/ itest/ itest/bpel/helloworld-reference/
itest/bpel/hellow...
Modified: tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java (original)
+++ tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java Thu Sep 18 23:38:53 2008
@@ -19,13 +19,14 @@
package org.apache.tuscany.sca.binding.sca.corba.impl;
+import java.io.ByteArrayInputStream;
import java.lang.reflect.Method;
import java.util.Map;
import javax.xml.stream.XMLStreamException;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.tuscany.sca.binding.corba.impl.exceptions.RequestConfigurationException;
import org.apache.tuscany.sca.binding.corba.impl.reference.DynaCorbaRequest;
import org.apache.tuscany.sca.binding.corba.impl.reference.DynaCorbaResponse;
@@ -62,11 +63,11 @@
String arg = omElement.toStringWithConsume();
request.addArgument(arg);
DynaCorbaResponse response = request.invoke();
- OMElement responseOM = AXIOMUtil.stringToOM((String)response.getContent());
+ OMElement responseOM = stringToOM((String)response.getContent());
msg.setBody(responseOM);
} catch (WrappedSCAException e) {
try {
- OMElement exceptionOM = AXIOMUtil.stringToOM(e.getFault());
+ OMElement exceptionOM = stringToOM(e.getFault());
// AxisFault axisFault = new AxisFault("");
// axisFault.setDetail(exceptionOM);
FaultException f = new FaultException(e.getMessage(), exceptionOM, e);
@@ -81,4 +82,18 @@
}
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;
+ }
}
Modified: tuscany/java/sca/modules/binding-ws-axis2-policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2-policy/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2-policy/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ws-axis2-policy/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/pom.xml Thu Sep 18 23:38:53 2008
@@ -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>
Modified: tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java Thu Sep 18 23:38:53 2008
@@ -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.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 @@
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();
}
Modified: tuscany/java/sca/modules/binding-ws-wsdlgen/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-wsdlgen/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-wsdlgen/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ws-wsdlgen/pom.xml Thu Sep 18 23:38:53 2008
@@ -74,7 +74,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: tuscany/java/sca/modules/contribution-groovy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-groovy/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-groovy/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-groovy/pom.xml Thu Sep 18 23:38:53 2008
@@ -58,7 +58,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/java/sca/modules/contribution-impl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-impl/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-impl/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-impl/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/contribution-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-java/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-java/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-java/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/contribution-namespace/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-namespace/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-namespace/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-namespace/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/contribution-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-osgi/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-osgi/pom.xml Thu Sep 18 23:38:53 2008
@@ -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>
Modified: tuscany/java/sca/modules/contribution-resource/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-resource/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-resource/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-resource/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/contribution-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-xml/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-xml/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-xml/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/core-databinding/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-databinding/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-databinding/pom.xml (original)
+++ tuscany/java/sca/modules/core-databinding/pom.xml Thu Sep 18 23:38:53 2008
@@ -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>
Modified: tuscany/java/sca/modules/core-spi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spi/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spi/pom.xml (original)
+++ tuscany/java/sca/modules/core-spi/pom.xml Thu Sep 18 23:38:53 2008
@@ -82,7 +82,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/java/sca/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/pom.xml (original)
+++ tuscany/java/sca/modules/core/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/databinding-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-axiom/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-axiom/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-axiom/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/databinding-jaxb-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb-axiom/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb-axiom/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-jaxb-axiom/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/databinding-json/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-json/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-json/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-json/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/databinding-sdo-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/databinding-xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-xmlbeans/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-xmlbeans/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-xmlbeans/pom.xml Thu Sep 18 23:38:53 2008
@@ -49,7 +49,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
</dependency>
</dependencies>
Modified: tuscany/java/sca/modules/databinding-xstream/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-xstream/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-xstream/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-xstream/pom.xml Thu Sep 18 23:38:53 2008
@@ -61,7 +61,7 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
@@ -74,20 +74,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>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/java/sca/modules/databinding/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/pom.xml (original)
+++ tuscany/java/sca/modules/databinding/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/extension-helper/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/extension-helper/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/extension-helper/pom.xml (original)
+++ tuscany/java/sca/modules/extension-helper/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/host-webapp-junit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp-junit/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp-junit/pom.xml (original)
+++ tuscany/java/sca/modules/host-webapp-junit/pom.xml Thu Sep 18 23:38:53 2008
@@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
</dependency>
<dependency>
Modified: tuscany/java/sca/modules/implementation-data-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-data-xml/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-data-xml/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-data-xml/pom.xml Thu Sep 18 23:38:53 2008
@@ -119,7 +119,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: tuscany/java/sca/modules/implementation-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-ejb/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-ejb/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-ejb/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/implementation-node-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-node-runtime/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-node-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-node-runtime/pom.xml Thu Sep 18 23:38:53 2008
@@ -77,7 +77,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/java/sca/modules/implementation-node/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-node/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-node/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-node/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/implementation-notification/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-notification/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-notification/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-notification/pom.xml Thu Sep 18 23:38:53 2008
@@ -70,7 +70,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/java/sca/modules/implementation-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-osgi/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/implementation-resource-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-resource-runtime/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-resource-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-resource-runtime/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/implementation-resource/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-resource/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-resource/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-resource/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/implementation-script/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-script/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-script/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-script/pom.xml Thu Sep 18 23:38:53 2008
@@ -78,20 +78,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>
@@ -119,7 +119,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/java/sca/modules/implementation-web-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-web-runtime/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/implementation-web/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-web/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/implementation-widget-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-widget-runtime/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-widget-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-widget-runtime/pom.xml Thu Sep 18 23:38:53 2008
@@ -94,7 +94,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/java/sca/modules/implementation-widget/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-widget/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-widget/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-widget/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/implementation-xquery/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-xquery/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-xquery/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-xquery/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/interface-java-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-jaxws/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-java-jaxws/pom.xml (original)
+++ tuscany/java/sca/modules/interface-java-jaxws/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/interface-wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl/pom.xml (original)
+++ tuscany/java/sca/modules/interface-wsdl/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java (original)
+++ tuscany/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java Thu Sep 18 23:38:53 2008
@@ -182,5 +182,17 @@
static void stopOSGi(OSGiHost host) {
host.stop();
}
+
+ /*
+ static OSGiHost getOSGiHost() throws Exception {
+ ServiceDiscovery discovery = ServiceDiscovery.getInstance(Thread.currentThread().getContextClassLoader());
+ Class<?> hostClass = discovery.loadFirstServiceClass(OSGiHost.class);
+ if (hostClass != null) {
+ return (OSGiHost) hostClass.newInstance();
+ } else {
+ return null;
+ }
+ }
+ */
}
Modified: tuscany/java/sca/modules/node-manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-manager/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-manager/pom.xml (original)
+++ tuscany/java/sca/modules/node-manager/pom.xml Thu Sep 18 23:38:53 2008
@@ -110,7 +110,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/java/sca/modules/policy-security-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security-ws/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-security-ws/pom.xml (original)
+++ tuscany/java/sca/modules/policy-security-ws/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/policy-security/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-security/pom.xml (original)
+++ tuscany/java/sca/modules/policy-security/pom.xml Thu Sep 18 23:38:53 2008
@@ -60,7 +60,11 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.policy.security</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.policy.security*</Export-Package>
+ <Export-Package>
+ org.apache.tuscany.sca.policy.identity,
+ org.apache.tuscany.sca.policy.authorization,
+ org.apache.tuscany.sca.policy.security*
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/java/sca/modules/policy-xml-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml-ws/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml-ws/pom.xml (original)
+++ tuscany/java/sca/modules/policy-xml-ws/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/policy-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml/pom.xml (original)
+++ tuscany/java/sca/modules/policy-xml/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Thu Sep 18 23:38:53 2008
@@ -193,14 +193,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/java/sca/modules/workspace-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/workspace-xml/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/workspace-xml/pom.xml (original)
+++ tuscany/java/sca/modules/workspace-xml/pom.xml Thu Sep 18 23:38:53 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/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java (original)
+++ tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java Thu Sep 18 23:38:53 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/java/sca/modules/xsd/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/modules/xsd/pom.xml (original)
+++ tuscany/java/sca/modules/xsd/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/binding-echo-extension/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-echo-extension/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/binding-echo-extension/pom.xml (original)
+++ tuscany/java/sca/samples/binding-echo-extension/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/binding-echo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-echo/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/binding-echo/pom.xml (original)
+++ tuscany/java/sca/samples/binding-echo/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/binding-notification-broker/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-notification-broker/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/binding-notification-broker/pom.xml (original)
+++ tuscany/java/sca/samples/binding-notification-broker/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/binding-notification-consumer/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-notification-consumer/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/binding-notification-consumer/pom.xml (original)
+++ tuscany/java/sca/samples/binding-notification-consumer/pom.xml Thu Sep 18 23:38:53 2008
@@ -82,7 +82,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/java/sca/samples/binding-notification-producer/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-notification-producer/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/binding-notification-producer/pom.xml (original)
+++ tuscany/java/sca/samples/binding-notification-producer/pom.xml Thu Sep 18 23:38:53 2008
@@ -82,7 +82,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/java/sca/samples/calculator-distributed/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-distributed/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-distributed/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-distributed/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/calculator-implementation-policies/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-implementation-policies/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-implementation-policies/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-implementation-policies/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/calculator-lean/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-lean/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-lean/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-lean/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/calculator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-osgi/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-osgi/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-osgi/pom.xml Thu Sep 18 23:38:53 2008
@@ -87,7 +87,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/java/sca/samples/calculator-rcp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rcp/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-rcp/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-rcp/pom.xml Thu Sep 18 23:38:53 2008
@@ -86,7 +86,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/java/sca/samples/calculator-rmi-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-rmi-reference/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-rmi-reference/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/calculator-rmi-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-service/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-rmi-service/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-rmi-service/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/calculator-script/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-script/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-script/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-script/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/calculator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-webapp/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-webapp/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-webapp/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/calculator-ws-secure-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-ws-secure-webapp/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-ws-secure-webapp/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-ws-secure-webapp/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/calculator-ws-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-ws-webapp/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-ws-webapp/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator/pom.xml (original)
+++ tuscany/java/sca/samples/calculator/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/callback-ws-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/callback-ws-client/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/callback-ws-client/pom.xml (original)
+++ tuscany/java/sca/samples/callback-ws-client/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/callback-ws-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/callback-ws-service/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/callback-ws-service/pom.xml (original)
+++ tuscany/java/sca/samples/callback-ws-service/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/customer-dojo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/customer-dojo/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/customer-dojo/pom.xml (original)
+++ tuscany/java/sca/samples/customer-dojo/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/databinding-echo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/databinding-echo/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/databinding-echo/pom.xml (original)
+++ tuscany/java/sca/samples/databinding-echo/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/domain-management/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/domain-management/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/domain-management/pom.xml (original)
+++ tuscany/java/sca/samples/domain-management/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/feed-aggregator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml (original)
+++ tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/feed-aggregator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/feed-aggregator/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/feed-aggregator/pom.xml (original)
+++ tuscany/java/sca/samples/feed-aggregator/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-bpel/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-bpel/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-bpel/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-distributed/helloworld-webapp/build.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-distributed/helloworld-webapp/build.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-distributed/helloworld-webapp/build.xml (original)
+++ tuscany/java/sca/samples/helloworld-distributed/helloworld-webapp/build.xml Thu Sep 18 23:38:53 2008
@@ -30,7 +30,6 @@
</javac>
<copy todir="target/classes">
<fileset dir="src\main\resources"/>
- <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
</copy>
<war destfile="target/sample-helloworld-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
<fileset dir="src/main/webapp"/>
@@ -112,7 +111,7 @@
<include name="geronimo-j2ee-management_1.0_spec-1.0.jar"/>
<include name="geronimo-jms_1.1_spec-1.1.1.jar"/>
<include name="jaxb-api-2.1.jar"/>
- <include name="jaxb-impl-2.1.3.jar"/>
+ <include name="jaxb-impl-2.1.7.jar"/>
<include name="jaxen-1.1-beta-9.jar"/>
<include name="jaxws-api-2.1.jar"/>
<include name="jsr181-api-1.0-MR1.jar"/>
Modified: tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-reference-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-reference-jms/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-reference-jms/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-service-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-service-jms/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-service-jms/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-service-jms/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-ws-reference-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-ws-reference-lean/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-ws-reference-lean/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-ws-reference-lean/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-ws-reference-lean/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-ws-reference-secure/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-ws-reference-secure/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-ws-reference-secure/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-ws-reference-secure/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-ws-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-ws-reference/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-ws-reference/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-ws-reference/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-ws-sdo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-ws-sdo/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-ws-sdo/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-ws-sdo/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-ws-service-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-ws-service-jms/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-ws-service-jms/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-ws-service-jms/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-ws-service-secure/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-ws-service-secure/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-ws-service-secure/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-ws-service-secure/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/helloworld-ws-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-ws-service/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-ws-service/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-ws-service/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/implementation-composite/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/implementation-composite/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/implementation-composite/pom.xml (original)
+++ tuscany/java/sca/samples/implementation-composite/pom.xml Thu Sep 18 23:38:53 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/java/sca/samples/implementation-crud-extension/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/implementation-crud-extension/pom.xml?rev=696937&r1=696936&r2=696937&view=diff
==============================================================================
--- tuscany/java/sca/samples/implementation-crud-extension/pom.xml (original)
+++ tuscany/java/sca/samples/implementation-crud-extension/pom.xml Thu Sep 18 23:38:53 2008
@@ -64,7 +64,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>