Author: kwilliams
Date: Mon May 19 15:25:01 2008
New Revision: 658005
URL: http://svn.apache.org/viewvc?rev=658005&view=rev
Log:
Some refactoring
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
incubator/tuscany/java/sca/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
incubator/tuscany/java/sca/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
incubator/tuscany/java/sca/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
incubator/tuscany/java/sca/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
incubator/tuscany/java/sca/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java?rev=658005&r1=658004&r2=658005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
Mon May 19 15:25:01 2008
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.vtest.javaapi.annotations.conversational;
import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Scope;
/**
* Simple Local Service
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java?rev=658005&r1=658004&r2=658005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
Mon May 19 15:25:01 2008
@@ -21,8 +21,7 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import
org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.AService;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,7 +32,6 @@
*/
public class ConversationAnnotationTestCase {
- protected static SCADomain domain;
protected static String compositeName = "conversation.composite";
protected static AService aService = null;
@@ -41,8 +39,8 @@
public static void init() throws Exception {
try {
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
- aService = domain.getService(AService.class, "AComponent");
+ ServiceFinder.init(compositeName);
+ aService = ServiceFinder.getService(AService.class, "AComponent");
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -52,8 +50,7 @@
public static void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null)
- domain.close();
+ ServiceFinder.cleanup();
}
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java?rev=658005&r1=658004&r2=658005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
Mon May 19 15:25:01 2008
@@ -19,7 +19,7 @@
package
org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -32,7 +32,6 @@
*/
public class ConversationAttributesAnnotationTestCase {
- protected static SCADomain domain;
protected static String compositeName = "conversation.composite";
protected static AService aService = null;
@@ -40,8 +39,8 @@
public static void init() throws Exception {
try {
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
- aService = domain.getService(AService.class, "AComponent");
+ ServiceFinder.init(compositeName);
+ aService = ServiceFinder.getService(AService.class, "AComponent");
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -51,8 +50,7 @@
public static void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null)
- domain.close();
+ ServiceFinder.cleanup();
}
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java?rev=658005&r1=658004&r2=658005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
Mon May 19 15:25:01 2008
@@ -21,7 +21,7 @@
import javax.security.auth.login.Configuration;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -31,7 +31,6 @@
*/
public class SinglePricipalTestCase {
- protected static SCADomain domain;
protected static String compositeName = "singleprincipal.composite";
protected static AService aService = null;
@@ -45,20 +44,18 @@
.getResource("AJass.config").toString());
}
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
- aService = domain.getService(AService.class, "AComponent");
+ ServiceFinder.init(compositeName);
+ aService = ServiceFinder.getService(AService.class, "AComponent");
}
@After
public void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null)
- domain.close();
+ ServiceFinder.cleanup();
}
-
/**
* Line 1669, 1670
* <p>
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java?rev=658005&r1=658004&r2=658005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
Mon May 19 15:25:01 2008
@@ -19,9 +19,7 @@
package org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,7 +31,6 @@
*/
public class EndsConversationTestCase {
- protected static SCADomain domain;
protected static String compositeName = "endsconversation.composite";
protected static AService aService = null;
@@ -41,8 +38,8 @@
public static void init() throws Exception {
try {
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
- aService = domain.getService(AService.class, "AComponent");
+ ServiceFinder.init(compositeName);
+ aService = ServiceFinder.getService(AService.class, "AComponent");
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -52,9 +49,7 @@
public static void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null)
- domain.close();
-
+ ServiceFinder.cleanup();
}
/**
@@ -110,7 +105,7 @@
* This tests the second section of the errata. Starting with .. "If the
* conversation ends for any other reason ..."
*/
- @Test (expected = ConversationEndedException.class)
+ @Test(expected = ConversationEndedException.class)
public void atEndsConversation3() throws Exception {
aService.testTimedEnd();
}
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java?rev=658005&r1=658004&r2=658005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
Mon May 19 15:25:01 2008
@@ -23,6 +23,7 @@
import junit.framework.Assert;
import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,7 +34,6 @@
*/
public class OneWayAnnotationTestCase {
- protected static SCADomain domain;
protected static String compositeName = "oneway.composite";
protected static AService aService = null;
protected static BService bService = null;
@@ -42,8 +42,8 @@
public static void init() throws Exception {
try {
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
- aService = domain.getService(AService.class, "AComponent");
+ ServiceFinder.init(compositeName);
+ aService = ServiceFinder.getService(AService.class, "AComponent");
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -53,9 +53,7 @@
public static void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null)
- domain.close();
-
+ ServiceFinder.cleanup();
}
/**
Modified:
incubator/tuscany/java/sca/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java?rev=658005&r1=658004&r2=658005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
(original)
+++
incubator/tuscany/java/sca/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
Mon May 19 15:25:01 2008
@@ -34,7 +34,7 @@
public static void init(String compositeFileName) {
if (domain != null)
- System.out.println("VTEST WARNING: domain already exists is is
being overwritten!");
+ System.out.println("VTEST WARNING: domain already exists and is
will be overwritten!");
domain = SCADomain.newInstance(compositeFileName);
}
