You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/09/14 12:29:44 UTC
svn commit: r575609 - in /incubator/tuscany/java/sca/itest: admin/
admin/src/ admin/src/main/ admin/src/main/java/ admin/src/main/java/org/
admin/src/main/java/org/apache/ admin/src/main/java/org/apache/tuscany/
admin/src/main/java/org/apache/tuscany/s...
Author: svkrish
Date: Fri Sep 14 03:29:32 2007
New Revision: 575609
URL: http://svn.apache.org/viewvc?rev=575609&view=rev
Log:
applying itest contribution submitted in https://issues.apache.org/jira/browse/TUSCANY-1696
Added:
incubator/tuscany/java/sca/itest/admin/
incubator/tuscany/java/sca/itest/admin/pom.xml
incubator/tuscany/java/sca/itest/admin/readme.txt
incubator/tuscany/java/sca/itest/admin/src/
incubator/tuscany/java/sca/itest/admin/src/main/
incubator/tuscany/java/sca/itest/admin/src/main/java/
incubator/tuscany/java/sca/itest/admin/src/main/java/org/
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListService.java
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListServiceByYear.java
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListServiceImpl.java
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyLogger.java
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyService.java
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyServiceByDate.java
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyServiceImpl.java
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyTotalService.java
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyTotalServiceImpl.java
incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/SCAComponentService.java
incubator/tuscany/java/sca/itest/admin/src/main/resources/
incubator/tuscany/java/sca/itest/admin/src/main/resources/Iteration1Composite.composite
incubator/tuscany/java/sca/itest/admin/src/main/resources/Iteration3Composite.composite
incubator/tuscany/java/sca/itest/admin/src/main/resources/MySimpleService.composite
incubator/tuscany/java/sca/itest/admin/src/test/
incubator/tuscany/java/sca/itest/admin/src/test/java/
incubator/tuscany/java/sca/itest/admin/src/test/java/test/
incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/
incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/
incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MySimpleServiceInRecursiveTestCase.java
incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MySimpleServiceTestCase.java
incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MyTotalServiceTestCase.java
Modified:
incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml
Added: incubator/tuscany/java/sca/itest/admin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/pom.xml?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/pom.xml (added)
+++ incubator/tuscany/java/sca/itest/admin/pom.xml Fri Sep 14 03:29:32 2007
@@ -0,0 +1,60 @@
+<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-itest-admin</artifactId>
+ <name>Apache Tuscany Admin Tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-databinding</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Added: incubator/tuscany/java/sca/itest/admin/readme.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/readme.txt?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/readme.txt (added)
+++ incubator/tuscany/java/sca/itest/admin/readme.txt Fri Sep 14 03:29:32 2007
@@ -0,0 +1,28 @@
+This is a simple test compiled to test simple features of SCA
+
+There are interfaces to different services that have been included
+
+1. MyListService
+2. MyListServiceByYear
+3. MyService
+4. MyServiceByDate
+5. MyTotalservice
+
+The service that has been used in the tests primarily is MyService/MyTotalService.
+in the test cases.
+
+There are three test cases and three composites (MySimppleService,Iteration1,Iteration3).
+
+1. MySimpleServiceTestCase - Checks if the components in MySimpleService.composite are initialized properly.
+ It tries to call simple functions implemented in MySimpleServiceImpl.
+
+2. MyTotalServiceTestCase - Initializes the components in the Iteration3Composite.composite file.
+ tries to call simple functions implemented in MyTotalServiceImpl.
+
+3. MySimpleServiceInRecursiveTestCase - Initializes the components in the Iteration1Composite.composite file.
+ It initializes its components using implementation:composite tag in the
+ composite file which points to MySimpleService.composite.
+ The test case recursively calls functions initialized in MySimpleService.composite.
+
+
+
Added: incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListService.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListService.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListService.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,9 @@
+package org.apache.tuscany.sca.itest;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface MyListService {
+ String[] getHolidays();
+ String getYear();
+}
Added: incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListServiceByYear.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListServiceByYear.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListServiceByYear.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListServiceByYear.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,8 @@
+package org.apache.tuscany.sca.itest;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface MyListServiceByYear {
+ String[] getHolidays(int year);
+}
Added: incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListServiceImpl.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListServiceImpl.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyListServiceImpl.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,69 @@
+package org.apache.tuscany.sca.itest;
+
+
+import java.util.List;
+
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+import org.apache.tuscany.sca.itest.MyListService;
+import org.apache.tuscany.sca.itest.MyListServiceByYear;
+
+@Service(interfaces={MyListService.class,MyListServiceByYear.class})
+
+public class MyListServiceImpl implements MyListService,MyListServiceByYear
+{
+
+ // This is multiplicity=1:n
+ @Reference(name="myListServiceList",required=true)
+ public List<MyListService> myListServicesList;
+
+ // This is multiplicity=0:n
+ @Reference(name="myListServiceArray",required=false)
+ public MyListService[] myListServicesArray;
+
+ @Property(name="serviceYear")
+ protected String year = "2006";
+
+ public String[] getHolidays()
+ {
+ return getHolidays(new Integer(year).intValue());
+ }
+
+ public String[] getHolidays(int year)
+ {
+ MyListService myService;
+ if (myListServicesList!=null)
+ {
+ for (int i=0; i<myListServicesList.size(); i++)
+ {
+ myService=myListServicesList.get(i);
+ if(new Integer(myService.getYear()).intValue()==year)
+ {
+ return myService.getHolidays();
+ }
+ }
+ }
+ if (myListServicesArray!=null)
+ {
+ for (int i=0; i<myListServicesArray.length; i++)
+ {
+ myService=myListServicesArray[i];
+ if(new Integer(myService.getYear()).intValue()==year)
+ {
+ return myService.getHolidays();
+ }
+ }
+ }
+ return null;
+ }
+
+ public String getYear()
+ {
+ return year;
+ }
+
+
+
+}
Added: incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyLogger.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyLogger.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyLogger.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyLogger.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,17 @@
+package org.apache.tuscany.sca.itest;
+
+import java.io.PrintStream;
+
+public class MyLogger {
+
+ private PrintStream outStream;
+
+ public MyLogger(PrintStream out) {
+ this.outStream = out;
+ }
+
+ public void println(String text) {
+ outStream.println("MyLog: " + text);
+ }
+
+}
Added: incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyService.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyService.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyService.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,9 @@
+package org.apache.tuscany.sca.itest;
+
+import java.util.Date;
+
+public interface MyService extends SCAComponentService{
+ Date nextHoliday();
+ String getLocation();
+ String getYear();
+}
Added: incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyServiceByDate.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyServiceByDate.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyServiceByDate.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyServiceByDate.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,10 @@
+package org.apache.tuscany.sca.itest;
+
+import java.util.Date;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface MyServiceByDate {
+ Date nextHoliday(Date date);
+}
Added: incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyServiceImpl.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyServiceImpl.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyServiceImpl.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,113 @@
+package org.apache.tuscany.sca.itest;
+
+import java.util.Date;
+
+import org.osoa.sca.annotations.ComponentName;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Service;
+import org.apache.tuscany.sca.itest.MyListService;
+import org.apache.tuscany.sca.itest.MyListServiceByYear;
+import org.apache.tuscany.sca.itest.MyService;
+import org.apache.tuscany.sca.itest.MyServiceByDate;
+import org.apache.tuscany.sca.itest.MyLogger;
+
+
+@Service(interfaces={MyService.class, MyServiceByDate.class, MyListService.class, MyListServiceByYear.class})
+
+public class MyServiceImpl implements MyService, MyServiceByDate, MyListService, MyListServiceByYear{
+ static String[][] holidays = {{"2006/01/02","2006/05/29","2006/07/03","2006/07/04","2006/09/04","2006/11/23",
+ "2006/11/23","2006/11/24", "2006/12/25"},{"2007/01/01","2007/05/28","2007/07/04","2007/09/03","2007/11/22",
+ "2007/11/23","2007/12/25"},{"2006/01/02","2006/05/29","2006/07/03","2006/07/04","2006/09/04","2006/11/23",
+ "2006/11/23","2006/11/24", "2006/12/25"},{"2007/01/01","2007/05/28","2007/07/04","2007/09/03","2007/11/22",
+ "2007/11/23","2007/12/25"}};
+
+ @Property(name="location")
+ protected String location = "RTP";
+
+ @Property(name="year")
+ protected String year = "2006";
+
+
+ private String componentName;
+
+
+ private MyLogger logger;
+
+ public MyServiceImpl()
+ {
+ logger = new MyLogger(System.out);
+ logger.println("creating service instance...");
+ }
+
+ public Date nextHoliday() {
+
+ return nextHoliday(new Date());
+ }
+
+
+ public Date nextHoliday(Date today)
+ {
+ Date d1;
+ String[] days = getHolidays();
+ for (int j=0; j<days.length; j++)
+ {
+ d1 = new Date(days[j]);
+ if (d1.after(today))
+ return d1;
+ }
+ return null;
+ }
+
+
+ public String[] getHolidays(int year)
+ {
+ int index = year -2006;
+ if (index>=0 && index<holidays.length)
+ return holidays[index];
+ return null;
+ }
+
+ public String[] getHolidays()
+ {
+
+ Integer theYear;
+ if (year ==null || year.length()==0)
+ theYear = new Integer("2006");
+ else
+ theYear = new Integer(year);
+
+ return getHolidays(theYear.intValue());
+ }
+
+ @Init
+ public void start()
+ {
+ logger.println("Start service..");
+ }
+
+ @Destroy
+ public void stop()
+ {
+ logger.println("Stop service..");
+
+ }
+
+ public String getComponentName()
+ {
+ return componentName;
+ }
+
+
+ public String getLocation()
+ {
+ return location;
+ }
+
+ public String getYear()
+ {
+ return year;
+ }
+
+}
Added: incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyTotalService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyTotalService.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyTotalService.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyTotalService.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,6 @@
+package org.apache.tuscany.sca.itest;
+
+public interface MyTotalService extends MyListService, MyListServiceByYear, MyService, MyServiceByDate
+{
+
+}
Added: incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyTotalServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyTotalServiceImpl.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyTotalServiceImpl.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/MyTotalServiceImpl.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,74 @@
+package org.apache.tuscany.sca.itest;
+
+import java.util.Date;
+
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.ComponentName;
+import org.apache.tuscany.sca.itest.MyListService;
+import org.apache.tuscany.sca.itest.MyListServiceByYear;
+import org.apache.tuscany.sca.itest.MyService;
+import org.apache.tuscany.sca.itest.MyServiceByDate;
+import org.apache.tuscany.sca.itest.MyTotalService;
+
+@Service(MyTotalService.class)
+
+public class MyTotalServiceImpl implements MyTotalService
+{
+
+ // This is multiplicity=1:1
+ @Reference(required=true)
+ public MyListService myListService;
+
+ // default required==true so it is 1:1
+ @Reference (required=false)
+ public MyListServiceByYear myListServiceByYear = new MyServiceImpl();
+
+ // default required==true so it is 1:1
+ @Reference
+ public MyService myService;
+
+ // This is multiplicity=0:1
+ @Reference(required=false)
+ public MyServiceByDate myServiceByDate = new MyServiceImpl();
+
+ @ComponentName
+ private String componentName;
+
+ public String[] getHolidays()
+ {
+ return myListService.getHolidays();
+ }
+
+ public String[] getHolidays(int year)
+ {
+ return myListServiceByYear.getHolidays(year);
+ }
+
+
+ public Date nextHoliday(Date date)
+ {
+ return myServiceByDate.nextHoliday(date);
+ }
+
+ public String getLocation()
+ {
+ return myService.getLocation();
+ }
+
+ public String getYear()
+ {
+ return myService.getYear();
+ }
+
+ public String getComponentName()
+ {
+ return componentName;
+ }
+
+ public Date nextHoliday()
+ {
+ return myService.nextHoliday();
+ }
+}
Added: incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/SCAComponentService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/SCAComponentService.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/SCAComponentService.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/SCAComponentService.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,9 @@
+package org.apache.tuscany.sca.itest;
+
+
+
+public interface SCAComponentService
+{
+ String getComponentName();
+
+}
Added: incubator/tuscany/java/sca/itest/admin/src/main/resources/Iteration1Composite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/resources/Iteration1Composite.composite?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/resources/Iteration1Composite.composite (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/resources/Iteration1Composite.composite Fri Sep 14 03:29:32 2007
@@ -0,0 +1,43 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:foo="http://foo"
+ xmlns:cust="http://www.example.com/Customer"
+ xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
+ targetNamespace="http://foo"
+ name="Iteration1Composite" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <property name="newLocation" type="xs:anyURI">Raleigh</property>
+ <property name="newYear" type="xs:anyURI">2008</property>
+
+ <property name="anotherLocation" type="xs:anyURI">Durham</property>
+ <property name="anotherYear" type="xs:anyURI">2009</property>
+
+ <component name="MySimpleServiceInRecursive">
+ <implementation.composite name="foo:MySimpleService"/>
+ </component>
+
+ <component name="MySimpleServiceInRecursiveAnother">
+ <implementation.composite name="foo:MySimpleService"/>
+ <property name="newLocation">Durham</property>
+ <property name="newYear">2009</property>
+ </component>
+
+</composite>
Added: incubator/tuscany/java/sca/itest/admin/src/main/resources/Iteration3Composite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/resources/Iteration3Composite.composite?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/resources/Iteration3Composite.composite (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/resources/Iteration3Composite.composite Fri Sep 14 03:29:32 2007
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" name="Iteration3Composite"
+ targetNamespace="http://foo" local="true" autowire="false" requires="cns:confidentiality"
+ policySets="sns:secure">
+ <property name="newLocation" type="anyURI">Raleigh</property>
+ <property name="newYear" type="anyURI">2008</property>
+
+ <component name="MyServiceComponentOrig">
+ <implementation.java class="org.apache.tuscany.sca.itest.MyServiceImpl"/>
+ </component>
+
+ <component name="MyServiceComponentCary2007">
+ <implementation.java class="org.apache.tuscany.sca.itest.MyServiceImpl"/>
+ <property name="location">CARY</property>
+ <property name="year">2007</property>
+ </component>
+
+ <component name="MyServiceComponentNew">
+ <implementation.java class="org.apache.tuscany.sca.itest.MyServiceImpl"/>
+ <property name="location" source="$newLocation"/>
+ <property name="year" source="$newYear"/>
+ </component>
+
+ <component name="MyTotalServiceComponent">
+ <implementation.java class="org.apache.tuscany.sca.itest.MyTotalServiceImpl"/>
+ <reference name="myService" target="MyServiceComponentOrig/MyService"/>
+ <reference name="myListService" target="MyServiceComponentOrig/MyListService"/>
+ </component>
+
+ <component name="MyTotalServiceNewComponent">
+ <implementation.java class="org.apache.tuscany.sca.itest.MyTotalServiceImpl"/>
+ <reference name="myService" target="MyServiceComponentNew/MyService"/>
+ <reference name="myListService" target="MyServiceComponentNew/MyListService"/>
+ </component>
+
+ <property name="anotherLocation" type="anyURI">Durham</property>
+ <property name="anotherYear" type="anyURI">2009</property>
+
+ <component name="MySimpleServiceInRecursive">
+ <implementation.composite name="foo:MySimpleService"/>
+ </component>
+
+ <component name="MySimpleServiceInRecursiveAnother">
+ <implementation.composite name="foo:MySimpleService"/>
+ <property name="newLocation">Durham</property>
+ <property name="newYear">2009</property>
+ </component>
+</composite>
Added: incubator/tuscany/java/sca/itest/admin/src/main/resources/MySimpleService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/main/resources/MySimpleService.composite?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/main/resources/MySimpleService.composite (added)
+++ incubator/tuscany/java/sca/itest/admin/src/main/resources/MySimpleService.composite Fri Sep 14 03:29:32 2007
@@ -0,0 +1,59 @@
+<?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.
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:foo="http://foo"
+ xmlns:cust="http://www.example.com/Customer"
+ xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
+ targetNamespace="http://foo"
+ name="MySimpleService" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <service name="MyServiceCary1" promote="MyServiceComponentCary2007/MyService">
+ <interface.java interface="org.apache.tuscany.sca.itest.MyService"/>
+ </service>
+
+ <service name="MyServiceOrig1" promote="MyServiceComponentOrig/MyService">
+ <interface.java interface="org.apache.tuscany.sca.itest.MyService"/>
+ </service>
+
+ <service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">
+ <interface.java interface="org.apache.tuscany.sca.itest.MyService"/>
+ </service>
+
+ <property name="newLocation" type="anyURI">Raleigh</property>
+ <property name="newYear" type="anyURI">2008</property>
+
+ <component name="MyServiceComponentOrig">
+ <implementation.java class="org.apache.tuscany.sca.itest.MyServiceImpl"/>
+ </component>
+
+ <component name="MyServiceComponentCary2007">
+ <implementation.java class="org.apache.tuscany.sca.itest.MyServiceImpl"/>
+ <property name="location">CARY</property>
+ <property name="year">2007</property>
+ </component>
+
+ <component name="MyServiceComponentNew">
+ <implementation.java class="org.apache.tuscany.sca.itest.MyServiceImpl"/>
+ <property name="location" source="$newLocation"/>
+ <property name="year" source="$newYear"/>
+ </component>
+
+</composite>
Added: incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MySimpleServiceInRecursiveTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MySimpleServiceInRecursiveTestCase.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MySimpleServiceInRecursiveTestCase.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MySimpleServiceInRecursiveTestCase.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,60 @@
+package test.sca.tests;
+
+import static junit.framework.Assert.assertEquals;
+import org.apache.tuscany.sca.itest.MyService;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+
+public class MySimpleServiceInRecursiveTestCase
+{
+ private static MyService myServiceOrg;
+ private static MyService myServiceAnother;
+ private static MyService myServiceCary;
+
+ private static SCADomain domain;
+
+
+ @Test
+ public void testPropertyDefault()
+ {
+ assertEquals("RTP",myServiceOrg.getLocation());
+ assertEquals("2006",myServiceOrg.getYear());
+ }
+
+
+ @Test
+ public void testPropertyOverrideValue()
+ {
+ assertEquals("CARY",myServiceCary.getLocation());
+ assertEquals("2007",myServiceCary.getYear());
+ }
+
+
+ @Test
+ public void testPropertyOverrideVariable()
+ {
+ assertEquals("Durham",myServiceAnother.getLocation());
+ assertEquals("2009",myServiceAnother.getYear());
+ }
+
+
+ @BeforeClass
+ public static void init() throws Exception {
+ try {
+ domain = SCADomain.newInstance("Iteration1Composite.composite");
+ } catch ( Exception e ) { e.printStackTrace(); }
+
+ myServiceOrg = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceOrig1");
+ myServiceCary = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceCary1");
+ myServiceAnother = domain.getService(MyService.class, "MySimpleServiceInRecursiveAnother/MyServiceNew1");
+ }
+
+ @AfterClass
+ public static void destroy() throws Exception {
+ domain.close();
+ }
+}
Added: incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MySimpleServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MySimpleServiceTestCase.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MySimpleServiceTestCase.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MySimpleServiceTestCase.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,56 @@
+package test.sca.tests;
+
+import static junit.framework.Assert.assertEquals;
+import org.apache.tuscany.sca.itest.MyService;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MySimpleServiceTestCase
+{
+ private static SCADomain domain;
+ private static MyService myServiceOrg;
+ private static MyService myServiceNew;
+ private static MyService myServiceCary;
+
+ @Test
+ public void testPropertyDefault()
+ {
+ assertEquals("RTP",myServiceOrg.getLocation());
+ assertEquals("2006",myServiceOrg.getYear());
+ }
+
+
+ @Test
+ public void testPropertyOverrideWithValue()
+ {
+ assertEquals("CARY",myServiceCary.getLocation());
+ assertEquals("2007",myServiceCary.getYear());
+ }
+
+
+ @Test
+ public void testPropertyOverrideWithVariable()
+ {
+ assertEquals("Raleigh",myServiceNew.getLocation());
+ assertEquals("2008",myServiceNew.getYear());
+ }
+
+
+ @BeforeClass
+ public static void init() throws Exception {
+ try {
+ domain = SCADomain.newInstance("MySimpleService.composite");
+ } catch ( Exception e ) { System.out.println("Could not initialize " + e.toString());
+ e.printStackTrace(); }
+ myServiceOrg = domain.getService(MyService.class, "MyServiceComponentOrig/MyService");
+ myServiceCary = domain.getService(MyService.class, "MyServiceComponentCary2007/MyService");
+ myServiceNew = domain.getService(MyService.class, "MyServiceComponentNew/MyService");
+ }
+
+ @AfterClass
+ public static void destroy() throws Exception {
+ domain.close();
+ }
+}
Added: incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MyTotalServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MyTotalServiceTestCase.java?rev=575609&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MyTotalServiceTestCase.java (added)
+++ incubator/tuscany/java/sca/itest/admin/src/test/java/test/sca/tests/MyTotalServiceTestCase.java Fri Sep 14 03:29:32 2007
@@ -0,0 +1,47 @@
+package test.sca.tests;
+
+import static junit.framework.Assert.assertEquals;
+import org.apache.tuscany.sca.itest.MyTotalService;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MyTotalServiceTestCase
+{
+ private static MyTotalService myTotalServiceOrg;
+ private static MyTotalService myTotalServiceNew;
+
+ private static SCADomain domain;
+
+ @Test
+ public void testPropertyDefault()
+ {
+ assertEquals("RTP",myTotalServiceOrg.getLocation());
+ assertEquals("2006",myTotalServiceOrg.getYear());
+ }
+
+
+ @Test
+ public void testPropertyOverrideVariable()
+ {
+ assertEquals("Raleigh",myTotalServiceNew.getLocation());
+ assertEquals("2008",myTotalServiceNew.getYear());
+ }
+
+
+ @BeforeClass
+ public static void init() throws Exception {
+ try {
+ domain = SCADomain.newInstance("Iteration3Composite.composite");
+ } catch ( Exception e ) { e.printStackTrace(); }
+
+ myTotalServiceOrg =domain.getService(MyTotalService.class, "MyTotalServiceComponent");
+ myTotalServiceNew=domain.getService(MyTotalService.class, "MyTotalServiceNewComponent");
+ }
+
+ @AfterClass
+ public static void destroy() throws Exception {
+ domain.close();
+ }
+}
Modified: incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml?rev=575609&r1=575608&r2=575609&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml Fri Sep 14 03:29:32 2007
@@ -29,7 +29,7 @@
<artifactId>itest-databindings-sdo</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Apache Tuscany SCA SDO Databinding Integration Tests</name>
+ <name>Apache Tuscany SDO Databinding Integration Test</name>
<repositories>
<repository>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org