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/02/13 18:32:15 UTC

svn commit: r627540 - in /incubator/tuscany/java/sca/itest/services/src: main/resources/META-INF/ main/resources/META-INF/sca-contribution.xml test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java

Author: rfeng
Date: Wed Feb 13 09:32:10 2008
New Revision: 627540

URL: http://svn.apache.org/viewvc?rev=627540&view=rev
Log:
Convert the services itest to work w/ the itest web framework

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

Added: incubator/tuscany/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml?rev=627540&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml (added)
+++ incubator/tuscany/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml Wed Feb 13 09:32:10 2008
@@ -0,0 +1,22 @@
+<?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://foo" xmlns:foo="http://foo">
+    <deployable composite="foo:InnerServicesTest" />
+</contribution>
\ No newline at end of file

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

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

Modified: incubator/tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java?rev=627540&r1=627539&r2=627540&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java Wed Feb 13 09:32:10 2008
@@ -33,7 +33,9 @@
 
     @BeforeClass
     public static void init() throws Exception {
-        domain = SCADomain.newInstance("ServicesTest.composite");
+        if (domain == null) {
+            domain = SCADomain.newInstance("ServicesTest.composite");
+        }
     }
 
     @AfterClass



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org