You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/08/20 04:36:48 UTC
svn commit: r567527 - in /incubator/tuscany/java/sca/itest:
callback-api/src/test/java/org/apache/tuscany/sca/test/
callback-basic/src/test/java/org/apache/tuscany/sca/test/
callback-complex-type/src/test/java/org/apache/tuscany/sca/test/
callback-id/s...
Author: jsdelfino
Date: Sun Aug 19 19:36:45 2007
New Revision: 567527
URL: http://svn.apache.org/viewvc?rev=567527&view=rev
Log:
Minor code cleanup, fixed warnings, removed unused imports, variables and dead code, added missing annotations. Fixed a few package names.
Added:
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/
- copied from r567424, incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/hello/
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/
- copied from r567424, incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/helloworld/
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/
- copied from r567424, incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/helloworld/
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/
- copied from r567424, incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/helloworld/
Removed:
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/hello/
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/helloworld/
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/helloworld/
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/helloworld/
Modified:
incubator/tuscany/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCaseFIXME.java
incubator/tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
incubator/tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
incubator/tuscany/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCaseFIXME.java
incubator/tuscany/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
incubator/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
incubator/tuscany/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCaseFIXME.java
incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
incubator/tuscany/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCaseFIXME.java
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
incubator/tuscany/java/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTestCaseFIXME.java
incubator/tuscany/java/sca/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
incubator/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
incubator/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/CompositeTestCase.java
incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
incubator/tuscany/java/sca/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
incubator/tuscany/java/sca/itest/recursive/src/test/java/test/InnerTestCase.java
incubator/tuscany/java/sca/itest/recursive/src/test/java/test/OuterTestCase.java
incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
incubator/tuscany/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
incubator/tuscany/java/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
Modified: incubator/tuscany/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCaseFIXME.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCaseFIXME.java Sun Aug 19 19:36:45 2007
@@ -32,6 +32,7 @@
aCallBackClient.run();
}
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("CallBackApiTest.composite");
@@ -39,6 +40,7 @@
domain.getService(CallBackApiClient.class, "CallBackApiClient");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java Sun Aug 19 19:36:45 2007
@@ -32,6 +32,7 @@
aCallBackClient.run();
}
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("CallBackBasicTest.composite");
aCallBackClient = domain.getService(CallBackBasicClient.class, "CallBackBasicClient");
Modified: incubator/tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java Sun Aug 19 19:36:45 2007
@@ -32,6 +32,7 @@
aCallBackClient.run();
}
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("CallBackCTypeClient.composite");
@@ -39,6 +40,7 @@
domain.getService(CallBackCTypeClient.class, "CallBackCTypeClient");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCaseFIXME.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCaseFIXME.java Sun Aug 19 19:36:45 2007
@@ -32,12 +32,14 @@
aCallBackClient.run();
}
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("CallBackIdClient.composite");
aCallBackClient = domain.getService(CallBackIdClient.class, "CallBackIdClient");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java Sun Aug 19 19:36:45 2007
@@ -31,12 +31,14 @@
private MyClient myClient1;
private MyClient myClient2;
+ @Override
protected void setUp() throws Exception {
scaDomain = SCADomain.newInstance("CallbackMultiWireTest.composite");
myClient1 = scaDomain.getService(MyClient.class, "MyClientComponent1");
myClient2 = scaDomain.getService(MyClient.class, "MyClientComponent2");
}
+ @Override
protected void tearDown() throws Exception {
scaDomain.close();
}
Modified: incubator/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java (original)
+++ incubator/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java Sun Aug 19 19:36:45 2007
@@ -22,9 +22,6 @@
public class CallBackSetCallbackBadCallback {
- private String anAttribure = null;
- private int anIntAttribute = 0;
-
public CallBackSetCallbackBadCallback() {
super();
}
Modified: incubator/tuscany/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCaseFIXME.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCaseFIXME.java Sun Aug 19 19:36:45 2007
@@ -32,6 +32,7 @@
aCallBackClient.run();
}
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("CallBackSetCallbackTest.composite");
@@ -40,6 +41,7 @@
"CallBackSetCallbackClient");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java (original)
+++ incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java Sun Aug 19 19:36:45 2007
@@ -18,11 +18,9 @@
*/
package org.apache.tuscany.sca.test;
-import java.io.Serializable;
-
import junit.framework.Assert;
-public class CallBackSetCallbackConvBadCallback implements Serializable {
+public class CallBackSetCallbackConvBadCallback {
public CallBackSetCallbackConvBadCallback() {
super();
Modified: incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java (original)
+++ incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java Sun Aug 19 19:36:45 2007
@@ -18,9 +18,8 @@
*/
package org.apache.tuscany.sca.test;
-import java.io.Serializable;
-public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable {
+public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback {
private int callBackCount = 0;
private Object monitor;
Modified: incubator/tuscany/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCaseFIXME.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCaseFIXME.java Sun Aug 19 19:36:45 2007
@@ -32,6 +32,7 @@
aCallBackClient.run();
}
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("CallBackSetCallbackConvTest.composite");
@@ -40,6 +41,7 @@
"CallBackSetCallbackConvClient");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java?rev=567527&r1=567424&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java Sun Aug 19 19:36:45 2007
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package hello;
+package org.apache.tuscany.sca.test.contribution;
+
+import hello.Hello;
import java.io.File;
import java.io.IOException;
@@ -38,6 +40,7 @@
private ClassLoader cl;
private EmbeddedSCADomain domain;
+ @Override
protected void setUp() throws Exception {
// Create a test embedded SCA domain
cl = getClass().getClassLoader();
@@ -69,6 +72,7 @@
assertEquals(hello.getGreetings("lresende"), "Hello lresende");
}
+ @Override
public void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java?rev=567527&r1=567424&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java Sun Aug 19 19:36:45 2007
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package helloworld;
+package org.apache.tuscany.test.contribution;
+
+import helloworld.HelloWorldService;
import java.io.File;
import java.io.IOException;
@@ -39,6 +41,7 @@
private Contribution helloWorldContribution;
private Contribution compositeContribution;
+ @Override
protected void setUp() throws Exception {
//Create a test embedded SCA domain
cl = getClass().getClassLoader();
@@ -87,6 +90,7 @@
assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
}
+ @Override
public void tearDown() throws Exception {
ContributionService contributionService = domain.getContributionService();
Modified: incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java?rev=567527&r1=567424&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java Sun Aug 19 19:36:45 2007
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package helloworld;
+package org.apache.tuscany.sca.test.contribution;
+
+import helloworld.HelloWorldService;
import java.io.File;
import java.io.IOException;
@@ -38,6 +40,7 @@
private Contribution helloWorldContribution;
private Contribution javaContribution;
+ @Override
protected void setUp() throws Exception {
//Create a test embedded SCA domain
cl = getClass().getClassLoader();
@@ -85,7 +88,8 @@
assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
}
- public void tearDown() throws Exception {
+ @Override
+ public void tearDown() throws Exception {
ContributionService contributionService = domain.getContributionService();
// Remove the contribution from the in-memory repository
Modified: incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java?rev=567527&r1=567424&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java Sun Aug 19 19:36:45 2007
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package helloworld;
+package org.apache.tuscany.sca.test.contribution;
+
+import helloworld.HelloWorldService;
import java.io.File;
import java.io.IOException;
@@ -39,6 +41,7 @@
private Contribution wsdlContribution;
private Contribution consumerContribution;
+ @Override
protected void setUp() throws Exception {
// Create a test embedded SCA domain
cl = getClass().getClassLoader();
@@ -84,6 +87,7 @@
assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
}
+ @Override
public void tearDown() throws Exception {
ContributionService contributionService = domain.getContributionService();
Modified: incubator/tuscany/java/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java Sun Aug 19 19:36:45 2007
@@ -25,54 +25,19 @@
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
import junit.framework.TestCase;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.xml.ComponentTypeDocumentProcessor;
-import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
-import org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor;
-import org.apache.tuscany.sca.assembly.xml.CompositeProcessor;
-import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeDocumentProcessor;
-import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.DeployedArtifact;
-import org.apache.tuscany.sca.contribution.impl.ContributionFactoryImpl;
-import org.apache.tuscany.sca.contribution.processor.ContributionPostProcessor;
-import org.apache.tuscany.sca.contribution.processor.DefaultContributionPostProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultPackageProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleContributionPostProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensiblePackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.impl.FolderContributionProcessor;
-import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolverExtensionPoint;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
-import org.apache.tuscany.sca.contribution.service.ContributionRepository;
import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionRepositoryImpl;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionServiceImpl;
-import org.apache.tuscany.sca.contribution.service.impl.PackageTypeDescriberImpl;
import org.apache.tuscany.sca.contribution.service.util.FileHelper;
import org.apache.tuscany.sca.contribution.service.util.IOHelper;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
/**
* This is more intended to be a integration test then a unit test. *
@@ -87,6 +52,7 @@
private EmbeddedSCADomain domain;
private ContributionService contributionService;
+ @Override
protected void setUp() throws Exception {
//Create a test embedded SCA domain
cl = getClass().getClassLoader();
Modified: incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java Sun Aug 19 19:36:45 2007
@@ -19,9 +19,7 @@
package org.apache.tuscany.sca.itest.conversational;
import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Remotable;
Modified: incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java Sun Aug 19 19:36:45 2007
@@ -20,9 +20,7 @@
import org.osoa.sca.annotations.Callback;
import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Remotable;
Modified: incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java Sun Aug 19 19:36:45 2007
@@ -26,9 +26,7 @@
import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Context;
import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
Modified: incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java Sun Aug 19 19:36:45 2007
@@ -25,13 +25,9 @@
import org.osoa.sca.ComponentContext;
import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
/**
Modified: incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java Sun Aug 19 19:36:45 2007
@@ -18,21 +18,9 @@
*/
package org.apache.tuscany.sca.itest.conversational.impl;
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
/**
Modified: incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java Sun Aug 19 19:36:45 2007
@@ -19,16 +19,12 @@
package org.apache.tuscany.sca.itest.conversational.impl;
import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
import org.osoa.sca.annotations.Callback;
import org.osoa.sca.annotations.ConversationAttributes;
import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Remotable;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java Sun Aug 19 19:36:45 2007
@@ -21,21 +21,11 @@
import java.util.HashMap;
import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.Conversation;
-import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java Sun Aug 19 19:36:45 2007
@@ -248,7 +248,8 @@
//
ConversationsLifeCycleService aConversationsLifeCycleService;
- Object aConversationID;
+//FIXME Port to the 1.0 spec API
+// Object aConversationID;
Assert.assertNotNull("current composite context",myContext);
ServiceReference aServRef;
this.removeMarkerFile();
Modified: incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java Sun Aug 19 19:36:45 2007
@@ -97,7 +97,7 @@
@Test
public void testStatelessStatefulConversationCheckingScope() {
- int count = conversationalStatelessClientStatefulService.runConversationCheckingScope();
+ conversationalStatelessClientStatefulService.runConversationCheckingScope();
Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
ConversationalServiceStatefulImpl.calls.toString());
}
@@ -168,7 +168,7 @@
@Test
public void testStatelessStatelessConversationCheckingScope() {
- int count = conversationalStatelessClientStatelessService.runConversationCheckingScope();
+ conversationalStatelessClientStatelessService.runConversationCheckingScope();
Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
ConversationalServiceStatelessImpl.calls.toString());
}
@@ -227,7 +227,7 @@
@Test
public void testStatefulStatefulConversationCheckingScope() {
- int count = conversationalStatefulClientStatefulService.runConversationCheckingScope();
+ conversationalStatefulClientStatefulService.runConversationCheckingScope();
Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
ConversationalServiceStatefulImpl.calls.toString());
}
@@ -287,7 +287,7 @@
@Test
public void testStatefulStatelessConversationCheckingScope() {
- int count = conversationalStatefulClientStatelessService.runConversationCheckingScope();
+ conversationalStatefulClientStatelessService.runConversationCheckingScope();
Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
ConversationalServiceStatelessImpl.calls.toString());
}
Modified: incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTestCaseFIXME.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTestCaseFIXME.java Sun Aug 19 19:36:45 2007
@@ -33,6 +33,7 @@
aConversationsClient.run();
}
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("ConversationsTest.composite");
@@ -42,6 +43,7 @@
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java Sun Aug 19 19:36:45 2007
@@ -27,18 +27,15 @@
*/
public class GenerateTestCase extends TestCase {
- private Generate generator = null;
- private static boolean initalised = false;
+ //private Generate generator = null;
+ @Override
protected void setUp() throws Exception {
- if (!initalised) {
- generator = new Generate();
- initalised = true;
- }
+ //generator = new Generate();
}
+ @Override
protected void tearDown() {
-
}
/**
@@ -47,6 +44,6 @@
* @throws Exception
*/
public void testGenerate() throws Exception {
- // generator.generate();
+ //generator.generate();
}
}
Modified: incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java (original)
+++ incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java Sun Aug 19 19:36:45 2007
@@ -27,8 +27,9 @@
*
*/
public class InvalidSymbolSDOException extends Exception {
-
- public static final QName FAULT_ELEMENT = new QName("http://scatesttool.stockexceptiontestservice", "InvalidSymbolFault");
+ private static final long serialVersionUID = -3824848763300476741L;
+
+ public static final QName FAULT_ELEMENT = new QName("http://scatesttool.stockexceptiontestservice", "InvalidSymbolFault");
/**
*
Modified: incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java (original)
+++ incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java Sun Aug 19 19:36:45 2007
@@ -25,6 +25,8 @@
*
*/
public class MarketClosedSDOException extends Exception {
+ private static final long serialVersionUID = 7652466275656958031L;
+
public static final QName FAULT_ELEMENT =
new QName("http://scatesttool.stockexceptiontestservice", "MarketClosedFault");
Modified: incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java (original)
+++ incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java Sun Aug 19 19:36:45 2007
@@ -27,8 +27,9 @@
*
*/
public class InvalidSymbolSDOException extends Exception {
-
- public static final QName FAULT_ELEMENT = new QName("http://scatesttool.stockexceptiontestservice", "InvalidSymbolFault");
+ private static final long serialVersionUID = -3824848763300476741L;
+
+ public static final QName FAULT_ELEMENT = new QName("http://scatesttool.stockexceptiontestservice", "InvalidSymbolFault");
/**
*
Modified: incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java (original)
+++ incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java Sun Aug 19 19:36:45 2007
@@ -25,6 +25,8 @@
*
*/
public class MarketClosedSDOException extends Exception {
+ private static final long serialVersionUID = 7652466275656958031L;
+
public static final QName FAULT_ELEMENT =
new QName("http://scatesttool.stockexceptiontestservice", "MarketClosedFault");
Modified: incubator/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java (original)
+++ incubator/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java Sun Aug 19 19:36:45 2007
@@ -21,6 +21,7 @@
public class Checked extends Exception {
+ private static final long serialVersionUID = -129752837478357452L;
/**
*
Modified: incubator/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java (original)
+++ incubator/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java Sun Aug 19 19:36:45 2007
@@ -20,6 +20,7 @@
package org.apache.tuscany.sca.test.exceptions;
public class UnChecked extends RuntimeException {
+ private static final long serialVersionUID = -1318118082838092244L;
/**
*
Modified: incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java (original)
+++ incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java Sun Aug 19 19:36:45 2007
@@ -67,6 +67,7 @@
this.numberSet = numberSet;
}
+ @Override
public String toString() {
return Double.toString(integerNumber) + " - " +
Double.toString(floatNumber) + " - " +
Modified: incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/CompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/CompositeTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/CompositeTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/CompositeTestCase.java Sun Aug 19 19:36:45 2007
@@ -27,11 +27,13 @@
private SCADomain domain;
private Source source;
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("OuterComposite.composite");
source = domain.getService(Source.class, "SourceComponent");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java Sun Aug 19 19:36:45 2007
@@ -34,6 +34,7 @@
private EmbeddedSCADomain domain;
private Contribution contribution;
+ @Override
protected void setUp() throws Exception {
// Create a test embedded SCA domain
cl = getClass().getClassLoader();
@@ -91,6 +92,7 @@
}
}
+ @Override
public void tearDown() throws Exception {
ContributionService contributionService = domain.getContributionService();
Modified: incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java Sun Aug 19 19:36:45 2007
@@ -28,10 +28,12 @@
private SCADomain domain;
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("OuterComposite.composite");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java Sun Aug 19 19:36:45 2007
@@ -28,6 +28,7 @@
private SCADomain domain;
private Service1 tracker, tracker2;
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("http://localhost", "/", "Composite1.composite", "Composite2.composite");
tracker = domain.getService(Service1.class, "ComponentC");
@@ -35,6 +36,7 @@
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/recursive/src/test/java/test/InnerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/recursive/src/test/java/test/InnerTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/recursive/src/test/java/test/InnerTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/recursive/src/test/java/test/InnerTestCase.java Sun Aug 19 19:36:45 2007
@@ -27,11 +27,13 @@
private SCADomain domain;
private Aggregator aggregator;
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("Inner.composite");
aggregator = domain.getService(Aggregator.class, "Aggregator");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/recursive/src/test/java/test/OuterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/recursive/src/test/java/test/OuterTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/recursive/src/test/java/test/OuterTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/recursive/src/test/java/test/OuterTestCase.java Sun Aug 19 19:36:45 2007
@@ -27,11 +27,13 @@
private SCADomain domain;
private Aggregator aggregator;
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("Outer.composite");
aggregator = domain.getService(Aggregator.class, "Inner");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java Sun Aug 19 19:36:45 2007
@@ -75,9 +75,4 @@
}
}
- public static void main(String[] args) throws Exception {
- InnerReferenceTestCase.init();
- InnerReferenceTestCase tester = new InnerReferenceTestCase();
- InnerReferenceTestCase.destroy();
- }
}
Modified: incubator/tuscany/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java Sun Aug 19 19:36:45 2007
@@ -57,7 +57,8 @@
}
private class ModuleScopeTestThread extends Thread {
- public void run() {
+ @Override
+ public void run() {
StateVerifier moduleScopeService = domain.getService(StateVerifier.class, "ModuleScopeComponent");
for(int i=1; i<=iterations; i++) {
moduleScopeService.setState(i);
@@ -68,7 +69,8 @@
}
private class RequestScopeTestThread extends Thread {
- public void run() {
+ @Override
+ public void run() {
StateVerifier requestScopeService = domain.getService(StateVerifier.class, "RequestScopeComponent");
for(int i=1; i<=iterations; i++) {
requestScopeService.setState(i);
@@ -78,14 +80,14 @@
}
}
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("scopes.composite");
}
+ @Override
protected void tearDown() throws Exception {
- if (domain != null) {
- domain.close();
- }
+ domain.close();
}
}
Modified: incubator/tuscany/java/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java?rev=567527&r1=567526&r2=567527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java Sun Aug 19 19:36:45 2007
@@ -85,10 +85,12 @@
assertEquals(dataIn.getPassword(), dataOut.getPassword());
}
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("SDOWSDLTest.composite");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org