tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwilli...@apache.org
Subject svn commit: r663416 - in /incubator/tuscany/java/sca/vtest/assembly/ctypefile/src: main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/ main/resources/ main/resources/org/ main/resources/org/apache/ main/resources/org/apache/tuscany/ main/re...
Date Wed, 04 Jun 2008 23:29:10 GMT
Author: kwilliams
Date: Wed Jun  4 16:29:10 2008
New Revision: 663416

URL: http://svn.apache.org/viewvc?rev=663416&view=rev
Log:
Adding first vtest for component type file

Added:
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
  (with props)
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
  (with props)
Modified:
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite
    incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java

Modified: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java?rev=663416&r1=663415&r2=663416&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
(original)
+++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
Wed Jun  4 16:29:10 2008
@@ -21,17 +21,17 @@
 
 import org.apache.tuscany.sca.vtest.assembly.ctypefile.AService;
 import org.apache.tuscany.sca.vtest.assembly.ctypefile.BService;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
 
-@Service(AService.class)
 public class AServiceImpl implements AService {
 
-    @Reference
-    protected BService b;
+    private BService bService;
+
+    public void setBService(BService b) {
+        this.bService = b;
+    }
 
     public String getState() {
-        return b.getState();
+        return bService.getState();
     }
 
 }

Modified: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java?rev=663416&r1=663415&r2=663416&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
(original)
+++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
Wed Jun  4 16:29:10 2008
@@ -20,13 +20,11 @@
 package org.apache.tuscany.sca.vtest.assembly.ctypefile.impl;
 
 import org.apache.tuscany.sca.vtest.assembly.ctypefile.BService;
-import org.osoa.sca.annotations.Service;
 
-//@Service(BService.class)
 public class BServiceImpl implements BService {
 
     public String getState() {
         return "SomeStateFromB";
     }
 
-}
+} 

Added: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType?rev=663416&view=auto
==============================================================================
--- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
(added)
+++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
Wed Jun  4 16:29:10 2008
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * 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.
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+
+  <service name="AService">
+     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.AService"/>

+  </service>
+
+ <reference name="bService">
+    <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.BService"/>
+ </reference>
+
+</componentType>              
\ No newline at end of file

Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType?rev=663416&view=auto
==============================================================================
--- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
(added)
+++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
Wed Jun  4 16:29:10 2008
@@ -0,0 +1,26 @@
+<!--
+ * 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.
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+
+  <service name="BService">
+     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.BService"/>

+  </service>
+
+</componentType>              
+       
\ No newline at end of file

Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite?rev=663416&r1=663415&r2=663416&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite
(original)
+++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite
Wed Jun  4 16:29:10 2008
@@ -19,12 +19,12 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://java-api-tests"
+	targetNamespace="http://assembly-tests"
 	name="Assemby-component-typefile-Composite">
 
     <component name="AComponent">
 	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.AServiceImpl"/>
-	    <reference name="b" target="BComponent"/>
+	    <reference name="bService" target="BComponent/BService"/>
      </component>
 
     <component name="BComponent">

Modified: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java?rev=663416&r1=663415&r2=663416&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
(original)
+++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
Wed Jun  4 16:29:10 2008
@@ -40,10 +40,10 @@
         try {
             System.out.println("Setting up");
             ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent");
+            aService = ServiceFinder.getService(AService.class, "AComponent/AService");
         } catch (Exception ex) {
             ex.printStackTrace();
-        }
+        } 
     }
 
     @AfterClass
@@ -56,7 +56,6 @@
 
     @Test
     public void typeFile1() throws Exception {
-        String thisState = "This State";
         Assert.assertSame("SomeStateFromB", aService.getState());
     }
 



Mime
View raw message