diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-26 23:44:59 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-26 23:44:59 +0000 |
commit | 71a7cba384b8ae7f4578fb9ab1f725d5ce616074 (patch) | |
tree | 98bbc7c066d037a8d9ea1fea7a3ccfa64419ab11 /branches/sca-java-1.x/itest | |
parent | 01a38d872dc2692d2a31f07f9c8f8098aa078853 (diff) |
Merge all changes from 1.5.2 branch into trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/itest')
13 files changed, 11 insertions, 45 deletions
diff --git a/branches/sca-java-1.x/itest/atom/pom.xml b/branches/sca-java-1.x/itest/atom/pom.xml index 3047c3d208..44e6d8dc30 100644 --- a/branches/sca-java-1.x/itest/atom/pom.xml +++ b/branches/sca-java-1.x/itest/atom/pom.xml @@ -23,7 +23,7 @@ <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-itest</artifactId> <version>1.6-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>itest-atom</artifactId> <name>Apache Tuscany SCA iTest Atom Binding</name> @@ -150,7 +150,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxws-maven-plugin</artifactId> - <version>1.9</version> + <version>1.12</version> <!-- Explicitly add the transitive dependencies for jaxws-api http://jira.codehaus.org/browse/MEV-498 --> diff --git a/branches/sca-java-1.x/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java b/branches/sca-java-1.x/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java index 9e1b9bdcec..b9f2b4e2fc 100644 --- a/branches/sca-java-1.x/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java +++ b/branches/sca-java-1.x/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java @@ -19,7 +19,6 @@ package test.abdera; import java.net.Socket; -import java.util.List; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.AfterClass; diff --git a/branches/sca-java-1.x/itest/corba/pom.xml b/branches/sca-java-1.x/itest/corba/pom.xml index bdb17e791a..6079e77a2d 100644 --- a/branches/sca-java-1.x/itest/corba/pom.xml +++ b/branches/sca-java-1.x/itest/corba/pom.xml @@ -106,7 +106,6 @@ <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-databinding-sdo</artifactId> <version>1.6-SNAPSHOT</version> - <scope>compile</scope> </dependency> <dependency> diff --git a/branches/sca-java-1.x/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java b/branches/sca-java-1.x/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java index 3d2b89f213..5b74c5584e 100644 --- a/branches/sca-java-1.x/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java +++ b/branches/sca-java-1.x/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java @@ -20,7 +20,6 @@ package itest; import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -42,14 +41,7 @@ public class LicenseTestCase extends TestCase { public void testCreateComponent() throws ZipException, IOException {
File archive = new File("..\\..\\distribution\\target\\apache-tuscany-sca-1.6-SNAPSHOT.zip");
- ZipFile zf = null;
-
- try {
- zf = new ZipFile(archive);
- } catch (FileNotFoundException e) {
- return; // archive has not been built yet
- }
-
+ ZipFile zf = new ZipFile(archive);
try {
String licenstText = getLicenseText(zf);
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/pom.xml b/branches/sca-java-1.x/itest/domainmgr/error/pom.xml index 37573c2156..5ff39c4289 100644 --- a/branches/sca-java-1.x/itest/domainmgr/error/pom.xml +++ b/branches/sca-java-1.x/itest/domainmgr/error/pom.xml @@ -28,18 +28,6 @@ <artifactId>itest-domainmgr-error</artifactId> <name>Apache Tuscany SCA iTest Domain Manager Error Handling</name> - <repositories> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 2.x Repository</name> - <url>http://download.java.net/maven/2</url> - <layout>legacy</layout> - </repository> - </repositories> - <packaging>pom</packaging> <build> <defaultGoal>install</defaultGoal> diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java index f4ba59e61b..e38f9104c0 100644 --- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java +++ b/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java @@ -45,10 +45,10 @@ public class PropertiesTestCase { client.aClientMethod();
- // wait for up to 5 seconds but should wake up as soon as done
+ // wait for up to 10 seconds but should wake up as soon as done
synchronized(MsgServiceImpl.lock) {
if (MsgServiceImpl.msg == null) {
- MsgServiceImpl.lock.wait(5000);
+ MsgServiceImpl.lock.wait(10000);
}
}
assertNotNull(MsgServiceImpl.msg);
@@ -66,10 +66,10 @@ public class PropertiesTestCase { client.op2();
- // wait for up to 5 seconds but should wake up as soon as done
+ // wait for up to 10 seconds but should wake up as soon as done
synchronized(MsgServiceImpl.lock) {
if (MsgServiceImpl.msg == null) {
- MsgServiceImpl.lock.wait(6000);
+ MsgServiceImpl.lock.wait(10000);
}
}
assertNotNull(MsgServiceImpl.msg);
diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml b/branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml index c78a7e47d8..5bedabfb5b 100644 --- a/branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml +++ b/branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml @@ -100,6 +100,7 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.5</version> + <scope>test</scope> </dependency> <dependency> @@ -108,5 +109,6 @@ <version>1.6.1</version> <scope>test</scope> </dependency> + </dependencies> </project> diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/definitions.xml b/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/definitions.xml index 455ca2f917..dbdf0cd263 100644 --- a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/definitions.xml +++ b/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/definitions.xml @@ -31,10 +31,6 @@ <tuscany:userName>myname</tuscany:userName> <tuscany:password>mypassword</tuscany:password> </tuscany:basicAuthentication> - <tuscany:basicAuthentication> - <tuscany:userName>myname1</tuscany:userName> - <tuscany:password>mypassword1</tuscany:password> - </tuscany:basicAuthentication> </sca:policySet> <sca:policySet name="ImplementationIdentityPolicySet" diff --git a/branches/sca-java-1.x/itest/pom.xml b/branches/sca-java-1.x/itest/pom.xml index b97ae53ffc..14312bfade 100644 --- a/branches/sca-java-1.x/itest/pom.xml +++ b/branches/sca-java-1.x/itest/pom.xml @@ -79,8 +79,7 @@ <!-- <module>contribution-classloader</module> --> - <module>contribution-jee-samples</module> - <!--TUSCANY-3165 + <!-- TUSCANY-3165 - waiting for OpenEJB 3.0.2 release <module>contribution-jee</module> --> <module>contribution-jee-samples</module> @@ -88,7 +87,6 @@ <module>corba</module> <module>conversations-ws</module> <module>databindings</module> - <module>distro-license-check</module> <!--module>domain</module--> <module>domainmgr</module> <module>exceptions</module> @@ -115,7 +113,6 @@ <module>jms-nulls</module> <module>jms-selectors</module> <module>jms-ttl</module> - <module>large-sdo-ws</module> <module>late-reference-resolution</module> <module>oneway</module> <module>operation-overloading</module> @@ -216,7 +213,6 @@ <module>interfaces</module> <module>wires</module> <module>scopes</module> - <module>large-sdo-ws</module> </modules> diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java b/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java index 19d62685b9..a0c7c899ec 100644 --- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java +++ b/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java @@ -34,8 +34,6 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; import org.apache.tuscany.sca.monitor.impl.ProblemImpl; -import org.apache.tuscany.sca.xsd.XSDFactory; -import org.apache.tuscany.sca.xsd.XSDefinition; /** * An ArtifactProcessor for XYZ documents. @@ -44,12 +42,10 @@ import org.apache.tuscany.sca.xsd.XSDefinition; */ public class XYZProcessor implements URLArtifactProcessor<XYZ> { - private XSDFactory factory; private XMLInputFactory inputFactory; private Monitor monitor; public XYZProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) { - this.factory = modelFactories.getFactory(XSDFactory.class); this.inputFactory = modelFactories.getFactory(XMLInputFactory.class); this.monitor = monitor; } diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl b/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl index 1aa32179e6..90eeae3c8a 100644 --- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl +++ b/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl @@ -26,7 +26,7 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
name="helloworld">
- <wsdl:import namespace="http://helloworld3" location="../../helloworld-import.wsdl"/>
+ <wsdl:import namespace="http://helloworld3" location="../../helloworld-import.wsdl" />
<wsdl:binding name="HelloWorldSoapBinding" type="tns3:HelloWorld">
<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite b/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite index ff25a32e6a..1af51162ac 100644 --- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite +++ b/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite @@ -24,7 +24,6 @@ <component name="HelloWorldServiceComponent">
<service name="HelloWorldService">
- <!--<interface.wsdl interface="http://helloworld3#wsdl.interface(HelloWorld)" />-->
<interface.java interface="helloworld.HelloWorldService"/>
<binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />
</service>
diff --git a/branches/sca-java-1.x/itest/wsdlgen/pom.xml b/branches/sca-java-1.x/itest/wsdlgen/pom.xml index 0a2a280e62..cf06761947 100644 --- a/branches/sca-java-1.x/itest/wsdlgen/pom.xml +++ b/branches/sca-java-1.x/itest/wsdlgen/pom.xml @@ -107,7 +107,6 @@ </configuration> </plugin> </plugins> - </build> </project> |