Author: lresende
Date: Thu Feb 14 12:08:54 2008
New Revision: 627861

URL: http://svn.apache.org/viewvc?rev=627861&view=rev
Log:
Convert callback-basic itest to work w/ the itest web framework

Added:
    incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/
    
incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
   (with props)
Modified:
    incubator/tuscany/java/sca/itest/callback-basic/pom.xml
    
incubator/tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java

Modified: incubator/tuscany/java/sca/itest/callback-basic/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-basic/pom.xml?rev=627861&r1=627860&r2=627861&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-basic/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/callback-basic/pom.xml Thu Feb 14 12:08:54 
2008
@@ -42,4 +42,9 @@
             <scope>runtime</scope>
         </dependency>
     </dependencies>
+
+    <properties>
+        
<was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script>
+        <was.python.script>${basedir}/../wasAdmin.py</was.python.script>
+    </properties>    
 </project>

Added: 
incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml?rev=627861&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
 (added)
+++ 
incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
 Thu Feb 14 12:08:54 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"; 
targetNamespace="http://callback";
+    xmlns:t="http://callback";>
+    <deployable composite="t:CallBackBasicTest" />
+</contribution>
\ No newline at end of file

Propchange: 
incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: 
incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

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=627861&r1=627860&r2=627861&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
 Thu Feb 14 12:08:54 2008
@@ -25,7 +25,7 @@
 
 public class CallBackBasicTestCase extends TestCase {
 
-    private SCADomain domain;
+    private static SCADomain domain;
     private CallBackBasicClient aCallBackClient;
 
     public void testCallBackBasic() {
@@ -34,7 +34,10 @@
 
     @Override
     protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("CallBackBasicTest.composite");
+       if( domain==null ) {
+               domain = SCADomain.newInstance("CallBackBasicTest.composite");
+       }
+       
         aCallBackClient = domain.getService(CallBackBasicClient.class, 
"CallBackBasicClient");
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to