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 2007/10/24 06:31:01 UTC
svn commit: r587778 [2/13] - in /incubator/tuscany/branches/sca-java-1.0.1:
./ distribution/ distribution/bundle/ distribution/manifest/
distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/
distribution/webapp/src/main/resources/_node/ dist...
Modified: incubator/tuscany/branches/sca-java-1.0.1/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/distribution/bundle/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/distribution/bundle/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/distribution/bundle/pom.xml Tue Oct 23 21:30:02 2007
@@ -315,37 +315,37 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-policy</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-policy-security</artifactId>
+ <artifactId>tuscany-policy</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-policy-xml</artifactId>
+ <artifactId>tuscany-policy-logging</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-definitions</artifactId>
+ <artifactId>tuscany-policy-security</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-topology</artifactId>
+ <artifactId>tuscany-policy-xml</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-topology-xml</artifactId>
+ <artifactId>tuscany-definitions</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
@@ -374,13 +374,6 @@
<artifactId>wstx-asl</artifactId>
</exclusion>
</exclusions>
- <exclusions>
- <exclusion>
- <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
@@ -404,7 +397,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>shade-maven-plugin</artifactId>
- <version>1.0-alpha-7</version>
+ <version>1.0-alpha-12</version>
<executions>
<execution>
<phase>package</phase>
Modified: incubator/tuscany/branches/sca-java-1.0.1/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/distribution/manifest/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/distribution/manifest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/distribution/manifest/pom.xml Tue Oct 23 21:30:02 2007
@@ -177,6 +177,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-domain-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-domain-impl</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -308,37 +313,37 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-policy</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-policy-security</artifactId>
+ <artifactId>tuscany-policy</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-policy-xml</artifactId>
+ <artifactId>tuscany-policy-logging</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-definitions</artifactId>
+ <artifactId>tuscany-policy-security</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-topology</artifactId>
+ <artifactId>tuscany-policy-xml</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-topology-xml</artifactId>
+ <artifactId>tuscany-definitions</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
@@ -360,13 +365,6 @@
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.0-incubating</version>
- <exclusions>
- <exclusion>
- <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- </exclusions>
<exclusions>
<exclusion>
<!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
Modified: incubator/tuscany/branches/sca-java-1.0.1/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/distribution/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/distribution/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/distribution/pom.xml Tue Oct 23 21:30:02 2007
@@ -101,18 +101,6 @@
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
- <exclusions>
- <exclusion>
- <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
Modified: incubator/tuscany/branches/sca-java-1.0.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java Tue Oct 23 21:30:02 2007
@@ -40,7 +40,10 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.contribution.service.ContributionException;
import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.node.impl.ContributionManagerImpl;
+import org.apache.tuscany.sca.domain.SCADomain;
+import org.apache.tuscany.sca.node.NodeException;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
import org.apache.tuscany.sca.node.impl.SCANodeImpl;
/**
@@ -53,7 +56,8 @@
public class WarContextListener implements ServletContextListener {
private final static Logger logger = Logger.getLogger(WarContextListener.class.getName());
- protected SCANodeImpl node;
+ protected SCANode node;
+ protected SCADomain domain;
protected AddableURLClassLoader classLoader;
protected File repository;
@@ -65,7 +69,6 @@
protected HashMap<URL, Long> existingContributions; // value is last modified time
private String domainName;
-
private String nodeName;
protected static final String NODE_ATTRIBUTE = WarContextListener.class.getName() + ".TuscanyNode";
@@ -104,31 +107,35 @@
protected void initNode() throws ContributionException, ActivationException, IOException,
CompositeBuilderException, URISyntaxException {
- logger.log(Level.INFO, "SCA node starting");
-
- classLoader = new AddableURLClassLoader(new URL[] {}, Thread.currentThread().getContextClassLoader());
- Thread.currentThread().setContextClassLoader(classLoader);
- node = new SCANodeImpl(domainName, nodeName, classLoader);
- node.start();
-
- existingContributions = new HashMap<URL, Long>();
- URL[] contributions = getContributionJarURLs(repository);
- for (URL contribution : contributions) {
- try {
- addContribution(contribution);
- } catch (Throwable e) {
- e.printStackTrace();
- logger.log(Level.WARNING, "Exception adding contribution: " + e);
+ try {
+ logger.log(Level.INFO, "SCA node starting");
+
+ classLoader = new AddableURLClassLoader(new URL[] {}, Thread.currentThread().getContextClassLoader());
+ Thread.currentThread().setContextClassLoader(classLoader);
+
+ SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ node = nodeFactory.createSCANode(nodeName, domainName);
+ domain = node.getDomain();
+
+
+ existingContributions = new HashMap<URL, Long>();
+ URL[] contributions = getContributionJarURLs(repository);
+ for (URL contribution : contributions) {
+ addContribution(contribution);
}
+
+ node.start();
+
+ initHotDeploy(repository);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ logger.log(Level.WARNING, "Exception adding contribution: " + e);
}
-
- initHotDeploy(repository);
-
}
- protected void addContribution(URL contribution) throws CompositeBuilderException, ContributionException, IOException, ActivationException, URISyntaxException {
+ protected void addContribution(URL contribution) throws URISyntaxException, NodeException {
classLoader.addURL(contribution);
- ((ContributionManagerImpl)node.getContributionManager()).addContribution(contribution);
+ node.addContribution(contribution.toString(), contribution);
existingContributions.put(contribution, new Long(new File(contribution.toURI()).lastModified()));
logger.log(Level.INFO, "Added contribution: " + contribution);
}
@@ -260,13 +267,13 @@
if (servletContext.getInitParameter("domainName") != null) {
domainName = servletContext.getInitParameter("domainName");
} else {
- domainName = SCANodeImpl.LOCAL_DOMAIN_URI;
+ domainName = null;
}
if (servletContext.getInitParameter("nodeName") != null) {
nodeName = servletContext.getInitParameter("nodeName");
} else {
- nodeName = SCANodeImpl.LOCAL_NODE_URI;
+ nodeName = "DefaultNode";
}
if (servletContext.getInitParameter("hotDeployInterval") != null) {
Modified: incubator/tuscany/branches/sca-java-1.0.1/distribution/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/distribution/webapp/src/main/webapp/WEB-INF/web.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/distribution/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/distribution/webapp/src/main/webapp/WEB-INF/web.xml Tue Oct 23 21:30:02 2007
@@ -30,11 +30,11 @@
<context-param>
<param-name>domainName</param-name>
- <param-value>http://localhost:8080/</param-value>
+ <param-value>http://localhost:8877/</param-value>
</context-param>
<context-param>
<param-name>nodeName</param-name>
- <param-value>http://localhost:8081/</param-value>
+ <param-value>http://localhost:8080/</param-value>
</context-param>
<context-param>
<param-name>hotDeployInterval</param-name>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java Tue Oct 23 21:30:02 2007
@@ -21,13 +21,16 @@
import static junit.framework.Assert.assertEquals;
+import javax.xml.namespace.QName;
+
import junit.framework.Assert;
import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.node.impl.SCANodeImpl;
-import org.apache.tuscany.sca.node.impl.SCANodeUtil;
+import org.apache.tuscany.sca.domain.SCADomainFactory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -39,11 +42,11 @@
*/
public class CallableReferenceRemoteTestCase {
- private static String DEFAULT_DOMAIN_URL = "http://localhost:8877";
+ private static String DEFAULT_DOMAIN_URI = "http://localhost:8877";
private static SCADomain domain;
- private static SCADomain domainNodeA;
- private static SCADomain domainNodeB;
+ private static SCANode nodeA;
+ private static SCANode nodeB;
private static AComponent acomponent;
@@ -51,23 +54,27 @@
public static void init() throws Exception {
try {
- System.out.println("Setting up distributed registry");
- domain = SCADomain.newInstance("domain.composite");
+ System.out.println("Setting up domain");
+ SCADomainFactory domainFactory = SCADomainFactory.newInstance();
+ domain= domainFactory.createSCADomain(DEFAULT_DOMAIN_URI);
- System.out.println("Setting up distributed nodes");
-
- // create the node that runs the
- // calculator component
- domainNodeA = SCADomain.newInstance(DEFAULT_DOMAIN_URL, "nodeA", null, "nodeA/CompositeA.composite");
-
- // create the node that runs the
- // add component
- domainNodeB = SCADomain.newInstance(DEFAULT_DOMAIN_URL, "nodeB", null, "nodeB/CompositeB.composite");
-
+ System.out.println("Setting up nodes");
+
+ ClassLoader cl = CallableReferenceRemoteTestCase.class.getClassLoader();
+
+ SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+
+ nodeA = nodeFactory.createSCANode("nodeA", DEFAULT_DOMAIN_URI);
+ nodeA.addContribution("nodeA", cl.getResource("nodeA/"));
+ nodeA.start();
+
+ nodeB = nodeFactory.createSCANode("nodeB", DEFAULT_DOMAIN_URI);
+ nodeB.addContribution("nodeB", cl.getResource("nodeB/"));
+ nodeB.start();
// get a reference to the calculator service from domainA
// which will be running this component
- acomponent = domainNodeA.getService(AComponent.class, "AComponent/AComponent");
+ acomponent = nodeA.getDomain().getService(AComponent.class, "AComponent/AComponent");
} catch (Exception ex) {
System.out.println(ex.toString());
}
@@ -76,9 +83,8 @@
@AfterClass
public static void destroy() throws Exception {
// stop the nodes and hence the domains they contain
- domainNodeA.close();
- domainNodeB.close();
- domain.close();
+ nodeA.stop();
+ nodeB.stop();
}
@Test
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorClient.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorClient.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorClient.java Tue Oct 23 21:30:02 2007
@@ -31,7 +31,7 @@
SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
CalculatorService calculatorService =
- scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
+ scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
// Calculate
System.out.println("3 + 2=" + calculatorService.add(3, 2));
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java Tue Oct 23 21:30:02 2007
@@ -18,6 +18,8 @@
*/
package calculator;
+import org.osoa.sca.annotations.Reference;
+
/**
Propchange: incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-multiple/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 23 21:30:02 2007
@@ -0,0 +1,18 @@
+dojo
+work
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.felix
+
Copied: incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-multiple/pom.xml (from r587600, incubator/tuscany/java/sca/itest/contribution-multiple/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-multiple/pom.xml?p2=incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-multiple/pom.xml&p1=incubator/tuscany/java/sca/itest/contribution-multiple/pom.xml&r1=587600&r2=587778&rev=587778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-multiple/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-multiple/pom.xml Tue Oct 23 21:30:02 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-contribution-multiple</artifactId>
@@ -32,19 +32,19 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-impl</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Propchange: incubator/tuscany/branches/sca-java-1.0.1/itest/conversations-ws/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 23 21:30:02 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+work
Copied: incubator/tuscany/branches/sca-java-1.0.1/itest/conversations-ws/pom.xml (from r587600, incubator/tuscany/java/sca/itest/conversations-ws/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/conversations-ws/pom.xml?p2=incubator/tuscany/branches/sca-java-1.0.1/itest/conversations-ws/pom.xml&p1=incubator/tuscany/java/sca/itest/conversations-ws/pom.xml&r1=587600&r2=587778&rev=587778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/conversations-ws/pom.xml Tue Oct 23 21:30:02 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-conversations-ws</artifactId>
@@ -32,26 +32,26 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-tomcat</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/interop/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/interop/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/interop/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/interop/pom.xml Tue Oct 23 21:30:02 2007
@@ -143,6 +143,13 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -164,6 +171,32 @@
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>copy</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/jaxbgen/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/jaxbgen/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/jaxbgen/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/jaxbgen/pom.xml Tue Oct 23 21:30:02 2007
@@ -131,6 +131,13 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -152,6 +159,32 @@
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>copy</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/pom.xml Tue Oct 23 21:30:02 2007
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>itest-databindings</artifactId>
<name>Apache Tuscany SCA Databindings Integration Tests</name>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/pom.xml Tue Oct 23 21:30:02 2007
@@ -119,7 +119,42 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
+ </configuration>
</plugin>
<!-- Sun's JAX-WS Generation -->
<plugin>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-cross-binding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-cross-binding/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-cross-binding/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-cross-binding/pom.xml Tue Oct 23 21:30:02 2007
@@ -113,7 +113,42 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
+ </configuration>
</plugin>
<!-- JAX-WS Generation -->
<plugin>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/resources/example.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/resources/example.composite?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/resources/example.composite (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/resources/example.composite Tue Oct 23 21:30:02 2007
@@ -23,18 +23,18 @@
name="example">
<component name="ExampleClientComponent">
+ <implementation.java class="com.example.ExampleClientImpl" />
<reference name="myService">
<interface.wsdl interface="http://example.com#wsdl.interface(ExampleServicePortType)" />
<binding.ws wsdlElement="http://example.com#wsdl.port(ExampleService/ExampleServiceSOAP11port_http)" />
</reference>
- <implementation.java class="com.example.ExampleClientImpl" />
</component>
<component name="ExampleComponent">
+ <implementation.java class="com.example.ExampleServiceImpl"/>
<service name="ExampleService">
<interface.wsdl interface="http://example.com#wsdl.interface(ExampleServicePortType)" />
<binding.ws wsdlElement="http://example.com#wsdl.port(ExampleService/ExampleServiceSOAP11port_http)" />
</service>
- <implementation.java class="com.example.ExampleServiceImpl"/>
</component>
</composite>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl Tue Oct 23 21:30:02 2007
@@ -117,13 +117,13 @@
</wsdl:binding>
<wsdl:service name="ExampleService">
<wsdl:port name="ExampleServiceSOAP11port_http" binding="ns0:ExampleServiceSOAP11Binding">
- <soap:address location="http://localhost:8080/axis2/services/ExampleService"/>
+ <soap:address location="http://localhost:8085/axis2/services/ExampleService"/>
</wsdl:port>
<wsdl:port name="ExampleServiceSOAP12port_http" binding="ns0:ExampleServiceSOAP12Binding">
- <soap12:address location="http://localhost:8080/axis2/services/ExampleService"/>
+ <soap12:address location="http://localhost:8085/axis2/services/ExampleService"/>
</wsdl:port>
<wsdl:port name="ExampleServiceHttpport" binding="ns0:ExampleServiceHttpBinding">
- <http:address location="http://localhost:8080/axis2/services/ExampleService"/>
+ <http:address location="http://localhost:8085/axis2/services/ExampleService"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Propchange: incubator/tuscany/branches/sca-java-1.0.1/itest/oneway/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 23 21:30:02 2007
@@ -0,0 +1,13 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
Copied: incubator/tuscany/branches/sca-java-1.0.1/itest/oneway/build.xml (from r587600, incubator/tuscany/java/sca/itest/oneway/build.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/oneway/build.xml?p2=incubator/tuscany/branches/sca-java-1.0.1/itest/oneway/build.xml&p1=incubator/tuscany/java/sca/itest/oneway/build.xml&r1=587600&r2=587778&rev=587778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/oneway/build.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/oneway/build.xml Tue Oct 23 21:30:02 2007
@@ -22,96 +22,96 @@
<path id="repo.classpath">
<pathelement location="target/classes"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.1-incubating-SNAPSHOT\tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.1-incubating-SNAPSHOT\tuscany-host-http-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.1-incubating-SNAPSHOT\tuscany-binding-ws-axis2-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.1-incubating-SNAPSHOT\tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.0.1-incubating-SNAPSHOT\tuscany-core-spi-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.0.1-incubating-SNAPSHOT\tuscany-host-http-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-axis2-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.0.1-incubating-SNAPSHOT\tuscany-policy-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>
<pathelement location="${m2.repo}\org\mortbay\jetty\jetty-util\6.1.3\jetty-util-6.1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.1-incubating-SNAPSHOT\tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.0.1-incubating-SNAPSHOT\tuscany-implementation-java-runtime-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>
<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
<pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>
<pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.1-incubating-SNAPSHOT\tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.0.1-incubating-SNAPSHOT\tuscany-contribution-namespace-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\jdom\jdom\1.0\jdom-1.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\1.1-incubating-SNAPSHOT\tuscany-assembly-xsd-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.1-incubating-SNAPSHOT\tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\1.0.1-incubating-SNAPSHOT\tuscany-assembly-xsd-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.0.1-incubating-SNAPSHOT\tuscany-assembly-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.1-incubating-SNAPSHOT\tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.0.1-incubating-SNAPSHOT\tuscany-core-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar"/>
<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.1-incubating-SNAPSHOT\tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.0.1-incubating-SNAPSHOT\tuscany-policy-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.1-incubating-SNAPSHOT\tuscany-sca-api-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.0.1-incubating-SNAPSHOT\tuscany-sca-api-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>
<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/>
<pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>
<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.1-incubating-SNAPSHOT\tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.0.1-incubating-SNAPSHOT\tuscany-contribution-java-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.1-incubating-SNAPSHOT\tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.0.1-incubating-SNAPSHOT\tuscany-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.1-incubating-SNAPSHOT\tuscany-binding-ws-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
<pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>
<pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.1-incubating-SNAPSHOT\tuscany-policy-security-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.1-incubating-SNAPSHOT\tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.0.1-incubating-SNAPSHOT\tuscany-policy-security-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.0.1-incubating-SNAPSHOT\tuscany-assembly-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.1-incubating-SNAPSHOT\tuscany-domain-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.0.1-incubating-SNAPSHOT\tuscany-domain-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.1-incubating-SNAPSHOT\tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.0.1-incubating-SNAPSHOT\tuscany-interface-java-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.1-incubating-SNAPSHOT\tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.1-incubating-SNAPSHOT\tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.0.1-incubating-SNAPSHOT\tuscany-contribution-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.0.1-incubating-SNAPSHOT\tuscany-implementation-java-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/>
<pathelement location="${m2.repo}\com\ibm\icu\icu4j\2.6.1\icu4j-2.6.1.jar"/>
<pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\1.1-incubating-SNAPSHOT\tuscany-domain-api-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.1-incubating-SNAPSHOT\tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\1.0.1-incubating-SNAPSHOT\tuscany-domain-api-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\xom\xom\1.0\xom-1.0.jar"/>
<pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\1.1-incubating-SNAPSHOT\tuscany-host-jetty-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\1.0.1-incubating-SNAPSHOT\tuscany-host-jetty-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/>
<pathelement location="${m2.repo}\junit\junit\4.2\junit-4.2.jar"/>
<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.1-incubating-SNAPSHOT\tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.1-incubating-SNAPSHOT\tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.0.1-incubating-SNAPSHOT\tuscany-implementation-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.1-incubating-SNAPSHOT\tuscany-interface-wsdl-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.1-incubating-SNAPSHOT\tuscany-binding-ws-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.0.1-incubating-SNAPSHOT\tuscany-interface-wsdl-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
<pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.1-incubating-SNAPSHOT\tuscany-databinding-axiom-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.0.1-incubating-SNAPSHOT\tuscany-databinding-axiom-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\mortbay\jetty\jetty\6.1.3\jetty-6.1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/>
<pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.1-incubating-SNAPSHOT\tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.1-incubating-SNAPSHOT\tuscany-interface-wsdl-xml-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.1-incubating-SNAPSHOT\tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.1-incubating-SNAPSHOT\tuscany-node-1.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.1-incubating-SNAPSHOT\tuscany-definitions-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.0.1-incubating-SNAPSHOT\tuscany-core-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.0.1-incubating-SNAPSHOT\tuscany-interface-wsdl-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.0.1-incubating-SNAPSHOT\tuscany-contribution-impl-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.0.1-incubating-SNAPSHOT\tuscany-node-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.0.1-incubating-SNAPSHOT\tuscany-definitions-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>
<pathelement location="${m2.repo}\jaxen\jaxen\1.1.1\jaxen-1.1.1.jar"/>
<pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.1-incubating-SNAPSHOT\tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.0.1-incubating-SNAPSHOT\tuscany-host-embedded-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/>
<pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>
<pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-codegen\1.3\axis2-codegen-1.3.jar"/>
<pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>
<pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.1-incubating-SNAPSHOT\tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.0.1-incubating-SNAPSHOT\tuscany-interface-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/>
<pathelement location="${m2.repo}\xerces\xmlParserAPIs\2.6.2\xmlParserAPIs-2.6.2.jar"/>
<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.1-incubating-SNAPSHOT\tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.0.1-incubating-SNAPSHOT\tuscany-interface-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\easymock\easymock\2.2\easymock-2.2.jar"/>
</path>
Copied: incubator/tuscany/branches/sca-java-1.0.1/itest/oneway/pom.xml (from r587600, incubator/tuscany/java/sca/itest/oneway/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/oneway/pom.xml?p2=incubator/tuscany/branches/sca-java-1.0.1/itest/oneway/pom.xml&p1=incubator/tuscany/java/sca/itest/oneway/pom.xml&r1=587600&r2=587778&rev=587778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/oneway/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/oneway/pom.xml Tue Oct 23 21:30:02 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-oneway</artifactId>
@@ -32,25 +32,25 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java Tue Oct 23 21:30:02 2007
@@ -31,7 +31,9 @@
*/
public class JavaCallbackClientImpl implements CallbackClient, CallbackCallback {
+ @Reference
protected CallbackService callbackService;
+
private static String returnMessage = null;
private static int callbackCount = 0;
private static Object monitor = new Object();
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java Tue Oct 23 21:30:02 2007
@@ -24,7 +24,6 @@
import org.osoa.sca.annotations.ConversationAttributes;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
@@ -80,7 +79,7 @@
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
- serviceReference.getConversation().end();
+ // serviceReference.getConversation().end();
return clientCount;
}
@@ -97,7 +96,7 @@
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
- serviceReference.getConversation().end();
+ // serviceReference.getConversation().end();
return clientCount;
}
@@ -240,6 +239,7 @@
public String endConversation(){
calls.append("endConversation,");
+ callbackCount = 0;
return null;
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java Tue Oct 23 21:30:02 2007
@@ -78,7 +78,7 @@
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
- serviceReference.getConversation().end();
+ // serviceReference.getConversation().end();
return clientCount;
}
@@ -93,7 +93,7 @@
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
- serviceReference.getConversation().end();
+ // serviceReference.getConversation().end();
return clientCount;
}
@@ -141,7 +141,7 @@
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
- serviceReference.getConversation().end();
+ // serviceReference.getConversation().end();
return clientCount;
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java Tue Oct 23 21:30:02 2007
@@ -19,6 +19,7 @@
package conversation.referenceclient;
import org.osoa.sca.CallableReference;
+import org.osoa.sca.annotations.AllowsPassByReference;
import org.osoa.sca.annotations.Service;
import conversation.service.ConversationalService;
@@ -31,6 +32,7 @@
*/
@Service(interfaces={ConversationalReferenceClient.class})
+@AllowsPassByReference
public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{
public void incrementCount(CallableReference<ConversationalService> conversationalService){
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl Tue Oct 23 21:30:02 2007
@@ -73,7 +73,7 @@
<wsdl:service name="HelloWorldService">
<wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8080/services/HelloWorldWebService"/>
+ <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java Tue Oct 23 21:30:02 2007
@@ -23,7 +23,7 @@
public class Callback1TestCase extends CallbackTestCase {
public Callback1TestCase() {
- super("callback/callback-test1.composite");
+ super("callback-test1.composite");
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java Tue Oct 23 21:30:02 2007
@@ -20,10 +20,10 @@
package callback;
-public abstract class Callback2TestCase extends CallbackTestCase {
+public class Callback2TestCase extends CallbackTestCase {
public Callback2TestCase() {
- super("callback/callback-test2.composite");
+ super("callback-test2.composite");
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java Tue Oct 23 21:30:02 2007
@@ -23,7 +23,7 @@
public class Callback3TestCase extends CallbackTestCase {
public Callback3TestCase() {
- super("callback/callback-test3.composite");
+ super("callback-test3.composite");
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java Tue Oct 23 21:30:02 2007
@@ -19,43 +19,30 @@
package callback;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
import callback.client.CallbackClient;
-import util.OSGiTestUtil;
+import test.OSGiTestCase;
-public abstract class CallbackTestCase extends TestCase {
+public abstract class CallbackTestCase extends OSGiTestCase {
- private SCADomain scaDomain;
private CallbackClient aCallbackClient;
protected String compositeName;
public CallbackTestCase(String compositeName) {
- super();
- this.compositeName = compositeName;
+ super(compositeName, "callback");
}
protected void setUp() throws Exception {
- OSGiTestUtil.setUpOSGiTestRuntime();
-
- scaDomain = SCADomain.newInstance(compositeName);
+ super.setUp();
aCallbackClient = scaDomain.getService(CallbackClient.class, "CallbackClient");
}
- protected void tearDown() throws Exception {
- scaDomain.close();
-
- OSGiTestUtil.shutdownOSGiRuntime();
- }
-
public void test() throws Exception {
aCallbackClient.run();
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java Tue Oct 23 21:30:02 2007
@@ -21,42 +21,41 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import conversation.client.ConversationalClient;
-import util.OSGiTestUtil;
+import test.OSGiTestCase;
-public abstract class ConversationTestCase {
+public class ConversationTestCase extends OSGiTestCase {
- private SCADomain domain;
private ConversationalClient conversationalStatelessClientStatelessService;
private ConversationalClient conversationalStatelessClientStatefulService;
private ConversationalClient conversationalStatefulClientStatelessService;
- private ConversationalClient conversationalStatefulClientStatefulService;
+ private ConversationalClient conversationalStatefulClientStatefulService;
+
+ public ConversationTestCase() {
+ super("conversation-test.composite", "conversation");
+ }
@Before
public void setUp() throws Exception {
try {
- OSGiTestUtil.setUpOSGiTestRuntime();
-
- domain = SCADomain.newInstance("conversation/conversation-test.composite");
+ super.setUp();
- conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,
+ conversationalStatelessClientStatelessService = scaDomain.getService(ConversationalClient.class,
"ConversationalStatelessClientStatelessService/ConversationalClient");
- conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class,
+ conversationalStatelessClientStatefulService = scaDomain.getService(ConversationalClient.class,
"ConversationalStatelessClientStatefulService/ConversationalClient");
- conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class,
+ conversationalStatefulClientStatelessService = scaDomain.getService(ConversationalClient.class,
"ConversationalStatefulClientStatelessService/ConversationalClient");
- conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class,
+ conversationalStatefulClientStatefulService = scaDomain.getService(ConversationalClient.class,
"ConversationalStatefulClientStatefulService/ConversationalClient");
@@ -69,14 +68,7 @@
}
- @After
- public void tearDown() throws Exception {
- domain.close();
-
-
- OSGiTestUtil.shutdownOSGiRuntime();
- }
-
+
// stateless client stateful service tests
// =======================================
@Test
@@ -121,7 +113,7 @@
}
/////@Test
- public void testStatelessStatefulConversationHavingPassedReference() {
+ public void _testStatelessStatefulConversationHavingPassedReference() {
int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference();
Assert.assertEquals(3, count);
}
@@ -191,7 +183,7 @@
conversationalStatelessClientStatelessService.getCalls());
}
/////@Test
- public void testStatelessStatelessConversationHavingPassedReference() {
+ public void _testStatelessStatelessConversationHavingPassedReference() {
int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference();
Assert.assertEquals(3, count);
}
@@ -244,6 +236,7 @@
@Test
public void testStatefulStatefulConversationWithCallback() {
int count = conversationalStatefulClientStatefulService.runConversationWithCallback();
+ //System.out.println("Calls: " + conversationalStatefulClientStatefulService.getCalls());
Assert.assertEquals(4, count);
Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,init,",
@@ -251,7 +244,7 @@
}
/////@Test
- public void testStatefulStatefulConversationHavingPassedReference() {
+ public void _testStatefulStatefulConversationHavingPassedReference() {
int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference();
Assert.assertEquals(3, count);
}
@@ -312,7 +305,7 @@
}
/////@Test
- public void testStatefulStatelessConversationHavingPassedReference() {
+ public void _testStatefulStatelessConversationHavingPassedReference() {
int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference();
Assert.assertEquals(3, count);
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java Tue Oct 23 21:30:02 2007
@@ -20,25 +20,23 @@
package helloworld.passbyref;
import helloworld.Greetings;
-import junit.framework.TestCase;
+import test.OSGiTestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import util.OSGiTestUtil;
+public class PassByRefTestCase extends OSGiTestCase {
-
-public abstract class PassByRefTestCase extends TestCase {
-
- private SCADomain scaDomain;
private Greetings greetingsJava;
private Greetings greetingsOSGi;
private String[] origNames = {"world"};
private String[] names;
+
+ public PassByRefTestCase() {
+ super("passbyref-test.composite", "passbyref");
+ }
protected void setUp() throws Exception {
- OSGiTestUtil.setUpOSGiTestRuntime();
-
- scaDomain = SCADomain.newInstance("passbyref/passbyref-test.composite");
+
+ super.setUp();
greetingsJava = scaDomain.getService(Greetings.class, "JavaGreetingsComponent");
greetingsOSGi = scaDomain.getService(Greetings.class, "OSGiGreetingsComponent");
@@ -46,10 +44,6 @@
System.arraycopy(origNames, 0, names, 0, names.length);
}
- protected void tearDown() throws Exception {
- scaDomain.close();
- OSGiTestUtil.shutdownOSGiRuntime();
- }
public void test() throws Exception {
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java Tue Oct 23 21:30:02 2007
@@ -20,22 +20,22 @@
package helloworld.ws;
import helloworld.HelloWorld;
-import junit.framework.TestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import test.OSGiTestCase;
import util.OSGiTestUtil;
-public class HelloWorldTestCase extends TestCase {
+public class HelloWorldTestCase extends OSGiTestCase {
- private SCADomain scaDomain;
private HelloWorld helloWorld;
+
+ public HelloWorldTestCase() {
+ super("ws-helloworld.composite", "ws");
+ }
protected void setUp() throws Exception {
- OSGiTestUtil.setUpOSGiTestRuntime();
-
- scaDomain = SCADomain.newInstance("ws/ws-helloworld.composite");
+ super.setUp();
helloWorld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent");
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java Tue Oct 23 21:30:02 2007
@@ -18,44 +18,28 @@
*/
package supplychain;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-
import supplychain.customer.Customer;
-import util.OSGiTestUtil;
+import test.OSGiTestCase;
/**
* Test case for supplychain - it is invoked with different composite files to test
* various scenarios.
*/
-public abstract class SupplyChainTestCase extends TestCase {
+public abstract class SupplyChainTestCase extends OSGiTestCase {
- private String compositeName;
- private SCADomain scaDomain;
public Customer customer;
- public SupplyChainTestCase(String compositeName) {
- super();
- this.compositeName = compositeName;
+
+ public SupplyChainTestCase(String compositeName, String contributionLocation) {
+ super(compositeName, contributionLocation);
}
protected void setUp() throws Exception {
- OSGiTestUtil.setUpOSGiTestRuntime();
-
- scaDomain = SCADomain.newInstance(compositeName);
+ super.setUp();
customer = scaDomain.getService(Customer.class, "CustomerComponent");
}
- protected void tearDown() throws Exception {
- scaDomain.close();
-
- OSGiTestUtil.shutdownOSGiRuntime();
- }
-
-
public void test() throws Exception {
System.out.println("Main thread " + Thread.currentThread());
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java Tue Oct 23 21:30:02 2007
@@ -18,42 +18,31 @@
*/
package supplychain;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
import supplychain.customer.Customer;
-import util.OSGiTestUtil;
+import test.OSGiTestCase;
/**
* OSGi test program - common code for versioned bundles
*/
-public abstract class VersionedSupplyChainTestCase extends TestCase {
+public abstract class VersionedSupplyChainTestCase extends OSGiTestCase {
- private String compositeName;
- private SCADomain scaDomain;
private Customer customer1;
private Customer customer2;
- public VersionedSupplyChainTestCase(String compositeName) {
- super();
- this.compositeName = compositeName;
+ public VersionedSupplyChainTestCase(String compositeName, String contributionLocation) {
+ super(compositeName, contributionLocation);
}
protected void setUp() throws Exception {
- OSGiTestUtil.setUpOSGiTestRuntime();
-
- scaDomain = SCADomain.newInstance(compositeName);
+ super.setUp();
customer1 = scaDomain.getService(Customer.class, "CustomerComponent1");
customer2 = scaDomain.getService(Customer.class, "CustomerComponent2");
}
protected void tearDown() throws Exception {
- scaDomain.close();
-
- OSGiTestUtil.shutdownOSGiRuntime();
+ super.tearDown();
Thread.sleep(1000);
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java Tue Oct 23 21:30:02 2007
@@ -25,7 +25,7 @@
public class DSFactoryTestCase extends FactoryTestCase {
public DSFactoryTestCase() {
- super("factory/factory-ds-test.composite");
+ super("factory-ds-test.composite", "factory/ds");
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java Tue Oct 23 21:30:02 2007
@@ -26,11 +26,11 @@
public class FactoryTestCase extends SupplyChainTestCase {
public FactoryTestCase() {
- super("factory/factory-test.composite");
+ super("factory-test.composite", "factory");
}
- protected FactoryTestCase(String compositeName) {
- super(compositeName);
+ protected FactoryTestCase(String compositeName, String contributionLocation) {
+ super(compositeName, contributionLocation);
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java Tue Oct 23 21:30:02 2007
@@ -23,10 +23,10 @@
/**
* OSGi test program - declarative with components exposing multiple services with multiple interfaces
*/
-public abstract class DSInterfacesTestCase extends SupplyChainTestCase {
+public class DSInterfacesTestCase extends SupplyChainTestCase {
public DSInterfacesTestCase() {
- super("interfaces/interfaces-ds-test.composite");
+ super("interfaces-ds-test.composite", "interfaces/ds");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org