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/12/04 22:09:33 UTC
svn commit: r723439 [2/4] - in /tuscany/java/sca/itest: ./
bpel/helloworld-reference/ bpel/helloworld-ws/ builder/
builder/src/test/java/org/apache/tuscany/sca/itest/builder/
callablereferences-ws/ callablereferences/
callablereferences/src/test/java/o...
Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java Thu Dec 4 13:09:28 2008
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.test.corba.types;
-import org.apache.tuscany.sca.binding.corba.meta.CorbaArray;
+import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray;
/**
* @version $Rev$ $Date$ Scenario six structure used by Tuscany.
Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java Thu Dec 4 13:09:28 2008
@@ -19,8 +19,8 @@
package org.apache.tuscany.sca.test.corba.types;
-import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElementType;
+import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
+import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
/**
* @version $Rev$ $Date$
Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java Thu Dec 4 13:09:28 2008
@@ -19,8 +19,8 @@
package org.apache.tuscany.sca.test.corba.types;
-import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElementType;
+import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
+import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
/**
* @version $Rev$ $Date$
Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java Thu Dec 4 13:09:28 2008
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.test.corba.types;
-import org.apache.tuscany.sca.binding.corba.meta.CorbaArray;
+import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray;
/**
* @version $Rev$ $Date$
Propchange: tuscany/java/sca/itest/databindings/interop/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 4 13:09:28 2008
@@ -0,0 +1 @@
+test
Modified: tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java Thu Dec 4 13:09:28 2008
@@ -27,9 +27,9 @@
import junit.framework.Assert;
import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -39,8 +39,8 @@
*/
public class DatabindingTestCase {
- private static SCAClient client;
- private static SCANode node;
+ private static Client client;
+ private static Node node;
/**
* Runs once before running the tests
@@ -48,10 +48,13 @@
@BeforeClass
public static void setUp() throws Exception {
try {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/helloservice.composite", null);
node.start();
- client = (SCAClient)node;
+ client = (Client)node;
+ }catch(Throwable e) {
+ e.printStackTrace();
+ }
}catch(Throwable e) {
e.printStackTrace();
}
Modified: tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,9 +22,9 @@
import junit.framework.Assert;
import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -34,18 +34,18 @@
*/
public class PrimitivesDatabindingTestCase {
- private static SCAClient domain;
- private static SCANode node;
+ private static Client domain;
+ private static Node node;
/**
* Runs before each test method
*/
@BeforeClass
public static void setUp() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/primitivesservice.composite", null);
node.start();
- domain = (SCAClient)node;
+ domain = (Client)node;
}
/**
Modified: tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java Thu Dec 4 13:09:28 2008
@@ -55,9 +55,9 @@
import org.apache.tuscany.sca.databinding.xml.String2Node;
import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -69,18 +69,18 @@
*/
public class StandardTypesDatabindingTestCase {
- private static SCAClient domain;
- private static SCANode node;
+ private static Client domain;
+ private static Node node;
/**
* Runs once before the tests
*/
@BeforeClass
public static void setUp() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/standard-types-service.composite", null);
node.start();
- domain = (SCAClient)node;
+ domain = (Client)node;
}
/**
Propchange: tuscany/java/sca/itest/databindings/jaxbgen/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 4 13:09:28 2008
@@ -0,0 +1 @@
+test
Propchange: tuscany/java/sca/itest/databindings/jaxbgen/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 4 13:09:28 2008
@@ -0,0 +1 @@
+java
Propchange: tuscany/java/sca/itest/databindings/sdogen/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 4 13:09:28 2008
@@ -0,0 +1 @@
+test
Propchange: tuscany/java/sca/itest/databindings/sdogen/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 4 13:09:28 2008
@@ -0,0 +1 @@
+java
Modified: tuscany/java/sca/itest/exceptions-simple-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/exceptions-simple-ws/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/exceptions-simple-ws/pom.xml (original)
+++ tuscany/java/sca/itest/exceptions-simple-ws/pom.xml Thu Dec 4 13:09:28 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/java/sca/itest/interfaces/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/interfaces/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/interfaces/pom.xml (original)
+++ tuscany/java/sca/itest/interfaces/pom.xml Thu Dec 4 13:09:28 2008
@@ -29,17 +29,24 @@
<name>Apache Tuscany Interface Integration Tests</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/java/sca/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java (original)
+++ tuscany/java/sca/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,28 +22,33 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class InterfacesTestCase {
- private static SCADomain domain;
+ private static Node node;
@BeforeClass
public static void init() throws Exception {
- domain = SCADomain.newInstance("InterfacesTest.composite");
+ String location = ContributionLocationHelper.getContributionLocation("InterfacesTest.composite");
+ node = NodeFactory.newInstance().createNode("InterfacesTest.composite", new Contribution("c1", location));
+ node.start();
}
@AfterClass
public static void destroy() throws Exception {
- domain.close();
+ node.stop();
}
@Test
public void testLocalClient() {
- LocalServiceComponent service = domain.getService(LocalServiceComponent.class, "LocalServiceComponent");
- LocalClientComponent local = domain.getService(LocalClientComponent.class, "LocalClientComponent");
+ LocalServiceComponent service = node.getService(LocalServiceComponent.class, "LocalServiceComponent");
+ LocalClientComponent local = node.getService(LocalClientComponent.class, "LocalClientComponent");
try {
ParameterObject po = new ParameterObject();
@@ -83,8 +88,8 @@
@Test
public void testRemoteClient() {
- RemoteServiceComponent service = domain.getService(RemoteServiceComponent.class, "RemoteServiceComponent");
- RemoteClientComponent remote = domain.getService(RemoteClientComponent.class, "RemoteClientComponent");
+ RemoteServiceComponent service = node.getService(RemoteServiceComponent.class, "RemoteServiceComponent");
+ RemoteClientComponent remote = node.getService(RemoteClientComponent.class, "RemoteClientComponent");
try {
// Test Pass By Value
Modified: tuscany/java/sca/itest/interop-soap-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/interop-soap-service/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/interop-soap-service/pom.xml (original)
+++ tuscany/java/sca/itest/interop-soap-service/pom.xml Thu Dec 4 13:09:28 2008
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Propchange: tuscany/java/sca/itest/jms-selectors/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 4 13:09:28 2008
@@ -6,7 +6,6 @@
*.iml
derby.log
maven.log
-maven-eclipse.xml
build.xml
build-dependency.xml
velocity.log*
@@ -18,3 +17,4 @@
.deployables
.wtpmodules
.externalToolBuilders
+maven-eclipse.xml
Modified: tuscany/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java (original)
+++ tuscany/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,7 @@
import javax.jms.Message;
import javax.jms.Session;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
+import org.apache.tuscany.sca.binding.jms.impl.JMSBindingImpl;
import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
public class TestMessageProcessor extends XMLTextMessageProcessor {
@@ -31,7 +31,7 @@
public static boolean extractPayloadFromJMSMessageCalled;
public static boolean setOperationNameCalled;
- public TestMessageProcessor(JMSBinding jmsBinding) {
+ public TestMessageProcessor(JMSBindingImpl jmsBinding) {
super(jmsBinding);
}
public Object extractPayloadFromJMSMessage(Message message) {
Modified: tuscany/java/sca/itest/large-sdo-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/large-sdo-ws/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/large-sdo-ws/pom.xml (original)
+++ tuscany/java/sca/itest/large-sdo-ws/pom.xml Thu Dec 4 13:09:28 2008
@@ -60,7 +60,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version> <!-- to keep compatible with older servlet containers -->
+ <version>2.5</version>
<scope>test</scope>
</dependency>
@@ -73,7 +73,7 @@
</dependencies>
- <!-- Declare tuscany-host-tomcat dependency in the default profile so that it can be replaced -->
+ <!-- Declare tuscany-host-jetty dependency in the default profile so that it can be replaced -->
<profiles>
<profile>
<id>default</id>
@@ -83,7 +83,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/java/sca/itest/late-reference-resolution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/late-reference-resolution/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/late-reference-resolution/pom.xml (original)
+++ tuscany/java/sca/itest/late-reference-resolution/pom.xml Thu Dec 4 13:09:28 2008
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: tuscany/java/sca/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java (original)
+++ tuscany/java/sca/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java Thu Dec 4 13:09:28 2008
@@ -23,10 +23,10 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -38,9 +38,9 @@
*/
public class LateReferenceResolutionTestCase {
- private static SCANode nodeA;
- private static SCANode nodeB;
- private static SCANode nodeC;
+ private static Node nodeA;
+ private static Node nodeB;
+ private static Node nodeC;
private static CalculatorService calculatorService;
@@ -53,22 +53,22 @@
System.out.println("Setting up domain");
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- nodeC = nodeFactory.createSCANode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(),
- new SCAContribution("NodeC",
+ NodeFactory nodeFactory = NodeFactory.newInstance();
+ nodeC = nodeFactory.createNode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(),
+ new Contribution("NodeC",
new File("src/main/resources/nodeC").toURL().toString()));
- nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(),
- new SCAContribution("NodeB",
+ nodeB = nodeFactory.createNode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(),
+ new Contribution("NodeB",
new File("src/main/resources/nodeB").toURL().toString()));
- nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(),
- new SCAContribution("NodeA",
+ nodeA = nodeFactory.createNode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(),
+ new Contribution("NodeA",
new File("src/main/resources/nodeA").toURL().toString()));
nodeC.start();
nodeB.start();
nodeA.start();
- SCAClient client = (SCAClient)nodeA;
+ Client client = (Client)nodeA;
calculatorService =
client.getService(CalculatorService.class, "CalculatorServiceComponentA");
Modified: tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java (original)
+++ tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java Thu Dec 4 13:09:28 2008
@@ -30,9 +30,9 @@
import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;
import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl;
import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +49,7 @@
*/
private static final int MAX_SLEEP_TIME = 10000;
- private SCANode node;
+ private Node node;
/**
* Initialise the SCADomain.
@@ -59,7 +59,7 @@
@Before
public void setUp() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
node = nodeFactory.createSCANodeFromClassLoader("OneWayContribution/META-INF/sca-deployables/oneWay.composite", null);
node.start();
@@ -84,7 +84,7 @@
@Test
public void testOneWay() throws Exception {
OneWayClient client =
- ((SCAClient)node).getService(OneWayClient.class, "OneWayClientComponent");
+ ((Client)node).getService(OneWayClient.class, "OneWayClientComponent");
int count = 100;
@@ -120,7 +120,7 @@
@Test
public void testOneWayUsingNonBlockingInterceptorThrowsAnException() {
OneWayClient client =
- ((SCAClient)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");
+ ((Client)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");
// We need to modify the JDK Logger for the NonBlockingInterceptor so we
// can check that it logs a message for the @OneWay invocation that throws
Modified: tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml Thu Dec 4 13:09:28 2008
@@ -35,11 +35,6 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-monitor-logging</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-assembly</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -445,7 +440,7 @@
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -537,7 +532,7 @@
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified: tuscany/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml Thu Dec 4 13:09:28 2008
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-monitor-logging</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-assembly</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -446,7 +441,7 @@
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -538,7 +533,7 @@
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified: tuscany/java/sca/itest/policy-security-basicauth/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/policy-security-basicauth/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/policy-security-basicauth/pom.xml (original)
+++ tuscany/java/sca/itest/policy-security-basicauth/pom.xml Thu Dec 4 13:09:28 2008
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/java/sca/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java (original)
+++ tuscany/java/sca/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java Thu Dec 4 13:09:28 2008
@@ -24,9 +24,9 @@
import junit.framework.Assert;
import helloworld.HelloWorldService;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.ws.security.util.Base64;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -39,18 +39,18 @@
import com.meterware.httpunit.WebResponse;
public class BasicAuthTestCase {
- private static SCANode node;
+ private static Node node;
private static HelloWorldService service;
@BeforeClass
public static void init() throws Exception {
try {
- SCANodeFactory factory = SCANodeFactory.newInstance();
+ NodeFactory factory = NodeFactory.newInstance();
node = factory.createSCANodeFromClassLoader("helloworld.composite",
BasicAuthTestCase.class.getClassLoader());
node.start();
- service = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
+ service = ((Client)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
} catch (Exception ex) {
ex.printStackTrace();
}
Modified: tuscany/java/sca/itest/policy-security-jsr250/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/policy-security-jsr250/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/policy-security-jsr250/pom.xml (original)
+++ tuscany/java/sca/itest/policy-security-jsr250/pom.xml Thu Dec 4 13:09:28 2008
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/java/sca/itest/policy-security/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/policy-security/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/policy-security/pom.xml (original)
+++ tuscany/java/sca/itest/policy-security/pom.xml Thu Dec 4 13:09:28 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/java/sca/itest/policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/policy/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/policy/pom.xml (original)
+++ tuscany/java/sca/itest/policy/pom.xml Thu Dec 4 13:09:28 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/java/sca/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java (original)
+++ tuscany/java/sca/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java Thu Dec 4 13:09:28 2008
@@ -23,12 +23,12 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.policy.Policy;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -40,7 +40,7 @@
*/
public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {
- public TestPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+ public TestPolicyProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
}
Modified: tuscany/java/sca/itest/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/pom.xml (original)
+++ tuscany/java/sca/itest/pom.xml Thu Dec 4 13:09:28 2008
@@ -36,13 +36,6 @@
<version>4.5</version>
<scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
@@ -50,7 +43,6 @@
<was.python.script>${basedir}/wasAdmin.py</was.python.script>
</properties>
-
<profiles>
<profile>
<id>default</id>
@@ -58,7 +50,35 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- </modules>
+ <module>builder</module>
+ <module>callablereferences</module>
+ <module>callback-api</module>
+ <module>callback-basic</module>
+ <module>callback-complex-type</module>
+ <module>callback-id</module>
+ <module>callback-multiple-wires</module>
+ <module>callback-separatethread</module>
+ <module>callback-set-callback</module>
+ <module>callback-set-conversation</module>
+ <module>component-type</module>
+ <module>contribution</module>
+ <module>contribution-import-export</module>
+ <module>conversations</module>
+ <module>exceptions</module>
+ <module>extended-api</module>
+ <module>interfaces</module>
+ <module>late-reference-resolution</module>
+ <module>oneway</module>
+ <module>operation-overloading</module>
+ <module>properties</module>
+ <module>recursive</module>
+ <module>recursive-multi-level</module>
+ <module>references</module>
+ <module>serialization</module>
+ <module>services</module>
+ <module>scopes</module>
+ <module>wires</module>
+ </modules>
</profile>
<profile>
<id>old</id>
@@ -77,15 +97,13 @@
<module>callback-set-conversation</module>
<module>component-type</module>
<module>contribution</module>
- <module>contribution-multiple</module>
- <module>contribution-import-export</module>
<!--
<module>contribution-classloader</module> -->
+ <module>contribution-import-export</module>
<module>conversations</module>
- <module>corba</module>
<module>conversations-ws</module>
+ <module>corba</module>
<module>databindings</module>
- <!--module>domain</module-->
<module>exceptions</module>
<module>exceptions-cross-binding</module>
<module>exceptions-cross-binding-ws</module>
@@ -107,28 +125,33 @@
<module>late-reference-resolution</module>
<module>oneway</module>
<module>operation-overloading</module>
+ <!--
<module>osgi-implementation</module>
<module>osgi-contribution</module>
+ -->
<module>policy</module>
<module>policy-security</module>
<module>policy-security-basicauth</module>
<module>policy-security-jsr250</module>
<module>policy-security-token</module>
+ <!--
+ <module>promotion-interface-missmatch</module>
+ -->
<module>properties</module>
<module>recursive</module>
<module>recursive-multi-level</module>
<module>recursive-ws</module>
<module>references</module>
+ <module>scopes</module>
<module>serialization</module>
<module>services</module>
<module>spring</module>
- <module>scopes</module>
<module>transaction</module>
<module>validation</module>
<module>wires</module>
<module>wsdl</module>
- <module>wsdlless</module>
<module>wsdl2java</module>
+ <module>wsdlless</module>
<module>wsdl-multiple</module>
<module>ws-void-args-return</module>
</modules>
@@ -164,7 +187,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -172,29 +195,16 @@
<modules>
<module>callback-api</module>
<module>callback-basic</module>
- <!--
- <module>callback-complex-type</module>
- -->
<module>callback-id</module>
<module>callback-multiple-wires</module>
<module>callback-set-callback</module>
<module>callback-set-conversation</module>
- <!--
- <module>contribution</module>
- <module>contribution-multiple</module>
- <module>contribution-import-export</module>
- <module>contribution-classloader</module>
- -->
<module>conversations</module>
<module>exceptions</module>
<module>exceptions-cross-binding</module>
<module>extended-api</module>
<module>oneway</module>
<module>operation-overloading</module>
- <!--
- <module>properties</module>
- <module>recursive</module>
- -->
<module>references</module>
<module>services</module>
<module>component-type</module>
@@ -266,7 +276,7 @@
<configuration>
<primaryArtifact>false</primaryArtifact>
<!-- Exclude a few jars to avoid conflicts -->
- <warSourceExcludes>WEB-INF/lib/tuscany-host-tomcat-*.jar,WEB-INF/lib/tuscany-host-jetty-*.jar,servlet-api-*.jar, WEB-INF/lib/catalina*.jar,WEB-INF/classes/META-INF/sca-contribution*.xml</warSourceExcludes>
+ <warSourceExcludes>WEB-INF/lib/tuscany-host-jetty-*.jar,WEB-INF/lib/tuscany-host-jetty-*.jar,servlet-api-*.jar, WEB-INF/lib/catalina*.jar,WEB-INF/classes/META-INF/sca-contribution*.xml</warSourceExcludes>
<webResources>
<!-- Add the tests jar into the WAR -->
<!--
Modified: tuscany/java/sca/itest/promotion-interface-missmatch/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/promotion-interface-missmatch/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/promotion-interface-missmatch/pom.xml (original)
+++ tuscany/java/sca/itest/promotion-interface-missmatch/pom.xml Thu Dec 4 13:09:28 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/java/sca/itest/references/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/references/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/references/pom.xml (original)
+++ tuscany/java/sca/itest/references/pom.xml Thu Dec 4 13:09:28 2008
@@ -29,25 +29,24 @@
<name>Apache Tuscany SCA References Integration Tests</name>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: tuscany/java/sca/itest/scopes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/scopes/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/scopes/pom.xml (original)
+++ tuscany/java/sca/itest/scopes/pom.xml Thu Dec 4 13:09:28 2008
@@ -29,19 +29,26 @@
<artifactId>itest-scopes</artifactId>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
-
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/serialization/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/serialization/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/serialization/pom.xml (original)
+++ tuscany/java/sca/itest/serialization/pom.xml Thu Dec 4 13:09:28 2008
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: tuscany/java/sca/itest/services/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/services/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/services/pom.xml (original)
+++ tuscany/java/sca/itest/services/pom.xml Thu Dec 4 13:09:28 2008
@@ -29,17 +29,24 @@
<name>Apache Tuscany SCA Services Integration Tests</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java (original)
+++ tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,73 +22,76 @@
import static junit.framework.Assert.assertEquals;
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.osoa.sca.ServiceRuntimeException;
public class ServicesTestCase {
- private static SCADomain domain;
+ private static Node node;
@BeforeClass
public static void init() throws Exception {
- if (domain == null) {
- domain = SCADomain.newInstance("ServicesTest.composite");
- }
+ String location = ContributionLocationHelper.getContributionLocation("ServicesTest.composite");
+ node = NodeFactory.newInstance().createNode("ServicesTest.composite", new Contribution("c1", location));
+ node.start();
}
@AfterClass
public static void destroy() throws Exception {
- domain.close();
+ node.stop();
}
@Test
public void testAService() {
- AComponent a1 = domain.getService(AComponent.class, "AComponent1");
+ AComponent a1 = node.getService(AComponent.class, "AComponent1");
assertEquals("AComponent", a1.foo());
- AComponent a2 = domain.getService(AComponent.class, "AComponent2/AComponent");
+ AComponent a2 = node.getService(AComponent.class, "AComponent2/AComponent");
assertEquals("AComponent", a2.foo());
}
@Test
public void testBService() {
- BComponent a1 = domain.getService(BComponent.class, "BComponent1");
+ BComponent a1 = node.getService(BComponent.class, "BComponent1");
assertEquals("BComponent", a1.foo());
- BComponent a2 = domain.getService(BComponent.class, "BComponent2/BComponent");
+ BComponent a2 = node.getService(BComponent.class, "BComponent2/BComponent");
assertEquals("BComponent", a2.foo());
}
@Test
public void testCService() {
- CComponent a1 = domain.getService(CComponent.class, "CComponent1");
+ CComponent a1 = node.getService(CComponent.class, "CComponent1");
assertEquals("CComponent", a1.foo());
- CComponent a2 = domain.getService(CComponent.class, "CComponent2/CComponent");
+ CComponent a2 = node.getService(CComponent.class, "CComponent2/CComponent");
assertEquals("CComponent", a2.foo());
}
@Test
public void testDService() {
- DComponent a1 = domain.getService(DComponent.class, "DComponent1/DComponent");
+ DComponent a1 = node.getService(DComponent.class, "DComponent1/DComponent");
assertEquals("DComponent", a1.foo());
- D1Component a2 = domain.getService(D1Component.class, "DComponent1/D1Component");
+ D1Component a2 = node.getService(D1Component.class, "DComponent1/D1Component");
assertEquals("DComponent", a2.foo1());
try {
- domain.getService(DComponent.class, "DComponent1");
+ node.getService(DComponent.class, "DComponent1");
Assert.fail("The service name is required");
} catch (ServiceRuntimeException e) {
Assert.assertTrue("The service name is required", true);
}
- DComponent a3 = domain.getService(DComponent.class, "DComponent2/DComponent");
+ DComponent a3 = node.getService(DComponent.class, "DComponent2/DComponent");
assertEquals("DComponent", a3.foo());
- D1Component a4 = domain.getService(D1Component.class, "DComponent2/D1Component");
+ D1Component a4 = node.getService(D1Component.class, "DComponent2/D1Component");
assertEquals("DComponent", a4.foo1());
}
Modified: tuscany/java/sca/itest/validation/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/pom.xml?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/pom.xml (original)
+++ tuscany/java/sca/itest/validation/pom.xml Thu Dec 4 13:09:28 2008
@@ -32,12 +32,6 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-monitor-logging</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-resource</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -80,12 +74,6 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-osgi</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-ejb</artifactId>
<version>2.0-SNAPSHOT</version>
<exclusions>
@@ -96,19 +84,6 @@
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-osgi-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>1.0.4</version>
- </dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
Modified: tuscany/java/sca/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/assembly/xml/ContributionReadException.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/assembly/xml/ContributionReadException.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/assembly/xml/ContributionReadException.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("ContributionReadException", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("PolicyImplValidationException", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("PolicyServiceValidationException", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("UnexpectedBindingElement", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("UnexpectedImplementationElement", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
/**
@@ -51,7 +50,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("UnexpectedInterfaceElement", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -59,7 +58,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("UnknownEJBSessionType", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -58,7 +57,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("UnknownEJBVersion", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("DoesntProcessActivationSpec", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("DoesntProcessDestinationType", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.junit.Ignore;
import domain.CustomCompositeBuilder;
@@ -54,7 +53,7 @@
@Ignore("TUSCANY-2532")
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
// assertEquals("DoesntProcessHeaders", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("DoesntProcessResourceAdapter", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("DoesntProcessResponseActivationSpec", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("DoesntProcessResponseConnectionFactory", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("DoesntProcessResponseDestinationType", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("InvalidCorrelationScheme", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("InvalidJMSDeliveryMode", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("InvalidJMSPriority", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("InvalidResponseDestinationType", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("MissingActivationSpecName", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("MissingConnectionFactoryName", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("MissingResponseActivationSpec", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("MissingResponseConnectionFactory", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("MustStartWithSchema", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("UnexpectedElement", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("UnexpectedResponseElement", problem.getMessageId());
Modified: tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java?rev=723439&r1=723438&r2=723439&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java Thu Dec 4 13:09:28 2008
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +51,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = monitor.getLastProblem();
assertNotNull(problem);
assertEquals("UnknownTokenInURI", problem.getMessageId());