-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 0bc67c4c98..0000000000
--- a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index ce99d94a15..0000000000
--- a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
- Tuscany Alert Aggregator Demo
-
-
- org.apache.tuscany.sca.webapp.TuscanyContextListener
-
-
-
- TuscanyServlet
- org.apache.tuscany.sca.webapp.TuscanyServlet
-
-
-
- TuscanyServlet
- /services/*
-
-
-
- AlertAggregator.html
-
-
-
diff --git a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/pop.png b/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/pop.png
deleted file mode 100644
index 1cf1df24a7..0000000000
Binary files a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/pop.png and /dev/null differ
diff --git a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/rss.png b/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/rss.png
deleted file mode 100644
index b3c949d224..0000000000
Binary files a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/rss.png and /dev/null differ
diff --git a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/service.smd b/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/service.smd
deleted file mode 100644
index bc77e39bf9..0000000000
--- a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/service.smd
+++ /dev/null
@@ -1 +0,0 @@
-{"SMDVersion":".1","objectName":"AlertsService","serviceType":"JSON-RPC","serviceURL":"http://localhost:8080/sample-feed-aggregator/services/AlertsServiceJSONRPC","methods":[{"name":"getAllNewAlerts","parameters":[{"name":"param0","type":"STRING"}]}]}
diff --git a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/sources.smd b/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/sources.smd
deleted file mode 100644
index b5f1824363..0000000000
--- a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/sources.smd
+++ /dev/null
@@ -1 +0,0 @@
-{"SMDVersion":".1","objectName":"AlertsSourcesService","serviceType":"JSON-RPC","serviceURL":"http://localhost:8081/sample-feed-aggregator/services/AlertsSourcesServiceJSONRPC","methods":[{"name":"getAlertSources","parameters":[{"name":"param0","type":"STRING"}]},{"name":"getAlertSource","parameters":[{"name":"param0","type":"STRING"}]},{"name":"updateAlertSource","parameters":[{"name":"param0","type":"STRING"}]},{"name":"addAlertSource","parameters":[{"name":"param0","type":"STRING"}]},{"name":"removeAlertSource","parameters":[{"name":"param0","type":"STRING"}]}]}
diff --git a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/style.css b/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/style.css
deleted file mode 100644
index f5bbf23379..0000000000
--- a/branches/sca-java-0.91/demos/alert-aggregator/src/main/webapp/style.css
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * 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.
- */
-
-p,table,li,h1,h2,h3
-{
-font-family: verdana, arial, 'sans serif';
-}
-
-p, h1, h2, h3, table, li, hr
-{
-margin-left: 10pt;
-}
-
-table
-{
-border-color: black;
-border-collapse: separate;
-border-spacing: 0px 1px;
-
-margin-right: 10pt;
-margin-left: 10pt;
-width: 800px;
-}
-
-.sourceDetailsTable
-{
-width: 600px;
-}
-
-tr, td
-{
-margin-left: 0pt;
-margin-right: 0pt;
-padding-left: 10pt;
-font-size: 90%;
-}
-
-p,li,th
-{
-font-size: 90%;
-margin-left: 10pt;
-}
-
-pre
-{
-margin-left: 10pt;
-}
-
-body
-{
-#ffffff;
-}
-
-h1,h2,h3,hr
-{
-color: firebrick;
-}
-
-a:link {COLOR: firebrick;}
-a:visited {COLOR: firebrick;}
-a:active {COLOR: navy;}
-
-.link
-{
-COLOR: firebrick;
-text-decoration: underline;
-}
-
-.clickable
-{
-cursor: pointer
-}
-
-.unread_title
-{
-font-weight: bold;
-}
-
-.read_title
-{
-font-weight: normal;
-}
-
-.summary
-{
-color: DimGrey;
-}
-
-.hidden
-{
-display: none;
-}
-
-.source_name
-{
-width: 600px;
-}
-
-.alert_text
-{
-width: 600px;
-}
-
-.alert_data
-{
-margin-left: 10px;
-width: 800px;
-height: 800px;
-}
-
-.source_0
-{
-background-color: LightGreen;
-}
-
-.source_1
-{
-background-color: LightSkyBlue;
-}
-
-.source_2
-{
-background-color: Khaki;
-}
-
-.source_3
-{
-background-color: LightPink;
-}
-
-.source_4
-{
-background-color: Orange;
-}
-
-.source_5
-{
-background-color: LightCoral;
-}
-
-.source_6
-{
-background-color: Orchid;
-}
-
-.source_7
-{
-background-color: Peru;
-}
-
-.source_8
-{
-background-color: SpringGreen;
-}
-
-.source_9
-{
-background-color: LightGrey;
-}
-
diff --git a/branches/sca-java-0.91/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java b/branches/sca-java-0.91/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java
deleted file mode 100644
index a8481ce5ea..0000000000
--- a/branches/sca-java-0.91/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.demos.aggregator;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.json.JSONObject;
-
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-
-/**
- */
-public class AlertsTestCase extends TestCase {
- private SCADomain scaDomain;
- /**
- * Runs before each test method
- */
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("alerts.composite");
- super.setUp();
- }
-
- /**
- * Runs after each test method
- */
- protected void tearDown() {
- scaDomain.close();
- }
-
-/* Use this if you want to test locally without deploying to a web container
- public void testWait() throws Exception {
- System.out.println("Feed aggregator server started (press enter to shutdown)");
- System.in.read();
- System.out.println("Feed aggregator server stopped");
- }
-*/
-
- public void testGetAllNewAlerts() throws Exception {
- JSONObject jsonRequest = new JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAllNewAlerts\",\"id\":2}");
- JSONObject jsonResp = callService ("http://localhost:8080/SCADomain/AlertsServiceJSONRPC",
- jsonRequest);
- }
-
- public void testAddAlertSources() throws Exception {
- JSONObject jsonRequest = new JSONObject("{\"params\":[{\"name\":\"news\",\"id\":\"2\",\"address\":\"www.news.com\",\"feedAddress\":\"http://news.com.com/2547-1_3-0-20.xml\",\"feedType\":\"rss\",\"lastChecked\":\"lastChecked\",\"javaClass\":\"org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl\"}],\"method\":\"addAlertSource\",\"id\":2}");
- JSONObject jsonResp = callService ("http://localhost:8080/SCADomain/AlertsSourcesServiceJSONRPC",
- jsonRequest);
- }
-
- public void testGetAlertSources() throws Exception {
- JSONObject jsonRequest = new JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAlertSources\",\"id\":2}");
- JSONObject jsonResp = callService ("http://localhost:8080/SCADomain/AlertsSourcesServiceJSONRPC",
- jsonRequest);
- assertEquals("BBC News", jsonResp.getJSONObject("result").getJSONObject("source").optJSONArray("list").getJSONObject(0).getString("name"));
- }
-
- public JSONObject callService(String url, JSONObject jsonRequest) throws Exception {
- System.out.println("Request = " + jsonRequest.toString());
- WebConversation wc = new WebConversation();
- WebRequest request = new PostMethodWebRequest( url,
- new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json");
- WebResponse response = wc.getResource(request);
- System.out.println("Response= " + response.getText());
- assertEquals(200, response.getResponseCode());
- return new JSONObject(response.getText());
- }
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/README b/branches/sca-java-0.91/demos/bigbank-account/README
deleted file mode 100644
index ee398e7a4c..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/README
+++ /dev/null
@@ -1,50 +0,0 @@
-BigBank
-======
-
-This application comprises three modules that represent the different aspects
-of a fictitious banking application. To run the sample you need to run each of
-the modules sample servers. This will bring up a Tuscany runtime, load the
-application and make the application's services available. You will need both
-ant and maven installed to run these applications.
-
-Bigbank-calculator
-
-A calculator application, based on the calculator-script sample that uses a
-variety of languages to implement a calculator, which the banking application
-uses for simple value multiplication. To run the service do the following:
-
-cd bigbank-calculator
-ant run
-
-Bigbank-stockquote
-
-A very simple web services based stock quote application which returns random
-stock quotes on request.
-
-cd bigbank-stockquote
-ant run
-
-Bigbank-account
-
-The front end of this demo application this module provides a web app for
-retrieving account information. It makes calls out to the stockquote and
-calculator applications to satisfy account requests. See the README in this
-module for further instructions.
-
-cd bigbank-account
-mvn -f pom-runapp.xml
-
-Maven is used in this last step as there are unresolved issues with running
-this app from the provided ant file.
-
-To try the app out point your browser at:
-
-http://localhost:8082/WebResourceComponent/AccountJSON.html
-
-This should display an interface with a single button that goes and retrieves
-a single set of account details exercising services across the three running
-SCA applications.
-
-
-
-
diff --git a/branches/sca-java-0.91/demos/bigbank-account/bigbank.png b/branches/sca-java-0.91/demos/bigbank-account/bigbank.png
deleted file mode 100644
index 985cc6bd05..0000000000
Binary files a/branches/sca-java-0.91/demos/bigbank-account/bigbank.png and /dev/null differ
diff --git a/branches/sca-java-0.91/demos/bigbank-account/bigbank.svg b/branches/sca-java-0.91/demos/bigbank-account/bigbank.svg
deleted file mode 100644
index 6698b8cc9b..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/bigbank.svg
+++ /dev/null
@@ -1,519 +0,0 @@
-
-
-
diff --git a/branches/sca-java-0.91/demos/bigbank-account/build.xml b/branches/sca-java-0.91/demos/bigbank-account/build.xml
deleted file mode 100644
index 040bf2de83..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/build.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/demos/bigbank-account/pom-runapp.xml b/branches/sca-java-0.91/demos/bigbank-account/pom-runapp.xml
deleted file mode 100644
index ec1f0b8579..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/pom-runapp.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-demos
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- demo-bigbank-account
- jar
- Apache Tuscany BigBank Account Demo
-
-
-
-
- apache.incubator
- http://people.apache.org/repo/m2-incubating-repository
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-feed
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-jsonrpc
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-rmi
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-resource
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-http-jetty
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- junit
- junit
- 4.2
- test
-
-
-
-
-
- demo-bigbank-account
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
-
-
- install-dojo
- validate
-
- run
-
-
-
-
-
-
-
-
-
-
- copy-dojo-files
- generate-resources
-
- run
-
-
-
-
-
-
-
-
-
-
-
- clean-dojo-files
- clean
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/demos/bigbank-account/pom.xml b/branches/sca-java-0.91/demos/bigbank-account/pom.xml
deleted file mode 100644
index fcd193172d..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/pom.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-demos
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- demo-bigbank-account
- jar
- Apache Tuscany BigBank Account Demo
-
-
- true
-
-
-
-
- apache.incubator
- http://people.apache.org/repo/m2-incubating-repository
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-feed
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-jsonrpc
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-rmi
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-resource
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-http-jetty
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- junit
- junit
- 4.2
- test
-
-
-
-
-
- demo-bigbank-account
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
-
-
- install-dojo
- validate
-
- run
-
-
-
-
-
-
-
-
-
-
- copy-dojo-files
- generate-resources
-
- run
-
-
-
-
-
-
-
-
-
-
-
- clean-dojo-files
- clean
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/demos/bigbank-account/runapp.xml b/branches/sca-java-0.91/demos/bigbank-account/runapp.xml
deleted file mode 100644
index 9f286f75fb..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/runapp.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/account/AccountService.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/account/AccountService.java
deleted file mode 100644
index abe65cbbe0..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/account/AccountService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package bigbank.account;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-
-@Remotable
-@Service
-public interface AccountService {
-
- public double getAccountReport(String customerID);
-
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/account/AccountServiceImpl.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/account/AccountServiceImpl.java
deleted file mode 100644
index 4f1afee204..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/account/AccountServiceImpl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.
- */
-package bigbank.account;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import stockquote.StockQuoteService;
-import bigbank.accountdata.AccountDataService;
-import bigbank.accountdata.CheckingAccount;
-import bigbank.accountdata.SavingsAccount;
-import bigbank.accountdata.StockAccount;
-import calculator.CalculatorService;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-
-@Service(AccountService.class)
-public class AccountServiceImpl implements AccountService {
-
- @Reference
- protected AccountDataService accountDataService;
-
- @Reference
- protected StockQuoteService stockQuoteService;
-
- @Reference
- protected CalculatorService calculatorService;
-
- @Property
- protected String currency;
-
- public double getAccountReport(String customerID) {
-
- // Get the checking, savings and stock accounts from the AccountData
- // service component
- CheckingAccount checking = accountDataService.getCheckingAccount(customerID);
- System.out.println("Checking account: " + checking);
-
- SavingsAccount savings = accountDataService.getSavingsAccount(customerID);
- System.out.println("Savings account: " + savings);
-
- StockAccount stock = accountDataService.getStockAccount(customerID);
- System.out.println("Stock account: " + stock);
-
- // Get the stock price in USD
- double price = stockQuoteService.getQuote(stock.getSymbol());
- System.out.println("Stock price for " + stock.getSymbol() + ": " + price);
-
- // Convert to the configured currency
- if (currency.equals("EURO")) {
-
- // Use our fancy calculator service to convert to the target currency
- price = calculatorService.multiply(price, 0.70);
-
- System.out.println("Converted to " + currency + ": " + price);
- }
-
- // Calculate the value of the stock account
- double stockValue = price * stock.getQuantity();
-
- // Calculate the total balance of all accounts and return it
- double balance = checking.getBalance() + savings.getBalance() + stockValue;
-
- return balance;
- }
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/account/feed/AccountFeedImpl.java
deleted file mode 100644
index 1df30580da..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.
- */
-package bigbank.account.feed;
-
-import org.apache.tuscany.sca.binding.feed.Feed;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import bigbank.account.AccountService;
-
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-
-@Service(Feed.class)
-public class AccountFeedImpl implements Feed {
-
- @Reference
- protected AccountService accountService;
-
- @SuppressWarnings("unchecked")
- public SyndFeed get(String uri) {
-
- // Get the account report for the specified customer ID
- String customerID = uri.substring(uri.lastIndexOf('/')+1);
- double balance = accountService.getAccountReport(customerID);
- String value = Double.toString(balance);
-
- // Create a new Feed
- SyndFeed feed = new SyndFeedImpl();
- feed.setTitle("Account Report Feed");
- feed.setDescription("A sample Account Report feed");
- feed.setAuthor("anonymous");
- feed.setLink(uri);
-
- SyndEntry entry = new SyndEntryImpl();
- entry.setAuthor("anonymous");
- SyndContent content = new SyndContentImpl();
- content.setValue(value);
- entry.setDescription(content);
- feed.getEntries().add(entry);
-
- return feed;
- }
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataService.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataService.java
deleted file mode 100644
index 02f4d0e7b6..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package bigbank.accountdata;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-
-public interface AccountDataService {
-
- public CheckingAccount getCheckingAccount(String customerID);
-
- public SavingsAccount getSavingsAccount(String customerID);
-
- public StockAccount getStockAccount(String customerID);
-
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index 2e1290aa5f..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-package bigbank.accountdata;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-
-@Service(AccountDataService.class)
-public class AccountDataServiceImpl implements AccountDataService {
-
- public CheckingAccount getCheckingAccount(String customerID) {
-
- CheckingAccount checkingAccount = new CheckingAccount();
- checkingAccount.setAccountNumber("CHA_" + customerID);
- checkingAccount.setBalance(500.0f);
-
- return checkingAccount;
- }
-
- public SavingsAccount getSavingsAccount(String customerID) {
-
- SavingsAccount savingsAccount = new SavingsAccount();
- savingsAccount.setAccountNumber("SAA_" + customerID);
- savingsAccount.setBalance(1500.0f);
-
- return savingsAccount;
- }
-
- public StockAccount getStockAccount(String customerID) {
-
- StockAccount stockAccount = new StockAccount();
- stockAccount.setAccountNumber("STA_" + customerID);
- stockAccount.setSymbol("IBM");
- stockAccount.setQuantity(100);
-
- return stockAccount;
- }
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/CheckingAccount.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/CheckingAccount.java
deleted file mode 100644
index 567991a555..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package bigbank.accountdata;
-
-/**
- * @version $$Rev$$ $$Date: 2007-04-09 12:03:34 -0700 (Mon, 09 Apr
- * 2007) $$
- */
-
-public class CheckingAccount {
- private String accountNumber;
- private double balance;
-
- public String getAccountNumber() {
- return accountNumber;
- }
-
- public void setAccountNumber(String n) {
- this.accountNumber = n;
- }
-
- public double getBalance() {
- return balance;
- }
-
- public void setBalance(double b) {
- this.balance = b;
- }
-
- public String toString() {
- return accountNumber + ", balance:" + balance;
- }
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/SavingsAccount.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/SavingsAccount.java
deleted file mode 100644
index 8f826bedaa..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package bigbank.accountdata;
-
-/**
- * @version $$Rev$$ $$Date: 2007-04-09 12:03:34 -0700 (Mon, 09 Apr
- * 2007) $$
- */
-
-public class SavingsAccount {
- private String accountNumber;
- private double balance;
-
- public String getAccountNumber() {
- return accountNumber;
- }
-
- public void setAccountNumber(String n) {
- this.accountNumber = n;
- }
-
- public double getBalance() {
- return balance;
- }
-
- public void setBalance(double b) {
- this.balance = b;
- }
-
- public String toString() {
- return accountNumber + ", balance:" + balance;
- }
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/StockAccount.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/StockAccount.java
deleted file mode 100644
index 52d1b8d8ad..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/accountdata/StockAccount.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-package bigbank.accountdata;
-
-/**
- * @version $$Rev$$ $$Date: 2007-04-09 12:03:34 -0700 (Mon, 09 Apr
- * 2007) $$
- */
-
-public class StockAccount {
- private String accountNumber;
- private String symbol;
- private int quantity;
-
- public String getAccountNumber() {
- return accountNumber;
- }
-
- public void setAccountNumber(String n) {
- this.accountNumber = n;
- }
-
- public double getQuantity() {
- return quantity;
- }
-
- public void setQuantity(int a) {
- this.quantity = a;
- }
-
- public String getSymbol() {
- return symbol;
- }
-
- public void setSymbol(String s) {
- this.symbol = s;
- }
-
- public String toString() {
- return accountNumber + ", symbol:" + symbol + ", quantity:" + quantity;
- }
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/client/BigBankClient.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/client/BigBankClient.java
deleted file mode 100644
index a7fa5ecc22..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/client/BigBankClient.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-
-package bigbank.client;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import bigbank.account.AccountService;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class BigBankClient {
-
- public static void main(String[] args) throws Exception {
-
- SCADomain domain = SCADomain.newInstance("BigBank.composite");
-
- AccountService accountService = domain.getService(AccountService.class, "AccountServiceComponent");
-
- String customerID = "1234";
-
- System.out.println("Calling account service for customer: " + customerID);
- System.out.println();
- double balance = accountService.getAccountReport(customerID);
-
- System.out.println();
- System.out.println("Balance: " + balance);
-
- domain.close();
- }
-
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/demo/BigBankServer.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/demo/BigBankServer.java
deleted file mode 100644
index 4132abe929..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/bigbank/demo/BigBankServer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- */
-
-package bigbank.demo;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class BigBankServer {
-
- public static void main(String[] args) throws Exception {
-
- System.out.println("Starting the Sample SCA BigBank server...");
-
- SCADomain domain = SCADomain.newInstance("BigBank.composite");
-
- System.out.println("Press Enter to Exit...");
- System.in.read();
-
- domain.close();
-
- System.out.println("Bye");
- }
-
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index c89043276e..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
- double add(double n1, double n2);
-
- double subtract(double n1, double n2);
-
- double multiply(double n1, double n2);
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/stockquote/StockQuoteService.java b/branches/sca-java-0.91/demos/bigbank-account/src/main/java/stockquote/StockQuoteService.java
deleted file mode 100644
index 1607344788..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/java/stockquote/StockQuoteService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package stockquote;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-@Service
-public interface StockQuoteService {
-
- public double getQuote(String symbol);
-}
-
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/resources/AccountData.composite b/branches/sca-java-0.91/demos/bigbank-account/src/main/resources/AccountData.composite
deleted file mode 100644
index 6f5ee4c6fd..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/resources/AccountData.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/resources/BigBank.composite b/branches/sca-java-0.91/demos/bigbank-account/src/main/resources/BigBank.composite
deleted file mode 100644
index 0545e2cafc..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/resources/BigBank.composite
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- EURO
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/demos/bigbank-account/src/main/resources/web/AccountJSON.html b/branches/sca-java-0.91/demos/bigbank-account/src/main/resources/web/AccountJSON.html
deleted file mode 100644
index 3cc60a3b9d..0000000000
--- a/branches/sca-java-0.91/demos/bigbank-account/src/main/resources/web/AccountJSON.html
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
- Tuscany JSON-RPC BigBank Client
-
-
-
-
-
-
-
-
-
-
-
-
-
-<% } //catch
-
-%>
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index fd58cb8b0e..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
- SCA Test Service Driver
-
- SCATestTool.jsp
-
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java
deleted file mode 100644
index 6cc72c99a2..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-
-import java.io.IOException;
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.api.SCARuntime;
-
-public class SCATestToolServerTest extends TestCase {
-
- @Override
- protected void setUp() throws Exception {
- SCARuntime.start("bindingscomposite-system.composite", "bindingscomposite.composite");
- }
-
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
- @Override
- protected void tearDown() throws Exception {
- SCARuntime.stop();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java
deleted file mode 100644
index b5f076b7e8..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.lang.reflect.UndeclaredThrowableException;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.api.SCARuntime;
-import org.apache.tuscany.core.test.SCATestCaseRunner;
-import org.apache.tuscany.sca.util.SCATestUtilityServerTest;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-public class WSBindingsClientTestCase extends TestCase {
- private SCATestToolService scaTestTool;
-
- private SCATestCaseRunner toolServer;
- private SCATestCaseRunner utilityServer;
-
- // Hops over one composite
- public void testOneHopPing() throws Throwable {
- try {
- assertTrue(scaTestTool.doOneHopPing("brio").contains("brio"));
- } catch (UndeclaredThrowableException e) {
- throw (e.getCause());
- }
- }
-
- // Hops over two composites
- public void testTwoHopPing() {
- assertTrue(scaTestTool.doTwoHopPing("brio").contains("brio"));
- }
-
- protected void setUp() throws Exception {
- SCARuntime.start("bindingsclient.composite");
-
- toolServer = new SCATestCaseRunner(SCATestToolServerTest.class);
- toolServer.setUp();
- utilityServer = new SCATestCaseRunner(SCATestUtilityServerTest.class);
- utilityServer.setUp();
-
- CompositeContext cc = CurrentCompositeContext.getContext();
- System.out.println("Composite Name = " + cc.getName());
- System.out.println(CurrentCompositeContext.getContext());
- scaTestTool =
- (SCATestToolService)CurrentCompositeContext.getContext().locateService(SCATestToolService.class,
- "SCATestToolWSReference");
- if (scaTestTool == null) {
- System.out.println("Yo Yo It is null");
- } else {
- System.out.println("Yo Yo It is not null: " + scaTestTool);
- }
-
- }
-
- @Override
- protected void tearDown() throws Exception {
- SCARuntime.stop();
- toolServer.tearDown();
- utilityServer.tearDown();
- }
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java
deleted file mode 100644
index 0f6cb912a7..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.util;
-
-
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.api.SCARuntime;
-
-import junit.framework.TestCase;
-
-public class SCATestUtilityServerTest extends TestCase {
-
- @Override
- protected void setUp() throws Exception {
- SCARuntime.start("bindingsutility-system.composite", "bindingsutility.composite");
- }
-
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8081);
- }
-
- @Override
- protected void tearDown() throws Exception {
- SCARuntime.stop();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/pom.xml b/branches/sca-java-0.91/itest/bindings/bindingscomposite/pom.xml
deleted file mode 100644
index 28e9480291..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
- org.apache.tuscany.testing
- sca-itest
- 0.91-incubating-SNAPSHOT
- ../../pom.xml
-
- 4.0.0
- org.apache.tuscany.testing.bindingstest
- tuscany-itest-bindings-bindingscomposite
- jar
- SCA FVT Bindings Test Tool Service Composite
-
-
-
- org.apache.tuscany.sca.services.databinding
- databinding-sdo
- 0.91-incubating-SNAPSHOT
-
-
-
- commonj
- sdo-api-r2.1
- 1.0-incubating-beta1
- runtime
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-impl
- 1.0-incubating-beta1
- runtime
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java
deleted file mode 100644
index efe30c4f4e..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Random;
-import java.util.Vector;
-
-import org.apache.tuscany.sca.util.SCATestUtilityService;
-
-public class SCADataTypeHelper {
-
- Date date;
- Random ran;
- SCATestUtilityService scaUtil; // change this to be the service provider
-
- public SCADataTypeHelper(SCATestUtilityService util) {
- date = new Date();
- ran = new Random(date.getTime());
- scaUtil = util;
- }
-
- public StringBuffer test_char() throws SCADataTypeHelperException {
-
- char x = 'a';
- x += ran.nextInt(26); // get a char a-z
- StringBuffer rc = new StringBuffer("\nchar datatype test sending ==> " + x);
- try {
- char y = scaUtil.echo_char(x);
- if (x == y) {
- rc.append("\nchar successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException(rc + "\nDatatype exception: char ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_char\n" + e.toString());
- }
- return rc;
- }
-
- public StringBuffer test_String() throws SCADataTypeHelperException {
-
- String x = date.toString();
- StringBuffer rc = new StringBuffer("\nString datatype test sending ==> " + x);
- try {
- String y = scaUtil.echo_String(x);
- if (x.equals(y)) {
- rc.append("\nString successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException(rc + "\nDatatype exception: String ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_String\n" + e.toString());
- }
- return rc;
- }
-
- public StringBuffer test_int() throws SCADataTypeHelperException {
-
- int x = ran.nextInt();
- StringBuffer rc = new StringBuffer("\nint datatype test sending ==> " + x);
- try {
- int y = scaUtil.echo_int(x);
- if (x == y) {
- rc.append("\nint successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException(rc + "\nDatatype exception: int ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_int\n" + e.toString());
- }
- return rc;
- }
-
- public StringBuffer test_boolean() throws SCADataTypeHelperException {
-
- boolean x = ran.nextBoolean();
- StringBuffer rc = new StringBuffer("\nboolean datatype test sending ==> " + x);
- try {
- boolean y = scaUtil.echo_boolean(x);
- if (x == y) {
- rc.append("\nboolean successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException(rc + "\nDatatype exception: boolean ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_boolean\n" + e.toString());
- }
- return rc;
- }
-
- public StringBuffer test_long() throws SCADataTypeHelperException {
-
- long x = ran.nextLong();
- StringBuffer rc = new StringBuffer("\nlong datatype test sending ==> " + x);
- try {
- long y = scaUtil.echo_long(x);
- if (x == y) {
- rc.append("\nlong successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException(rc + "\nDatatype exception: long ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_long\n" + e.toString());
- }
- return rc;
- }
-
- public StringBuffer test_short() throws SCADataTypeHelperException {
-
- short x = (short)ran.nextInt();
- StringBuffer rc = new StringBuffer("\nshort datatype test sending ==> " + x);
- try {
- short y = scaUtil.echo_short(x);
- if (x == y) {
- rc.append("\nshort successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException(rc + "\nDatatype exception: short ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_short\n" + e.toString());
- }
- return rc;
- }
-
- public StringBuffer test_float() throws SCADataTypeHelperException {
-
- float x = ran.nextFloat();
- StringBuffer rc = new StringBuffer("\nfloat datatype test sending ==> " + x);
- try {
- float y = scaUtil.echo_float(x);
- if (x == y) {
- rc.append("\nfloat successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException(rc + "\nDatatype exception: float ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_float " + e.toString());
- }
- return rc;
- }
-
- public StringBuffer test_double() throws SCADataTypeHelperException {
-
- double x = ran.nextDouble();
- StringBuffer rc = new StringBuffer("\ndouble datatype test sending ==> " + x);
- try {
- double y = scaUtil.echo_double(x);
- if (x == y) {
- rc.append("\ndouble successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException(rc + "\nDatatype exception: double ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_double\n" + e.toString());
- }
- return rc;
- }
-
- public StringBuffer test_BigInteger() throws SCADataTypeHelperException {
-
- BigInteger x = new BigInteger(ran.nextInt(32) + 32, ran); // between
- // 32 - 64
- // bitLength
- StringBuffer rc = new StringBuffer("\nBigInteger datatype test sending ==> " + x);
- try {
- BigInteger y = scaUtil.echo_BigInteger(x);
- if (x.equals(y)) {
- rc.append("\nBigInteger successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException("\n" + rc + "\nDatatype exception: BigInteger ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_BigInteger\n" + e.toString());
- }
- return rc;
- }
-
- public StringBuffer test_BigDecimal() throws SCADataTypeHelperException {
-
- BigDecimal x = new BigDecimal(ran.nextDouble());
- StringBuffer rc = new StringBuffer("\nBigDecimal datatype test sending ==> " + x);
- try {
- BigDecimal y = scaUtil.echo_BigDecimal(x);
- if (x.equals(y)) {
- rc.append("\nBigDecimal successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException("\n" + rc + "\nDatatype exception: BigDecimal ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_BigDecimal\n" + e.toString());
- }
- return rc;
- }
-
- private StringBuffer test_Vector() throws SCADataTypeHelperException {
-
- Vector vector = new Vector();
- vector.addElement("DanW");
- vector.addElement(new Float(2000F));
- vector.addElement(new Short((short)11));
- StringBuffer rc = new StringBuffer("\nVector datatype test sending ==> " + vector.toString());
- boolean passed = true;
- try {
- Vector y = scaUtil.echo_Vector(vector);
- if (((String)y.elementAt(0)).equals("DanW")) {
- rc.append("\nVector element 0 string " + y.elementAt(0) + " successfully recieved");
- } else {
- passed = false;
- }
- if ((((Float)y.elementAt(1)).equals((Float)vector.elementAt(1)))) {
- rc.append("\nVector element 1 Float " + y.elementAt(1) + " successfully recieved");
- } else {
- passed = false;
- }
- if (y.elementAt(2).equals(vector.elementAt(2))) {
- rc.append("\nVector element 2 (Short) " + y.elementAt(2) + " successfully received");
- } else {
- passed = false;
- }
- if (!passed) {
- //
- // one of the tests failed
- //
- rc.append("\nVector element 0 (String) " + y.elementAt(0) + " should be \"DanW\"");
- rc.append("\nVector element 1 (Float) " + y.elementAt(1) + " should be \"2000F\"");
- rc.append("\nVector element 2 (Short) " + y.elementAt(2) + " should be \"11\"");
- throw new SCADataTypeHelperException("\n" + rc + "\nDataType exception: Vector ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_Vector\n" + e.toString());
- }
- return rc;
- }
-
- public StringBuffer test_GregorianCalendar() throws SCADataTypeHelperException {
-
- GregorianCalendar x = new GregorianCalendar();
- StringBuffer rc = new StringBuffer("\nGregorianCalendar datatype test sending ==> " + x.toString());
- try {
- GregorianCalendar y = scaUtil.echo_GregorianCalendar(x);
- if (x.equals(y)) {
- rc.append("\nGregorianCalendar successfully received ==> " + y);
- } else {
- throw new SCADataTypeHelperException("\n" + rc + "\nDatatype exception: GregorianCalendar ==> " + y);
- }
- } catch (Exception e) {
- throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_GregorianCalendar\n" + e
- .toString());
- }
- return rc;
- }
-
- public StringBuffer doDataType() {
-
- StringBuffer rc = new StringBuffer();
- try {
- rc.append(test_boolean());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- }
- try {
- rc.append(test_char());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- }
- try {
- rc.append(test_String());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- }
- try {
- rc.append(test_int());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString());
- }
- try {
- rc.append(test_long());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- }
- try {
- rc.append(test_short());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- }
- try {
- rc.append(test_float());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- }
- try {
- rc.append(test_double());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- }
- try {
- rc.append(test_BigInteger());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- }
- try {
- rc.append(test_BigDecimal());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- }
- try {
- rc.append(test_Vector());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- }
- try {
- rc.append(test_GregorianCalendar());
- } catch (SCADataTypeHelperException e) {
- rc.append("\n" + e.toString() + "\n");
- } catch (Exception e) {
- rc.append("\n" + e.toString() + "\n");
- }
-
- return rc;
- }
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java
deleted file mode 100644
index 074fba8057..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-public class SCADataTypeHelperException extends Exception {
-
- public SCADataTypeHelperException() {
- }
-
- public SCADataTypeHelperException(String msg) {
- super(msg);
- }
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
deleted file mode 100644
index c55e22c905..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-/**
- * SCA Test Tool Callback Service
- */
-public interface SCATestToolCallbackService {
-
- public void pingCallBack(String reply);
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java
deleted file mode 100644
index 44e799a566..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-
-import java.io.IOException;
-
-import org.apache.tuscany.api.SCARuntime;
-
-public class SCATestToolServer {
-
- /**
- * @param args
- */
- public static void main(String[] args) {
-
- SCARuntime.start("bindingscomposite-system.composite", "bindingscomposite.composite");
-
- try {
- System.out.println("SCATestTool server started");
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- SCARuntime.stop();
- System.out.println("SCATestTool server stopped");
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
deleted file mode 100644
index 67b7e8eb64..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * SCA Test Tool Service
- */
-
-@Remotable
-public interface SCATestToolService {
-
- public String doOneHopPing(String input);
-
- public String doTwoHopPing(String input);
-
- public String doDataTypeTest(String input);
-
- public String getCallbackBuffer();
-
- public void clearCallbackBuffer();
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java
deleted file mode 100644
index e207a23927..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-import org.apache.tuscany.sca.util.SCATestUtilityService;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * SCA Test Service Implementation
- */
-
-@Service(SCATestToolService.class)
-public class SCATestToolServiceImpl implements SCATestToolService, SCATestToolCallbackService {
- @Reference
- public SCATestUtilityService scaTestUtil;
-
- private String callbackBuffer = null;
-
- public String doOneHopPing(String input) {
- System.out.println("Invoking SCATestToolServiceImpl.doOneHopPing()");
- StringBuffer rc = new StringBuffer();
- rc.append("doOneHopPing(): ");
- rc.append(input);
- return rc.toString();
- }
-
- public String doTwoHopPing(String input) {
- System.out.println("Invoking SCATestToolServiceImpl.doTwoHopPing()");
- StringBuffer rc = new StringBuffer();
- rc.append("doTwoHopPing(): ");
- rc.append(input);
- rc.append(" --> ");
- rc.append(scaTestUtil.ping(input));
- return rc.toString();
- }
-
- public String doDataTypeTest(String input) {
- StringBuffer rc = new StringBuffer();
- rc.append("doDataTypeTest(): ");
- rc.append(input);
- rc.append(" --> ");
- SCADataTypeHelper dataHelper = new SCADataTypeHelper(scaTestUtil);
- rc.append(dataHelper.doDataType());
- return rc.toString();
- }
-
- public void pingCallBack(String reply) {
- callbackBuffer = reply;
- }
-
- public String getCallbackBuffer() {
- return callbackBuffer;
- }
-
- public void clearCallbackBuffer() {
- callbackBuffer = null;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
deleted file mode 100644
index 0ceb553727..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.util;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Vector;
-import java.util.GregorianCalendar;
-
-import org.apache.tuscany.sca.itest.SCATestToolCallbackService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * SCA Test Utility Service
- */
-
-@Remotable
-public interface SCATestUtilityService {
- public String ping(String input);
-
- @Callback(SCATestToolCallbackService.class)
- public void asyncping();
-
- public int echo_int(int input);
-
- public short echo_short(short input);
-
- public long echo_long(long input);
-
- public float echo_float(float input);
-
- public double echo_double(double input);
-
- public boolean echo_boolean(boolean input);
-
- public char echo_char(char input);
-
- public String echo_String(String input);
-
- public BigDecimal echo_BigDecimal(BigDecimal input);
-
- public BigInteger echo_BigInteger(BigInteger input);
-
- public Vector echo_Vector(Vector input);
-
- public GregorianCalendar echo_GregorianCalendar(GregorianCalendar input);
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite
deleted file mode 100644
index 0b894bf701..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
- 8085
-
-
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
deleted file mode 100644
index 33f9f713c2..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- SCATestToolWSServiceComponent
-
-
-
-
-
- SCATestUtilityWSReference
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl
deleted file mode 100644
index 870af6ac2e..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl
deleted file mode 100644
index 32d9050a61..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl
+++ /dev/null
@@ -1,704 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
deleted file mode 100644
index 727eb2332f..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-
-import java.io.IOException;
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.api.SCARuntime;
-
-public class SCATestToolServerTestCase extends TestCase {
-
- @Override
- protected void setUp() throws Exception {
- SCARuntime.start("bindingscomposite-system.composite", "bindingscomposite.composite");
- }
-
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
- @Override
- protected void tearDown() throws Exception {
- SCARuntime.stop();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/pom.xml b/branches/sca-java-0.91/itest/bindings/bindingsutility/pom.xml
deleted file mode 100644
index 24601d5c4c..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsutility/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
- org.apache.tuscany.testing
- sca-itest
- 0.91-incubating-SNAPSHOT
- ../../pom.xml
-
-
- 4.0.0
- org.apache.tuscany.testing.bindingstest
- tuscany-itest-bindings-bindingsutility
- jar
- SCA FVT Bindings Test Tool Utility Composite
-
-
-
- org.apache.tuscany.sca.services.databinding
- databinding-sdo
- 1.0-incubating-beta1
-
-
-
- commonj
- sdo-api-r2.1
- 1.0-incubating-beta1
- runtime
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-impl
- 1.0-incubating-beta1
- runtime
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
deleted file mode 100644
index 664fb06930..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-/**
- * SCA Test Tool Callback Service
- */
-
-public interface SCATestToolCallbackService {
-
- public void pingCallBack(String reply);
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java
deleted file mode 100644
index cd967e275a..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.util;
-
-
-import java.io.IOException;
-
-import org.apache.tuscany.api.SCARuntime;
-
-public class SCATestUtilityServer {
-
- /**
- * @param args
- */
- public static void main(String[] args) {
-
- SCARuntime.start("bindingsutility-system.composite", "bindingsutility.composite");
-
- try {
- System.out.println("SCATestUtility server started");
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- SCARuntime.stop();
- System.out.println("SCATestUtility server stopped");
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
deleted file mode 100644
index 0ceb553727..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.util;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Vector;
-import java.util.GregorianCalendar;
-
-import org.apache.tuscany.sca.itest.SCATestToolCallbackService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * SCA Test Utility Service
- */
-
-@Remotable
-public interface SCATestUtilityService {
- public String ping(String input);
-
- @Callback(SCATestToolCallbackService.class)
- public void asyncping();
-
- public int echo_int(int input);
-
- public short echo_short(short input);
-
- public long echo_long(long input);
-
- public float echo_float(float input);
-
- public double echo_double(double input);
-
- public boolean echo_boolean(boolean input);
-
- public char echo_char(char input);
-
- public String echo_String(String input);
-
- public BigDecimal echo_BigDecimal(BigDecimal input);
-
- public BigInteger echo_BigInteger(BigInteger input);
-
- public Vector echo_Vector(Vector input);
-
- public GregorianCalendar echo_GregorianCalendar(GregorianCalendar input);
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java
deleted file mode 100644
index e752e4d6e6..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.util;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.util.GregorianCalendar;
-import java.util.Properties;
-import java.util.Vector;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(SCATestUtilityService.class)
-public class SCATestUtilityServiceImpl implements SCATestUtilityService {
-
- // private SCATestToolCallbackService utilCallBack;
-
- /**
- * The setter used by the runtime to set the callback reference
- *
- * @param myServiceCallback
- */
-
- // @Callback
- // public void setCallback(SCATestToolCallbackService utilCallBack) {
- // this.utilCallBack = utilCallBack;
- // }
- public String ping(String input) {
- System.out.println("Invoking SCATestUtilityServiceImpl.ping()");
- StringBuffer rc = new StringBuffer();
-
- try {
- // get a systems property object
- Properties sp = System.getProperties();
- rc.append("Pinged SCA Test Utility Service on: ");
- // get operating system info
- rc.append(sp.getProperty("os.name"));
- rc.append(", " + sp.getProperty("os.version"));
- // get network info
- rc.append(" - " + InetAddress.getLocalHost().toString());
- } catch (Exception e) {
- System.out.println("\nException preparing system infomation for ping service reply\n" + e.toString());
- e.printStackTrace();
- }
- return rc.toString();
- }
-
- public void asyncping() {
-
- StringBuffer rc = new StringBuffer();
-
- try {
- // get a systems property object
- Properties sp = System.getProperties();
- rc.append("Pinged SCA Test Utility Service on: ");
- // get operating system info
- rc.append(sp.getProperty("os.name"));
- rc.append(", " + sp.getProperty("os.version"));
- // get network info
- rc.append(" - " + InetAddress.getLocalHost().toString());
- } catch (Exception e) {
- System.out.println("\nException preparing system infomation for ping service reply\n" + e.toString());
- e.printStackTrace();
- }
- // utilCallBack.pingCallBack(rc.toString());
- }
-
- public int echo_int(int input) {
- int local;
- local = input;
- return local;
- }
-
- public short echo_short(short input) {
- short local;
- local = input;
- return local;
- }
-
- public long echo_long(long input) {
- long local;
- local = input;
- return local;
- }
-
- public float echo_float(float input) {
- float local;
- local = input;
- return local;
- }
-
- public double echo_double(double input) {
- double local;
- local = input;
- return local;
- }
-
- public boolean echo_boolean(boolean input) {
- boolean local;
- local = input;
- return local;
- }
-
- public char echo_char(char input) {
- char local;
- local = input;
- return local;
- }
-
- public String echo_String(String input) {
- String local;
- local = input;
- return local;
- }
-
- public BigDecimal echo_BigDecimal(BigDecimal input) {
- BigDecimal local;
- local = input;
- return local;
- }
-
- public BigInteger echo_BigInteger(BigInteger input) {
- BigInteger local;
- local = input;
- return local;
- }
-
- public Vector echo_Vector(Vector input) {
- Vector local;
- local = input;
- return local;
- }
-
- public GregorianCalendar echo_GregorianCalendar(GregorianCalendar input) {
- GregorianCalendar local;
- local = input;
- return local;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite
deleted file mode 100644
index 7126b78572..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
- 8081
-
-
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility.composite b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility.composite
deleted file mode 100644
index 6771b72442..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
- SCATestUtilityWSServiceComponent
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl
deleted file mode 100644
index 32d9050a61..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl
+++ /dev/null
@@ -1,704 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java
deleted file mode 100644
index 66246fc006..0000000000
--- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.util;
-
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.api.SCARuntime;
-
-import junit.framework.TestCase;
-
-public class SCATestUtilityServerTestCase extends TestCase {
-
- @Override
- protected void setUp() throws Exception {
- SCARuntime.start("bindingsutility-system.composite", "bindingsutility.composite");
- }
-
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8081);
- }
-
- @Override
- protected void tearDown() throws Exception {
- SCARuntime.stop();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/bindings/pom.xml b/branches/sca-java-0.91/itest/bindings/pom.xml
deleted file mode 100644
index 4c332708f3..0000000000
--- a/branches/sca-java-0.91/itest/bindings/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
- org.apache.tuscany.testing
- sca-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
-
- 4.0.0
- org.apache.tuscany.testing
- ${testing.version}
- bindingstest
- pom
- SCA FVT Test Tool Suite
-
-
-
- bindingscomposite
- bindingsutility
- bindingsclient
-
-
diff --git a/branches/sca-java-0.91/itest/callback-api/pom.xml b/branches/sca-java-0.91/itest/callback-api/pom.xml
deleted file mode 100644
index 1c329be97c..0000000000
--- a/branches/sca-java-0.91/itest/callback-api/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-callback-api
- Apache Tuscany SCA Callback API Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
deleted file mode 100644
index 56e7ba7b3f..0000000000
--- a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- * @author lamodeo
- */
-public interface CallBackApiCallBack {
-
- public void callBackMessage(String aString);
-
- public void callBackIncrement(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
deleted file mode 100644
index 3e7c840e15..0000000000
--- a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackApiClient {
-
- public void run();
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
deleted file mode 100644
index 1c32783271..0000000000
--- a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackApiClient.class)
-public class CallBackApiClientImpl implements CallBackApiClient, CallBackApiCallBack {
-
- @Reference
- protected CallBackApiService aCallBackService;
-
- private static String returnMessage = null;
- private static int callBackCount = 0;
- private static Object monitor = new Object();
-
- public void run() {
-
- // This tests basic callback patterns.
-
- // Test3a is the basic callback where the target calls back prior to
- // returning to the client.
- test3a();
-
- // Test3b is where the target does not call back to the client.
- test3b();
-
- // Test3c is where the target calls back multiple times to the client.
- test3c();
-
- return;
- }
-
- private void test3a() {
- aCallBackService.knockKnock("Knock Knock");
- int count = 0;
-
- //
- // If we cant get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage());
-
- }
-
- private void test3b() {
- aCallBackService.noCallBack("No Reply Desired");
- Assert.assertEquals("CallBackApiITest - test3b", 1, 1);
- return;
- }
-
- private void test3c() {
- aCallBackService.multiCallBack("Call me back 3 times");
- int count = 0;
-
- //
- // If we cant get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (this.getCallBackCount() < 3 && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackApiITest - test3c", 3, this.getCallBackCount());
- return;
- }
-
- public String getReturnMessage() {
- return returnMessage;
- }
-
- public void setReturnMessage(String aReturnMessage) {
- returnMessage = aReturnMessage;
- }
-
- public int getCallBackCount() {
- return callBackCount;
- }
-
- public void incrementCallBackCount() {
- callBackCount++;
- }
-
- public void callBackMessage(String aString) {
- System.out.println("Entering callback callBackMessage: " + aString);
- synchronized (monitor) {
- this.setReturnMessage(aString);
- monitor.notify();
- }
- }
-
- public void callBackIncrement(String aString) {
- System.out.println("Entering callback increment: " + aString);
- synchronized (monitor) {
- this.incrementCallBackCount();
- monitor.notify();
- }
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
deleted file mode 100644
index 51d9f24723..0000000000
--- a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackApiCallBack.class)
-/**
- *
- */
-public interface CallBackApiService {
-
- public void knockKnock(String aString);
-
- public void noCallBack(String aString);
-
- public void multiCallBack(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
deleted file mode 100644
index 727047e42e..0000000000
--- a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackApiService.class)
-public class CallBackApiServiceImpl implements CallBackApiService {
-
- @Context
- protected ComponentContext componentContext;
-
- private CallBackApiCallBack callback;
-
- public void knockKnock(String aString) {
-
- System.out.println("CallBackApiServiceImpl message received: " + aString);
- callback = this.getCallBackInterface();
- callback.callBackMessage("Who's There");
- System.out.println("CallBackApiServiceImpl response sent");
- return;
-
- }
-
- public void multiCallBack(String aString) {
-
- callback = this.getCallBackInterface();
-
- System.out.println("CallBackApiServiceImpl message received: " + aString);
- callback.callBackIncrement("Who's There 1");
- System.out.println("CallBackApiServiceImpl response sent");
- callback.callBackIncrement("Who's There 2");
- System.out.println("CallBackApiServiceImpl response sent");
- callback.callBackIncrement("Who's There 3");
- System.out.println("CallBackApiServiceImpl response sent");
- return;
-
- }
-
- public void noCallBack(String aString) {
-
- System.out.println("CallBackApiServiceImpl message received: " + aString);
-
- return;
-
- }
-
- private CallBackApiCallBack getCallBackInterface() {
- System.out.println("CallBackApiServiceImpl getting request context");
- RequestContext rc = componentContext.getRequestContext();
- System.out.println("CallBackApiServiceImpl getting callback from request context");
- callback = (CallBackApiCallBack) ((ServiceReference) rc.getServiceReference()).getCallback();
- System.out.println("CallBackApiServiceImpl returning callback");
- return callback;
-
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/resources/CallBackApiTest.composite b/branches/sca-java-0.91/itest/callback-api/src/main/resources/CallBackApiTest.composite
deleted file mode 100644
index 946c4862ee..0000000000
--- a/branches/sca-java-0.91/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java b/branches/sca-java-0.91/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java
deleted file mode 100644
index 892c425e48..0000000000
--- a/branches/sca-java-0.91/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackApiTest extends TestCase {
-
- private SCADomain domain;
- private CallBackApiClient aCallBackClient;
-
- public void testCallBackBasic() {
- aCallBackClient.run();
- }
-
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackApiTest.composite");
-
- aCallBackClient =
- domain.getService(CallBackApiClient.class, "CallBackApiClient");
- }
-
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-basic/pom.xml b/branches/sca-java-0.91/itest/callback-basic/pom.xml
deleted file mode 100644
index cc72f5bdb1..0000000000
--- a/branches/sca-java-0.91/itest/callback-basic/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-callback-basic
- Apache Tuscany SCA Callback Basic Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
deleted file mode 100644
index ab1f39c057..0000000000
--- a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- * @author lamodeo
- */
-public interface CallBackBasicCallBack {
-
- public void callBackMessage(String aString);
-
- public void callBackIncrement(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
deleted file mode 100644
index 9f4019f28c..0000000000
--- a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackBasicClient {
-
- public void run();
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
deleted file mode 100644
index 1bb2dc22b7..0000000000
--- a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackBasicClient.class)
-public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack {
-
- @Reference
- protected CallBackBasicService aCallBackService;
- private static String returnMessage = null;
- private static int callBackCount = 0;
- private static Object monitor = new Object();
-
- public void run() {
-
- // This tests basic callback patterns.
-
- // Test1 is the basic callback where the target calls back prior to
- // returning to the client.
- test1a();
-
- // Test2 is where the target does not call back to the client.
- test1b();
-
- // Test3 is where the target calls back multiple times to the client.
- test1c();
-
- return;
- }
-
- private void test1a() {
- aCallBackService.knockKnock("Knock Knock");
- int count = 0;
-
- //
- // If we cant get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackBasicITest - test1a", "Who's There", this.getReturnMessage());
-
- }
-
- private void test1b() {
- aCallBackService.noCallBack("No Reply Desired");
- Assert.assertEquals("CallBackBasicITest - test1b", 1, 1);
-
- return;
- }
-
- private void test1c() {
- aCallBackService.multiCallBack("Call me back 3 times");
- int count = 0;
-
- //
- // If we cant get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (this.getCallBackCount() < 3 && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount());
- return;
- }
-
- public String getReturnMessage() {
- return returnMessage;
- }
-
- public void setReturnMessage(String aReturnMessage) {
- returnMessage = aReturnMessage;
- }
-
- public int getCallBackCount() {
- return callBackCount;
- }
-
- public void incrementCallBackCount() {
- callBackCount++;
- }
-
- public void callBackMessage(String aString) {
- System.out.println("Entering callback callBackMessage: " + aString);
- synchronized (monitor) {
- this.setReturnMessage(aString);
- monitor.notify();
- }
- }
-
- public void callBackIncrement(String aString) {
- System.out.println("Entering callback increment: " + aString);
- synchronized (monitor) {
- this.incrementCallBackCount();
- monitor.notify();
- }
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
deleted file mode 100644
index bd41fa7037..0000000000
--- a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackBasicCallBack.class)
-/**
- *
- */
-public interface CallBackBasicService {
-
- public void knockKnock(String aString);
-
- public void noCallBack(String aString);
-
- public void multiCallBack(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
deleted file mode 100644
index 4ca2dc9af9..0000000000
--- a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackBasicService.class)
-public class CallBackBasicServiceImpl implements CallBackBasicService {
-
- @Callback
- protected CallBackBasicCallBack callback;
-
- public void knockKnock(String aString) {
-
- System.out.println("CallBackBasicServiceImpl message received: " + aString);
- callback.callBackMessage("Who's There");
- System.out.println("CallBackBasicServiceImpl response sent");
- return;
-
- }
-
- public void multiCallBack(String aString) {
-
- System.out.println("CallBackBasicServiceImpl message received: " + aString);
- callback.callBackIncrement("Who's There 1");
- System.out.println("CallBackBasicServiceImpl response sent");
- callback.callBackIncrement("Who's There 2");
- System.out.println("CallBackBasicServiceImpl response sent");
- callback.callBackIncrement("Who's There 3");
- System.out.println("CallBackBasicServiceImpl response sent");
- return;
-
- }
-
- public void noCallBack(String aString) {
-
- System.out.println("CallBackBasicServiceImpl message received: " + aString);
- // System.out.println("CallBackBasicServiceImpl No response desired");
- return;
-
- }
-}
diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/branches/sca-java-0.91/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
deleted file mode 100644
index c506956088..0000000000
--- a/branches/sca-java-0.91/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/branches/sca-java-0.91/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
deleted file mode 100644
index c01d3d3e2c..0000000000
--- a/branches/sca-java-0.91/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackBasicTestCase extends TestCase {
-
- private SCADomain domain;
- private CallBackBasicClient aCallBackClient;
-
- public void testCallBackBasic() {
- aCallBackClient.run();
- }
-
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackBasicTest.composite");
- aCallBackClient = domain.getService(CallBackBasicClient.class, "CallBackBasicClient");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-complex-type/pom.xml b/branches/sca-java-0.91/itest/callback-complex-type/pom.xml
deleted file mode 100644
index d99cf8b85f..0000000000
--- a/branches/sca-java-0.91/itest/callback-complex-type/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-callback-complex-type
- Apache Tuscany SCA Callback Complex Type Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
deleted file mode 100644
index 70e22f4ef2..0000000000
--- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- * @author lamodeo
- */
-public interface CallBackCTypeCallBack {
-
- public void callBackMessage(String aString);
-
- public void callBackIncrement(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
deleted file mode 100644
index 739983c277..0000000000
--- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackCTypeClient {
-
- public void run();
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
deleted file mode 100644
index 188b1f2c01..0000000000
--- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackCTypeClient.class)
-public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTypeCallBack {
-
- @Reference
- protected CallBackCTypeService aCallBackService;
- private static String returnMessage = null;
- private static int callBackCount = 0;
- private static Object monitor = new Object();
-
- public CallBackCTypeClientImpl() {
- }
-
- public void run() {
-
- // This test is the same as the Basic Callback except it uses a
- // componentType side file.
- // This test currently fails because the integration test environment
- // does not properly copy
- // the componentType files to the target folder. This is documented in
- // Tuscany-967.
-
- // Test12a is the basic callback where the target calls back prior to
- // returning to the client.
- test12a();
-
- // Test12b is where the target does not call back to the client.
- test12b();
-
- // Test12c is where the target calls back multiple times to the client.
- test12c();
-
- return;
- }
-
- private void test12a() {
- aCallBackService.knockKnock("Knock Knock");
- int count = 0;
-
- //
- // If we cant get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackBasicITest - test12a -", "Who's There", this.getReturnMessage());
-
- }
-
- private void test12b() {
- aCallBackService.noCallBack("No Reply Desired");
- Assert.assertEquals("CallBackBasicITest - test12b -", 1, 1);
- return;
- }
-
- private void test12c() {
- aCallBackService.multiCallBack("Call me back 3 times");
- int count = 0;
-
- //
- // If we cant get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (this.getCallBackCount() < 3 && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackBasicITest - test12c -", 3, this.getCallBackCount());
- return;
- }
-
- public String getReturnMessage() {
- return returnMessage;
- }
-
- public void setReturnMessage(String aReturnMessage) {
- returnMessage = aReturnMessage;
- }
-
- public int getCallBackCount() {
- return callBackCount;
- }
-
- public void incrementCallBackCount() {
- callBackCount++;
- }
-
- public void callBackMessage(String aString) {
- System.out.println("Entering callback callBackMessage: " + aString);
- synchronized (monitor) {
- this.setReturnMessage(aString);
- monitor.notify();
- }
- }
-
- public void callBackIncrement(String aString) {
- System.out.println("Entering callback increment: " + aString);
- synchronized (monitor) {
- this.incrementCallBackCount();
- monitor.notify();
- }
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
deleted file mode 100644
index ffbf4f35fa..0000000000
--- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-// @Callback(CallBackCTypeCallBack.class)
-/**
- *
- */
-public interface CallBackCTypeService {
-
- public void knockKnock(String aString);
-
- public void noCallBack(String aString);
-
- public void multiCallBack(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
deleted file mode 100644
index dc31ed156b..0000000000
--- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackCTypeService.class)
-public class CallBackCTypeServiceImpl implements CallBackCTypeService {
-
- @Callback
- protected CallBackCTypeCallBack callback;
-
- public CallBackCTypeServiceImpl() {
- }
-
- public void knockKnock(String aString) {
-
- System.out.println("CallBackCTypeServiceImpl message received: " + aString);
- callback.callBackMessage("Who's There");
- System.out.println("CallBackCTypeServiceImpl response sent");
- return;
-
- }
-
- public void multiCallBack(String aString) {
-
- System.out.println("CallBackCTypeServiceImpl message received: " + aString);
- callback.callBackIncrement("Who's There 1");
- System.out.println("CallBackCTypeServiceImpl response sent");
- callback.callBackIncrement("Who's There 2");
- System.out.println("CallBackCTypeServiceImpl response sent");
- callback.callBackIncrement("Who's There 3");
- System.out.println("CallBackCTypeServiceImpl response sent");
- return;
-
- }
-
- public void noCallBack(String aString) {
-
- System.out.println("CallBackCTypeServiceImpl message received: " + aString);
- System.out.println("CallBackCTypeServiceImpl No response desired");
- return;
-
- }
-}
diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
deleted file mode 100644
index 3f48f16389..0000000000
--- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
deleted file mode 100644
index ff38134df5..0000000000
--- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java b/branches/sca-java-0.91/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java
deleted file mode 100644
index 5ea13b8981..0000000000
--- a/branches/sca-java-0.91/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackCTypeTest extends TestCase {
-
- private SCADomain domain;
- private CallBackCTypeClient aCallBackClient;
-
- public void testCallBackBasic() {
- aCallBackClient.run();
- }
-
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackCTypeClient.composite");
-
- aCallBackClient =
- domain.getService(CallBackCTypeClient.class, "CallBackCTypeClient");
- }
-
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-id/pom.xml b/branches/sca-java-0.91/itest/callback-id/pom.xml
deleted file mode 100644
index fed0d4d794..0000000000
--- a/branches/sca-java-0.91/itest/callback-id/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-callback-id
- Apache Tuscany SCA Callback ID Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
deleted file mode 100644
index e86c7e9ed7..0000000000
--- a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- * @author lamodeo
- */
-public interface CallBackIdCallBack {
-
- public void callBackMessage(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
deleted file mode 100644
index a9e551f8b4..0000000000
--- a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackIdClient {
-
- public void run();
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
deleted file mode 100644
index 5adf64f0c6..0000000000
--- a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackIdClient.class)
-public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBack {
-
- @Context
- protected ComponentContext componentContext;
- @Reference
- protected CallBackIdService aCallBackService;
-
- private static String returnMessage = null;
- private static Object monitor = new Object();
- private static Object callBackId;
-
- public void run() {
-
- // This tests the use of the set/get callbackId API both SCA generated
- // and client specified.
-
- // Test1 uses a SCA generated callback ID and compare that with the
- // callbackID returned during callback.
- test11a();
-
- // Test2 uses a Client specified callback ID and compare that with the
- // callbackID returned during callback.
- test11b();
-
- return;
- }
-
- private void test11a() {
-
- // Retrieve this services callback ID and save it. Once the callback is
- // received the callback ID will be compared with the one
- // returned. Equal is good.
-
- Object origCallBackId = ((ServiceReference)aCallBackService).getCallbackID();
- aCallBackService.knockKnock("Knock Knock - Test1");
- int count = 0;
-
- //
- // If we cannot get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackIdITest - test11a - SCA Generated Id", origCallBackId, this.getCallBackId());
-
- }
-
- private void test11b() {
-
- // Set the services callback ID and save it. Once the callback is
- // received the callback ID will be compared with the one
- // returned. Equal is good.
-
- String origCallBackId = "CallBackId1";
- ((ServiceReference)aCallBackService).setCallbackID(origCallBackId);
-
- aCallBackService.knockKnock("Knock Knock - Test2");
- int count = 0;
-
- //
- // If we cant get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert
- .assertEquals("CallBackIdITest - 11b - Client Specified Id", origCallBackId, (String)this.getCallBackId());
-
- }
-
- public String getReturnMessage() {
- return returnMessage;
- }
-
- public void setReturnMessage(String aReturnMessage) {
- returnMessage = aReturnMessage;
- }
-
- public void callBackMessage(String aString) {
-
- System.out.println("Entering callback callBackMessage: " + aString);
- RequestContext rc = componentContext.getRequestContext();
- Object callBackId = rc.getServiceReference().getCallbackID();
-
- synchronized (monitor) {
- this.setReturnMessage(aString);
- this.setCallBackId(callBackId);
- monitor.notify();
- }
- }
-
- protected Object getCallBackId() {
- return callBackId;
- }
-
- protected void setCallBackId(Object aCallBackId) {
- callBackId = aCallBackId;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
deleted file mode 100644
index 18c592a1c1..0000000000
--- a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackIdCallBack.class)
-/**
- *
- */
-public interface CallBackIdService {
-
- public void knockKnock(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
deleted file mode 100644
index 16f5ec3e11..0000000000
--- a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackIdService.class)
-public class CallBackIdServiceImpl implements CallBackIdService {
-
- @Callback
- protected CallBackIdCallBack callback;
- @Context
- protected ComponentContext compositeContext;
-
- public void knockKnock(String aString) {
-
- System.out.println("CallBackIdServiceImpl message received: " + aString);
- RequestContext rc = compositeContext.getRequestContext();
- Object callBackId = rc.getServiceReference().getCallbackID();
- System.out.println("CallBackIdServiceImpl callbackID: " + callBackId.toString());
-
- callback.callBackMessage("Who's There");
- System.out.println("CallBackIdServiceImpl response sent");
- return;
-
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/resources/CallBackIdClient.composite b/branches/sca-java-0.91/itest/callback-id/src/main/resources/CallBackIdClient.composite
deleted file mode 100644
index c9a6ba6258..0000000000
--- a/branches/sca-java-0.91/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java b/branches/sca-java-0.91/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java
deleted file mode 100644
index a86fbc9a45..0000000000
--- a/branches/sca-java-0.91/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackIdTest extends TestCase {
-
- private SCADomain domain;
- private CallBackIdClient aCallBackClient;
-
- public void testCallBackBasic() {
- aCallBackClient.run();
- }
-
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackIdClient.composite");
-
- aCallBackClient = domain.getService(CallBackIdClient.class, "CallBackIdClient");
- }
-
- protected void tearDown() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/pom.xml b/branches/sca-java-0.91/itest/callback-set-callback/pom.xml
deleted file mode 100644
index 6b85f04466..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-callback-set-callback
- Apache Tuscany SCA Set Callback Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
deleted file mode 100644
index b352a2f1f7..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-
-// @Remotable
-@Callback(CallBackSetCallbackCallback.class)
-/**
- *
- */
-public interface CallBackSetCalbackService {
-
- public void knockKnock(String aString);
-
- public void setCallbackIllegally(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
deleted file mode 100644
index 766d47c654..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackBadCallback {
-
- private String anAttribure = null;
- private int anIntAttribute = 0;
-
- public CallBackSetCallbackBadCallback() {
- super();
- }
-
- public void callback(String aString) {
- //
- // This callback method should never be called.
- //
- System.out.println("CallBackSetCallbackBadCallback: callback called");
- Assert.fail("CallBackSetCallbackBadCallback: callback called");
- return;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
deleted file mode 100644
index 26a6ecc879..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-// @Remotable
-/**
- * @author lamodeo
- */
-public interface CallBackSetCallbackCallback {
-
- public void callBackMessage(String aString);
-
- public void callBackIncrement(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
deleted file mode 100644
index 0a22b0e01f..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackCallback.class)
-public class CallBackSetCallbackCallbackImpl implements CallBackSetCallbackCallback {
-
- private static String returnMessage = null;
- private static int callBackCount = 0;
-
- public String getReturnMessage() {
- return returnMessage;
- }
-
- public void setReturnMessage(String aReturnMessage) {
- returnMessage = aReturnMessage;
- }
-
- public int getCallBackCount() {
- return callBackCount;
- }
-
- public void incrementCallBackCount() {
- callBackCount++;
- }
-
- public void callBackMessage(String aString) {
-
- System.out.println("Entering CallBackSetCallbackCallbackImpl callBackMessage: " + aString);
-
- File aFile = new File("target/test4_marker");
- try {
- aFile.createNewFile();
- } catch (Exception ex) {
- System.out.println("Error Creating target/test4_marker marker file");
- ex.printStackTrace();
- }
-
- }
-
- public void callBackIncrement(String aString) {
- System.out.println("Entering callback increment: " + aString);
- this.incrementCallBackCount();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
deleted file mode 100644
index 94cb6aa73b..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackSetCallbackClient {
-
- public void run();
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
deleted file mode 100644
index 9fafb05835..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.NoRegisteredCallbackException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackClient.class)
-public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient {
-
- @Reference
- protected CallBackSetCalbackService aCallBackService;
- @Reference
- protected CallBackSetCallbackCallback callBack;
-
- public void run() {
-
- // This test various aspects of the setCallback() API in a stateless
- // scope.
-
- /*
- * test4 Client does not implement the callback interface but calls
- * setCallback with a service reference before invoking the target,
- * Verify successful executon.
- */
-
- test4();
-
- /*
- * test5 The client does not implement the callback interface and does
- * not call setCallback() before invoking the target. Verify a
- * NoRegisteredCallbackException is thrown.
- */
-
- test5();
-
- /*
- * test6() The client calls setCallback() with an object that is not a
- * service reference and the callback interface is stateless. Verify
- * that an appropriate exception is thrown. When calling setCallback
- * with an object the interface must be stateful. Stateless interfaces
- * require a service Reference.
- */
-
- test6();
-
- /*
- * test10 The target calls setCallback() on its own service reference,
- * e.g. getRequestContext().getServiceReference().getCallback(). Verify
- * an appropriate exeception occurs.
- */
-
- test10();
-
- return;
- }
-
- private void test4() {
-
- //
- // Since callbacks do not synchronously return and this test results in
- // a callback to a component other
- // than this client I am using a marker file to determine the outcome.
- // The presence of the marker
- // file will be used for the Assertion test. If it exists then the
- // callback occurred and all is good.
- //
-
- // Make sure the marker file is not present before starting the test.
- File aFile = new File("target/test4_marker");
- if (aFile.exists())
- aFile.delete();
-
- ((ServiceReference)aCallBackService).setCallback(callBack);
-
- aCallBackService.knockKnock("Knock Knock");
-
- // Lets give the callback a little time to complete....
-
- int count = 0;
- long timeout = 1000;
-
- while (count++ < 30 && (aFile.exists() == false)) {
- try {
- Thread.sleep(timeout);
- } catch (InterruptedException ie) {
- }
- }
-
- Assert.assertEquals("CallBackSetCallback - Test4", true, aFile.exists());
-
- }
-
- private void test5() {
-
- boolean correctException = false;
-
- //
- // The backend service is expecting a callback reference to be set. This
- // test will not
- // set one so an exception is expected. According to the spec if a
- // client calls a method on
- // a service reference prior to calling setCallback() then a
- // NoRegisteredCallbackException
- // will be thrown on the client.
- //
-
- try {
- aCallBackService.knockKnock("Knock Knock");
- } catch (NoRegisteredCallbackException NotRegEx) {
- correctException = true;
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- Assert.assertEquals("CallBackSetCallback - Test5", true, correctException);
-
- }
-
- private void test6() {
-
- boolean correctException = false;
-
- //
- // This test is to specify an Object that is not a service reference
- // that does impliment
- // the callback interface. However because this callback service is
- // stateless the expected
- // result is an appropriate exception.
- //
-
- try {
- ((ServiceReference)aCallBackService).setCallback(new CallBackSetCallbackObjectCallback());
- aCallBackService.knockKnock("Knock Knock");
- }
- //
- // This should catch an appropriate exception.
- //
- catch (NoRegisteredCallbackException NotRegEx) {
- correctException = true;
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- Assert.assertEquals("CallBackSetCallback - Test6", true, correctException);
-
- }
-
- private void test10() {
- //
- // Since callbacks do not synchronously return and this test results in
- // a failure on the service
- // side of the fence I am using a marker file to determine the outcome.
- // The presence of the marker
- // file will be used for the Assertion test. If it exists then all is
- // good.
- //
-
- // Make sure the marker file is not present before starting the test.
- File aFile = new File("target/test10_marker");
- if (aFile.exists())
- aFile.delete();
-
- aCallBackService.setCallbackIllegally("Try to set callback on your own service reference");
-
- Assert.assertEquals("CallBackSetCallback - Test10", true, aFile.exists());
-
- return;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
deleted file mode 100644
index afedcdf7f1..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-public class CallBackSetCallbackObjectCallback implements CallBackSetCallbackCallback {
-
- private int callBackCount = 0;
-
- public CallBackSetCallbackObjectCallback() {
- super();
- }
-
- public void incrementCallBackCount() {
- callBackCount++;
- }
-
- public void callBackMessage(String aString) {
-
- System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString);
-
- }
-
- public void callBackIncrement(String aString) {
- System.out.println("Entering callback increment: " + aString);
- this.incrementCallBackCount();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
deleted file mode 100644
index 0eccf6e379..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCalbackService.class)
-public class CallBackSetCallbackServiceImpl implements CallBackSetCalbackService {
-
- @Callback
- private CallBackSetCallbackCallback callback;
- @Context
- private ComponentContext context;
-
- public void knockKnock(String aString) {
-
- try {
- System.out.println("CallBackBasicServiceImpl message received: " + aString);
- callback.callBackMessage("Who's There");
- System.out.println("CallBackBasicServiceImpl response sent");
- return;
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- }
-
- public void setCallbackIllegally(String aString) {
-
- System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString);
-
- boolean exceptionProduced = false;
- RequestContext requestContext = null;
- ServiceReference serviceRef = null;
-
- // Context is not working properly so we can't trust that this is
- // working.....
- try {
- requestContext = context.getRequestContext();
- serviceRef = (ServiceReference) requestContext.getServiceReference();
- } catch (Exception ex) {
- System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() " + ex.toString());
- ex.printStackTrace();
- return;
- }
-
- // Ok, call setCallback with my own service reference.
- try {
- serviceRef.setCallback(serviceRef);
- } catch (NullPointerException npe) // This needs to be removed once
- // appropriate exception is
- // identified.
- {
- // This is not an appropriate exception.
- System.out.println("Test10 NPE exception during setCallback to own service reference");
- npe.printStackTrace();
- return;
- }
- // This needs to catch the appropriate exception, once we figure out
- // what is needs to be!
- catch (Exception ex) {
- exceptionProduced = true;
- System.out.println("Test10 appropriate exception caught during setCallback to own service reference");
- }
- ;
-
- // If we get the exception we are looking for then create the marker
- // file.
- if (exceptionProduced == true) {
- File aFile = new File("target/test10_marker");
- try {
- aFile.createNewFile();
- } catch (Exception ex) {
- System.out.println("Error Creating target/test10_marker marker file");
- ex.printStackTrace();
- }
- }
-
- }
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/branches/sca-java-0.91/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
deleted file mode 100644
index 3552ddecab..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java b/branches/sca-java-0.91/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java
deleted file mode 100644
index f977dd643f..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackSetCallbackTest extends TestCase {
-
- private SCADomain domain;
- private CallBackSetCallbackClient aCallBackClient;
-
- public void testCallBackSetCallback() {
- aCallBackClient.run();
- }
-
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackSetCallbackTest.composite");
-
- aCallBackClient =
- domain.getService(CallBackSetCallbackClient.class,
- "CallBackSetCallbackClient");
- }
-
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/pom.xml b/branches/sca-java-0.91/itest/callback-set-conversation/pom.xml
deleted file mode 100644
index a70f5a40f3..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-callback-set-conversation
- Apache Tuscany SCA Callback Set Conversation Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
deleted file mode 100644
index 685dd83c62..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.Serializable;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackConvBadCallback implements Serializable {
-
- public CallBackSetCallbackConvBadCallback() {
- super();
- }
-
- public void callback(String aString) {
- //
- // This callback method should never be called.
- //
- System.out.println("CallBackSetCallbackBadCallback: callback called");
- Assert.fail("CallBackSetCallbackConvBadCallback: callback called");
- return;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
deleted file mode 100644
index 7483e834b4..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-// @Remotable
-/**
- * @author lamodeo
- */
-public interface CallBackSetCallbackConvCallback {
-
- public void callBackMessage(String aString);
-
- public void callBackIncrement(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
deleted file mode 100644
index 013424bf5e..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackSetCallbackConvClient {
-
- public void run();
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
deleted file mode 100644
index ef9d858126..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.NoRegisteredCallbackException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackConvClient.class)
-@Scope("CONVERSATION")
-public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackConvClient {
-
- @Reference
- protected CallBackSetCallbackConvService aCallBackService;
- private CallBackSetCallbackConvObjectCallback aCallbackObject = null;
- private Object monitor = new Object();
-
- public void run() {
-
- // This tests aspects of the setCallback() API within a conversational
- // scope.
-
- /*
- * test7 The client calls setCallback() with an object that is not a
- * service reference and the callback interface is stateful. Verify
- * successful execution.
- */
- test7();
-
- /*
- * test8() The client calls setCallback() with an object that does not
- * implement the callback interface. Verify an appropriate exception is
- * thrown. This requires a STATEFUL interface.
- */
- test8();
-
- /*
- * test9 The client calls setCallback() with an object that is not
- * serializable. Verify an appropriate exception is thrown. This
- * requires a STATEFUL callback interface. Move from the stateless test
- * case.
- */
- test9();
-
- return;
- }
-
- private void test7() {
-
- //
- // This test is to specify an Object that is not a service reference
- // that does implement
- // the callback interface and is Serializeable. Verify successful
- // execution.
- //
-
- aCallbackObject = new CallBackSetCallbackConvObjectCallback();
- aCallbackObject.incrementCallBackCount();
- aCallbackObject.setMonitor(monitor);
-
- ((ServiceReference)aCallBackService).setCallback(aCallbackObject);
- aCallBackService.knockKnock("Knock Knock");
-
- // Lets give the callback a little time to complete....
-
- int count = 0;
-
- synchronized (monitor) {
- while (aCallbackObject.getCount() != 2 && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackSetCallbackConv - Test7", 2, aCallbackObject.getCount());
-
- }
-
- private void test8() {
-
- boolean correctException = false;
-
- //
- // This test is to specify an Object that is not a service reference
- // that does not impliment
- // the callback interface. The expected result is an appropriate
- // exception.
- //
-
- try {
- ((ServiceReference)aCallBackService).setCallback(new CallBackSetCallbackConvBadCallback());
- aCallBackService.knockKnock("Knock Knock");
- }
-
- //
- // This should catch an appropriate exception.
- //
-
- catch (NoRegisteredCallbackException NotRegEx) // This needs to be
- // changed to proper
- // exception once we
- // know what it is ;-)
- {
- correctException = true;
- }
-
- catch (Exception ex) {
- // This means an inappropriate exception occurred
- ex.printStackTrace();
- }
-
- Assert.assertEquals("CallBackSetCallbackConv - Test8", true, correctException);
-
- }
-
- private void test9() {
-
- boolean correctException = false;
-
- //
- // This test is to specify an Object that is not a service reference
- // that does impliment
- // the callback interface but does not implement Serializeable. Verify
- // an appropriate exception
- // is thrown.
- //
-
- try {
- ((ServiceReference)aCallBackService).setCallback(new CallBackSetCallbackConvNonSerCallback());
- aCallBackService.knockKnock("Knock Knock");
- }
- //
- // This should catch an appropriate exception.
- //
- catch (NoRegisteredCallbackException NotRegEx) // This needs to be
- // changed to
- // appropriate exception
- // when we know what it
- // is ;-)
- {
- correctException = true;
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- Assert.assertEquals("CallBackSetCallbackConv - Test9", true, correctException);
-
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
deleted file mode 100644
index 789e04e907..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-public class CallBackSetCallbackConvNonSerCallback implements CallBackSetCallbackConvCallback {
-
- private int callBackCount = 0;
- private Object monitor;
-
- public CallBackSetCallbackConvNonSerCallback() {
- super();
- }
-
- public synchronized void incrementCallBackCount() {
- callBackCount++;
- }
-
- public synchronized int getCount() {
- return callBackCount;
- }
-
- public void setMonitor(Object anObject) {
- monitor = anObject;
- }
-
- public void callBackMessage(String aString) {
-
- System.out.println("Entering CallBackSetCallbackConvNonSerCallback callBackMessage: " + aString);
-
- }
-
- public void callBackIncrement(String aString) {
-
- System.out.println("Entering callback increment: " + aString);
-
- synchronized (monitor) {
- this.incrementCallBackCount();
- monitor.notify();
- }
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
deleted file mode 100644
index fead6705fd..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.Serializable;
-
-public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable {
-
- private int callBackCount = 0;
- private Object monitor;
-
- public CallBackSetCallbackConvObjectCallback() {
- super();
- }
-
- public synchronized void incrementCallBackCount() {
- callBackCount++;
- }
-
- public synchronized int getCount() {
- return callBackCount;
- }
-
- public void setMonitor(Object anObject) {
- monitor = anObject;
- }
-
- public void callBackMessage(String aString) {
-
- System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString);
-
- }
-
- public void callBackIncrement(String aString) {
-
- System.out.println("Entering callback increment: " + aString);
-
- synchronized (monitor) {
- this.incrementCallBackCount();
- monitor.notify();
- }
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
deleted file mode 100644
index 4b0dccefdc..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-
-// @Remotable
-@Callback(CallBackSetCallbackConvCallback.class)
-/**
- *
- */
-public interface CallBackSetCallbackConvService {
-
- public void knockKnock(String aString);
-
- public void setCallbackIllegally(String aString);
-
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
deleted file mode 100644
index 5b685e695b..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackConvService.class)
-@Scope("CONVERSATION")
-public class CallBackSetCallbackConvServiceImpl implements CallBackSetCallbackConvService {
-
- @Callback
- private CallBackSetCallbackConvCallback callback;
- @Context
- protected ComponentContext context;
-
- public void knockKnock(String aString) {
-
- try {
- System.out.println("CallBackBasicServiceImpl message received: " + aString);
- callback.callBackMessage("Who's There");
- System.out.println("CallBackBasicServiceImpl response sent");
- return;
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- }
-
- public void setCallbackIllegally(String aString) {
-
- System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString);
-
- boolean exceptionProduced = false;
- RequestContext requestContext = null;
- ServiceReference serviceRef = null;
-
- // Context is not working properly so we can't trust that this is
- // working.....
- try {
- requestContext = context.getRequestContext();
- serviceRef = (ServiceReference) requestContext.getServiceReference();
- } catch (Exception ex) {
- System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() " + ex.toString());
- ex.printStackTrace();
- return;
- }
-
- // Ok, call setCallback with my own service reference.
- try {
- serviceRef.setCallback(serviceRef);
- } catch (NullPointerException npe) {
- // This is not an appropriate exception.
- System.out.println("Test10 NPE exception during setCallback to own service reference");
- npe.printStackTrace();
- return;
- }
- // This needs to catch the appropriate exception, once we figure out
- // what is needs to be!
- catch (Exception ex) {
- exceptionProduced = true;
- System.out.println("Test10 appropriate exception caught during setCallback to own service reference");
- }
- ;
-
- // If we get the exception we are looking for then create the marker
- // file.
- if (exceptionProduced == true) {
- File aFile = new File("target/test10_marker");
- try {
- aFile.createNewFile();
- } catch (Exception ex) {
- System.out.println("Error Creating target/test10_marker marker file");
- ex.printStackTrace();
- }
- }
-
- }
-}
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
deleted file mode 100644
index ce73417f94..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java
deleted file mode 100644
index e9113a8766..0000000000
--- a/branches/sca-java-0.91/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackSetCallbackConvTest extends TestCase {
-
- private SCADomain domain;
- private CallBackSetCallbackConvClient aCallBackClient;
-
- public void testCallBackSetCallback() {
- aCallBackClient.run();
- }
-
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackSetCallbackConvTest.composite");
-
- aCallBackClient =
- domain.getService(CallBackSetCallbackConvClient.class,
- "CallBackSetCallbackConvClient");
- }
-
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/pom.xml b/branches/sca-java-0.91/itest/contribution/pom.xml
deleted file mode 100644
index 74cd42de95..0000000000
--- a/branches/sca-java-0.91/itest/contribution/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-contribution
- Apache Tuscany Contribution Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-contribution-impl
- 0.91-incubating-SNAPSHOT
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddService.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddService.java
deleted file mode 100644
index 6392676e76..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
- public double add(double n1, double n2) {
- return n1 + n2;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 40ca4d9b0f..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-
-package calculator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
- public static void main(String[] args) throws Exception {
-
- SCADomain domain = SCADomain.newInstance("Calculator.composite");
-
- CalculatorService calculatorService = domain.getService(CalculatorService.class,
- "CalculatorServiceComponent");
-
- // Calculate
- System.out.println("3 + 2=" + calculatorService.add(3, 2));
- System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
- System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
- System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
- domain.close();
-
- }
-
-}
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
- double add(double n1, double n2);
-
- double subtract(double n1, double n2);
-
- double multiply(double n1, double n2);
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index ae4ed12b7b..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-import org.osoa.sca.annotations.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
- private AddService addService;
- private SubtractService subtractService;
- private MultiplyService multiplyService;
- private DivideService divideService;
-
- @Reference
- public void setAddService(AddService addService) {
- this.addService = addService;
- }
-
- @Reference
- public void setSubtractService(SubtractService subtractService) {
- this.subtractService = subtractService;
- }
-
- @Reference
- public void setDivideService(DivideService divideService) {
- this.divideService = divideService;
- }
-
- @Reference
- public void setMultiplyService(MultiplyService multiplyService) {
- this.multiplyService = multiplyService;
- }
-
- public double add(double n1, double n2) {
- return addService.add(n1, n2);
- }
-
- public double subtract(double n1, double n2) {
- return subtractService.subtract(n1, n2);
- }
-
- public double multiply(double n1, double n2) {
- return multiplyService.multiply(n1, n2);
- }
-
- public double divide(double n1, double n2) {
- return divideService.divide(n1, n2);
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideService.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 3158458b5e..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
- public double divide(double n1, double n2) {
- return n1 / n2;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/MultiplyService.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 62db05175e..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
- public double multiply(double n1, double n2) {
- return n1 * n2;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractService.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 309f88f098..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
- public double subtract(double n1, double n2) {
- return n1 - n2;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/resources/ContributionTest.composite b/branches/sca-java-0.91/itest/contribution/src/main/resources/ContributionTest.composite
deleted file mode 100644
index d814e439e2..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/resources/ContributionTest.composite
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/Calculator.composite b/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/Calculator.composite
deleted file mode 100644
index 657a2f95d8..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/sca-contribution.xml
deleted file mode 100644
index 2d31075091..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/branches/sca-java-0.91/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
deleted file mode 100644
index 0322796417..0000000000
--- a/branches/sca-java-0.91/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.contribution;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-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.DefaultPackageProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
-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.ModelResolver;
-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.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. *
- */
-public class ContributionServiceTestCase extends TestCase {
- private static final String CONTRIBUTION_001_ID = "contribution001/";
- private static final String CONTRIBUTION_002_ID = "contribution002/";
- private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
- private static final String FOLDER_CONTRIBUTION = "target/classes/";
-
- private ContributionService contributionService;
-
- protected void setUp() throws Exception {
-
- // Create default factories
- AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
- PolicyFactory policyFactory = new DefaultPolicyFactory();
- InterfaceContractMapper mapper = new InterfaceContractMapperImpl();
-
- // Create an extension point registry
- ExtensionPointRegistry extensionRegistry = new DefaultExtensionPointRegistry();
-
- // Add artifact processor extension points
- DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
- extensionRegistry.addExtensionPoint(staxProcessors);
- ExtensibleStAXArtifactProcessor staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
- DefaultURLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint();
- extensionRegistry.addExtensionPoint(documentProcessors);
- ExtensibleURLArtifactProcessor documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors);
-
- // Register base artifact processors
- staxProcessors.addArtifactProcessor(new CompositeProcessor(assemblyFactory, policyFactory, mapper,
- staxProcessor));
- staxProcessors.addArtifactProcessor(new ComponentTypeProcessor(assemblyFactory, policyFactory, staxProcessor));
- staxProcessors.addArtifactProcessor(new ConstrainingTypeProcessor(assemblyFactory, policyFactory,
- staxProcessor));
-
- XMLInputFactory inputFactory = XMLInputFactory.newInstance();
- documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory));
- documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory));
- documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory));
-
- // Create package processor extension point
- PackageTypeDescriberImpl describer = new PackageTypeDescriberImpl();
- PackageProcessorExtensionPoint packageProcessors = new DefaultPackageProcessorExtensionPoint();
- PackageProcessor packageProcessor = new ExtensiblePackageProcessor(packageProcessors, describer);
- extensionRegistry.addExtensionPoint(packageProcessors);
-
- // Register base package processors
- packageProcessors.addPackageProcessor(new JarContributionProcessor());
- packageProcessors.addPackageProcessor(new FolderContributionProcessor());
-
- // Create a repository
- ContributionRepository repository = new ContributionRepositoryImpl("target");
-
- // Create an artifact resolver and contribution service
- this.contributionService = new ContributionServiceImpl(repository, packageProcessor, documentProcessor,
- assemblyFactory,
- new ContributionFactoryImpl(), XMLInputFactory
- .newInstance());
- }
-
- public void testContributeJAR() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId, contributionLocation, resolver, false);
- assertNotNull(contributionService.getContribution(contributionId));
- }
-
- public void testStoreContributionPackageInRepository() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId, contributionLocation, resolver, true);
-
- assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))
- .exists());
-
- assertNotNull(contributionId);
-
- Contribution contributionModel = contributionService.getContribution(contributionId);
-
- File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));
- assertTrue(contributionFile.exists());
- }
-
- public void testStoreContributionStreamInRepository() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
-
- InputStream contributionStream = contributionLocation.openStream();
- try {
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId, contributionLocation, contributionStream, resolver);
- } finally {
- IOHelper.closeQuietly(contributionStream);
- }
-
- assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))
- .exists());
-
- assertNotNull(contributionId);
-
- Contribution contributionModel = contributionService.getContribution(contributionId);
-
- File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));
- assertTrue(contributionFile.exists());
- }
-
- public void testStoreDuplicatedContributionInRepository() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId1 = CONTRIBUTION_001_ID;
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId1, contributionLocation, resolver, true);
- assertNotNull(contributionService.getContribution(contributionId1));
- String contributionId2 = CONTRIBUTION_002_ID;
- ModelResolver resolver2 = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId2, contributionLocation, resolver2, true);
- assertNotNull(contributionService.getContribution(contributionId2));
- }
-
- public void testContributeFolder() throws Exception {
- File rootContributionFolder = new File(FOLDER_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- //first rename the sca-contribution metadata file
- //File calculatorMetadataFile = new File("target/classes/calculator/sca-contribution.xml");
- //File metadataDirectory = new File("target/classes/META-INF/");
- //if (!metadataDirectory.exists()) {
- // FileHelper.forceMkdir(metadataDirectory);
- //}
- //FileHelper.copyFileToDirectory(calculatorMetadataFile, metadataDirectory);
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId, rootContributionFolder.toURL(), resolver, false);
- assertNotNull(contributionService.getContribution(contributionId));
- }
-
- public void testAddDeploymentComposites() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- Contribution contribution = contributionService.contribute(contributionId, contributionLocation, resolver, false);
- assertNotNull(contributionService.getContribution(contributionId));
-
- String artifactId = "contributionComposite.composite";
- Composite composite = (new DefaultAssemblyFactory()).createComposite();
- composite.setName(new QName(null, "contributionComposite"));
- composite.setURI("contributionComposite.composite");
-
- contributionService.addDeploymentComposite(contribution, composite);
-
- List deployables = contributionService.getContribution(contributionId).getDeployables();
- Composite composite1 = (Composite)deployables.get(deployables.size() - 1);
- assertEquals("contributionComposite", composite1.getName().toString());
-
- DeployedArtifact artifact = null;
- contribution = contributionService.getContribution(contributionId);
- String id = artifactId.toString();
- for (DeployedArtifact a : contribution.getArtifacts()) {
- if (id.equals(a.getURI())) {
- artifact = a;
- break;
- }
- }
- Composite composite2 = (Composite)artifact.getModel();
- assertEquals("contributionComposite", composite2.getName().toString());
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/branches/sca-java-0.91/itest/contribution/src/test/resources/deployables/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
Binary files a/branches/sca-java-0.91/itest/contribution/src/test/resources/deployables/sample-calculator.jar and /dev/null differ
diff --git a/branches/sca-java-0.91/itest/contribution/src/test/resources/repository/sample-calculator.jar b/branches/sca-java-0.91/itest/contribution/src/test/resources/repository/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
Binary files a/branches/sca-java-0.91/itest/contribution/src/test/resources/repository/sample-calculator.jar and /dev/null differ
diff --git a/branches/sca-java-0.91/itest/conversations/pom.xml b/branches/sca-java-0.91/itest/conversations/pom.xml
deleted file mode 100644
index e19ec9b07e..0000000000
--- a/branches/sca-java-0.91/itest/conversations/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-conversations
- Apache Tuscany SCA Conversations Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java
deleted file mode 100644
index 31786588b2..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-
-/**
- *
- */
-public interface AnotherService {
-
- public void setService(ServiceReference aServiceReference);
- public void add(int anInt);
- public int getCount();
-
-}
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java
deleted file mode 100644
index 027109787a..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AnotherService.class)
-@Scope("CONVERSATION")
-
-public class AnotherServiceImpl implements AnotherService {
-
- // This is a simple pass-thru service used to test propogation
- // of ServiceReference and maintenance of Session state.
-
- private ServiceReference aServiceReference;
-
- public void add(int anInt) {
-
- Assert.assertNotNull("AnotherServiceImpl - add ", aServiceReference);
- ((ConversationsService) aServiceReference).add(anInt);
-
- }
-
-
- public void initializeCount() {
-
- Assert.assertNotNull("AnotherServiceImpl - initializeCount ", aServiceReference);
- ((ConversationsService) aServiceReference).initializeCount();
-
- }
-
-
- public void setService(ServiceReference aRef) {
-
- Assert.assertNotNull("AnotherServiceImpl - setService ", aRef);
- aServiceReference = aRef;
-
- }
-
-
- public int getCount() {
-
- Assert.assertNotNull("AnotherServiceImpl - getCount ", aServiceReference);
- return ((ConversationsService) aServiceReference).getLocalCount();
- }
-
-
-}
-
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java
deleted file mode 100644
index 5eb9ba3ace..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-
-/**
- * @author lamodeo
- *
- */
-public interface ConversationsCallback {
-
- public void callBackMessage(String aString);
- public void callBackIncrement(String aString);
- public void callBackEndSession();
-
-}
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java
deleted file mode 100644
index a23748bcd2..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ConversationsClient {
-
- public void run();
- public int count();
-
-}
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java
deleted file mode 100644
index 41463fa39a..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ConversationsClient2 {
- public String getDateTime();
-
-
-}
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
deleted file mode 100644
index 00c2a1c2f5..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-import java.text.DateFormat;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ConversationEndedException;
-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.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(interfaces={ConversationsClient.class,ConversationsClient2.class})
-
-
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="10 minutes",
- singlePrincipal=false)
-
-
-public class ConversationsClientImpl implements ConversationsClient, ConversationsClient2, ConversationsCallback {
-
- @Reference
- protected ConversationsService aService;
- @Reference
- protected AnotherService anotherService;
- @Reference
- protected ConversationsLifeCycleService aLifeCycleService;
- @Context
- protected ComponentContext myContext;
- @ConversationID
- protected String conversationID;
-
- private Object monitor = new Object();
- private int count=0;
- private String message;
- private String initialState;
- private int initialCount = 56;
- private String dateTime;
- private final static String markerFileName = "target/testConversations_test3_marker";
-
- public void run() {
-
- // This tests various aspects of session lifecycle and maintenance of session state.
- // None of these test are working due to various issues.
-
- /* test0()
- This test verifies annotations and API's for ConversationID.
- */
- test0(); // - Tuscany-1001.
-
- /* test1()
- Test stateful callbacks. Verify that the client�s state is maintained throughout the execution of
- all callback methods.
- */
- test1(); // This test is working for MODULE scope. Cant claim succcess because it needs Conversation scope.
-
- /* test2()
- Test each method of starting a session. Test @Init.
- */
- test2(); // Tuscany-965, Tuscany-1001
-
- /* test3()
- Test each method of ending a session. Test @Destroy.
- */
- test3(); // Tuscany-965, Tuscany-1001
-
- /* test4()
- Pass an existing service reference with an active session to another service. Verify the session is maintained
- */
- test4(); // Tuscany-964, Tuscant-1001
-
- /* test5()
- Call the createServiceReferenceForSession() API to get a service reference for the active session.
- Pass the service reference to another service. Verify the session is maintained.
- */
- test5();
-
- /* test6()
- * Allow a session to timeout.
- */
- test6(); // Tuscany-965, Tuscany-1001
-
-
- return;
- }
-
- private void test0()
- {
-
- // Verify that conversationID was injected.
- Assert.assertNotNull("test0 - conversationID injected", conversationID);
- System.out.println("ConversationID: " + conversationID);
-
- //
- // The client may access the ConversationID by calling getConversationID on a Service Reference.
- // This also verifies a session was created during injection of this Service Reference.
- //
- //FIXME Port to the 1.0 spec API
- //Object aServicesSessionID =((ServiceReference)aService).getSessionID();
- //Assert.assertNotNull("test0 - ConversationID from service reference", aServicesSessionID);
-
- //FIXME Port to the 1.0 spec API
- //Object aLifeCycleServicesSessionID =((ServiceReference)aLifeCycleService).getSessionID();
- //Assert.assertNotNull("test0 - ConversationID from LifeCycleService service reference", aLifeCycleServicesSessionID);
-
- // This will verify the @Init() is working for a session created during injection. See test2().
- aLifeCycleService.knockKnock("Hello");
-
- }
-
- private void test1()
- {
-
- //
- // This test verifies that the state of the client is preserved across method calls. Each
- // call to the service results in 2 callbacks. One to increment a count and the other to set a string.
- // At the end of the test the count should equal 5 and the string should be set. Also the original strings
- // values should be preserved.
- //
- //
- initialState = "Initial State";
-
- int numCalls = 0;
-
- for(int i=0; i < 10; i++)
- {
- aService.knockKnock("Knock Knock " + ++numCalls);
- }
-
- // I want to drive multiple callbacks and then give them time to complete. Don't want to
- // force serialization. After 20 seconds check the assertions.
-
- synchronized(monitor)
- {
- try
- {
- monitor.wait(20000L);
- }
- catch (Exception ex)
- {ex.printStackTrace();}
- }
-
- // Here we test for the expected state of several different variables. State needs to be maintained
- // across method calls to the service. If the same client instance is used then the state should match
- // the following assertions.
-
- // instance variable count should equal the number of calls to the backend service. count is incremented
- // during callback processing.
- Assert.assertEquals("Conversations - Test1 count", numCalls, count);
- // The returned message should be like the following.
- Assert.assertEquals("Conversations - Test1 message", true, message.startsWith("Who's There"));
- // any initial state set prior to running the callbacks should be maintained.
- Assert.assertEquals("Conversations - Test1 initialState", "Initial State", initialState);
- Assert.assertEquals("Conversations - Test1 initialCount", 56, initialCount);
-
- return;
-
- }
-
- private void test2()
- {
-
- // Verify the various methods to create a new Session.
- // Sesssions can be started:
- //
- // 1) When a service reference is injected into a client. This is verified in test0().
- // 2) By the client calling newSession() API with and without a ConversationID.
- //
- // Verify init() is called prior to any business methods. This is performed in the Service when any
- // business methos is called.
-
- Assert.assertNotNull("current composite context",myContext);
-
- // This tests creating a conversational session. And that @Init is run prior to business method.
- ServiceReference aServRef = null;
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService");
- Assert.assertNotNull("Conversations - Test2 Service Reference 1 not returned", aServRef);
-
- //FIXME Port to the 1.0 spec API
- //Get the session ID.
- //Object aConversationID = aServRef.getSessionID();
- ConversationsLifeCycleService aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
-
- //Create a new session this time specifying a session ID. Verify the seesion id is what was specified.
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService","Test2-12345");
- Assert.assertNotNull("Conversations - Test2 Service Reference 2 not returned", aServRef);
- //FIXME Port to the 1.0 spec API
- //Get the session ID.
- //Object aConversationID2 = aServRef.getSessionID();
- //Assert.assertEquals("Conversations - Test2 Session not created with specified ConversationID", "Test2-12345", aConversationID2);
- aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
-
- //FIXME Port to the 1.0 spec API
- //Assert.assertNotSame("Conversations - Test2 sessions are not different", aConversationID, aConversationID2);
-
- }
-
- private void test3()
- {
-
- // Note: The @EndSesion and @EndsConversation anotations are not implemented.
- // So #1 an #2 cannot be done.
-
- //
- // Verify the various methods to end a session.
- // Sesssions can be ended:
- //
- // 1) Server operation annotated with @EndsConversation.
- // 2) Server operation calls an @EndSession annotated callback method.
- // 3) Servers conversation lifetime times out. This is test6() so its not implimented in the test3 method.
- // 4) The client calls ServiceReference.endSession();
- //
- // Verify @Destroy annotated method get called after completion of the business
- // method that called the endSession.
- //
-
- ConversationsLifeCycleService aConversationsLifeCycleService;
- Object aConversationID;
- Assert.assertNotNull("current composite context",myContext);
- ServiceReference aServRef;
- this.removeMarkerFile();
-
- //
- // test3 variation #1 - Cannot be done annotation not implimented yet. 12/15/2006
- //
-
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService");
- aServRef = null;
- Assert.assertNotNull("Conversations - Test3-1 Service Reference not returned", aServRef);
-
- aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNotNull("Conversations - Test3-1 ConversationID not found", aConversationID);
-
- //Call the business method annotated with @EndsConversation.
- aConversationsLifeCycleService.endThisSession(); // This should also drive @Destroy method.
-
- // Verify session has ended. The ConversationID should be null;
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNull("Conversations - Test3-1 session not null after endSession()", aConversationID);
-
- // Verify Destroy was run. The baxckend service creates a marker file when @Destroy annotated method is run.
- Assert.assertEquals("Conversations - Test3-1 @Destroy method not invoked", true, this.isMarkerFilePresent());
- this.removeMarkerFile();
-
- //
- // test3 variation #2 - Cannot be done annotation not implimented yet. 12/15/2006
- //
-
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService");
- Assert.assertNotNull("Conversations - Test3-2 Service Reference not returned", aServRef);
-
- aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNotNull("Conversations - Test3-2 ConversationID not found", aConversationID);
-
- //Call the business method that will invoke my @EndSession callback method.
- aConversationsLifeCycleService.endThisSessionUsingCallback(); // This should also drive @Destroy method.
-
- // Verify session has ended. The ConversationID should be null;
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNull("Conversations - Test3-2 session not null after endSession()", aConversationID);
-
- // Verify Destroy was run. The baxckend service creates a marker file when @Destroy annotated method is run.
- Assert.assertEquals("Conversations - Test3-2 @Destroy method not invoked", true, this.isMarkerFilePresent());
- this.removeMarkerFile();
-
- //
- // test3 variation #4 - Client calls endSession()
- //
-
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService");
- aServRef = null;
- Assert.assertNotNull("Conversations - Test3-4 Service Reference not returned", aServRef);
-
- aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNotNull("Conversations - Test3-4 ConversationID not found", aConversationID);
-
- //Call the endSession() API on the Service Reference.
- //FIXME Port to the 1.0 spec API
- //aServRef.endSession(); // This should also drive @Destroy method.
-
- // Verify session has ended. The ConversationID should be null;
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNull("Conversations - Test3-4 session not null after endSession()", aConversationID);
-
- // Verify Destroy was run. The baxckend service creates a marker file when @Destroy annotated method is run.
- Assert.assertEquals("Conversations - Test3-4 @Destroy method not invoked", true, this.isMarkerFilePresent());
- this.removeMarkerFile();
- }
-
- public void test4()
- {
-
- //
- // This test uses the injected active session for the ConversationsService. It starts a conversation
- // in this method building up state with a counter. It then passes this reference to another backend service adding
- // additional state. It then returns and adds more state using original service and then performs the Assertions.
- //
-
- aService.initializeCount();
- aService.add(1);
- anotherService.setService((ServiceReference)aService);
- anotherService.add(1);
- anotherService.add(1);
- aService.add(1);
- aService.add(1);
- int count = anotherService.getCount();
-
- Assert.assertEquals("test4 - ConversationsClientImpl ", 5, count);
-
- return;
- }
-
-
- public void test5()
- {
-
- // The first test verifies that the createServiceReferenceForSession(this) API is functioning.
- // This is done in the backend serviced as it needs a single interface defined. The 2nd test
- // uses the variant of this API when > 1 interfaces are implemented.
- //
- // The 2nd test obtains a service reference for myself and passes that reference to a backend service.
- // The backend service then invokes the count() method on my service reference. It then returns
- // the count that it retrieved. The test then asserts that the count returned from the backend
- // service matches the client services internal state.
- //
-
- Assert.assertNotNull("current composite context",myContext);
-
- boolean result = aService.createServiceReferenceForSelf();
- System.out.println("Laa: returned from createServiceReferenceForSelf() " + result);
- Assert.assertEquals("test5 - createServiceReferenceForSelf",true,result);
-
- count = 6;
- int returnCount = 0;
- //FIXME Port to the 1.0 spec API
- //ServiceReference myServiceReference = myContext.createServiceReferenceForSession(this,"ConversationsClient2");
- ServiceReference myServiceReference = null;
- Assert.assertNotNull("test5 - createServiceReferenceForSession - myContext.createServiceReferenceForSession(this,ConversationsClient);", myServiceReference);
- returnCount = aService.getCount(myServiceReference);
-
- Assert.assertEquals("test5 - createServiceReferenceForSession(this,ConversationsClient2)",count,returnCount);
- String aRemoteDateTime = aService.getDateTime(myServiceReference);
- Assert.assertEquals("test5 - createServiceReferenceForSession(this,ConversationsClient2 - dateTime)", dateTime, aRemoteDateTime);
-
- return;
- }
-
- public void test6()
- {
-
- //
- // Create a session and allow it to timeout and verify that it did.
- // Invoking a business method on a service that has timed out should result in
- // a SessionEndedException.
- //
-
- Assert.assertNotNull("current composite context",myContext);
-
- // This tests creating a conversational session. This service has a maxAge="5 seconds".
- ServiceReference aServRef;
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService");
- aServRef = null;
- Assert.assertNotNull("Conversations - Test6 Service Reference not returned", aServRef);
-
- // Run a business method.
- ConversationsLifeCycleService aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
-
- //
- // wait 10 seconds so session will time out.
- //
- try {
- Thread.sleep(10000L);
- }
- catch (InterruptedException ex)
- {
- ex.printStackTrace();
- }
-
- // Run a busineess method after timeout period has elapsed.
- boolean sessionEnded = false;
- try
- {
- aConversationsLifeCycleService.knockKnock("Hello");
- }
- catch (ConversationEndedException sex)
- {
- sessionEnded = true;
- }
-
- Assert.assertEquals("Conversations - Test6 Session did not timeout ", true, sessionEnded);
-
- return;
- }
-
-
- public synchronized void callBackIncrement(String aString) {
-
- count++;
- System.out.println("Laa: callBackIncrement invoked on client. count = " + count);
-
- }
-
- public synchronized void callBackMessage(String aString) {
-
- message = aString;
- System.out.println("Laa: callBackIMessage invoked on client. message = " + message);
-
- }
-
- // @EndSession - This is for test3() variation #2.
- public void callBackEndSession() {
-
- System.out.println("Laa: callBackEndSession method invoked on client.");
-
- }
-
- public int count()
- {
- return this.count;
- }
-
- public String getDateTime() {
-
- dateTime = DateFormat.getDateTimeInstance().toString();
- return dateTime;
-
- }
-
- private void removeMarkerFile()
- {
- // Make sure the marker file is not present before starting the test.
- File aFile = new File(markerFileName);
- if (aFile.exists())
- aFile.delete();
- }
-
- private boolean isMarkerFilePresent()
- {
- File aFile = new File(markerFileName);
- return aFile.exists();
- }
-
-
-
-}
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java
deleted file mode 100644
index bd18b48da2..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(ConversationsCallback.class)
-
-/**
- *
- */
-public interface ConversationsLifeCycleService {
-
- public String knockKnock(String aString);
- public void endThisSession();
- public void endThisSessionUsingCallback();
-
-}
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
deleted file mode 100644
index 7f38e356f6..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationsLifeCycleService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="5 seconds")
-
-// This is a short-lived conversational service.
-
-public class ConversationsLifeCycleServiceImpl implements ConversationsLifeCycleService {
-
- @Callback
- protected ConversationsCallback callback;
-
- private String state = "NOT READY";
- private final static String markerFileName = "target/testConversations_test3_marker";
-
-
- public String knockKnock(String aString) {
-
- // Prior to any business methods being invoked the state must have been set to READY using the @Init.
- System.out.println("ConversationsLifeCycleServiceImpl.knockKnock - State = " + state);
- Assert.assertEquals("ConversationsLifeCycleServiceImpl.knockKnock - not in READY state ", "READY", state);
-
- return "Who's There!";
- }
-
- @Init
- public void init()
- {
- state = "READY";
- System.out.println("ConversationsLifeCycleServiceImpl.init()");
- }
-
-
- @Destroy
- public void destroy()
- {
- state = "DESTROYED";
-
- File aFile = new File(markerFileName);
- try
- {
- aFile.createNewFile();
- }
- catch (Exception ex)
- {
- System.out.println("Error Creating " + markerFileName);
- ex.printStackTrace();
- }
- System.out.println("ConversationsLifeCycleServiceImpl.destroy()");
- }
-
-// @EndsConversation
- public void endThisSession() {
- //This method will end the current session by annotation.
- System.out.println("ConversationsLifeCycleServiceImpl.endThisSession()");
-
- }
-
- public void endThisSessionUsingCallback() {
-
- //This method will end the current session by a callback method annotated with @EndSession.
- callback.callBackEndSession();
- System.out.println("ConversationsLifeCycleServiceImpl.endThisSessionUsingCallback()");
- }
-
-}
-
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java
deleted file mode 100644
index 6bdc1c5c03..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(ConversationsCallback.class)
-
-/**
- *
- */
-public interface ConversationsService {
-
- public void knockKnock(String aString);
- public void add(int anInt);
- public void initializeCount();
- public int getCount(ServiceReference aServiceReference);
- public int getLocalCount();
- public String getDateTime(ServiceReference aServiceReference);
- public boolean createServiceReferenceForSelf();
-
-}
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java
deleted file mode 100644
index 45fc68308b..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationsService.class)
-@Scope("CONVERSATION")
-
-public class ConversationsServiceImpl implements ConversationsService {
-
- @Context
- protected ComponentContext context;
-
- @Callback
- protected ConversationsCallback callback;
- private int count=0;
-
- public void knockKnock(String aString) {
-
- try
- {
- count++;
- //System.out.println("ConversationsServiceImpl message received: " + aString);
- callback.callBackMessage("Who's There " + count);
- callback.callBackIncrement("Add one please");
- //System.out.println("ConversationsServiceImpl responses sent");
- return;
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- }
-
- }
-
- public int getCount(ServiceReference aServiceReference)
- {
-
- //
- // Invoke a method on the service reference and return back the result.
- //
-
- int count=0;
- try
- {
- count = ((ConversationsClient) aServiceReference).count();
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- }
- return count;
-
- }
-
- public int getLocalCount()
- {
-
- //
- // Return my localc instance count. This is used for test4.
- //
-
- return count;
-
- }
-
- public String getDateTime(ServiceReference aServiceReference)
- {
-
- //
- // Invoke a method on the service reference and return back the result.
- //
-
- String dateTime;
- dateTime = ((ConversationsClient2) aServiceReference).getDateTime();
- return dateTime;
-
- }
-
- public void add(int anInt) {
-
- count +=anInt;
-
- }
-
- public void initializeCount() {
-
- count =0;
-
- }
-
- public boolean createServiceReferenceForSelf() {
-
- // This is done here because we need to test getting a ServiceReference
- // from a component that implements a single interface. The client in this test
- // impliments 2 interfaces to test the variant of this that takes interface name as an argumnet.
-
- boolean aBoolean = false;
-
- ServiceReference myServiceReference = null;
-
- try
- {
- myServiceReference = context.createSelfReference(ConversationsService.class);
- System.out.println("Laa: Created Service Reference for Session:" + myServiceReference);
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- }
-
-
- if (myServiceReference != null)
- {
- aBoolean = true;
- System.out.println("Laa: Service Reference is not null");
- }
-
- return aBoolean;
- }
-
-
-}
-
diff --git a/branches/sca-java-0.91/itest/conversations/src/main/resources/ConversationsTest.composite b/branches/sca-java-0.91/itest/conversations/src/main/resources/ConversationsTest.composite
deleted file mode 100644
index 93b44c260f..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/main/resources/ConversationsTest.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java b/branches/sca-java-0.91/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java
deleted file mode 100644
index af917d67f4..0000000000
--- a/branches/sca-java-0.91/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ConversationsTest extends TestCase {
-
- private SCADomain domain;
- private ConversationsClient aConversationsClient;
-
- public void testConversations() {
- aConversationsClient.run();
- }
-
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("ConversationsTest.composite");
-
- aConversationsClient =
- domain.getService(ConversationsClient.class,
- "ConversationsClient/org.apache.tuscany.sca.test.ConversationsClient");
-
- }
-
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/databindings/common/pom.xml b/branches/sca-java-0.91/itest/databindings/common/pom.xml
deleted file mode 100644
index ac603c1a39..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/pom.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings
- 0.91-incubating-SNAPSHOT
-
-
- 4.0.0
-
- tuscany-itest-databindings-common
- 0.91-incubating-SNAPSHOT
- jar
- Apache Tuscany Common elements of Databindings Integration Tests
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- https://maven-repository.dev.java.net/nonav/repository
- legacy
-
-
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- https://maven-repository.dev.java.net/repository
- legacy
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-databinding-sdo
- ${pom.version}
- compile
-
-
- velocity
- velocity
- 1.4
- compile
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.0
-
-
- add-test-source
- generate-sources
-
- add-test-source
-
-
-
- target/sdo-source
-
-
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.0-incubating-beta1
-
-
- generate-sdo
- generate-sources
-
-
-
- ${basedir}/src/main/resources/generate/generate.xsd
-
-
- true
- true
- true
-
-
- generate
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/branches/sca-java-0.91/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
deleted file mode 100644
index 73dfebb73c..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.generate;
-
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.tuscany.generate.GenerateFactory;
-import org.apache.tuscany.generate.GenerateType;
-import org.apache.tuscany.generate.TemplateType;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * Generates test files based on the information in a configuration files (generate.xml)
- * and a set of velocity templates. The process is
- *
- * for each template
- * for each file
- * add a line to pom for code gen
- * include the factory into the composite
- * for each type
- * add client iface method
- * add client impl method
- * add service iface method
- * add service impl method
- * add test method
- * add wsdl type and method
- *
- * @version $Rev$ $Date$
- */
-public class Generate {
-
- /**
- * Does all the hard work of running the velocity templates against the
- * the list of types to test. Both the list of templates and the list of
- * XSD files is held in the configuration file (generate.xsd) which lives in the
- * resources/generate directory of the project being generated.
- *
- * @param projectBuildDir the path to the target dir of the project being generated.
- */
- public static void generate(String projectBuildDir) {
- System.out.println(">> Building project from dir: " + projectBuildDir);
- FileInputStream fis = null;
-
- try {
- // Load the config file into a stream
- fis = new FileInputStream(projectBuildDir + "/classes/generate/generate.xml");
-
- // Load the stream into SDO
- // We are just using SDO as a conveniet way to parse the XML config file
- HelperContext scope = SDOUtil.createHelperContext();
- GenerateFactory.INSTANCE.register(scope);
- XMLDocument xmlDoc = scope.getXMLHelper().load(fis);
- GenerateType generateType = (GenerateType)xmlDoc.getRootObject();
-
- // Get the file list. This is the list of XSD that is passed into the
- // the velocity templates. Each confiured file holds a list of types
- // that the velocity templates expand into appropriate methods and method calls
- List fileList = generateType.getInputFile();
-
- //Intialise velocity ready to generate the various files
- Properties p = new Properties();
- p.setProperty("file.resource.loader.path", projectBuildDir + "/classes/generate");
- Velocity.init(p);
- VelocityContext context = new VelocityContext();
- context.put("fileList", fileList);
-
- List templateList = generateType.getTemplate();
-
- // For each velocity template in the template list pass in the XSD file list
- for ( Object item: templateList){
- TemplateType template = (TemplateType)item;
- context.put("template", template);
- String tmp = template.getTemplateName();
- String filename = projectBuildDir + "/" + template.getTemplateTargetDir() + "/" + tmp.substring(0,tmp.length() - 3);
- FileWriter fw = new FileWriter(filename);
- System.out.println(">> Processing " + template.getTemplateName() + " to " + filename);
- Velocity.mergeTemplate(template.getTemplateName(), context, fw );
- fw.flush();
- fw.close();
- }
-
- } catch (Exception e) {
- System.out.println("Exception : " + e.toString());
- e.printStackTrace();
- return;
- }
- }
-
- /**
- * The mainline
- *
- * @param args the target directory where project in which files are being generated
- */
- public static void main(String[] args) {
- Generate gen = new Generate();
- gen.generate(args[0]);
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
deleted file mode 100644
index b2346aa973..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-
-import ${template.getJavaPackage()}.GreeterService;
-
-// Data types
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-import $file.getJavaPackage().$file.getFactory();
-#end
-#end
-
-/**
- * Automatically generated test case. Calls the greeter client for a number of
- * bindings and a number of data types.
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-public class DatabindingTestCase extends TestCase {
-
- private SCADomain domain;
- private GreeterService greeterClient;
-
- /**
- * Runs before each test method
- */
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("greeter.composite");
- super.setUp();
- }
-
- /**
- * Runs after each test method
- */
- protected void tearDown() {
- domain.close();
- }
-
- /**
- * Finds the SCA component that relates to the protocol being tested. This test
- * always connects locally to the client component but the client component will
- * connect to the back end component using the appropriate protocol
- *
- * @param ext the protcol required
- */
- private void setUpClient(String ext) throws Exception {
- greeterClient = domain.getService(GreeterService.class, ext + "GreeterServiceClient");
- }
-
- /**
- * Invokes the SDO Greet service using web service bindings with SDO payload
- */
- public void testWSGreet() throws Exception {
- setUpClient("WS");
- greet();
- }
-
- /**
- * Invokes the SDO Greet service using default bindings with SDO payload
- */
- public void testDefaultGreet() throws Exception {
- setUpClient("Default");
- greet();
- }
-
- /**
- * A generic method which, regarless of which client is connected, sends out a
- * series of requrests passing different data types.
- */
- public void greet() {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
- // test $typeInstance.getTypeName()
- {
- $typeInstance.getTypeName() param = null;
- $typeInstance.getCreateTypeCode()
- $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param);
- $typeInstance.getResultComparison()
- }
-#end
-#end
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
deleted file mode 100644
index 88616cc997..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-#foreach($file in $fileList)
-
-#end
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-#end
-#end
-
-
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-
-
-#end
-#end
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
deleted file mode 100644
index b0e298b823..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The automcatically generated interface to the service that reflects data objects
- * that are sent to it
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-@Remotable
-public interface GreeterService {
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
- /**
- * Take the provided data object, change it slightly and return it
- *
- * @param param the data object to be changed and returned
- * @return the change data object
- */
- $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param);
-#end
-#end
-
-}
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
deleted file mode 100644
index ee73db6152..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-
-/**
- * GreeterServiceClient
- */
-@AllowsPassByReference
-public interface GreeterServiceClient {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
- $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param);
-#end
-#end
-}
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
deleted file mode 100644
index 57827d27b9..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-/**
- * The automcatically generated service that simply forwards data objects on to
- * the GreeterService and passes back the responses
- *
- * @version $Rev: 508831 $ $Date: 2007-02-18 00:12:31 +0000 (Sun, 18 Feb 2007) $
- */
-@Service(GreeterService.class)
-public class GreeterServiceClientImpl implements GreeterService {
-
- /**
- * the reference the the GreeterService that will
- * change each data object slightly and return it
- */
- private GreeterService service;
-
- @Reference
- public void setGreeterService(GreeterService service) {
- this.service = service;
- }
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.itest.sdodatabinding.GreeterService#greet$typeInstance.getTypeName()($typeInstance.getTypeName() param)
- */
- public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) {
- return service.greet$typeInstance.getTypeName()(param);
- }
-#end
-#end
-}
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
deleted file mode 100644
index 1fd7509667..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * The automcatically generated service implementation that reflects data objects
- * that are sent to it
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-@Service(GreeterService.class)
-public class GreeterServiceImpl implements GreeterService {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
- /**
- * Take the provided data object, change it slightly and return it
- *
- * @param param the data object to be changed and returned
- * @return the change data object
- */
- public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) {
- $typeInstance.getModifyTypeCode()
- return param;
- }
-#end
-#end
-}
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/generate.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/generate.xsd
deleted file mode 100644
index 1fabedf55f..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
deleted file mode 100644
index 8927d725b6..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-A dummy file that causes the target/classes/wsdl dir to be created in the generated test project. This is
-required because the test generator must run in the process-resource phase, after generate.xml has been copied
-into target. The generator needs to write out target/classes/wsdl and will fail the directory isn't there. So
-this file just gets unpacked and forces the directory to be created.
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xml
deleted file mode 100644
index f1f4346e58..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
deleted file mode 100644
index 1fae43eb09..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
- SDO 2.0.1
-
- A schema that tests the presence of annotations in schema read by SDO
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xml
deleted file mode 100644
index c20c80b658..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
deleted file mode 100644
index bd3db2e030..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
deleted file mode 100644
index 30e4979dca..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
deleted file mode 100644
index e7738dcff7..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
deleted file mode 100644
index 9552421e2d..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
deleted file mode 100644
index c7b9655749..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
deleted file mode 100644
index 5e5e7fbd55..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
deleted file mode 100644
index 5c455c2ab5..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
deleted file mode 100644
index 635e851632..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
deleted file mode 100644
index 004dab4fbb..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
deleted file mode 100644
index 136092951b..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
deleted file mode 100644
index 796f08e1cf..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
deleted file mode 100644
index 927b94885c..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
deleted file mode 100644
index 93f83cd0a1..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
deleted file mode 100644
index ea7db70595..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
deleted file mode 100644
index c64323e7e1..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
deleted file mode 100644
index 85c7d85fd4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
deleted file mode 100644
index 543f276c50..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
deleted file mode 100644
index fcd281539b..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
deleted file mode 100644
index 1610c2b861..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
deleted file mode 100644
index 36a0760a61..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- anySimpleType
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
deleted file mode 100644
index 999b72bb35..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
deleted file mode 100644
index 5849165fe0..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
deleted file mode 100644
index 71dad561ca..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
deleted file mode 100644
index 8acf9376d7..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- http://tempuri.org
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
deleted file mode 100644
index a49987c352..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
deleted file mode 100644
index a35b6e174a..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ABCDEF
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
deleted file mode 100644
index e1995890f9..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
deleted file mode 100644
index 91cfce51b8..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
- true
- false
- 1
- 0
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
deleted file mode 100644
index a2f86ba8c5..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
deleted file mode 100644
index 907474cd1b..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 127
- -127
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
deleted file mode 100644
index a2f6bcfa77..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
deleted file mode 100644
index c5820e1a2e..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 2001-01-01
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
deleted file mode 100644
index f4d596bfe3..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
deleted file mode 100644
index 0debe2fec5..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 2001-12-31T12:00:00
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
deleted file mode 100644
index b5bcfdcfd4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
deleted file mode 100644
index 7f001254cc..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- -1.23456789
- 1.23456789
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
deleted file mode 100644
index 8d4d106f59..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
deleted file mode 100644
index f875b9f94d..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 0.0
- 12.3E-4
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
deleted file mode 100644
index 4c8a39b06c..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
deleted file mode 100644
index 7d343d6dda..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- P1D
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
deleted file mode 100644
index bb12bc04a9..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
deleted file mode 100644
index 7a81f3b0dd..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 0.0
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
deleted file mode 100644
index f0e1c21233..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
deleted file mode 100644
index d35568b3c9..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ---01
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
deleted file mode 100644
index 92bd9a4b66..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
deleted file mode 100644
index 52cdfa8c4e..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- --01--
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
deleted file mode 100644
index 78d001a585..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
deleted file mode 100644
index 2609a858f7..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- --01-01
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
deleted file mode 100644
index 38f6c55059..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
deleted file mode 100644
index 7868a47ca3..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 2001
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
deleted file mode 100644
index 0d65b124ff..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
deleted file mode 100644
index 3f5080d49f..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 2001-01
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
deleted file mode 100644
index 340555dc5f..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
deleted file mode 100644
index 0deb7af980..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 0F00
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
deleted file mode 100644
index 8059fe6da0..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
deleted file mode 100644
index 06c92ce19b..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- idvalue0
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
deleted file mode 100644
index 7b1f02d1d4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
deleted file mode 100644
index 9bc0cefd0f..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- idvalue0
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
deleted file mode 100644
index 0c207983bc..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
deleted file mode 100644
index f91b602f99..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- idvalue0
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
deleted file mode 100644
index b99bf01b73..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
deleted file mode 100644
index c99698e175..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- -2147483648
- 2147483647
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
deleted file mode 100644
index b5b9b0d1eb..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
deleted file mode 100644
index 80d22ce057..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- -2147483648
- 2147483647
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
deleted file mode 100644
index 4902935db5..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
deleted file mode 100644
index 664bf824b4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- EN
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
deleted file mode 100644
index 5d3658d224..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
deleted file mode 100644
index c5861fa92a..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- -9223372036854775808
- 9223372036854775807
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
deleted file mode 100644
index 0aa4710057..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
deleted file mode 100644
index 1f95950394..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- NCName
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
deleted file mode 100644
index 6ee9c435db..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
deleted file mode 100644
index 0297f1aeb4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- NMTOKEN
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
deleted file mode 100644
index 56d027bdbb..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
deleted file mode 100644
index 81ba1069bd..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- NMTOKENS
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
deleted file mode 100644
index 866ab73024..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
deleted file mode 100644
index 8bb3a08b94..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- tns:BuiltInNotationNotation
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
deleted file mode 100644
index c7c62f812b..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
deleted file mode 100644
index 8235718c5e..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- Name
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
deleted file mode 100644
index 36caba2f16..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
deleted file mode 100644
index 599c428a44..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- -1
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
deleted file mode 100644
index 389d5a99f0..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
deleted file mode 100644
index 919c4a20ee..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 0
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
deleted file mode 100644
index 59887078b5..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
deleted file mode 100644
index 79011f26ab..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- -1
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
deleted file mode 100644
index 5de7d64d7b..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
deleted file mode 100644
index c40be9e18b..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- normalizedString
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
deleted file mode 100644
index d4a78787b8..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
deleted file mode 100644
index c30434de66..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 1
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
deleted file mode 100644
index 5381590cd1..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
deleted file mode 100644
index 4cd6ea7e72..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- QName
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
deleted file mode 100644
index e8faf6225b..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
deleted file mode 100644
index b4375467c4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- -32768
- 32767
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
deleted file mode 100644
index a4f564d9b7..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
deleted file mode 100644
index d30ab85530..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- string
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
deleted file mode 100644
index 8abb34b5a5..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
deleted file mode 100644
index 7fd9a061ae..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
deleted file mode 100644
index 1615976813..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
deleted file mode 100644
index cd567ba528..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- token
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
deleted file mode 100644
index 0beaac571f..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
deleted file mode 100644
index 025362defb..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 0
- 255
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
deleted file mode 100644
index d6d951fe5d..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
deleted file mode 100644
index 5736a8c121..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 0
- 4294967295
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
deleted file mode 100644
index 242be1d53b..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
deleted file mode 100644
index d728115a77..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 0
- 18446744073709551615
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
deleted file mode 100644
index 108e3a8619..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
deleted file mode 100644
index d4ffae5e17..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 0
- 65535
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
deleted file mode 100644
index 5ee5e0229e..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
deleted file mode 100644
index 3d5aed5aa8..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
deleted file mode 100644
index e7b80ab11c..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
deleted file mode 100644
index 2b4fe5594e..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- SimpleTypeWithName
- SimpleTypeWithNameExtended
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
deleted file mode 100644
index fc4deb63c2..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
deleted file mode 100644
index 03570f41d9..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ComplexTypeExtendingSimpeTypeElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
deleted file mode 100644
index c754502645..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
deleted file mode 100644
index 4603793bfc..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ComplexTypeSimpleContentRestrictingComplexTypeElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
deleted file mode 100644
index 4bcd2f8c46..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
deleted file mode 100644
index a6861f803a..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- BaseElement
- ExtensionElement
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
deleted file mode 100644
index 8bb251cab2..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
deleted file mode 100644
index 467ec007ed..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- Some
- ]]>
- Mixed
- SimpleType]]>WithName
- Content
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
deleted file mode 100644
index 8d00646678..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
deleted file mode 100644
index 7deafd798a..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
deleted file mode 100644
index 72ac75fee0..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
deleted file mode 100644
index f6208f81b3..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
- Some
- Mixed
- SimpleTypeWithName
- Content
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
deleted file mode 100644
index 1f26e13673..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
deleted file mode 100644
index 97de7b98eb..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
deleted file mode 100644
index 67716553d8..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
deleted file mode 100644
index 5941348921..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
- Some
- Mixed
- SimpleTypeWithName
- Content
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
deleted file mode 100644
index 24d5d09054..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
deleted file mode 100644
index f684d06a4d..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- SomeData
-
-
- idvalue2
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
deleted file mode 100644
index de4a8a666d..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
deleted file mode 100644
index 242908bd27..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
deleted file mode 100644
index 4c00fbe295..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
deleted file mode 100644
index 925e8625d5..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
deleted file mode 100644
index b12bec040b..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
deleted file mode 100644
index c73708ce46..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
deleted file mode 100644
index 795c3ea7d9..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
deleted file mode 100644
index 3ebdc89ae0..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
deleted file mode 100644
index 21546d0f67..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
deleted file mode 100644
index 89657e42ca..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
deleted file mode 100644
index d01b4172e4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
deleted file mode 100644
index 82fd1eedaf..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
deleted file mode 100644
index e1dcf06194..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
deleted file mode 100644
index ebf03c9d5d..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- ElementInAllOne
- ElementInAllTwo
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
deleted file mode 100644
index 8b9ba5b4b8..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
deleted file mode 100644
index 26466b1b39..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- Element1InChoice
- Element2InChoice
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
deleted file mode 100644
index ff418c56ab..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
deleted file mode 100644
index 27bb1ce9cc..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
- ChangeSummaryText
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
deleted file mode 100644
index 2bf1df8c99..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
deleted file mode 100644
index 9b5561ed43..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementOfSimpleTypeWithDefaultDefault
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
deleted file mode 100644
index 0b4e7bdf45..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
deleted file mode 100644
index f1b7cd264c..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementOfSimpleTypeWithFixedFixed
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
deleted file mode 100644
index a2c8456257..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
deleted file mode 100644
index 1f60b0423f..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementOfSimpleTypeWithSDODataTypeElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
deleted file mode 100644
index 21e55ab8c1..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
deleted file mode 100644
index 30762f4912..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- idvalue0
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
deleted file mode 100644
index 5bf35d0d70..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
deleted file mode 100644
index 2dd01e4090..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- idvalue0
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
deleted file mode 100644
index 6920cd8dd0..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
deleted file mode 100644
index 6a526bdc47..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementOfSimpleTypeWithSDOStringElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
deleted file mode 100644
index 1117a95eb8..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
deleted file mode 100644
index ab91458bff..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- ElementInSubstitutionGroupBase
-
-
-
- Some Data
-
-
-
- ElementInSubstitutionGroupBase
-
-
- ElementInSubstitutionGroupExtends
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
deleted file mode 100644
index 3e015843b5..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
deleted file mode 100644
index b6d68fd08a..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- ElementWithMaxOccursElement1
- ElementWithMaxOccursElement2
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
deleted file mode 100644
index d4453a4477..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
deleted file mode 100644
index 6de3adc937..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementWithNillableElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
deleted file mode 100644
index 786ab226da..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
deleted file mode 100644
index 64093aa803..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementWithSDOAliasName
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
deleted file mode 100644
index 01f4c2b1ef..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
deleted file mode 100644
index 774646f682..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementWithSDONameElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
deleted file mode 100644
index 34da37564c..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
deleted file mode 100644
index a1fb3aa803..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
deleted file mode 100644
index 8eb7a4fce4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
deleted file mode 100644
index f68eb1939d..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- GlobalElementSimpleType
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
deleted file mode 100644
index b9f77e6658..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xml
deleted file mode 100644
index fd28850050..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
- SomeString
- SomeString
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xsd
deleted file mode 100644
index eae93fd44a..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
deleted file mode 100644
index a7e568decf..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xml
deleted file mode 100644
index d4b9e24fa6..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xsd
deleted file mode 100644
index 34ff314a19..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Interop.xsd
deleted file mode 100644
index ae22ab2c44..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xml
deleted file mode 100644
index b75ac6500a..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-tns:Tuscany
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xsd
deleted file mode 100644
index 6ad019cb81..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Person.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Person.xsd
deleted file mode 100644
index 5f5021b15e..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
deleted file mode 100644
index 6c5ad88ff4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
deleted file mode 100644
index 6b7e39b334..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
deleted file mode 100644
index f9d4a24a49..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithAbstractExtensionElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
deleted file mode 100644
index f649e2ba83..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
deleted file mode 100644
index 410df4b7e4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithExtendedInstanceClassElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
deleted file mode 100644
index 36629e8295..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
deleted file mode 100644
index 7b74867c03..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithInstanceClassElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
deleted file mode 100644
index 7a08de84be..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
deleted file mode 100644
index 708d526f44..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- listmember1 listmember2
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
deleted file mode 100644
index 681cf7d5af..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
deleted file mode 100644
index e404ac86b7..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithNameElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
deleted file mode 100644
index af0431f048..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
deleted file mode 100644
index c86a0f6bcb..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithSDONameElement
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
deleted file mode 100644
index 89b00a36cc..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
deleted file mode 100644
index 399b0d8175..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- EN
- 01:02:03
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
deleted file mode 100644
index fee04b9f24..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
deleted file mode 100644
index bc8cf35368..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithoutName
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
deleted file mode 100644
index 536aa822de..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
deleted file mode 100644
index da2929776e..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
deleted file mode 100644
index ace5427786..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
deleted file mode 100644
index e6b9697a8d..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Expected type is emof:Package.
-
-
-
-
-
-
-
-
-
-
- Expected type is xsd:schema.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
deleted file mode 100644
index 7387568942..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
deleted file mode 100644
index c5aabc9cc8..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ /dev/null
@@ -1,221 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/branches/sca-java-0.91/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
deleted file mode 100644
index 131e11012a..0000000000
--- a/branches/sca-java-0.91/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.generate;
-
-import junit.framework.TestCase;
-
-
-/**
- *
- */
-public class GenerateTestCase extends TestCase {
-
- private Generate generator = null;
- private static boolean initalised = false;
-
- protected void setUp() throws Exception {
- if (!initalised) {
- generator = new Generate();
- initalised = true;
- }
- }
-
- protected void tearDown() {
-
- }
-
- /**
- * Invokes the Generate class to generate databinding test classes and resources.
- *
- * @throws Exception
- */
- public void testGenerate() throws Exception {
- // generator.generate();
- }
-}
diff --git a/branches/sca-java-0.91/itest/databindings/config.png b/branches/sca-java-0.91/itest/databindings/config.png
deleted file mode 100644
index 7912019e9d..0000000000
Binary files a/branches/sca-java-0.91/itest/databindings/config.png and /dev/null differ
diff --git a/branches/sca-java-0.91/itest/databindings/config.svg b/branches/sca-java-0.91/itest/databindings/config.svg
deleted file mode 100644
index aaf027e2df..0000000000
--- a/branches/sca-java-0.91/itest/databindings/config.svg
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/databinding.png b/branches/sca-java-0.91/itest/databindings/databinding.png
deleted file mode 100644
index 76a9c71b7d..0000000000
Binary files a/branches/sca-java-0.91/itest/databindings/databinding.png and /dev/null differ
diff --git a/branches/sca-java-0.91/itest/databindings/databinding.svg b/branches/sca-java-0.91/itest/databindings/databinding.svg
deleted file mode 100644
index d6850ccf7d..0000000000
--- a/branches/sca-java-0.91/itest/databindings/databinding.svg
+++ /dev/null
@@ -1,242 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/interop.png b/branches/sca-java-0.91/itest/databindings/interop.png
deleted file mode 100644
index 005e0f24ea..0000000000
Binary files a/branches/sca-java-0.91/itest/databindings/interop.png and /dev/null differ
diff --git a/branches/sca-java-0.91/itest/databindings/interop.svg b/branches/sca-java-0.91/itest/databindings/interop.svg
deleted file mode 100644
index 03897c6d09..0000000000
--- a/branches/sca-java-0.91/itest/databindings/interop.svg
+++ /dev/null
@@ -1,352 +0,0 @@
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/interop/pom.xml b/branches/sca-java-0.91/itest/databindings/interop/pom.xml
deleted file mode 100644
index ffee182521..0000000000
--- a/branches/sca-java-0.91/itest/databindings/interop/pom.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings
- 0.91-incubating-SNAPSHOT
-
-
- 4.0.0
-
- tuscany-itest-databindings-interop
- 0.91-incubating-SNAPSHOT
- jar
- Apache Tuscany Interoperability Databindings Integration Test
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- https://maven-repository.dev.java.net/nonav/repository
- legacy
-
-
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- https://maven-repository.dev.java.net/repository
- legacy
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-databinding-jaxb
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-databinding-sdo
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-databinding-axiom
- ${pom.version}
- compile
-
-
- javax.xml.bind
- jaxb-api
- 2.1
- compile
-
-
- com.sun.xml.bind
- jaxb-impl
- 2.1
- runtime
-
-
- com.sun.xml.ws
- jaxws-rt
- 2.1
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings-common
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings-sdo
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings-jaxb
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-interface-java-runtime
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-http-jetty
- ${pom.version}
- test
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- generate-sources
-
- unpack
-
-
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings-common
- ${project.version}
- true
- ${project.build.directory}/classes
-
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
- generate-test-source
- process-resources
-
- java
-
-
-
-
- org.apache.tuscany.sca.itest.generate.Generate
-
- ${project.build.directory}
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
deleted file mode 100644
index 7bdfc57924..0000000000
--- a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import ${template.getJavaPackage()}.GreeterService;
-
-// Data types
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-import $file.getJavaPackage().$file.getFactory();
-#end
-#end
-
-/**
- * Automatically generated test case. Calls the greeter client for a number of
- * bindings and a number of data types.
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-public class InteropDatabindingTestCase extends TestCase {
-
- private static boolean initalised = false;
- private GreeterService greeterClient;
- private static SCADomain domain;
-
- /**
- * Runs before each test method
- */
- protected void setUp() throws Exception {
- if (!initalised) {
- domain = SCADomain.newInstance("interopgreeter.composite");
- super.setUp();
- initalised = true;
- }
- }
-
- /**
- * Runs after each test method
- */
- protected void tearDown() {
-
- }
-
- /**
- * Finds the SCA component that relates to the protocol being tested. This test
- * always connects locally to the client component but the client component will
- * connect to the back end component using the appropriate protocol
- *
- * @param ext the protcol required
- */
- private void setUpClient(String ext) throws Exception {
- greeterClient = domain.getService(GreeterService.class, "SDO" + ext + "GreeterServiceClient");
- }
-
- /**
- * Invokes the SDO Greet service using web service bindings with SDO payload
- */
- public void testWSGreet() throws Exception {
- setUpClient("WS");
- greet();
- }
-
- /**
- * Invokes the SDO Greet service using default bindings with SDO payload
- */
- public void testDefaultGreet() throws Exception {
- setUpClient("Default");
- greet();
- }
-
- /**
- * A generic method which, regarless of which client is connected, sends out a
- * series of requrests passing different data types.
- */
- public void greet() {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
- // test $typeInstance.getTypeName()
- {
- $typeInstance.getTypeName() param = null;
- $typeInstance.getCreateTypeCode()
- $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param);
- $typeInstance.getResultComparison()
- }
-#end
-#end
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
deleted file mode 100644
index 38bfccce0c..0000000000
--- a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-#foreach($file in $fileList)
-
-#end
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-#end
-#end
-
-
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-
-
-#end
-#end
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
deleted file mode 100644
index 6f02af4c9d..0000000000
--- a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-#foreach($file in $fileList)
-
-#end
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-#end
-#end
-
-
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-
-
-#end
-#end
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/generate.xml b/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/generate.xml
deleted file mode 100644
index 8453dd56b4..0000000000
--- a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
- InteropDatabindingTestCase.java.vm
- ../src/test/java/org/apache/tuscany/sca/itest/sdodatabinding
- org.apache.tuscany.sca.itest.sdodatabinding
-
-
- interopgreeter.composite.vm
- classes
-
-
- SDOGreeter.wsdl.vm
- classes/wsdl
-
-
- JAXBGreeter.wsdl.vm
- classes/wsdl
-
-
- Person.xsd
- xsd
- org.apache.tuscany.sca.itest.databinding.types
- TypesFactory
- http://apache.org/tuscany/sca/itest/databinding/types
- p
-
- PersonType
-
- TypesFactory factory = TypesFactory.INSTANCE;
- param = factory.createPersonType();
- param.setFirstName("George");
- param.setLastName("Doors");
-
-
- param.setGreeting("Hello");
-
-
- assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-
-
-
-
- Interop.xsd
- xsd
- org.apache.tuscany.interop
- InteropFactory
- http://www.apache.org/tuscany/interop
- i
-
-
- AttributeComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType();
- attrib.setAttribute("SomeText");
- param = factory.createAttributeComplexType();
- param.setAttributeElement(attrib);
-
-
- param.getAttributeElement().setAttribute("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-
-
-
- AttributeReferenceComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createAttributeReferenceComplexType();
-
- param.setReferencedAttribute("SomeText");
-
-
- param.setReferencedAttribute("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-
-
-
- SimpleTypeWithAbstractComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createSimpleTypeWithAbstractComplexType();
- param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-
-
- param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-
-
-
- SimpleTypeWithNameComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createSimpleTypeWithNameComplexType();
- param.setSimpleTypeWithNameElement("SomeText");
-
-
- param.setSimpleTypeWithNameElement("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-
-
-
- ComplexTypeWithContentType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createComplexTypeWithContentType();
- param.setSimpleTypeWithName("SomeText");
-
-
- param.setSimpleTypeWithName("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
deleted file mode 100644
index 36797fde57..0000000000
--- a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
- #foreach( $file in $fileList )
-
- #end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/jaxbgen/pom.xml b/branches/sca-java-0.91/itest/databindings/jaxbgen/pom.xml
deleted file mode 100644
index cdef3e5d87..0000000000
--- a/branches/sca-java-0.91/itest/databindings/jaxbgen/pom.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings
- 0.91-incubating-SNAPSHOT
-
-
- 4.0.0
-
- tuscany-itest-databindings-jaxb
- 0.91-incubating-SNAPSHOT
- jar
- Apache Tuscany JAXB Databinding Integration Test
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- https://maven-repository.dev.java.net/nonav/repository
- legacy
-
-
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- https://maven-repository.dev.java.net/repository
- legacy
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- ${pom.version}
- runtime
-
-
- org.apache.tuscany.sca
- tuscany-databinding-jaxb
- ${pom.version}
- runtime
-
-
- org.apache.tuscany.sca
- tuscany-databinding-sdo
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-databinding-axiom
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings-common
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-interface-java-runtime
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-http-jetty
- 0.91-incubating-SNAPSHOT
- runtime
-
-
- javax.xml.bind
- jaxb-api
- 2.1
- compile
-
-
- com.sun.xml.bind
- jaxb-impl
- 2.1
- runtime
-
-
- com.sun.xml.ws
- jaxws-rt
- 2.1
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- generate-sources
-
- unpack
-
-
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings-common
- ${project.version}
- true
- ${project.build.directory}/classes
-
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.0
-
-
- add-test-source
- generate-sources
-
- add-test-source
-
-
-
- target/jaxws-source
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
- generate-test-source
- process-resources
-
- java
-
-
-
-
- org.apache.tuscany.sca.itest.generate.Generate
-
- ${project.build.directory}
-
-
-
-
- org.codehaus.mojo
- jaxws-maven-plugin
-
-
- process-resources
-
- wsimport
-
-
-
-
- org.apache.tuscany.sca.itest.jaxbdatabinding.generated
- ${project.build.directory}/classes/wsdl
-
- Greeter.wsdl
-
- ${project.build.directory}/jaxws-source
- true
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
deleted file mode 100644
index 8381a164ea..0000000000
--- a/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
-
-
- GreeterService.java.vm
- ../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding
- org.apache.tuscany.sca.itest.jaxbdatabinding
-
-
- GreeterServiceImpl.java.vm
- ../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding
- org.apache.tuscany.sca.itest.jaxbdatabinding
-
-
- GreeterServiceClient.java.vm
- ../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding
- org.apache.tuscany.sca.itest.jaxbdatabinding
-
-
- GreeterServiceClientImpl.java.vm
- ../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding
- org.apache.tuscany.sca.itest.jaxbdatabinding
-
-
- DatabindingTestCase.java.vm
- ../src/test/java/org/apache/tuscany/sca/itest/jaxbdatabinding
- org.apache.tuscany.sca.itest.jaxbdatabinding
-
-
- Greeter.wsdl.vm
- classes/wsdl
-
-
- Person.xsd
- xsd
- org.apache.tuscany.sca.itest.jaxbdatabinding.generated
- ObjectFactory
- http://apache.org/tuscany/sca/itest/databinding/types
- p
-
- PersonType
-
- ObjectFactory factory = new ObjectFactory();
- param = factory.createPersonType();
- param.setFirstName("George");
- param.setLastName("Doors");
-
-
- param.setGreeting("Hello");
-
-
- assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-
-
-
-
- Interop.xsd
- xsd
- org.apache.tuscany.sca.itest.jaxbdatabinding.generated
- ObjectFactory
- http://www.apache.org/tuscany/interop
- i
-
-
- AttributeComplexType
-
- ObjectFactory factory = new ObjectFactory();
- org.apache.tuscany.sca.itest.jaxbdatabinding.generated.AttributeType attrib = factory.createAttributeType();
- attrib.setAttribute("SomeText");
- param = factory.createAttributeComplexType();
- param.setAttributeElement(attrib);
-
-
- param.getAttributeElement().setAttribute("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-
-
-
- AttributeReferenceComplexType
-
- ObjectFactory factory = new ObjectFactory();
- param = factory.createAttributeReferenceComplexType();
-
- param.setReferencedAttribute("SomeText");
-
-
- param.setReferencedAttribute("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-
-
-
- SimpleTypeWithAbstractComplexType
-
- ObjectFactory factory = new ObjectFactory();
- param = factory.createSimpleTypeWithAbstractComplexType();
- param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-
-
- param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-
-
-
- SimpleTypeWithNameComplexType
-
- ObjectFactory factory = new ObjectFactory();
- param = factory.createSimpleTypeWithNameComplexType();
- param.setSimpleTypeWithNameElement("SomeText");
-
-
- param.setSimpleTypeWithNameElement("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-
-
-
- ComplexTypeWithContentType
-
- ObjectFactory factory = new ObjectFactory();
- param = factory.createComplexTypeWithContentType();
- param.setSimpleTypeWithName("SomeText");
-
-
- param.setSimpleTypeWithName("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/greeter.composite
deleted file mode 100644
index 520a68e9b8..0000000000
--- a/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- JAXBGreeterServiceComponent
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/pom.xml b/branches/sca-java-0.91/itest/databindings/pom.xml
deleted file mode 100644
index acf83b1b32..0000000000
--- a/branches/sca-java-0.91/itest/databindings/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest-databindings
- Apache Tuscany SCA Databindings Integration Tests
- 0.91-incubating-SNAPSHOT
-
-
- pom
-
- install
-
-
- common
- sdogen
- jaxbgen
- interop
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/readme.html b/branches/sca-java-0.91/itest/databindings/readme.html
deleted file mode 100644
index 24a44e4ed7..0000000000
--- a/branches/sca-java-0.91/itest/databindings/readme.html
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
-
-
-
-
- Tuscany SCA Integration Test Databindings
-
-
-
-
-
-
Tuscany SCA Integation Test Databindings
-
-
Overview
-
-
-This integration test tests the Tuscany SCA databinding implementation by passing various data structures
-across various bindings using the supported databindings. There are tests for the individual databindings
-which exercise various bindings with the same databinding at client and server ends of each binding. There
-is also an integration test which exercises the transformer chains by specifying different databindings at
-client and server ends of the binding.
-
-
-In doing this testing it is apparent that there is a lot of repetition in creating client, services, idl and
-type for each of the data types for each of the bindings for each of the databindings. To reduce the amount
-of effort required to maintain the tests as new types, bindings and databindings are added the test cases
-themselves are generated from configuration files.
-
-
-
Test Structure
-
-Databindings/Common - hold files common across all tests
-Databindings/Interop - test the transformer chains with combinations of databindings
-Databindings/sdogen and jaxbgen - test each databindings independently
-
-
Test Generation
-
-To reduce the amount of manual effort involved in building and maintaining tests cases the test cases
-themselves are generated at run time using a set of velocity templates. Each test module has a generate.xml
-file in the resources/generate directory which tells the generator what to do. The file looks like this.
-
-
-
-Each element describes a velocit template to use in the test. The generator process is to expand
-each velocity template provided with all of the types specified in the sections.
-
-
-Each element describes a schema file used in the test. It also contains a description of each
-data type that will be tested. The generator then arranges for the databinding being tested to generate
-appropriate Java classes to represent the type at runtime. The individual databinding tests use the following
-flow.
-
-
-Create data object at client
-Client passes data object to server
-Server modifies data object
-Server returns modified data object to client
-Client tests that modified data object is as expected
-
-Hence the CreateTypeCode, ModifyTypeCode and ResultComparison elements which contain the type specific code
-that is used in the tests.
-
-
-
The Common Directory
-
-The common directory contains the information that is common across all of the tests. This includes the
-common velocity templates and the source for the generator that reads the config.xml for each test. Common
-also contains all of the data type schema as these are common across all tests. Each test pom is written so
-that the contents of the common project are expanded into the tests target directory before the test starts.
-In this way all of the common elements are available for the test generation phase and at test runtime.
-
-
-
Individual Databinding Tests
-
-The individual databinding tests, for example, sdogen and jaxbgen, are mostly empty as their content is
-generated at runtime. The configuration and any test specific templates can be found in the resources/generate
-directory. Some files are hand crafted for each test and live in their static position in the tests directory
-structure.
-
-
-Each test uses the same scenario
-
-
-
-The interface exposed by the greeter service provides a greet method for each data type being tested, for
-example,
-
-These methods are taken from the SDO databinding test and hence PersonType, AttributeComplexType, etc. will
-have been generated by the SDO static type generator.
-
-
-Hence this tests a single databinding across a variety of data types and a variety of bindings. New bindings
-be tested by extending the composite. Be datatypes can be tested by updating the confix.xml file.
-
-
Databinding Interoperability Tests
-
-This test uses the generated client, services and types from the individual databinding tests. It does not
-regenerate them and you will see a dependency in the interop test pom on the other databinding tests. Is also
-has some generate elements because the composite file must currently have import statements for all of the
-SDO factories required during tested.
-
-
-The scenario used here is,
-
-
-
-A chain of components is built up for each binding. Each component, drawn from the the inidividual databinding
-tests, tests the full range of datatypes. The client components are designed so that they can be chained together
-and so tranformations across different databindings is tests. The service component simply changes the data
-content and returns it as before.
-
-
Building And Running The Tests
-
-The tests can be built by doing the following.
-
-
-cd sca/itest/databindings
-mvn
-
-
-The only modification to this process is required if a new input file is added to the tests suite. In this
-case you will need to edit the config.xml files as appropriate but run mvn twice. This may sound a little
-odd but currently the sdo test uses its pom file to generate the require SDO types. As the test is self
-generating the pom file will not be updated to include the new type file until the second time it's run. The
-aim is at some point to remove this feature from the pom.
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/sdogen/pom.xml b/branches/sca-java-0.91/itest/databindings/sdogen/pom.xml
deleted file mode 100644
index 67c975f523..0000000000
--- a/branches/sca-java-0.91/itest/databindings/sdogen/pom.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-
-
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings
- 0.91-incubating-SNAPSHOT
-
-
- 4.0.0
-
- tuscany-itest-databindings-sdo
- 0.91-incubating-SNAPSHOT
- jar
- Apache Tuscany SDO Databinding Integration Test
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- https://maven-repository.dev.java.net/nonav/repository
- legacy
-
-
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- https://maven-repository.dev.java.net/repository
- legacy
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- ${pom.version}
- runtime
-
-
- org.apache.tuscany.sca
- tuscany-core-databinding
- ${pom.version}
- runtime
-
-
- org.apache.tuscany.sca
- tuscany-databinding-jaxb
- ${pom.version}
- runtime
-
-
- org.apache.tuscany.sca
- tuscany-databinding-sdo
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-databinding-axiom
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-interface-java-runtime
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings-common
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-http-jetty
- 0.91-incubating-SNAPSHOT
- test
-
-
- javax.servlet
- servlet-api
- 2.5
- test
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- generate-sources
-
- unpack
-
-
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings-common
- ${project.version}
- true
- ${project.build.directory}/classes
-
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.0
-
-
- add-test-source
- generate-sources
-
- add-test-source
-
-
-
- target/sdo-source
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
- generate-test-source
- process-resources
-
- java
-
-
-
-
- org.apache.tuscany.sca.itest.generate.Generate
-
- ${project.build.directory}
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.0-incubating-beta1
-
-
- generate-sdo
- process-resources
-
-
-
- ${project.build.directory}/classes/wsdl/Greeter.wsdl
- org.apache.tuscany.sca.itest.databinding.services
-
-
- ${project.build.directory}/classes/xsd/Person.xsd
- org.apache.tuscany.sca.itest.databinding.types
-
-
- ${project.build.directory}/classes/xsd/Interop.xsd
- org.apache.tuscany.interop
-
-
- true
- true
- true
-
-
- generate
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/generate.xml
deleted file mode 100644
index 5487b113e8..0000000000
--- a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
-
- pom.xml.vm
- ..
-
-
- greeter.composite.vm
- classes
-
-
- GreeterService.java.vm
- ../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding
- org.apache.tuscany.sca.itest.sdodatabinding
-
-
- GreeterServiceImpl.java.vm
- ../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding
- org.apache.tuscany.sca.itest.sdodatabinding
-
-
- GreeterServiceClientImpl.java.vm
- ../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding
- org.apache.tuscany.sca.itest.sdodatabinding
-
-
- DatabindingTestCase.java.vm
- ../src/test/java/org/apache/tuscany/sca/itest/sdodatabinding
- org.apache.tuscany.sca.itest.sdodatabinding
-
-
- Greeter.wsdl.vm
- classes/wsdl
-
-
- Person.xsd
- xsd
- org.apache.tuscany.sca.itest.databinding.types
- TypesFactory
- http://apache.org/tuscany/sca/itest/databinding/types
- p
-
- PersonType
-
- TypesFactory factory = TypesFactory.INSTANCE;
- param = factory.createPersonType();
- param.setFirstName("George");
- param.setLastName("Doors");
-
-
- param.setGreeting("Hello");
-
-
- assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-
-
-
-
- Interop.xsd
- xsd
- org.apache.tuscany.interop
- InteropFactory
- http://www.apache.org/tuscany/interop
- i
-
-
- AttributeComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType();
- attrib.setAttribute("SomeText");
- param = factory.createAttributeComplexType();
- param.setAttributeElement(attrib);
-
-
- param.getAttributeElement().setAttribute("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-
-
-
- AttributeReferenceComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createAttributeReferenceComplexType();
-
- param.setReferencedAttribute("SomeText");
-
-
- param.setReferencedAttribute("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-
-
-
- SimpleTypeWithAbstractComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createSimpleTypeWithAbstractComplexType();
- param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-
-
- param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-
-
-
- SimpleTypeWithNameComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createSimpleTypeWithNameComplexType();
- param.setSimpleTypeWithNameElement("SomeText");
-
-
- param.setSimpleTypeWithNameElement("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-
-
-
- ComplexTypeWithContentType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createComplexTypeWithContentType();
- param.setSimpleTypeWithName("SomeText");
-
-
- param.setSimpleTypeWithName("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
deleted file mode 100644
index 9494d70f96..0000000000
--- a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
- #foreach( $file in $fileList )
-
- #end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm b/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
deleted file mode 100644
index b8389c1e92..0000000000
--- a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings
- 0.91-incubating-SNAPSHOT
-
-
- 4.0.0
-
- tuscany-itest-databindings-sdo
- 0.91-incubating-SNAPSHOT
- jar
- Apache Tuscany SDO Databinding Integration Test
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- https://maven-repository.dev.java.net/nonav/repository
- legacy
-
-
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- https://maven-repository.dev.java.net/repository
- legacy
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- ${pom.version}
- runtime
-
-
- org.apache.tuscany.sca
- tuscany-core-databinding
- ${pom.version}
- runtime
-
-
- org.apache.tuscany.sca
- tuscany-databinding-jaxb
- ${pom.version}
- runtime
-
-
- org.apache.tuscany.sca
- tuscany-databinding-sdo
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-databinding-axiom
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-interface-java-runtime
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings-common
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-http-jetty
- 0.91-incubating-SNAPSHOT
- test
-
-
- javax.servlet
- servlet-api
- 2.5
- test
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- generate-sources
-
- unpack
-
-
-
-
- org.apache.tuscany.sca
- tuscany-itest-databindings-common
- ${project.version}
- true
- ${project.build.directory}/classes
-
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.0
-
-
- add-test-source
- generate-sources
-
- add-test-source
-
-
-
- target/sdo-source
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
- generate-test-source
- process-resources
-
- java
-
-
-
-
- org.apache.tuscany.sca.itest.generate.Generate
-
- ${project.build.directory}
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.0-incubating-beta1
-
-
- generate-sdo
- process-resources
-
-
-
- ${project.build.directory}/classes/wsdl/Greeter.wsdl
- org.apache.tuscany.sca.itest.databinding.services
-
- #foreach( $file in $fileList )
-
- ${project.build.directory}/classes/$file.getFilePath()/$file.getFileName()
- $file.getJavaPackage()
-
- #end
-
- true
- true
- true
-
-
- generate
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/pom.xml b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/pom.xml
deleted file mode 100644
index b10be05e52..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/pom.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
-
- org.apache.tuscany.testing
- sca-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- iTest-exceptions-crossBinding-ws
- jar
- Test Suite Exception Handling cross bindings WS
-
-
-
- java.net
- https://maven-repository.dev.java.net/nonav/repository/
- legacy
-
-
-
-
-
- org.apache.tuscany.sca.services.databinding
- databinding-sdo
- ${scaKernelVersion}
-
-
- org.apache.tuscany.sca.services.idl
- tuscany-wsdl
- ${scaKernelVersion}
- runtime
-
-
-
- org.apache.tuscany.sca.extensions.axis2
- tuscany-axis2
- runtime
- ${scaKernelVersion}
-
-
-
-
- junit
- junit
- 4.2
- test
-
-
- org.apache.tuscany.sca.services
- tuscany-http-jetty
- runtime
- ${scaKernelVersion}
-
-
-
- org.apache.tuscany.sca.services.databinding
- databinding-jaxb
- ${scaKernelVersion}
-
-
- org.apache.tuscany.sca.extensions.axis2
- databinding-axiom
- ${scaKernelVersion}
-
-
-
-
- com.sun.xml.ws
- jaxws-rt
- 2.1
-
-
-
-
- javax.jws
- jsr181-api
- 1.0-MR1
-
-
- javax.xml.bind
- jaxb-api
- 2.1
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
-
- org.codehaus.mojo
- jaxws-maven-plugin
-
-
- generate-jaxb
- generate-resources
-
- wsimport
-
-
-
-
- ${basedir}/src/main/resources/wsdl
- true
- org.apache.tuscany.sca.test.exceptions.impl.jaxb
- true
-
-
-
- javax.jws
- jsr181-api
- 1.0-MR1
-
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.0-incubating-beta1
-
-
-
- ${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
- true
- true
- true
-
-
- generate
-
-
-
-
-
- org.apache.tuscany.sca.extensions.axis2.plugins
- tuscany-plugin-wsdl2java
- ${scaKernelVersion}
-
-
-
- ${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
-
-
- generate
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
deleted file mode 100644
index 2c9b2d25cb..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import org.apache.tuscany.api.annotation.DataType;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- *
- */
-@Remotable
-@DataType(name = "javax.xml.bind.JAXBElement")
-public interface StockExceptionTestJAXB extends StockExceptionTest {
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
deleted file mode 100644
index 65751175fb..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault_Exception;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault;
-import org.osoa.sca.annotations.Service;
-
-/**
- *
- */
-@Service(StockExceptionTestJAXB.class)
-public class StockExchangeJaxB implements StockExceptionTestJAXB {
-
- /**
- *
- */
- public StockExchangeJaxB() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest#stockQuoteOffer(org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer)
- */
- public StockOffer stockQuoteOffer(StockOffer input) throws InvalidSymbolFault_Exception, MarketClosedFault, TestNotDeclaredAtSourceFault{
-
- System.out.println("stockQuoteOffer '" + input + "'");
-
- String symbol = input.getSymbol();
- if ("IBM".equals(symbol)) {
- input.setPrice(99.00F);
- return input;
-
- }
- else if ("CLOSED".equals(input.getName())) {
- throw new MarketClosedFault("TO LATE!", 3);
-
- } else if( "testNotDeclaredAtSourceTest".equals(input.getName())){
-
- throw new TestNotDeclaredAtSourceFault("not declared", "fault info");
-
- }
- ObjectFactory jaxbOjectFactory = new ObjectFactory();
-
- InvalidSymbolFault faultinfo = jaxbOjectFactory.createInvalidSymbolFault();
-
- faultinfo.setOffer(input);
-
- throw new InvalidSymbolFault_Exception("bad symbol", faultinfo);
-
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
deleted file mode 100644
index 5f65d293ea..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public interface StockTraderSDO {
-
- StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
-
- void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
-
- Object testNotDeclaredAtSourceTest();
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
deleted file mode 100644
index 7d303887e7..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import stockexceptiontestservice.scatesttool.ScatesttoolFactory;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/**
- *
- */
-@Service(StockTraderSDO.class)
-public class StockTraderSDOImpl implements StockTraderSDO {
-
- private StockExceptionTest exchangeJaxb;
-
- /**
- *
- */
-
- public StockTraderSDOImpl() {
- // TODO Auto-generated constructor stub
- }
-
- @Reference
- public void setExchangeJaxb(StockExceptionTest exchangeJaxb) {
- this.exchangeJaxb = exchangeJaxb;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest()
- */
- public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
- StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
- stockOffer.setName("IBM");
- stockOffer.setSymbol("IBM");
- stockOffer.setPrice(100.00F); // offer to buy at max $100.00
-
- StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-
- return stockOfferAccepted;
-
- }
-
- public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException,
- MarketClosedSDOException {
- StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
- // set up for a InvalidSymbolSDOException
- stockOffer.setName("");
- stockOffer.setSymbol("IBM0");
-
- stockOffer.setPrice(11.0F); // offer to buy at max $100.00
- exchangeJaxb.stockQuoteOffer(stockOffer);
-
- }
-
- public void marketClosedSDOExceptionTest() {
- StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
- // set up for a MarketClosedSDOException
- stockOffer.setName("CLOSED");
- stockOffer.setSymbol("MBI");
- stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
- try {
- StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
- stockOfferAccepted.getPrice(); // the price actually bought.
- } catch (RemoteException e) {
-
- e.printStackTrace();
- } catch (InvalidSymbolSDOException e) {
-
- e.printStackTrace();
- } catch (MarketClosedSDOException e) {
-
- e.printStackTrace();
- }
- }
-
- public Object testNotDeclaredAtSourceTest() {
- StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
- // set up for a MarketClosedSDOException
- stockOffer.setName("testNotDeclaredAtSourceTest");
- stockOffer.setSymbol("TNDAS");
- stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
- try {
- return exchangeJaxb.stockQuoteOffer(stockOffer);
-
- } catch (Exception e) {
- return e;
-
- }
-
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
deleted file mode 100644
index e9df6ba473..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.sdohandgen;
-
-import javax.xml.namespace.QName;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-
-/**
- *
- */
-public class InvalidSymbolSDOException extends Exception {
-
- public static final QName FAULT_ELEMENT = new QName("http://scatesttool.stockexceptiontestservice", "InvalidSymbolFault");
-
- /**
- *
- */
- public InvalidSymbolSDOException() {
-
- }
-
- /**
- * @param message
- * @param faultInfo
- */
- public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo) {
- super(message);
- this.faultInfo = faultInfo;
-
- }
-
- /**
- * @param cause
- */
- public InvalidSymbolSDOException(InvalidSymbolFault faultInfo, Throwable cause) {
- super(cause);
- this.faultInfo = faultInfo;
-
- }
-
- /**
- * @param message
- * @param cause
- */
- public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo, Throwable cause) {
- super(message, cause);
- this.faultInfo = faultInfo;
-
- }
-
- // *** Below was hand added ... tooling needs to do this ***/
-
- /**
- * Java type that goes as soapenv:Fault detail element.
- */
- private InvalidSymbolFault faultInfo;
-
- /**
- * @return returns fault bean:
- * org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault
- */
- public InvalidSymbolFault getFaultInfo() {
- return faultInfo;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
deleted file mode 100644
index 39b702afe3..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.sdohandgen;
-
-import javax.xml.namespace.QName;
-
-/**
- *
- */
-public class MarketClosedSDOException extends Exception {
- public static final QName FAULT_ELEMENT =
- new QName("http://scatesttool.stockexceptiontestservice", "MarketClosedFault");
-
-
- /**
- * Java type that goes as soapenv:Fault detail element.
- */
- private int faultInfo;
-
- /**
- *
- */
- public MarketClosedSDOException() {
-
- }
-
- /**
- * @param message
- */
- public MarketClosedSDOException(String message, int faultInfo) {
- super(message);
- this.faultInfo = faultInfo;
- }
-
- /**
- * @param cause
- */
- public MarketClosedSDOException(int faultInfo, Throwable cause) {
- super(cause);
- this.faultInfo = faultInfo;
- }
-
- /**
- * @param message
- * @param cause
- */
- public MarketClosedSDOException(String message, int faultInfo, Throwable cause) {
- super(message, cause);
- this.faultInfo = faultInfo;
- }
-
- /**
- * @return returns fault bean: int
- */
- public int getFaultInfo() {
- return faultInfo;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
deleted file mode 100644
index 7b4b3a0f29..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-/**
- * StockExceptionTest.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
- */
-package org.apache.tuscany.sca.test.exceptions.sdohandgen;
-
-import org.apache.tuscany.api.annotation.DataType;
-import org.osoa.sca.annotations.Remotable;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-
-/*
- * StockExceptionTest java interface
- */
-
-@Remotable
-@DataType(name = "commonj.sdo.DataObject")
-public interface StockExceptionTest {
-
- /**
- * Auto generated method signatures
- *
- * @param param0
- */
- StockOffer stockQuoteOffer(StockOffer param0)
- throws java.rmi.RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index f955ba093c..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
deleted file mode 100644
index f385ebb47d..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
- exchangeJaxbComponent
-
-
-
-
-
-
-
-
- stockTraderSDOReference
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
deleted file mode 100644
index d70cdad313..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index 40e87953b6..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
deleted file mode 100644
index 9759647cfe..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
deleted file mode 100644
index ee4076394b..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.exceptions;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.api.SCARuntime;
-import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.spi.databinding.TransformationException;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public class IntraCompositeTestCase extends TestCase {
- private StockTraderSDO stockTrader;
-
- private CompositeContext context;
-
- public void testTrading() {
- try {
- StockOffer sp = stockTrader.testTrading();
- assertNotNull(sp);
- assertEquals(99.00F, sp.getPrice());
- assertEquals("IBM", sp.getSymbol());
- } catch (Exception e) {
-
- e.printStackTrace();
- fail(e + "");
-
- }
-
- }
-
- public void testInvalidSymbolSDOException() {
- try {
- stockTrader.testInvalidSymbolSDOException();
- fail("Expected InvalidSymbolSDOException");
- } catch (InvalidSymbolSDOException e) {
- InvalidSymbolFault isf = e.getFaultInfo();
-
- assertNotNull(isf);
- StockOffer sp = isf.getOffer();
- assertEquals(11.00F, sp.getPrice());
- assertEquals("IBM0", sp.getSymbol());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail("Expected InvalidSymbolSDOException" + e);
-
- }
- }
-
- public void _testNotDeclaredAtSourceException() {
-
- Object ret = stockTrader.testNotDeclaredAtSourceTest();
-
- assertNotNull(ret);
-
- assertEquals(TransformationException.class, ret.getClass());
-
- }
-
- @Override
- protected void setUp() throws Exception {
- SCARuntime.start("ExceptionTest.composite");
-
- context = CurrentCompositeContext.getContext();
- assertNotNull(context);
- stockTrader = context.locateService(StockTraderSDO.class, "stockTraderSDOComponent");
-
- assertNotNull(context);
- }
-
- @Override
- protected void tearDown() throws Exception {
- SCARuntime.stop();
- }
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/pom.xml b/branches/sca-java-0.91/itest/exceptions-cross-binding/pom.xml
deleted file mode 100644
index e1b5f9b539..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/pom.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
- org.apache.tuscany.testing
- sca-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- iTest-exceptions-crossBinding
- jar
- Test Suite Exception Handling cross bindings
-
-
-
- java.net
- https://maven-repository.dev.java.net/nonav/repository/
- legacy
-
-
-
-
-
- org.apache.tuscany.sca.services.databinding
- databinding-sdo
- ${scaKernelVersion}
-
-
- org.apache.tuscany.sca.services.databinding
- databinding-jaxb
- ${scaKernelVersion}
-
-
- org.apache.tuscany.sca.extensions.axis2
- databinding-axiom
- ${scaKernelVersion}
-
-
-
-
- com.sun.xml.ws
- jaxws-rt
- 2.1
-
-
-
-
- javax.jws
- jsr181-api
- 1.0-MR1
-
-
- javax.xml.bind
- jaxb-api
- 2.1
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
-
- org.codehaus.mojo
- jaxws-maven-plugin
-
-
- generate-jaxb
- generate-resources
-
- wsimport
-
-
-
-
- ${basedir}/src/main/resources/wsdl
- true
- org.apache.tuscany.sca.test.exceptions.impl.jaxb
- true
-
-
-
- javax.jws
- jsr181-api
- 1.0-MR1
-
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.0-incubating-beta1
-
-
-
- ${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
- true
- true
- true
-
-
- generate
-
-
-
-
-
- org.apache.tuscany.sca.extensions.axis2.plugins
- tuscany-plugin-wsdl2java
- ${scaKernelVersion}
-
-
-
- ${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
-
-
- generate
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
deleted file mode 100644
index 2c9b2d25cb..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import org.apache.tuscany.api.annotation.DataType;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- *
- */
-@Remotable
-@DataType(name = "javax.xml.bind.JAXBElement")
-public interface StockExceptionTestJAXB extends StockExceptionTest {
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
deleted file mode 100644
index 65751175fb..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault_Exception;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault;
-import org.osoa.sca.annotations.Service;
-
-/**
- *
- */
-@Service(StockExceptionTestJAXB.class)
-public class StockExchangeJaxB implements StockExceptionTestJAXB {
-
- /**
- *
- */
- public StockExchangeJaxB() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest#stockQuoteOffer(org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer)
- */
- public StockOffer stockQuoteOffer(StockOffer input) throws InvalidSymbolFault_Exception, MarketClosedFault, TestNotDeclaredAtSourceFault{
-
- System.out.println("stockQuoteOffer '" + input + "'");
-
- String symbol = input.getSymbol();
- if ("IBM".equals(symbol)) {
- input.setPrice(99.00F);
- return input;
-
- }
- else if ("CLOSED".equals(input.getName())) {
- throw new MarketClosedFault("TO LATE!", 3);
-
- } else if( "testNotDeclaredAtSourceTest".equals(input.getName())){
-
- throw new TestNotDeclaredAtSourceFault("not declared", "fault info");
-
- }
- ObjectFactory jaxbOjectFactory = new ObjectFactory();
-
- InvalidSymbolFault faultinfo = jaxbOjectFactory.createInvalidSymbolFault();
-
- faultinfo.setOffer(input);
-
- throw new InvalidSymbolFault_Exception("bad symbol", faultinfo);
-
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
deleted file mode 100644
index 5f65d293ea..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public interface StockTraderSDO {
-
- StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
-
- void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
-
- Object testNotDeclaredAtSourceTest();
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
deleted file mode 100644
index 7d303887e7..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import stockexceptiontestservice.scatesttool.ScatesttoolFactory;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/**
- *
- */
-@Service(StockTraderSDO.class)
-public class StockTraderSDOImpl implements StockTraderSDO {
-
- private StockExceptionTest exchangeJaxb;
-
- /**
- *
- */
-
- public StockTraderSDOImpl() {
- // TODO Auto-generated constructor stub
- }
-
- @Reference
- public void setExchangeJaxb(StockExceptionTest exchangeJaxb) {
- this.exchangeJaxb = exchangeJaxb;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest()
- */
- public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
- StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
- stockOffer.setName("IBM");
- stockOffer.setSymbol("IBM");
- stockOffer.setPrice(100.00F); // offer to buy at max $100.00
-
- StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-
- return stockOfferAccepted;
-
- }
-
- public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException,
- MarketClosedSDOException {
- StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
- // set up for a InvalidSymbolSDOException
- stockOffer.setName("");
- stockOffer.setSymbol("IBM0");
-
- stockOffer.setPrice(11.0F); // offer to buy at max $100.00
- exchangeJaxb.stockQuoteOffer(stockOffer);
-
- }
-
- public void marketClosedSDOExceptionTest() {
- StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
- // set up for a MarketClosedSDOException
- stockOffer.setName("CLOSED");
- stockOffer.setSymbol("MBI");
- stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
- try {
- StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
- stockOfferAccepted.getPrice(); // the price actually bought.
- } catch (RemoteException e) {
-
- e.printStackTrace();
- } catch (InvalidSymbolSDOException e) {
-
- e.printStackTrace();
- } catch (MarketClosedSDOException e) {
-
- e.printStackTrace();
- }
- }
-
- public Object testNotDeclaredAtSourceTest() {
- StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
- // set up for a MarketClosedSDOException
- stockOffer.setName("testNotDeclaredAtSourceTest");
- stockOffer.setSymbol("TNDAS");
- stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
- try {
- return exchangeJaxb.stockQuoteOffer(stockOffer);
-
- } catch (Exception e) {
- return e;
-
- }
-
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
deleted file mode 100644
index e9df6ba473..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.sdohandgen;
-
-import javax.xml.namespace.QName;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-
-/**
- *
- */
-public class InvalidSymbolSDOException extends Exception {
-
- public static final QName FAULT_ELEMENT = new QName("http://scatesttool.stockexceptiontestservice", "InvalidSymbolFault");
-
- /**
- *
- */
- public InvalidSymbolSDOException() {
-
- }
-
- /**
- * @param message
- * @param faultInfo
- */
- public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo) {
- super(message);
- this.faultInfo = faultInfo;
-
- }
-
- /**
- * @param cause
- */
- public InvalidSymbolSDOException(InvalidSymbolFault faultInfo, Throwable cause) {
- super(cause);
- this.faultInfo = faultInfo;
-
- }
-
- /**
- * @param message
- * @param cause
- */
- public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo, Throwable cause) {
- super(message, cause);
- this.faultInfo = faultInfo;
-
- }
-
- // *** Below was hand added ... tooling needs to do this ***/
-
- /**
- * Java type that goes as soapenv:Fault detail element.
- */
- private InvalidSymbolFault faultInfo;
-
- /**
- * @return returns fault bean:
- * org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault
- */
- public InvalidSymbolFault getFaultInfo() {
- return faultInfo;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
deleted file mode 100644
index 39b702afe3..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.sdohandgen;
-
-import javax.xml.namespace.QName;
-
-/**
- *
- */
-public class MarketClosedSDOException extends Exception {
- public static final QName FAULT_ELEMENT =
- new QName("http://scatesttool.stockexceptiontestservice", "MarketClosedFault");
-
-
- /**
- * Java type that goes as soapenv:Fault detail element.
- */
- private int faultInfo;
-
- /**
- *
- */
- public MarketClosedSDOException() {
-
- }
-
- /**
- * @param message
- */
- public MarketClosedSDOException(String message, int faultInfo) {
- super(message);
- this.faultInfo = faultInfo;
- }
-
- /**
- * @param cause
- */
- public MarketClosedSDOException(int faultInfo, Throwable cause) {
- super(cause);
- this.faultInfo = faultInfo;
- }
-
- /**
- * @param message
- * @param cause
- */
- public MarketClosedSDOException(String message, int faultInfo, Throwable cause) {
- super(message, cause);
- this.faultInfo = faultInfo;
- }
-
- /**
- * @return returns fault bean: int
- */
- public int getFaultInfo() {
- return faultInfo;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
deleted file mode 100644
index 7b4b3a0f29..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-/**
- * StockExceptionTest.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
- */
-package org.apache.tuscany.sca.test.exceptions.sdohandgen;
-
-import org.apache.tuscany.api.annotation.DataType;
-import org.osoa.sca.annotations.Remotable;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-
-/*
- * StockExceptionTest java interface
- */
-
-@Remotable
-@DataType(name = "commonj.sdo.DataObject")
-public interface StockExceptionTest {
-
- /**
- * Auto generated method signatures
- *
- * @param param0
- */
- StockOffer stockQuoteOffer(StockOffer param0)
- throws java.rmi.RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index f955ba093c..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
deleted file mode 100644
index da10f8881e..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
- exchangeJaxbComponent
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
deleted file mode 100644
index d70cdad313..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index 33b830c856..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
deleted file mode 100644
index 9759647cfe..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
deleted file mode 100644
index c589c5611c..0000000000
--- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.exceptions;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.api.SCARuntime;
-import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.spi.databinding.TransformationException;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public class IntraCompositeTestCase extends TestCase {
- private StockTraderSDO stockTrader;
-
- private CompositeContext context;
-
- public void testTrading() {
- try {
- StockOffer sp = stockTrader.testTrading();
- assertNotNull(sp);
- assertEquals(99.00F, sp.getPrice());
- assertEquals("IBM", sp.getSymbol());
- } catch (Exception e) {
-
- e.printStackTrace();
- fail(e + "");
-
- }
-
- }
-
- public void testInvalidSymbolSDOException() {
- try {
- stockTrader.testInvalidSymbolSDOException();
- fail("Expected InvalidSymbolSDOException");
- } catch (InvalidSymbolSDOException e) {
- InvalidSymbolFault isf = e.getFaultInfo();
-
- assertNotNull(isf);
- StockOffer sp = isf.getOffer();
- assertEquals(11.00F, sp.getPrice());
- assertEquals("IBM0", sp.getSymbol());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail("Expected InvalidSymbolSDOException" + e);
-
- }
- }
-
- public void testNotDeclaredAtSourceException() {
-
- Object ret = stockTrader.testNotDeclaredAtSourceTest();
-
- assertNotNull(ret);
-
- assertEquals(TransformationException.class, ret.getClass());
-
- }
-
- @Override
- protected void setUp() throws Exception {
- SCARuntime.start("ExceptionTest.composite");
-
- context = CurrentCompositeContext.getContext();
- assertNotNull(context);
- stockTrader = context.locateService(StockTraderSDO.class, "stockTraderSDOComponent");
-
- assertNotNull(context);
- }
-
- @Override
- protected void tearDown() throws Exception {
- SCARuntime.stop();
- }
-}
diff --git a/branches/sca-java-0.91/itest/exceptions/pom.xml b/branches/sca-java-0.91/itest/exceptions/pom.xml
deleted file mode 100644
index e2144e9dbb..0000000000
--- a/branches/sca-java-0.91/itest/exceptions/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-exceptions
- Apache Tuscany Exceptions Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
deleted file mode 100644
index e90289a07d..0000000000
--- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions;
-
-
-public class Checked extends Exception {
-
- /**
- *
- */
- public Checked() {
-
- }
-
- /**
- * @param message
- */
- public Checked(String message) {
- super(message);
-
- }
-
- /**
- * @param cause
- */
- public Checked(Throwable cause) {
- super(cause);
-
- }
-
- /**
- * @param message
- * @param cause
- */
- public Checked(String message, Throwable cause) {
- super(message, cause);
-
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
deleted file mode 100644
index 0d14240513..0000000000
--- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions;
-
-public interface ExceptionHandler {
-
- public abstract void testing();
-
- public abstract Checked getTheBad();
-
- public abstract String getTheGood();
-
- public abstract UnChecked getTheUgly();
-
-}
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
deleted file mode 100644
index 80073e7679..0000000000
--- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions;
-
-public interface ExceptionThrower {
- public static final String SO_THEY_SAY = "All is good that ends good.";
-
- public String theGood() throws org.apache.tuscany.sca.test.exceptions.Checked;
-
- public String theBad() throws org.apache.tuscany.sca.test.exceptions.Checked;
-
- public String theUgly() throws org.apache.tuscany.sca.test.exceptions.Checked;
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
deleted file mode 100644
index 1a439711dd..0000000000
--- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions;
-
-public class UnChecked extends RuntimeException {
-
- /**
- *
- */
- public UnChecked() {
-
- }
-
- /**
- * @param message
- */
- public UnChecked(String message) {
- super(message);
-
- }
-
- /**
- * @param cause
- */
- public UnChecked(Throwable cause) {
- super(cause);
-
- }
-
- /**
- * @param message
- * @param cause
- */
- public UnChecked(String message, Throwable cause) {
- super(message, cause);
-
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
deleted file mode 100644
index 32a23c5e7d..0000000000
--- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionHandler;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.apache.tuscany.sca.test.exceptions.UnChecked;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class ExceptionHandlerImpl implements ExceptionHandler {
- static final String INIT = "INIT";
-
- private ExceptionThrower exceptionThrower;
-
- private String theGood;
-
- private Checked theBad;
-
- private UnChecked theUgly;
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandler#testing()
- */
- public void testing() {
-
- assert exceptionThrower != null : "'exceptionThrower' never wired";
- String result = INIT;
- try {
- theGood = result = exceptionThrower.theGood();
- assert result == ExceptionThrower.SO_THEY_SAY;
- } catch (Throwable e) {
- assert result == INIT;
- assert false;
- e.printStackTrace();
- }
-
- result = INIT;
- try {
- result = exceptionThrower.theBad();
- // incredible
- assert false : "Expected 'Check' Exception";
-
- } catch (Checked e) {
- // This is good...
- assert result == INIT;
- theBad = e;
- } catch (Throwable t) {
- // This is not so good.
- t.printStackTrace();
- assert result == INIT;
- assert false : "Got wrong exception '" + t.getClass().getName();
- }
-
- result = INIT;
- try {
- result = exceptionThrower.theUgly();
- // incredible
- assert false : "Expected 'UnCheck' Exception";
-
- } catch (Checked e) {
- // This is not so good...
- assert false : "Got wrong exception '" + e.getClass().getName();
- assert result == INIT;
- } catch (UnChecked e) {
- theUgly = e;
-
- } catch (Throwable t) {
- // This is not good.
- assert false;
- assert result == INIT;
-
- System.out.println(ExceptionThrower.SO_THEY_SAY + " " + INIT);
- }
-
- }
-
- @Reference
- public void setExceptionThrower(ExceptionThrower exceptionThrower) {
- this.exceptionThrower = exceptionThrower;
- }
-
- public String getTheGood() {
- return theGood;
- }
-
- public Checked getTheBad() {
- return theBad;
- }
-
- public UnChecked getTheUgly() {
- return theUgly;
- }
-
- public ExceptionThrower getExceptionThrower() {
- return exceptionThrower;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
deleted file mode 100644
index c1b7c23d5d..0000000000
--- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.apache.tuscany.sca.test.exceptions.UnChecked;
-
-/**
- * @author rineholt
- *
- */
-public class ExceptionThrowerImpl implements ExceptionThrower {
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.exceptions.ExceptionThrower#theBad()
- */
- public String theBad() throws Checked {
-
- throw new Checked("theBad");
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.exceptions.ExceptionThrower#theGood()
- */
- public String theGood() throws Checked {
-
- return SO_THEY_SAY;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.exceptions.ExceptionThrower#theUgly()
- */
- public String theUgly() throws Checked {
-
- throw new UnChecked("theUgly");
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/resources/ExceptionTest.composite b/branches/sca-java-0.91/itest/exceptions/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index a725864d30..0000000000
--- a/branches/sca-java-0.91/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/resources/intracomposite.composite b/branches/sca-java-0.91/itest/exceptions/src/main/resources/intracomposite.composite
deleted file mode 100644
index efe1c5e207..0000000000
--- a/branches/sca-java-0.91/itest/exceptions/src/main/resources/intracomposite.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/branches/sca-java-0.91/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
deleted file mode 100644
index 4f719a26c4..0000000000
--- a/branches/sca-java-0.91/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.exceptions;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class IntraCompositeTestCase extends TestCase {
-
- private SCADomain domain;
- private ExceptionHandler exceptionHandler;
-
- public void testALL() {
- exceptionHandler.testing();
- assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() );
- assertNotNull(exceptionHandler.getTheBad());
- assertEquals( Checked.class, exceptionHandler.getTheBad().getClass());
- assertNotNull(exceptionHandler.getTheUgly());
- assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass());
-
- }
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("ExceptionTest.composite");
- exceptionHandler = domain.getService(ExceptionHandler.class, "main");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/extended-api/pom.xml b/branches/sca-java-0.91/itest/extended-api/pom.xml
deleted file mode 100644
index 4b910efcfb..0000000000
--- a/branches/sca-java-0.91/itest/extended-api/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-extended-api
- Apache Tuscany SCA Extended API Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
-
- org.apache.tuscany.sca
-
- tuscany-implementation-java-runtime
-
- 0.91-incubating-SNAPSHOT
-
- runtime
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
deleted file mode 100644
index 869565af17..0000000000
--- a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.extended;
-
-public interface BasicService {
-
- int negate(int theInt);
- int delegateNegate(int theInt);
-
-}
diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
deleted file mode 100644
index c54af93c05..0000000000
--- a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.extended;
-
-public interface MathService {
-
- int negate(int theInt);
-
-}
diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
deleted file mode 100644
index 523d238f2e..0000000000
--- a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.extended.impl;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.extended.BasicService;
-import org.apache.tuscany.sca.test.extended.MathService;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(BasicService.class)
-public class BasicServiceImpl implements BasicService {
-
- @Context
- protected ComponentContext context;
-
- public int negate(int theInt) {
- return -theInt;
- }
-
- public int delegateNegate(int theInt) {
- SCADomain domain = SCADomain.connect("sca://local");
- MathService service = domain.getService(MathService.class, "MathServiceComponent");
- return service.negate(theInt);
- }
-
-
-}
diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
deleted file mode 100644
index ab4300a7dd..0000000000
--- a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.extended.impl;
-
-import org.apache.tuscany.sca.test.extended.MathService;
-import org.osoa.sca.annotations.Service;
-
-@Service(MathService.class)
-public class MathServiceImpl implements MathService {
-
- public int negate(int theInt) {
- return -theInt;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/resources/BasicService.composite b/branches/sca-java-0.91/itest/extended-api/src/main/resources/BasicService.composite
deleted file mode 100644
index 128b33b16f..0000000000
--- a/branches/sca-java-0.91/itest/extended-api/src/main/resources/BasicService.composite
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/resources/MathService.composite b/branches/sca-java-0.91/itest/extended-api/src/main/resources/MathService.composite
deleted file mode 100644
index 8e99d3da60..0000000000
--- a/branches/sca-java-0.91/itest/extended-api/src/main/resources/MathService.composite
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/branches/sca-java-0.91/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
deleted file mode 100644
index 526e079f03..0000000000
--- a/branches/sca-java-0.91/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.extended;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class ServiceLocateTestCase {
-
- private SCADomain domain;
-
- /**
- * Test description: Locate a service using Domain.getService() from an
- * unmanaged client and invoke a method on that service
- */
- @Test
- public void unmanagedLocateService() {
- BasicService service = domain.getService(BasicService.class, "BasicServiceComponent");
- assertEquals(-99, service.negate(99));
- }
-
- /**
- * Test description: Locate a service using Domain.getService() from an
- * managed client. A service is located from this unmanaged test client and a method
- * is invoked. The method implementation of the service will also use Domain.getService
- */
- @Test
- public void managedLocateService() {
- BasicService service = domain.getService(BasicService.class, "BasicServiceComponent");
- assertEquals(-99, service.delegateNegate(99));
- }
-
- /**
- * Test description: Attempt to locate a service with an invalid name.
- */
- @Test(expected = ServiceRuntimeException.class)
- public void badComponentName() {
- domain.getService(BasicService.class, "IvalidServiceName");
- }
-
- @Before
- public void init() throws Exception {
- domain = SCADomain.newInstance("http://localhost", "/", "BasicService.composite", "MathService.composite");
- }
-
- @After
- public void destroy() throws Exception {
- domain.close();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/pom.xml b/branches/sca-java-0.91/itest/interop-soap-client/pom.xml
deleted file mode 100644
index f7b544172e..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
- org.apache.tuscany.testing
- tuscany-interop-clients
- 0.1-integration-incubating-SNAPSHOT
-
-
- 4.0.0
- interop-client-webserviceInteropDoc
- jar
- Tuscany Interop Testing - Clients - InteropDoc
-
-
- axis2
-
-
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.0-incubating-beta1
-
-
-
- ${basedir}/src/main/resources/wsdl/interopdoc.wsdl
- true
- true
- true
- true
-
-
- generate
-
-
-
-
-
- org.apache.tuscany.sca.extensions.axis2.plugins
- tuscany-plugin-wsdl2java
- ${sca.version}
-
-
-
- ${basedir}/src/main/resources/wsdl/interopdoc.wsdl
- org.soapinterop
-
-
- generate
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/branches/sca-java-0.91/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
deleted file mode 100644
index 1b3a6a6c1d..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.test.interop.client;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-import org.soapinterop.ComplexDocument;
-import org.soapinterop.DocTestPortType;
-import org.soapinterop.SimpleDocument1;
-import org.soapinterop.SingleTag;
-
-/**
- * This class implements the DocTest service component.
- */
-@Service(DocTestPortType.class)
-//FIXME workaround for JIRA TUSCANY-41
-@Scope("COMPOSITE")
-public class LoopbackInteropDocServiceComponentImpl implements DocTestPortType {
-
- public ComplexDocument ComplexDocument(ComplexDocument param0) throws RemoteException {
- return param0;
- }
-
- public SimpleDocument1 SimpleDocument(SimpleDocument1 param4) throws RemoteException {
- return param4;
- }
-
- public SingleTag SingleTag(SingleTag param2) throws RemoteException {
- return param2;
- }
-}
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/README.txt b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/README.txt
deleted file mode 100644
index 9b26d1690a..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M1 build (May, 2006)
-===================================
-
-http://incubator.apache.org/tuscany/
-
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Web Services PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list
-or in the JIRA issue tracker.
-
-Mailing list subscription:
- tuscany-dev-subscribe@ws.apache.org
-
-Jira:
- http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team.
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/sca/default.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/sca/default.scdl
deleted file mode 100644
index d286a5137f..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/sca/default.scdl
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl
deleted file mode 100644
index fb208f56ab..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
- axis2
- axis2-kernel
- SNAPSHOT
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl
deleted file mode 100644
index 92a6be450f..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl
deleted file mode 100644
index 61753384b4..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl
deleted file mode 100644
index 84538dab8b..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
- wsdl4j
- wsdl4j
- 1.5.2
-
-
- org.apache.ws.commons
- XmlSchema
- SNAPSHOT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl
deleted file mode 100644
index bda64f749e..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
deleted file mode 100644
index 89a8a2e3de..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/branches/sca-java-0.91/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
deleted file mode 100644
index 6b74f04283..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.test.interop.client;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.test.SCATestCase;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-import org.soapinterop.ArrayOfSimpleDocument;
-import org.soapinterop.ChildDocument;
-import org.soapinterop.ComplexDocument;
-import org.soapinterop.DocTestPortType;
-import org.soapinterop.SimpleDocument;
-import org.soapinterop.SimpleDocument1;
-import org.soapinterop.SingleTag;
-
-import commonj.sdo.helper.DataFactory;
-
-public class InteropDocClientTestCase extends SCATestCase {
-
- private DataFactory dataFactory;
-
- private DocTestPortType interopDoc;
-
- public InteropDocClientTestCase(){};
-
- public void testSingleTag() throws RemoteException {
-
- // Create the input
- SingleTag input = (SingleTag) dataFactory.create(SingleTag.class);
-
- // Invoke the service
- SingleTag output = interopDoc.SingleTag(input);
-
- // Test the results
- assertNotNull(output);
-
- }
-
- public void testSimpleDocument() throws RemoteException {
-
- // Create the input
- SimpleDocument1 input = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
- input.setValue("123");
-
- // Invoke the service
- SimpleDocument1 output = interopDoc.SimpleDocument(input);
-
- // Test the results
- assertNotNull(output);
- assertEquals("123", output.getValue());
-
- }
-
- public void testComplexDocument() throws RemoteException {
-
- // Create the input
- ComplexDocument input = (ComplexDocument) dataFactory.create(ComplexDocument.class);
- input.setAnAttribute("789");
- ChildDocument childDocument = (ChildDocument) dataFactory.create(ChildDocument.class);
- SimpleDocument simpleDocument = (SimpleDocument) dataFactory.create(SimpleDocument.class);
- ;
- SimpleDocument1 simpleDocument1 = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
- ;
- simpleDocument.setSimpleDocument(simpleDocument1);
- simpleDocument1.setValue("456");
- ArrayOfSimpleDocument arrayOfSimpleDocument = (ArrayOfSimpleDocument) dataFactory.create(ArrayOfSimpleDocument.class);
- ;
- arrayOfSimpleDocument.getSimpleDocument().add(simpleDocument1);
- childDocument.setChildSimpleDoc(arrayOfSimpleDocument);
- input.setChild(childDocument);
-
- // Invoke the service
- ComplexDocument output = interopDoc.ComplexDocument(input);
-
- // Test the results
- assertNotNull(output);
- assertEquals("789", output.getAnAttribute());
- assertNotNull(output.getChild());
- assertNotNull(output.getChild().getChildSimpleDoc());
-
- // FIXME Add more tests of the output document
-
- }
-
- protected void setUp() throws Exception {
-
- setApplicationSCDL(LoopbackInteropDocServiceComponentImpl.class, "META-INF/sca/default.scdl");
-
- addExtension("test.extensions", getClass().getClassLoader().getResource("META-INF/tuscany/extensions/test-extensions.scdl"));
- /*
- addExtension("org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry", getClass().getClassLoader().getResource(
-
- "META-INF/tuscany/interface.wsdl.scdl"));
-
- addExtension("org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospector", getClass().getClassLoader().getResource(
- "META-INF/tuscany/interface.wsdl.scdl"));
-
-
-
- addExtension("org.apache.tuscany.binding.axis2.WebServiceBinding", getClass().getClassLoader().getResource(
- "META-INF/tuscany/binding.axis2.scdl"));
- addExtension("org.apache.tuscany.databinding.sdo", getClass().getClassLoader().getResource("META-INF/tuscany/databinding.sdo.scdl"));
- */
- super.setUp();
-
- // Get the SDO DataFactory
- dataFactory = DataFactory.INSTANCE;
-
- // Locate the service to test
- interopDoc = locateInteropDocService();
-
- }
-
- /**
- * Locate the interop service to test
- *
- * @return
- */
- protected DocTestPortType locateInteropDocService() {
- String interopLocation = System.getProperty("interopLocation");
-
- // Valid service names are:
- // RemoteInteropDocService: the live interop Web Service
- // LocalHostInteropDocService: the interop Web Service hosted by Tuscany on localhost
- // LoopbackInteropDocServiceComponent: a dummy loopback service component
-
- // To specify the service name run mvn -interopLocation="Remote"
-
- if (interopLocation == null)
- interopLocation = "Remote";
-
- CompositeContext compositeContext = CurrentCompositeContext.getContext();
-
- return (DocTestPortType) compositeContext.locateService(DocTestPortType.class, interopLocation + "InteropDocService");
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/pom.xml b/branches/sca-java-0.91/itest/interop-soap-round2-client/pom.xml
deleted file mode 100644
index 979c649592..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
- org.apache.tuscany.testing
- tuscany-interop-clients
- 0.1-integration-incubating-SNAPSHOT
-
-
- 4.0.0
- interop-client-webserviceSOAPRound2
- jar
- Tuscany Interop Testing - Clients - SOAP Builders Round 2 Interop Test
-
-
- axis2
-
-
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.0-incubating-beta1
-
-
-
- ${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl
- true
- true
- true
- true
-
-
- generate
-
-
-
-
-
- org.apache.tuscany.sca.extensions.axis2.plugins
- tuscany-plugin-wsdl2java
- ${sdo.version}
-
-
-
- ${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl
- org.soapinterop.wsdl.interop.test.doc.lit
-
-
- generate
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
deleted file mode 100644
index 079d3aefeb..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.tuscany.test.interop.client;
-import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
-
-/*
- * 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.
- */
-
-
-/**
- * @author rineholt
- *
- */
-public class InteropTestDocLit {
- private WSDLInteropTestDocLitPortType interopTestDocLitPortType =null;
- /**
- * @param args
- */
- public static void main(String[] args) {
-
-
- }
- WSDLInteropTestDocLitPortType getInteropTestDocLitPortType() {
- return interopTestDocLitPortType;
- }
- void setInteropTestDocLitPortType(WSDLInteropTestDocLitPortType interopTestDocLitPortType) {
- this.interopTestDocLitPortType = interopTestDocLitPortType;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/README.txt b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/README.txt
deleted file mode 100644
index 9b26d1690a..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M1 build (May, 2006)
-===================================
-
-http://incubator.apache.org/tuscany/
-
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Web Services PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list
-or in the JIRA issue tracker.
-
-Mailing list subscription:
- tuscany-dev-subscribe@ws.apache.org
-
-Jira:
- http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team.
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/sca/default.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/sca/default.scdl
deleted file mode 100644
index 0ed260399c..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/sca/default.scdl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl
deleted file mode 100644
index fb208f56ab..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
- axis2
- axis2-kernel
- SNAPSHOT
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl
deleted file mode 100644
index 21df676937..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl
deleted file mode 100644
index 61753384b4..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl
deleted file mode 100644
index 84538dab8b..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
- wsdl4j
- wsdl4j
- 1.5.2
-
-
- org.apache.ws.commons
- XmlSchema
- SNAPSHOT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl
deleted file mode 100644
index 1e8c3b1589..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
deleted file mode 100644
index e08039cedb..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
deleted file mode 100644
index da70d5b3a6..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.test.interop.client;
-
-import java.rmi.RemoteException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.tuscany.test.SCATestCase;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
-import org.soapinterop.xsd.ArrayOfstring_literal;
-import org.soapinterop.xsd.SOAPStruct;
-import org.soapinterop.xsd.XsdPackage;
-
-import commonj.sdo.helper.DataFactory;
-
-/**
- * This test case is part of the tuscany interop tests. This is a reduced version of the SOAPBuilders InteropTest test, document/literal mode. This
- * version has operations such as echoString, echoArrayOfString and echoStruct.
- *
- *
- * The WSDL for the external service used in this test case can be downloaded from http://www.mssoapinterop.org/stkV3/wsdl/InteropTestDocLit.wsdl.
- * This is part of the WSDL interop test from Microsoft and more details aobout this test case are found at
- * http://www.mssoapinterop.org/stkV3/wsdl/WSDLInterop-0118.htm
- */
-public class InteropTestDocLitTestCase extends SCATestCase {
-
- private WSDLInteropTestDocLitPortType doc = null;
-
- private DataFactory dataFactory;
-
-
- protected void setUp() throws Exception {
- setApplicationSCDL(InteropTestDocLit.class, "META-INF/sca/default.scdl");
- addExtension("test.extensions", InteropTestDocLit.class.getClassLoader().getResource("META-INF/tuscany/extensions/test-extensions.scdl"));
-
- super.setUp();
-
- // Get the SDO DataFactory
- dataFactory = DataFactory.INSTANCE;
-
- // Locate the service to test
- doc = locateInteropDocService();
- }
-
- /**
- * Locate the interop service to test
- *
- * @return
- */
- protected WSDLInteropTestDocLitPortType locateInteropDocService() {
-
- CompositeContext compositeContext = CurrentCompositeContext.getContext();
- return compositeContext.locateService(WSDLInteropTestDocLitPortType.class, "RemoteInteropDocService");
-
- }
-
- /**
- * test echo void
- *
- * @throws RemoteException
- */
- public void testEchoVoid() throws RemoteException {
- doc.echoVoid();
- assertTrue(true);
- }
-
- /**
- * test echo string
- *
- * @throws RemoteException
- */
- public void testEchoString() throws RemoteException {
- String input = "a test string";
- String output = doc.echoString(input);
- assertEquals(input, output);
- }
-
- /**
- * test echo string
- *
- * @throws RemoteException
- */
- public void testEchoStringArray() throws RemoteException {
-
- ArrayOfstring_literal input = (ArrayOfstring_literal) dataFactory.create(ArrayOfstring_literal.class);
- List inStrings = Arrays.asList(new String[] { "petra", "sue" });
- input.set(XsdPackage.ARRAY_OFSTRING_LITERAL__STRING, inStrings);
-
- ArrayOfstring_literal output = doc.echoStringArray(input);
-
- List outStrings = output.getString();
- assertNotNull(outStrings);
- assertEquals(2, outStrings.size());
- assertEquals("petra", outStrings.get(0));
- assertEquals("sue", outStrings.get(1));
- }
-
- /**
- * test echo struct
- *
- * @throws RemoteException
- */
- public void testEchoStruct() throws RemoteException {
- SOAPStruct input = (SOAPStruct) dataFactory.create(SOAPStruct.class);
- input.setVarInt(200);
- input.setVarFloat(.002f);
- input.setVarString("Hello");
- SOAPStruct output = doc.echoStruct(input);
- assertEquals(input.getVarInt(), output.getVarInt());
- assertEquals(input.getVarFloat(), output.getVarFloat());
- assertEquals(input.getVarString(), output.getVarString());
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/interop-soap-service/pom.xml b/branches/sca-java-0.91/itest/interop-soap-service/pom.xml
deleted file mode 100644
index c18e9e0ff3..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-service/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
- org.apache.tuscany.testing
- tuscany-interop-services
- 0.1-integration-incubating-SNAPSHOT
-
-
- 4.0.0
- interop-service-webserviceInteropDoc
- war
- Tuscany Interop Testing - Services - InteropDoc
-
-
-
-
- org.apache.tuscany.sca.runtime
- webapp
- ${sca.version}
- runtime
-
-
- org.apache.tuscany.sca.runtime
- webapp-host
- ${sca.version}
- runtime
-
-
-
- org.apache.tuscany.sca.services.idl
- tuscany-wsdl
- ${sca.version}
- runtime
-
-
-
- org.apache.ws.commons.axiom
- axiom-api
- SNAPSHOT
- compile
-
-
- org.apache.ws.commons.axiom
- axiom-impl
- SNAPSHOT
- runtime
-
-
-
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.0-incubating-beta1
-
-
-
- ${basedir}/src/main/resources/wsdl/interopdoc.wsdl
- true
- true
- true
- true
-
-
- generate
-
-
-
-
-
- org.apache.tuscany.sca.extensions.axis2.plugins
- tuscany-plugin-wsdl2java
- ${sca.version}
-
-
-
- ${basedir}/src/main/resources/wsdl/interopdoc.wsdl
- org.soapinterop
-
-
- generate
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/branches/sca-java-0.91/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
deleted file mode 100644
index c34941f43e..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.test.interop.server;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Service;
-import org.soapinterop.ComplexDocument;
-import org.soapinterop.DocTestPortType;
-import org.soapinterop.SimpleDocument1;
-import org.soapinterop.SingleTag;
-
-/**
- * This class implements the HelloWorld service component.
- */
-@Service(DocTestPortType.class)
-public class InteropDocServiceComponentImpl implements DocTestPortType {
-
- public ComplexDocument ComplexDocument(ComplexDocument param2) throws RemoteException {
- return param2;
- }
-
- public SimpleDocument1 SimpleDocument(SimpleDocument1 param0) throws RemoteException {
- return param0;
- }
-
- public SingleTag SingleTag(SingleTag param4) throws RemoteException {
- return param4;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/branches/sca-java-0.91/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
deleted file mode 100644
index 820c26ca34..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/branches/sca-java-0.91/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
deleted file mode 100644
index 3fbc73616e..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- InteropDocServiceComponent/DocTestPortType
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.91/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8cf95fb789..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
- Tuscany Interop Test Server
-
-
- systemScdlPath
- /META-INF/sca/webapp.system.scdl
-
-
-
- applicationScdlPath
- /META-INF/sca/default.scdl
-
-
-
- org.apache.tuscany.runtime.webapp.TuscanyContextListener
-
-
-
- TuscanyServlet
- Tuscany Servlet
- org.apache.tuscany.runtime.webapp.TuscanyServlet
-
-
-
- TuscanyServlet
- /services/*
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-soap-service/t.bat b/branches/sca-java-0.91/itest/interop-soap-service/t.bat
deleted file mode 100755
index 0f83dedc37..0000000000
--- a/branches/sca-java-0.91/itest/interop-soap-service/t.bat
+++ /dev/null
@@ -1,34 +0,0 @@
- # 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.
-
-
-@echo off
-pushd target
-jar -xf ..\apache-tomcat-5.5.17.zip
-popd
-copy target\sample-helloworldws-1.0-SNAPSHOT.war target\apache-tomcat-5.5.17\webapps
-rem pushd target\apache-tomcat-5.5.17\webapps
-rem md sample-helloworldws-1.0-SNAPSHOT
-rem cd sample-helloworldws-1.0-SNAPSHOT
-rem jar -xf ..\sample-helloworldws-1.0-SNAPSHOT.war
-pushd target\apache-tomcat-5.5.17\shared
-rem jar -xf "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip"
-jar -xf "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip"
-popd
-rem hack
-mkdir target\apache-tomcat-5.5.17\shared\extension
-copy target\apache-tomcat-5.5.17\shared\lib\axis2-1.0-SNAPSHOT.jar target\apache-tomcat-5.5.17\shared\extension
diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/pom.xml b/branches/sca-java-0.91/itest/interop-xsq-client/pom.xml
deleted file mode 100644
index c31cce8fc3..0000000000
--- a/branches/sca-java-0.91/itest/interop-xsq-client/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
- org.apache.tuscany.testing
- tuscany-interop-clients
- 0.1-integration-incubating-SNAPSHOT
-
- 4.0.0
- interop-client-webserviceXSQ
- jar
- Tuscany Interop Testing - Clients - webserviceXSQ
-
- axis2
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- always
- -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=3720,server=y,suspend=y
-
-
-
-
-
-
-
-
-
- org.apache.tuscany.sca.services.idl
- tuscany-wsdl
- ${sca.version}
- provided
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/main/resources/META-INF/README.txt b/branches/sca-java-0.91/itest/interop-xsq-client/src/main/resources/META-INF/README.txt
deleted file mode 100644
index 9b26d1690a..0000000000
--- a/branches/sca-java-0.91/itest/interop-xsq-client/src/main/resources/META-INF/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M1 build (May, 2006)
-===================================
-
-http://incubator.apache.org/tuscany/
-
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Web Services PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list
-or in the JIRA issue tracker.
-
-Mailing list subscription:
- tuscany-dev-subscribe@ws.apache.org
-
-Jira:
- http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team.
-
diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/java/interop/ClientTestCase.java b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/java/interop/ClientTestCase.java
deleted file mode 100644
index f2a7b198a1..0000000000
--- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/java/interop/ClientTestCase.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.
- */
-package interop;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.test.SCATestCase;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-/**
- * This client program shows how to create an SCA runtime, start it, locate a
- * simple HelloWorld service component and invoke it.
- */
-public class ClientTestCase extends SCATestCase {
- private Object serviceProxy;
-
- // old tc
- // public void testGetQuote() throws ConfigurationException,
- // SecurityException, NoSuchMethodException, IllegalArgumentException,
- // IllegalAccessException, InvocationTargetException {
- //
- // TuscanyRuntime tuscany = new TuscanyRuntime("getQuote", null);
- // tuscany.start();
- // ModuleContext moduleContext = CurrentModuleContext.getContext();
- //
- // Object serviceProxy = moduleContext.locateService("webserviceXSQ");
- // Method m = serviceProxy.getClass().getMethod("GetQuote", new Class[] {
- // String.class });
- //
- // String sqResponse = (String) m.invoke(serviceProxy, "IBM");
- //
- // assertTrue(sqResponse.startsWith("IBM"));
- //
- // tuscany.stop();
- // }
-
- public void testGetQuote() throws IllegalArgumentException, IllegalAccessException,
- InvocationTargetException, SecurityException, NoSuchMethodException {
- Method m = serviceProxy.getClass().getMethod("GetQuote", new Class[] {String.class});
-
- String sqResponse = (String)m.invoke(serviceProxy, "IBM");
-
- assertTrue(sqResponse.startsWith("IBM"));
-
- }
-
- @Override
- protected void setUp() throws Exception {
- setApplicationSCDL(getClass(), "META-INF/sca/test.scdl");
-
- addExtension("test.exts", getClass().getClassLoader()
- .getResource("META-INF/tuscany/test-extensions.scdl"));
-
- super.setUp();
- CompositeContext compositeContext = CurrentCompositeContext.getContext();
- serviceProxy = compositeContext.locateService(Object.class, "webserviceXSQ");
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/sca/test.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/sca/test.scdl
deleted file mode 100644
index 22b3b90623..0000000000
--- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/sca/test.scdl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/binding.axis2.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/binding.axis2.scdl
deleted file mode 100644
index fb208f56ab..0000000000
--- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/binding.axis2.scdl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
- axis2
- axis2-kernel
- SNAPSHOT
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.axiom.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
deleted file mode 100644
index e4fe956e61..0000000000
--- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.sdo.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
deleted file mode 100644
index 61753384b4..0000000000
--- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/interface.wsdl.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
deleted file mode 100644
index 84538dab8b..0000000000
--- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
- wsdl4j
- wsdl4j
- 1.5.2
-
-
- org.apache.ws.commons
- XmlSchema
- SNAPSHOT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/test-extensions.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/test-extensions.scdl
deleted file mode 100644
index 355b663a1b..0000000000
--- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/test-extensions.scdl
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/wsdl/sq.wsdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/wsdl/sq.wsdl
deleted file mode 100644
index 0408a60297..0000000000
--- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/wsdl/sq.wsdl
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Get Stock quote for a company Symbol
-
-
-
-
-
-
-
- Get Stock quote for a company Symbol
-
-
-
-
-
-
-
- Get Stock quote for a company Symbol
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/operation-overloading/pom.xml b/branches/sca-java-0.91/itest/operation-overloading/pom.xml
deleted file mode 100644
index c65cbad1c0..0000000000
--- a/branches/sca-java-0.91/itest/operation-overloading/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-operation-overloading
- Apache Tuscany Operation Overloading Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
diff --git a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
deleted file mode 100644
index f630f9904f..0000000000
--- a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.opoverload;
-
-
-/**
- *
- */
-//@AllowsPassByReference
-public interface OverloadASourceTarget {
- final String opName = "operationA:";
-
- String operationA();
-
- String operationA(int parm1);
-
- String operationA(int parm1, String parm2);
-
- String operationA(String parm1, int parm2);
-
- String operationA(String string);
-
- String[] operationAall();
-
-}
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
deleted file mode 100644
index d0f78c409f..0000000000
--- a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.opoverload.impl;
-
-import java.util.ArrayList;
-
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- *
- */
-@Service(OverloadASourceTarget.class)
-public class OverloadASource implements OverloadASourceTarget{
- public OverloadASourceTarget overloadASourceTarget;
- /**
- *
- */
- public OverloadASource() {
-
- }
- /**
- * @return
- * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
- */
- public String[] operationAall() {
- assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
- ArrayList ret = new ArrayList();
- ret.add(overloadASourceTarget.operationA());
- ret.add(overloadASourceTarget.operationA(11));
- ret.add(overloadASourceTarget.operationA("eleven"));
- ret.add(overloadASourceTarget.operationA(3,"three"));
- ret.add(overloadASourceTarget.operationA("four",4));
- return (String[]) ret.toArray(new String[ret.size()]);
- }
-
-
- /**
- * @return
- * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
- */
- public String operationA() {
- assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
- return overloadASourceTarget.operationA();
- }
- /**
- * @param parm1
- * @return
- * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int)
- */
- public String operationA(int parm1) {
- assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
- return overloadASourceTarget.operationA(parm1);
- }
- /**
- * @param parm1
- * @param parm2
- * @return
- * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int, java.lang.String)
- */
- public String operationA(int parm1, String parm2) {
- assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
- return overloadASourceTarget.operationA(parm1, parm2);
- }
- public String operationA(String string) {
- assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
- return overloadASourceTarget.operationA(string);
- }
- /**
- * @param parm1
- * @param parm2
- * @return
- * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(java.lang.String, int)
- */
- public String operationA(String parm1, int parm2) {
- assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
- return overloadASourceTarget.operationA(parm1, parm2);
- }
-
- @Reference
- public void setOverloadASourceTarget(OverloadASourceTarget overloadASourceTarget) {
- assert overloadASourceTarget != null : "reference overloadASourceTarget is set tonull";
- this.overloadASourceTarget = overloadASourceTarget;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
deleted file mode 100644
index e83952e573..0000000000
--- a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.opoverload.impl;
-
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-import org.osoa.sca.annotations.Service;
-
-/**
- *
- */
-@Service(OverloadASourceTarget.class)
-public class OverloadATarget implements OverloadASourceTarget {
-
- /**
- *
- */
- public OverloadATarget() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int)
- */
- public String operationA(int parm1) {
- final String ret = opName + parm1;
- out(ret);
- return ret;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int,
- * java.lang.String)
- */
- public String operationA(int parm1, String parm2) {
- final String ret = opName + parm1 + parm2;
- out(ret);
- return ret;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
- */
- public String operationA() {
- out(opName);
- return opName;
-
- }
-
- public String operationA(String parm1, int parm2) {
- final String ret = opName + parm1 + parm2;
- out(ret);
- return ret;
- }
-
- public String operationA(String parm1) {
- final String ret = opName + parm1;
- out(ret);
- return ret;
- }
-
- private void out(String msg) {
-
- java.lang.System.out.println(msg);
- }
-
- public String[] operationAall() {
- throw new IllegalArgumentException("not supported");
-
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/operation-overloading/src/main/resources/OperationOverload.composite b/branches/sca-java-0.91/itest/operation-overloading/src/main/resources/OperationOverload.composite
deleted file mode 100644
index cbf5aa2078..0000000000
--- a/branches/sca-java-0.91/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/branches/sca-java-0.91/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
deleted file mode 100644
index 3129b03ff3..0000000000
--- a/branches/sca-java-0.91/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.opoverload.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-
-public class OverloadATestCase extends TestCase {
-
- private SCADomain domain;
- private OverloadASourceTarget overloadA;
-
- public void testOperationAall() {
- String[] result= overloadA.operationAall();
- assertEquals(5, result.length);
- assertEquals(OverloadASourceTarget.opName , result[0]);
- assertEquals(OverloadASourceTarget.opName + 11, result[1]);
- assertEquals(OverloadASourceTarget.opName + "eleven", result[2]);
- assertEquals(OverloadASourceTarget.opName + 3 + "three", result[3]);
- assertEquals(OverloadASourceTarget.opName + "four" + 4, result[4]);
- }
-
-// public void testOperationAInt() {
-// String result= overloadA.operationA(29);
-// assertEquals(OverloadASourceTarget.opName + 29, result);
-// }
-//
-// public void testOperationAString() {
-// String result= overloadA.operationA("rick:-)");
-// assertEquals(OverloadASourceTarget.opName + "rick:-)", result);
-// }
-//
-// public void testOperationAIntString() {
-// String result= overloadA.operationA(123, "Tuscany");
-// assertEquals(OverloadASourceTarget.opName +123+ "Tuscany", result);
-// }
-//
-// public void testOperationStringInt() {
-// String result= overloadA.operationA("StringInt", 77);
-// assertEquals(OverloadASourceTarget.opName + "StringInt" + 77, result);
-// }
-//
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("OperationOverload.composite");
- overloadA = domain.getService(OverloadASourceTarget.class, "OverloadASourceComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-0.91/itest/pom.xml b/branches/sca-java-0.91/itest/pom.xml
deleted file mode 100644
index 743ef121f8..0000000000
--- a/branches/sca-java-0.91/itest/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-sca
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest
- pom
- Apache Tuscany SCA Integration Tests
-
-
-
- default
-
- true
-
-
- callback-api
- callback-basic
- callback-complex-type
- callback-id
- callback-set-callback
- callback-set-conversation
- contribution
- conversations
- databindings
- exceptions
- extended-api
- operation-overloading
- properties
- recursive
- wsdl
-
-
-
-
-
-
-
- junit
- junit
- 4.2
- compile
-
-
-
- org.easymock
- easymock
- 2.2
- test
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/properties/pom.xml b/branches/sca-java-0.91/itest/properties/pom.xml
deleted file mode 100644
index 560fb56ef2..0000000000
--- a/branches/sca-java-0.91/itest/properties/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-properties
- Apache Tuscany Properties Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-core-databinding
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-databinding-sdo
- 0.91-incubating-SNAPSHOT
- compile
-
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.0-incubating-beta1
-
-
- generate-customer-sdo
- generate-sources
-
- ${basedir}/src/main/resources/customer.xsd
- com.example.customer.sdo
- true
- true
- true
-
-
- generate
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
deleted file mode 100644
index 667b854c10..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-public interface ABCDComponent {
- String getA();
- String getB();
- String getC();
- String getD();
-}
-
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
deleted file mode 100644
index 51d4d9b3cb..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class ABCDComponentImpl implements ABCDComponent {
- private ABComponent abComponent;
- private CDComponent cdComponent;
-
- @Reference
- public void setAb(ABComponent component) {
- this.abComponent = component;
- }
-
- @Reference
- public void setCd(CDComponent component) {
- this.cdComponent = component;
- }
-
- public String getA() {
- return this.abComponent.getA();
- }
-
- public String getB() {
- return this.abComponent.getB();
- }
-
- public String getC() {
- return this.cdComponent.getC();
- }
-
- public String getD() {
- return this.cdComponent.getD();
- }
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
deleted file mode 100644
index c33c140aec..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Remotable;
-@Remotable
-public interface ABComponent {
-
- String getA();
- String getB();
- String getZ();
- int getIntValue();
- String getF();
- Collection getManyStringValues();
- Collection getManyIntegers();
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
deleted file mode 100644
index b78d6380ef..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-public class ABComponentImpl implements ABComponent {
-
- private String aProperty;
- private String bProperty;
- private int intValue;
- private Collection manyStringValues;
- private Collection manyIntegerValues;
- private String zProperty;
- private String fProperty;
-
- @Property(name="xpath")
- public void setZProperty(final String value) {
- this.zProperty = value;
- }
-
- @Property(name="foobar")
- public void setManyStringValues(final Collection value) {
- this.manyStringValues = value;
- }
-
- @Property(name="fooInts")
- public void setManyIntegers(final Collection value) {
- this.manyIntegerValues = value;
- }
-
- @Property
- public void setA(final String A) {
- this.aProperty = A;
- }
-
- @Property
- public void setB(final String B) {
- this.bProperty = B;
- }
-
- @Property
- public void setF(final String F) {
- this.fProperty = F;
- }
-
- @Property
- public void setOne(final int value) {
- this.intValue = value;
- }
-
- public String getA() {
- return this.aProperty;
- }
-
- public String getB() {
- return this.bProperty;
- }
-
- public int getIntValue() {
- return this.intValue;
- }
-
- public String getZ() {
- return this.zProperty;
- }
-
- public String getF() {
- return this.fProperty;
- }
-
- public Collection getManyStringValues() {
- return manyStringValues;
- }
-
- public Collection getManyIntegers() {
- return manyIntegerValues;
- }
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
deleted file mode 100644
index cd3046c62c..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-public interface CDComponent {
-
- String getC();
- String getC2();
- String getD();
- String getNoSource();
- String getFileProperty();
- Collection getManyValuesFileProperty();
- int getOverrideValue();
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
deleted file mode 100644
index aec71d30f9..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-public class CDComponentImpl implements CDComponent {
-
- private String cProperty;
- private String dProperty;
- private String nosource;
- private String fileProperty;
- private Collection manyValuesFileProperty;
- private int overrideNumber;
- private String cProperty2;
-
- @Property(name="nonFileProperty")
- public void setC2(final String value) {
- this.cProperty2 = value;
- }
- @Property(name="two")
- public void setOverrideNumber(final int value) {
- this.overrideNumber = value;
- }
-
- @Property(name="fileProperty")
- public void setFileProp(final String value) {
- this.fileProperty = value;
- }
-
- @Property(name="manyValuesFileProperty")
- public void setFileManyValueProp(final Collection values) {
- this.manyValuesFileProperty = values;
- }
-
- @Property
- public void setC(final String C) {
- this.cProperty = C;
- }
-
- @Property
- public void setD(final String D) {
- this.dProperty = D;
- }
-
- @Property
- public void setNosource(final String value) {
- this.nosource = value;
- }
-
- public String getFileProperty() {
- return this.fileProperty;
- }
-
- public String getC() {
- return this.cProperty;
- }
-
- public String getC2() {
- return this.cProperty2;
- }
-
- public String getD() {
- return this.dProperty;
- }
-
- public String getNoSource() {
- return this.nosource;
- }
-
- public int getOverrideValue() {
- return this.overrideNumber;
- }
- public Collection getManyValuesFileProperty() {
- return this.manyValuesFileProperty;
- }
-}
-
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
deleted file mode 100644
index 56820279d6..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-public class ComplexPropertyBean {
-
- protected int integerNumber = 25;
- public float floatNumber = 50;
- public double doubleNumber = 75;
- public int[] intArray = null;
- public double[] doubleArray = null;
- protected String[] stringArray = null;
-
- ComplexPropertyBean numberSet;
- public ComplexPropertyBean[] numberSetArray = null;
-
- public ComplexPropertyBean() {
-
- }
-
- public double getDoubleNumber() {
- return doubleNumber;
- }
-
- public void setDoubleNumber(double doubleNumber) {
- this.doubleNumber = doubleNumber;
- }
-
- public float getFloatNumber() {
- return floatNumber;
- }
-
- public void setFloatNumber(float floatNumber) {
- this.floatNumber = floatNumber;
- }
-
- public int getIntegerNumber() {
- return integerNumber;
- }
-
- public void setIntegerNumber(int integerNumber) {
- this.integerNumber = integerNumber;
- }
-
- public ComplexPropertyBean getNumberSet() {
- return numberSet;
- }
-
- public void setNumberSet(ComplexPropertyBean numberSet) {
- this.numberSet = numberSet;
- }
-
- public String toString() {
- return Double.toString(integerNumber) + " - " +
- Double.toString(floatNumber) + " - " +
- Double.toString(doubleNumber) + " \n" +
- ((intArray == null ) ? "" : intArray[0] + " - " + intArray[1] + " \n " ) +
- ((doubleArray == null ) ? "" : doubleArray[0] + " - " + doubleArray[1] + " \n " ) +
- ((stringArray == null ) ? "" : stringArray[0] + " - " + stringArray[1] + " \n " ) +
- ((numberSetArray == null ) ? "" : numberSetArray[0] + " - " + numberSetArray[1] + " \n " ) +
- ((numberSet == null ) ? "" : numberSet.toString());
- }
-
- public String[] getStringArray() {
- return stringArray;
- }
-
- public void setStringArray(String[] stringArray) {
- this.stringArray = stringArray;
- }
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
deleted file mode 100644
index 116cdef48f..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-public interface OverrideService {
-
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
deleted file mode 100644
index a36bb5e419..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-public class OverrideServiceImpl implements OverrideService {
-
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
deleted file mode 100644
index 459cf2be09..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-import commonj.sdo.DataObject;
-
-
-public interface PropertyComponent {
- public String getLocation();
- public String getYear();
- public ComplexPropertyBean getComplexPropertyOne();
- public ComplexPropertyBean getComplexPropertyTwo();
- public ComplexPropertyBean getComplexPropertyThree();
- public Collection getComplexPropertyFour();
- public DataObject getSdoProperty();
- public DataObject getCustomerSdo();
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
deleted file mode 100644
index cdf381a553..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-import com.example.customer.sdo.impl.CustomerImpl;
-import commonj.sdo.DataObject;
-
-public class PropertyComponentImpl implements PropertyComponent {
-
- @Property
- protected CustomerImpl customerSdo;
-
- @Property
- protected DataObject sdoProperty;
-
- @Property
- protected ComplexPropertyBean complexPropertyOne;
-
- @Property
- protected ComplexPropertyBean complexPropertyTwo;
-
- @Property
- protected ComplexPropertyBean complexPropertyThree;
-
- @Property
- protected Collection complexPropertyFour;
-
- @Property(name = "location")
- protected String location = "RTP";
-
- @Property(name = "year")
- protected String year = "2006";
-
- public String getLocation(){
- return location;
- }
-
- public String getYear(){
- return year;
- }
-
- public ComplexPropertyBean getComplexPropertyOne() {
- //System.out.println(complexPropertyOne);
- return complexPropertyOne;
- }
-
- public ComplexPropertyBean getComplexPropertyTwo() {
- //System.out.println(complexPropertyTwo);
- return complexPropertyTwo;
- }
-
- public ComplexPropertyBean getComplexPropertyThree() {
- //System.out.println(complexPropertyThree);
- return complexPropertyThree;
- }
-
- public Collection getComplexPropertyFour() {
- //System.out.println(complexPropertyThree);
- return complexPropertyFour;
- }
-
- public DataObject getSdoProperty() {
- return sdoProperty;
- }
-
- public void setSdoProperty(DataObject sdoProperty) {
- System.out.println("Reached here da machi");
- this.sdoProperty = sdoProperty;
- }
-
- public CustomerImpl getCustomerSdo() {
- return customerSdo;
- }
-
- public void setCustomerSdo(CustomerImpl customerSdo) {
- this.customerSdo = customerSdo;
- }
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
deleted file mode 100644
index f20d295a06..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-public interface PropertyService {
-
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/resources/OuterPropertyTest.composite b/branches/sca-java-0.91/itest/properties/src/main/resources/OuterPropertyTest.composite
deleted file mode 100644
index 43853d46a5..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
- 125
-
-
- Overriden A
- Overriden B
- Overriden C
- Overriden D
-
- Overriden Y
- Overriden Z
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/properties/src/main/resources/PropertyTest.composite b/branches/sca-java-0.91/itest/properties/src/main/resources/PropertyTest.composite
deleted file mode 100644
index 137e4d1a78..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/resources/PropertyTest.composite
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
- a
- b
- c
- d
-
- y
- z
-
-
-
-
-
-
-
- 1
- 11
- 111
-
-
- 2
- 22
- 222
-
- TestString_1
- 10
- TestString_2
- 20
- 27
- 79.34
- 184.52
- 50.05
- 25.52
-
- 54
- 158.68
- 369.04
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- f
-
-
- "Apache" "Tuscany" "Java SCA"
- 123 456 789
-
-
-
-
-
-
-
- aValue
-
-
-
- 25
-
-
-
-
-
-
-
- TestString_1
- TestString_2
- 10
- 27
- 79.34
- 25.52
- 184.52
- 50.05
- 20
-
- 1
- 11
- 111
-
-
- 2
- 22
- 222
-
-
- 54
- 158.68
- 369.04
-
-
-
-
-
- TestElementString_1
- TestElementString_2
- 10
- 27
- 79.34
- 25.52
- 184.52
- 50.05
- 20
-
- 1
- 11
- 111
-
-
- 2
- 22
- 222
-
-
- 54
- 158.68
- 369.04
-
-
-
-
-
- 1
- 11.11
- 111.111
-
- 11
- 1111.1111
- 11111.11111
-
-
-
- 2
- 22.22
- 222.222
-
- 22
- 2222.2222
- 22222.22222
-
-
-
- 3
- 33.33
- 333.333
-
- 33
- 3333.3333
- 33333.33333
-
-
-
-
-
- Firstly Name
- Middler Name
- Lasting Name
-
-
-
-
- Sdo Firstly Name
- Sdo Middler Name
- Sdo Lasting Name
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/properties/src/main/resources/customer.xsd b/branches/sca-java-0.91/itest/properties/src/main/resources/customer.xsd
deleted file mode 100644
index 8861d7e7b8..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/resources/customer.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/properties/src/main/resources/fileProperty.txt b/branches/sca-java-0.91/itest/properties/src/main/resources/fileProperty.txt
deleted file mode 100644
index 0d3d9ead83..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/resources/fileProperty.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-fileValue
diff --git a/branches/sca-java-0.91/itest/properties/src/main/resources/manyValuesFileProperty.txt b/branches/sca-java-0.91/itest/properties/src/main/resources/manyValuesFileProperty.txt
deleted file mode 100644
index 450f397b30..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- "fileValueOne" "fileValueTwo" "fileValueThree" "fileValueFour"
-
diff --git a/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
deleted file mode 100644
index b2ac537dec..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import static junit.framework.Assert.assertEquals;
-
-import java.util.Iterator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class OuterPropertyTestCase {
-
- private static SCADomain domain;
- private static ABComponent outerABService;
-
- @BeforeClass
- public static void init() throws Exception {
- domain = SCADomain.newInstance("OuterPropertyTest.composite");
- outerABService = domain.getService(ABComponent.class, "OuterComponent");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-
- @Test
- public void testOverridenA() {
- assertEquals("Overriden A", outerABService.getA());
- }
-
- @Test
- public void testOverridenB() {
- assertEquals("Overriden B", outerABService.getB());
- }
-
- @Test
- public void testOverridenF() {
- assertEquals("Overriden A", outerABService.getF());
- }
-
- @Test
- public void testOverridenZ() {
- assertEquals("Overriden Z", outerABService.getZ());
- }
-
- @Test
- public void testOverridenIntValue() {
- assertEquals(125, outerABService.getIntValue());
- }
-
- @Test
- public void testDefaultValue() {
- assertEquals(125, outerABService.getIntValue());
- }
-
- @Test
- public void testManySimpleStringValues() {
- Iterator iterator = outerABService.getManyStringValues().iterator();
- assertEquals("Apache", iterator.next());
- assertEquals("Tuscany", iterator.next());
- assertEquals("Java SCA", iterator.next());
- }
-
- @Test
- public void testManySimpleIntegerValues() {
- Iterator iterator = outerABService.getManyIntegers().iterator();
- assertEquals(123, iterator.next().intValue());
- assertEquals(456, iterator.next().intValue());
- assertEquals(789, iterator.next().intValue());
- }
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
deleted file mode 100644
index a01700920f..0000000000
--- a/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-
-import java.util.Iterator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import commonj.sdo.DataObject;
-
-public class PropertyTestCase {
- private static SCADomain domain;
- private static ABComponent abService;
- private static CDComponent cdService;
- private static ABCDComponent abcdService;
- private static PropertyComponent propertyService;
-
- @Test
- public void testA() {
- assertEquals("a", abService.getA());
- }
-
- @Test
- public void testB() {
- assertEquals("b", abService.getB());
- }
-
- @Test
- public void testC() {
- assertEquals("c", cdService.getC());
- }
-
- @Test
- public void testC2() {
- assertEquals("c", cdService.getC2());
- }
-
- @Test
- public void testD() {
- assertEquals("d", cdService.getD());
- }
-
- @Test
- public void testF() {
- assertEquals("a", abService.getF());
- }
-
- @Test
- public void testZ() {
- assertEquals("z", abService.getZ());
- }
-
- @Test
- public void testIntValue() {
- assertEquals(1, abService.getIntValue());
- }
-
- @Test
- public void testDefaultValue() {
- assertEquals(1, abService.getIntValue());
- }
-
- @Test
- public void testDefaultValueOverride() {
- assertEquals(1, cdService.getOverrideValue());
- }
-
- @Test
- public void testNoSource() {
- assertEquals("aValue", cdService.getNoSource());
- }
-
- @Test
- public void testFileProperty() {
- assertEquals("fileValue", cdService.getFileProperty());
- }
-
- @Test
- public void testManyValuesFileProperty() {
- Iterator iterator = cdService.getManyValuesFileProperty().iterator();
- iterator.next();
- String secondValue = iterator.next();
- assertEquals(4, cdService.getManyValuesFileProperty().size());
- assertEquals("fileValueTwo", secondValue);
- }
-
- @Test
- public void testABCD() {
- assertEquals("a", abcdService.getA());
- assertEquals("b", abcdService.getB());
- assertEquals("c", abcdService.getC());
- assertEquals("d", abcdService.getD());
- }
-
- @Test
- public void testDefaultProperty() {
- assertEquals("RTP", propertyService.getLocation());
- assertEquals("2006", propertyService.getYear());
-
- }
-
- @Test
- public void testManySimpleStringValues() {
- Iterator iterator = abService.getManyStringValues().iterator();
- assertEquals("Apache", iterator.next());
- assertEquals("Tuscany", iterator.next());
- assertEquals("Java SCA", iterator.next());
- }
-
- @Test
- public void testManySimpleIntegerValues() {
- Iterator iterator = abService.getManyIntegers().iterator();
- assertEquals(123, iterator.next().intValue());
- assertEquals(456, iterator.next().intValue());
- assertEquals(789, iterator.next().intValue());
- }
-
- @Test
- public void testComplexPropertyOne() {
- ComplexPropertyBean propBean = propertyService.getComplexPropertyOne();
- assertNotNull(propBean);
- assertEquals("TestString_1", propBean.getStringArray()[0]);
- assertEquals(2, propBean.numberSetArray[1].integerNumber);
- }
-
- @Test
- public void testComplexPropertyTwo() {
- ComplexPropertyBean propBean = propertyService.getComplexPropertyTwo();
- assertNotNull(propBean);
- assertEquals(10, propBean.intArray[0]);
- assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
- }
-
- @Test
- public void testComplexPropertyThree() {
- ComplexPropertyBean propBean = propertyService.getComplexPropertyThree();
- assertNotNull(propBean);
- assertEquals("TestElementString_1", propBean.stringArray[0]);
- assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
- }
-
- @Test
- public void testComplexPropertyFour() {
- Object[] propBeanCollection = propertyService.getComplexPropertyFour().toArray();
- assertNotNull(propBeanCollection);
- assertEquals(1, ((ComplexPropertyBean)propBeanCollection[0]).getIntegerNumber());
- assertEquals(222.222, ((ComplexPropertyBean)propBeanCollection[1]).getDoubleNumber());
- assertEquals(33, ((ComplexPropertyBean)propBeanCollection[2]).getNumberSet().getIntegerNumber());
- }
-
- @Test
- public void testSDOProperty1() {
- DataObject dataObject = propertyService.getSdoProperty();
- assertNotNull(dataObject);
- assertEquals("Firstly Name", dataObject.get("firstName"));
- assertEquals("Middler Name", dataObject.getString("middleName"));
- assertEquals("Lasting Name", dataObject.getString("lastName"));
- }
-
- @Test
- public void testSDOProperty2() {
- DataObject dataObject = propertyService.getCustomerSdo();
- assertNotNull(dataObject);
- assertEquals("Sdo Firstly Name", dataObject.get("firstName"));
- assertEquals("Sdo Middler Name", dataObject.getString("middleName"));
- assertEquals("Sdo Lasting Name", dataObject.getString("lastName"));
- }
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- domain = SCADomain.newInstance("PropertyTest.composite");
- } catch ( Exception e ) { e.printStackTrace(); }
- abService = domain.getService(ABComponent.class, "ABComponent");
- cdService = domain.getService(CDComponent.class, "CDComponent");
- abcdService = domain.getService(ABCDComponent.class, "ABCDComponent");
- propertyService =
- domain.getService(PropertyComponent.class, "PropertyComponent");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-0.91/itest/recursive/pom.xml b/branches/sca-java-0.91/itest/recursive/pom.xml
deleted file mode 100644
index 85934a8122..0000000000
--- a/branches/sca-java-0.91/itest/recursive/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-recursive
- Apache Tuscany SCA Recursive Composition Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/CompositeClient.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/CompositeClient.java
deleted file mode 100644
index 5edc305970..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/CompositeClient.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-
-package composite;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Simple client program that invokes the components that we wired together.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeClient {
-
- public static void main(String[] args) throws Exception {
- SCADomain domain = SCADomain.newInstance("OuterComposite.composite");
-
- Source source = domain.getService(Source.class, "SourceComponent");
-
- System.out.println("Main thread " + Thread.currentThread());
- source.clientMethod("Client.main");
- Thread.sleep(500);
-
- domain.close();
- }
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Source.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Source.java
deleted file mode 100644
index d0efcc1df1..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Source.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-package composite;
-
-public interface Source {
-
- void clientMethod(String arg);
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceCallback.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceCallback.java
deleted file mode 100644
index baa95a8e39..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceCallback.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-package composite;
-
-public interface SourceCallback {
-
- void receiveResult(String result);
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceImpl.java
deleted file mode 100644
index b9a0c7ff74..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-package composite;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-@Service(Source.class)
-@Scope("COMPOSITE")
-public class SourceImpl implements Source, SourceCallback {
-
- private Target targetReference;
- private Target targetReference2;
-
- @Reference
- public void setTargetReference(Target target) {
- this.targetReference = target;
- }
-
- @Reference
- public void setTargetReference2(Target target) {
- this.targetReference2 = target;
- }
-
- public void clientMethod(String arg) {
- System.out.println("Source: " + arg + " -> Source.clientMethod");
- targetReference.someMethod(arg + " -> Source.clientMethod");
-
- System.out.println("Source: " + arg + " => Source.clientMethod2");
- targetReference2.someMethod(arg + " => Source.clientMethod2");
- }
-
- public void receiveResult(String result) {
- System.out.println("Work thread " + Thread.currentThread());
- System.out.println("Result: " + result);
- }
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Target.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Target.java
deleted file mode 100644
index 9a8f68a7fa..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Target.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package composite;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-
-
-@Callback(SourceCallback.class)
-public interface Target {
-
- @OneWay
- void someMethod(String arg);
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/TargetImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/TargetImpl.java
deleted file mode 100644
index 86686e9233..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/TargetImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-package composite;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-@Service(Target.class)
-@Scope("COMPOSITE")
-public class TargetImpl implements Target {
-
- private SourceCallback sourceCallback;
-
- @Callback
- public void setSourceCallback(SourceCallback sourceCallback) {
- this.sourceCallback = sourceCallback;
- }
-
- public void someMethod(String arg) {
- System.out.println("Target: " + arg);
- sourceCallback.receiveResult(arg + " -> Target.someMethod");
- }
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentAImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentAImpl.java
deleted file mode 100644
index f513949105..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-
-package sample;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Service1.class)
-public class ComponentAImpl implements Service1 {
-
- @Reference(name = "Reference1", required = false)
- protected Service1 ref;
-
- public String track(String source) {
- if (ref != null) {
- return ref.track(source + "-->ComponentA");
- }
- return source + "-->ComponentA";
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentCImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentCImpl.java
deleted file mode 100644
index 586a9ee6a7..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-
-package sample;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Service1.class)
-public class ComponentCImpl implements Service1 {
-
- @Reference(name = "Reference1", required = false)
- protected Service1 ref;
-
- public String track(String source) {
- if (ref != null) {
- return ref.track(source + "-->ComponentC");
- }
- return source + "-->ComponentC";
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentEImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentEImpl.java
deleted file mode 100644
index dbf2735aa7..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-package sample;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentEImpl implements Service1 {
- @Property(name = "Property1")
- protected String prefix;
-
- @Reference(name = "Reference1")
- protected Service1 ref;
-
- public String track(String source) {
- return ref.track(source + "-->ComponentE");
- }
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentFImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentFImpl.java
deleted file mode 100644
index 5e136e536c..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentFImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-
-package sample;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentFImpl implements Service1 {
-
- private Service1 ref;
-
- public String track(String source) {
- if (ref != null) {
- return ref.track(source + "-->ComponentF");
- } else {
- System.err.println("Reference1 is not wired...");
- return source + "-->ComponentF";
- }
- }
-
- @Reference(name = "Reference1")
- public void setComponentA(Service1 ref) {
- this.ref = ref;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/Service1.java b/branches/sca-java-0.91/itest/recursive/src/main/java/sample/Service1.java
deleted file mode 100644
index 81bdce79f1..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/Service1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-package sample;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Service1 {
- String track(String source);
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite1.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite1.composite
deleted file mode 100644
index 56fd7c621f..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite1.composite
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ABC
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite2.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite2.composite
deleted file mode 100644
index 377f14bd4d..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite2.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- XYZ
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite3.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite3.composite
deleted file mode 100644
index 6c81b28d1c..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite3.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 123
-
-
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite.composite
deleted file mode 100644
index 3376ac8ff5..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite2.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite2.composite
deleted file mode 100644
index c9eff4fa9d..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite2.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/OuterComposite.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/OuterComposite.composite
deleted file mode 100644
index cb1c1e13d4..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/main/resources/OuterComposite.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/recursive/src/test/java/composite/CompositeTestCase.java b/branches/sca-java-0.91/itest/recursive/src/test/java/composite/CompositeTestCase.java
deleted file mode 100644
index f81b02faef..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package composite;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CompositeTestCase extends TestCase {
-
- private SCADomain domain;
- private Source source;
-
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("OuterComposite.composite");
- source = domain.getService(Source.class, "SourceComponent");
- }
-
- protected void tearDown() throws Exception {
- domain.close();
- }
-
- public void test() throws Exception {
- try {
- System.out.println("Main thread " + Thread.currentThread());
- source.clientMethod("Client.main");
- System.out.println("Sleeping ...");
- Thread.sleep(1000);
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-0.91/itest/recursive/src/test/java/sample/RecursiveCompositeTest.java b/branches/sca-java-0.91/itest/recursive/src/test/java/sample/RecursiveCompositeTest.java
deleted file mode 100644
index 45f16b38c6..0000000000
--- a/branches/sca-java-0.91/itest/recursive/src/test/java/sample/RecursiveCompositeTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-package sample;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class RecursiveCompositeTest extends TestCase {
-
- private SCADomain domain;
- private Service1 tracker, tracker2;
-
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("http://localhost", "/", "Composite1.composite", "Composite2.composite");
- tracker = domain.getService(Service1.class, "ComponentC");
- tracker2 = domain.getService(Service1.class, "ComponentB");
-
- }
-
- protected void tearDown() throws Exception {
- domain.close();
- }
-
- public void test() throws Exception {
- try {
- System.out.println("Main thread " + Thread.currentThread());
- System.out.println(tracker.track("Client"));
- System.out.println(tracker2.track("Client"));
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/pom.xml b/branches/sca-java-0.91/itest/wsdl/pom.xml
deleted file mode 100644
index 90501ed247..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/pom.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-itest-wsdl
- Apache Tuscany WSDL Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-interface-wsdl
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-databinding-sdo
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-databinding-axiom
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-http-jetty
- 0.91-incubating-SNAPSHOT
- runtime
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-impl
- 1.0-incubating-beta1
- compile
-
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.0
-
-
- add-source
- generate-sources
-
- add-source
-
-
-
- target/sdo-source
-
-
-
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.0-incubating-beta1
-
-
- generate-sdo
- generate-sources
-
- ${basedir}/src/main/resources/wsdl/AccountService.wsdl
- com.bigbank.account
- Account
- true
- true
- true
-
-
- generate
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
deleted file mode 100644
index 265b11f7dd..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.
- */
-package bigbank.account.services.accountdata;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@AllowsPassByReference
-public interface AccountDataService {
-
- /**
- * Auto generated method signatures
- *
- * @param param0*
- * @param param1*
- * @param param2
- */
- public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param4
- */
- public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param6*
- * @param param7
- */
- public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param9*
- * @param param10*
- * @param param11
- */
- public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
- throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param13*
- * @param param14
- */
- public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param16*
- * @param param17
- */
- public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param19
- */
- public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param0
- */
- public com.bigbank.account.AccountLog getAccountLog(int param0) throws java.rmi.RemoteException;
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index 1e87899b01..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.
- */
-package bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Service;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-@Service(AccountDataService.class)
-public class AccountDataServiceImpl implements AccountDataService {
-
- public CustomerProfileData getCustomerProfile(String logonID) throws RemoteException {
-
- return null;
- }
-
- public AccountReport getAccountReport(int customerID) {
-
- return null;
- }
-
- public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
- throws RemoteException {
- CustomerProfileData data = AccountFactory.INSTANCE.createCustomerProfileData();
- data.setLoginID(customerProfile.getLoginID());
- data.setAddress(customerProfile.getAddress());
- data.setEmail(customerProfile.getEmail());
- data.setFirstName(customerProfile.getFirstName());
- data.setId(customerProfile.getId());
- data.setLastName(customerProfile.getLastName());
- data.setPassword(customerProfile.getPassword());
- return data;
- }
-
- public float deposit(String param6, float param7) throws RemoteException {
-
- return 0;
- }
-
- public StockSummary purchaseStock(int param0, StockSummary stock) throws RemoteException {
-
- return null;
- }
-
- public StockSummary sellStock(int param13, int param14) throws RemoteException {
-
- return null;
- }
-
- public float withdraw(String param16, float param17) throws RemoteException {
-
- return 0;
- }
-
- public AccountLog getAccountLog(final int customerID) throws RemoteException {
- throw new RemoteException("This method should not be called");
- }
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
deleted file mode 100644
index 694227d7fb..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.
- */
-
-package bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class AccountServiceClientImpl implements AccountDataService {
-
- AccountDataService accountService;
-
- @Reference
- public void setAccountService(AccountDataService accountService) {
- this.accountService = accountService;
- }
-
- public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
- return accountService.createAccount(param9, param10, param11);
- }
-
- public float deposit(String param6, float param7) throws RemoteException {
-
- return 0;
- }
-
- public AccountLog getAccountLog(int param0) throws RemoteException {
-
- return null;
- }
-
- public AccountReport getAccountReport(int param19) throws RemoteException {
-
- return null;
- }
-
- public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-
- return null;
- }
-
- public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-
- return null;
- }
-
- public StockSummary sellStock(int param13, int param14) throws RemoteException {
-
- return null;
- }
-
- public float withdraw(String param16, float param17) throws RemoteException {
-
- return 0;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
deleted file mode 100644
index 462a718c44..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.
- */
-
-package bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component2aImpl implements AccountDataService {
-
- AccountDataService accountService;
-
- @Reference
- public void setAccountService(AccountDataService accountService) {
- this.accountService = accountService;
- }
-
- public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
- return accountService.createAccount(param9, param10, param11);
- }
-
- public float deposit(String param6, float param7) throws RemoteException {
-
- return 0;
- }
-
- public AccountLog getAccountLog(int param0) throws RemoteException {
-
- return null;
- }
-
- public AccountReport getAccountReport(int param19) throws RemoteException {
-
- return null;
- }
-
- public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-
- return null;
- }
-
- public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-
- return null;
- }
-
- public StockSummary sellStock(int param13, int param14) throws RemoteException {
-
- return null;
- }
-
- public float withdraw(String param16, float param17) throws RemoteException {
-
- return 0;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
deleted file mode 100644
index 17dbc27060..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.
- */
-
-package bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component2bImpl implements AccountDataService {
-
- AccountDataService accountService;
-
- @Reference
- public void setAccountService(AccountDataService accountService) {
- this.accountService = accountService;
- }
-
- public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
- return accountService.createAccount(param9, param10, param11);
- }
-
- public float deposit(String param6, float param7) throws RemoteException {
-
- return 0;
- }
-
- public AccountLog getAccountLog(int param0) throws RemoteException {
-
- return null;
- }
-
- public AccountReport getAccountReport(int param19) throws RemoteException {
-
- return null;
- }
-
- public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-
- return null;
- }
-
- public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-
- return null;
- }
-
- public StockSummary sellStock(int param13, int param14) throws RemoteException {
-
- return null;
- }
-
- public float withdraw(String param16, float param17) throws RemoteException {
-
- return 0;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
deleted file mode 100644
index 90bf276834..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.
- */
-
-package bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component3aImpl implements AccountDataService {
-
- AccountDataService accountService;
-
- @Reference
- public void setAccountService(AccountDataService accountService) {
- this.accountService = accountService;
- }
-
- public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
- return accountService.createAccount(param9, param10, param11);
- }
-
- public float deposit(String param6, float param7) throws RemoteException {
-
- return 0;
- }
-
- public AccountLog getAccountLog(int param0) throws RemoteException {
-
- return null;
- }
-
- public AccountReport getAccountReport(int param19) throws RemoteException {
-
- return null;
- }
-
- public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-
- return null;
- }
-
- public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-
- return null;
- }
-
- public StockSummary sellStock(int param13, int param14) throws RemoteException {
-
- return null;
- }
-
- public float withdraw(String param16, float param17) throws RemoteException {
-
- return 0;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
deleted file mode 100644
index b76ef600e0..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.
- */
-
-package bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component3bImpl implements AccountDataService {
-
- AccountDataService accountService;
-
- @Reference
- public void setAccountService(AccountDataService accountService) {
- this.accountService = accountService;
- }
-
- public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
- return accountService.createAccount(param9, param10, param11);
- }
-
- public float deposit(String param6, float param7) throws RemoteException {
-
- return 0;
- }
-
- public AccountLog getAccountLog(int param0) throws RemoteException {
-
- return null;
- }
-
- public AccountReport getAccountReport(int param19) throws RemoteException {
-
- return null;
- }
-
- public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-
- return null;
- }
-
- public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-
- return null;
- }
-
- public StockSummary sellStock(int param13, int param14) throws RemoteException {
-
- return null;
- }
-
- public float withdraw(String param16, float param17) throws RemoteException {
-
- return 0;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
deleted file mode 100644
index e747eb041f..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.
- */
-package bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-/**
- * This interface allows access to a customer's id from the data service.
- */
-public interface CustomerIdService {
-
- /*
- * Return -1 if purchaseLotNumber not found
- */
- public int getCustomerIdByPurchaseLotNumber(int purchaseLotNumber) throws RemoteException;
-
- /*
- * Return -1 if account not found
- */
- public int getCustomerIdByAccount(String account) throws RemoteException;
-
- // TODO (isilval) Fix this !!!
- // Apparently, configuration can't deal with extends so I am adding the contents of AccountDataService here
-
- /**
- * Auto generated method signatures
- *
- * @param param0*
- * @param param1*
- * @param param2
- */
- public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param4
- */
- public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param6*
- * @param param7
- */
- public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param9*
- * @param param10*
- * @param param11
- */
- public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
- throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param13*
- * @param param14
- */
- public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param16*
- * @param param17
- */
- public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param19
- */
- public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index c9076ebba6..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
- public String getGreetings(String name) {
- return "Hi " + name;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index bd527ff8e2..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-@Service
-public interface HelloWorldService {
-
- public String getGreetings(String name);
-}
-
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index d706517b76..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-@Scope("COMPOSITE")
-public class HelloWorldServiceComponent implements HelloWorldService {
-
- HelloWorldService helloWorldService;
-
- public String getGreetings(String name) {
- return helloWorldService.getGreetings(name);
- }
-
- public HelloWorldService getHelloWorldService() {
- return helloWorldService;
- }
-
- public void setHelloWorldService(HelloWorldService helloWorldService) {
- this.helloWorldService = helloWorldService;
- }
-}
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
deleted file mode 100644
index 9d147dc013..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component2aImpl implements HelloWorldService {
-
- private HelloWorldService comp;
-
- @Reference
- public void setComp(HelloWorldService comp) {
- this.comp = comp;
- }
- public String getGreetings(String s) {
- return comp.getGreetings(s);
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
deleted file mode 100644
index 7556e02b36..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component2bImpl implements HelloWorldService {
-
- private HelloWorldService comp;
-
- @Reference
- public void setComp(HelloWorldService comp) {
- this.comp = comp;
- }
-
- public String getGreetings(String s) {
- return comp.getGreetings(s);
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
deleted file mode 100644
index e7031ff41c..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component3aImpl implements HelloWorldService {
-
- private HelloWorldService comp;
-
- @Reference
- public void setComp(HelloWorldService comp) {
- this.comp = comp;
- }
-
- public String getGreetings(String s) {
- return comp.getGreetings(s);
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
deleted file mode 100644
index 7a049ed7b0..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component3bImpl implements HelloWorldService {
-
- private HelloWorldService comp;
-
- @Reference
- public void setComp(HelloWorldService comp) {
- this.comp = comp;
- }
-
- public String getGreetings(String s) {
- return comp.getGreetings(s);
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/branches/sca-java-0.91/itest/wsdl/src/main/resources/SDOWSDLTest.composite
deleted file mode 100644
index 447824bad5..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/SDOWSDLTest.composite
+++ /dev/null
@@ -1,344 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/WSDLTest.composite b/branches/sca-java-0.91/itest/wsdl/src/main/resources/WSDLTest.composite
deleted file mode 100644
index 2024578dae..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/WSDLTest.composite
+++ /dev/null
@@ -1,371 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType b/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
deleted file mode 100644
index aa91a713d9..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType b/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
deleted file mode 100644
index 57b1d66e9c..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType b/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
deleted file mode 100644
index de8307b8c2..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType b/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
deleted file mode 100644
index de8307b8c2..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index 9bd1d71a0e..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,467 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 3921dec72d..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
deleted file mode 100644
index c11e814058..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.rmi.RemoteException;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import bigbank.account.services.accountdata.AccountDataService;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.CustomerProfileData;
-
-/**
- * Tests all the combinations of wiring services, components, and references
- * which use either interface.java or interface.wsdl.
- *
- * The tests use a service (1) wired to a components (2) wired to another
- * component (3) wired to a reference (4). Each of those uses either
- * interface.java (a) or interface.wsdl (b). This results in 16 different
- * combinations 1a2a3a4a thru 1b2b3b4b.
- */
-public class SDOWSDLTestCase extends TestCase {
-
- private SCADomain domain;
-
- public void testClient1a2a3a4a() throws RemoteException {
-
- doit("Client1a2a3a4a");
- doit("Client1a2a3a4b");
- doit("Client1a2a3b4a");
- doit("Client1a2a3b4b");
- doit("Client1a2b3a4a");
- doit("Client1a2b3a4b");
- doit("Client1a2b3b4a");
- doit("Client1a2b3b4b");
- doit("Client1b2a3a4a");
- doit("Client1b2a3a4b");
- doit("Client1b2a3b4a");
- doit("Client1b2a3b4b");
-
-// TODO: TUSCANY-1135, service using wsdl wired to component using wsdl fails
-// doit("Client1b2b3a4a");
-// doit("Client1b2b3a4b");
-// doit("Client1b2b3b4a");
-// doit("Client1b2b3b4b");
- }
-
- private void doit(String compName) throws RemoteException {
- AccountDataService client = domain.getService(AccountDataService.class, compName);
- CustomerProfileData dataIn = AccountFactory.INSTANCE.createCustomerProfileData();
- dataIn.setAddress("home");
- dataIn.setEmail("petra@home");
- dataIn.setFirstName("petra");
- dataIn.setId(1);
- dataIn.setLastName("A");
- dataIn.setLoginID("petra");
- dataIn.setPassword("ant");
-
- CustomerProfileData dataOut = client.createAccount(dataIn , false, false);
-
- assertEquals(dataIn.getAddress(), dataOut.getAddress());
- assertEquals(dataIn.getEmail(), dataOut.getEmail());
- assertEquals(dataIn.getFirstName(), dataOut.getFirstName());
- assertEquals(dataIn.getId(), dataOut.getId());
- assertEquals(dataIn.getLastName(), dataOut.getLastName());
- assertEquals(dataIn.getLoginID(), dataOut.getLoginID());
- assertEquals(dataIn.getPassword(), dataOut.getPassword());
- }
-
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("SDOWSDLTest.composite");
- }
-
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
deleted file mode 100644
index fd30d69c79..0000000000
--- a/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import static junit.framework.Assert.assertEquals;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests all the combinations of wiring services, components, and references
- * which use either interface.java or interface.wsdl. The tests use a service
- * (1) wired to a components (2) wired to another component (3) wired to a
- * reference (4). Each of those uses either interface.java (a) or interface.wsdl
- * (b). This results in 16 different combinations 1a2a3a4a thru 1b2b3b4b.
- */
-public class WSDLTestCase {
-
- private static SCADomain domain;
-
- @Test
- public void testClient1a2a3a4a() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4a");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1a2a3a4b() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4b");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1a2a3b4a() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4a");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1a2a3b4b() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4b");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1a2b3a4a() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4a");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1a2b3a4b() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4b");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1a2b3b4a() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4a");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1a2b3b4b() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4b");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1b2a3a4a() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4a");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1b2a3a4b() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4b");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1b2a3b4a() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4a");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1b2a3b4b() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4b");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1b2b3a4a() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4a");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1b2b3a4b() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4b");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1b2b3b4a() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4a");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @Test
- public void testClient1b2b3b4b() {
- HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4b");
- assertEquals("Hi petra", client.getGreetings("petra"));
- }
-
- @BeforeClass
- public static void init() throws Throwable {
- domain = SCADomain.newInstance("WSDLTest.composite");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/DISCLAIMER b/branches/sca-java-0.91/modules/assembly-java-dsl/DISCLAIMER
deleted file mode 100644
index d68a410903..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/LICENSE b/branches/sca-java-0.91/modules/assembly-java-dsl/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-
-
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/NOTICE b/branches/sca-java-0.91/modules/assembly-java-dsl/NOTICE
deleted file mode 100644
index 94481d6cfa..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/pom.xml b/branches/sca-java-0.91/modules/assembly-java-dsl/pom.xml
deleted file mode 100644
index 16e7260ce2..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-modules
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-assembly-java-dsl
- Apache Tuscany SCA Assembly Java DSL
-
-
-
- org.apache.tuscany.sca
- tuscany-assembly
- 0.91-incubating-SNAPSHOT
-
-
-
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
deleted file mode 100644
index 28a5ecdc24..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-
-public interface AssemblyBuilder {
-
- CompositeBuilder composite(String name);
-
- ComponentBuilder component(String name);
-
- ComponentReferenceBuilder reference(String name);
-
- ComponentServiceBuilder service(String name);
-
- ComponentPropertyBuilder property(String name);
-
- CompositeBuilder domain(String uri);
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
deleted file mode 100644
index 98f247e5cc..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-public interface ComponentBuilder {
-
- ComponentBuilder implementedBy(Class clazz);
-
- ComponentBuilder implementedBy(CompositeBuilder composite);
-
- public ComponentBuilder uses(ComponentReferenceBuilder... componentReferences);
-
- public ComponentBuilder provides(ComponentServiceBuilder... componentServices);
-
- public ComponentBuilder declares(ComponentPropertyBuilder...componentProperties);
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
deleted file mode 100644
index 7f3c89fd2f..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-public interface ComponentPropertyBuilder {
-
- ComponentPropertyBuilder ofType(String type);
-
- ComponentPropertyBuilder configuredTo(Object value);
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
deleted file mode 100644
index 8966a4be9d..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-public interface ComponentReferenceBuilder {
-
- ComponentReferenceBuilder wiredTo(String target);
-
- ComponentReferenceBuilder wiredTo(ComponentServiceBuilder target);
-
- ComponentReferenceBuilder typedBy(Class interfaceClass);
-
- ComponentReferenceBuilder promotedAs(String promoted);
-
- ComponentReferenceBuilder promoted();
-
- ComponentReferenceBuilder boundTo(String uri);
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
deleted file mode 100644
index f3e36e8c38..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-public interface ComponentServiceBuilder {
-
- ComponentServiceBuilder typedBy(Class interfaceClass);
-
- ComponentServiceBuilder promotedAs(String promoted);
-
- ComponentServiceBuilder promoted();
-
- ComponentServiceBuilder boundTo(String uri);
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
deleted file mode 100644
index e2108b5ef8..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-
-public interface CompositeBuilder {
-
- CompositeBuilder contains(ComponentBuilder... components);
-
- CompositeBuilder includes(CompositeBuilder... includes);
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
deleted file mode 100644
index 0968310548..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.assembly.dsl.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.dsl.AssemblyBuilder;
-import org.apache.tuscany.sca.assembly.dsl.ComponentBuilder;
-import org.apache.tuscany.sca.assembly.dsl.ComponentPropertyBuilder;
-import org.apache.tuscany.sca.assembly.dsl.ComponentReferenceBuilder;
-import org.apache.tuscany.sca.assembly.dsl.ComponentServiceBuilder;
-import org.apache.tuscany.sca.assembly.dsl.CompositeBuilder;
-
-public class AssemblyBuilderImpl extends DefaultAssemblyFactory implements AssemblyBuilder {
-
- public ComponentBuilder component(String name) {
- ComponentBuilderImpl component = new ComponentBuilderImpl();
- component.setName(name);
- return component;
- }
-
- public CompositeBuilder composite(String name) {
- CompositeBuilderImpl composite = new CompositeBuilderImpl();
- //TODO handle namespace
- composite.setName(new QName("", name));
- return composite;
- }
-
- public CompositeBuilder domain(String uri) {
- CompositeBuilderImpl composite = new CompositeBuilderImpl();
- composite.setName(new QName(uri, ""));
- return composite;
- }
-
- public ComponentPropertyBuilder property(String name) {
- ComponentPropertyBuilderImpl property = new ComponentPropertyBuilderImpl();
- property.setName(name);
- return property;
- }
-
- public ComponentReferenceBuilder reference(String name) {
- ComponentReferenceBuilderImpl reference = new ComponentReferenceBuilderImpl(this);
- reference.setName(name);
- return reference;
- }
-
- public ComponentServiceBuilder service(String name) {
- ComponentServiceBuilderImpl service = new ComponentServiceBuilderImpl(this);
- service.setName(name);
- return service;
- }
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
deleted file mode 100644
index 9022b9d9e6..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.dsl.ComponentBuilder;
-import org.apache.tuscany.sca.assembly.dsl.ComponentPropertyBuilder;
-import org.apache.tuscany.sca.assembly.dsl.ComponentReferenceBuilder;
-import org.apache.tuscany.sca.assembly.dsl.ComponentServiceBuilder;
-import org.apache.tuscany.sca.assembly.dsl.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.impl.ComponentImpl;
-
-public class ComponentBuilderImpl extends ComponentImpl implements ComponentBuilder {
-
- public ComponentBuilderImpl() {
- }
-
- public ComponentBuilder implementedBy(Class clazz) {
- //FIXME support Java implementations
- return this;
- }
-
- public ComponentBuilder implementedBy(CompositeBuilder composite) {
- setImplementation((Composite)composite);
- return this;
- }
-
- public ComponentBuilder uses(ComponentReferenceBuilder... componentReferences) {
- List references = getReferences();
- for (ComponentReferenceBuilder componentReference: componentReferences) {
- references.add((ComponentReference)componentReference);
- }
- return this;
- }
-
- public ComponentBuilder provides(ComponentServiceBuilder... componentServices) {
- List services = getServices();
- for (ComponentServiceBuilder componentService: componentServices) {
- services.add((ComponentService)componentService);
- }
- return this;
- }
-
- public ComponentBuilder declares(ComponentPropertyBuilder...componentProperties) {
- List properties = getProperties();
- for (ComponentPropertyBuilder componentProperty: componentProperties) {
- properties.add((ComponentProperty)componentProperty);
- }
- return this;
- }
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
deleted file mode 100644
index 49f7cd46b2..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.dsl.ComponentPropertyBuilder;
-import org.apache.tuscany.sca.assembly.impl.ComponentPropertyImpl;
-
-public class ComponentPropertyBuilderImpl extends ComponentPropertyImpl implements ComponentPropertyBuilder {
-
- public ComponentPropertyBuilderImpl ofType(String type) {
- //TODO handle namespace
- this.setXSDType(new QName("", type));
- return this;
- }
-
- public ComponentPropertyBuilderImpl configuredTo(Object value) {
- this.setValue(value);
- return this;
- }
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
deleted file mode 100644
index d9aab9de22..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.dsl.ComponentReferenceBuilder;
-import org.apache.tuscany.sca.assembly.dsl.ComponentServiceBuilder;
-import org.apache.tuscany.sca.assembly.impl.ComponentReferenceImpl;
-import org.apache.tuscany.sca.assembly.impl.ComponentServiceImpl;
-
-public class ComponentReferenceBuilderImpl extends ComponentReferenceImpl implements ComponentReferenceBuilder {
-
- private CompositeReference compositeReference;
- private AssemblyFactory assemblyFactory;
-
- protected ComponentReferenceBuilderImpl(AssemblyFactory assemblyFactory) {
- this.assemblyFactory = assemblyFactory;
- }
-
- public ComponentReferenceBuilder wiredTo(String target) {
- ComponentService componentService = assemblyFactory.createComponentService();
- componentService.setUnresolved(true);
- componentService.setName(target);
- getTargets().add(componentService);
- return this;
- }
-
- public ComponentReferenceBuilder wiredTo(ComponentServiceBuilder target) {
- getTargets().add((ComponentServiceImpl)target);
- return this;
- }
-
- public ComponentReferenceBuilderImpl typedBy(Class interfaceClass) {
- //FIXME support for Java interfaces
- return this;
- }
-
- public ComponentReferenceBuilderImpl promotedAs(String promoted) {
- compositeReference = assemblyFactory.createCompositeReference();
- compositeReference.setName(promoted);
- return this;
- }
-
- public ComponentReferenceBuilderImpl promoted() {
- compositeReference = assemblyFactory.createCompositeReference();
- compositeReference.setName(getName());
- return this;
- }
-
- public ComponentReferenceBuilder boundTo(String uri) {
- //TODO support bindings
- return this;
- }
-
- CompositeReference getCompositeReference() {
- return compositeReference;
- }
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
deleted file mode 100644
index 379429d17e..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.dsl.ComponentServiceBuilder;
-import org.apache.tuscany.sca.assembly.impl.ComponentServiceImpl;
-
-public class ComponentServiceBuilderImpl extends ComponentServiceImpl implements ComponentServiceBuilder {
-
- private CompositeService compositeService;
- private AssemblyFactory assemblyFactory;
-
- protected ComponentServiceBuilderImpl(AssemblyFactory assemblyFactory) {
- this.assemblyFactory = assemblyFactory;
- }
-
- public ComponentServiceBuilderImpl typedBy(Class interfaceClass) {
- //FIXME support for Java interfaces
- return this;
- }
-
- public ComponentServiceBuilderImpl promotedAs(String promoted) {
- compositeService = assemblyFactory.createCompositeService();
- compositeService.setName(promoted);
- return this;
- }
-
- public ComponentServiceBuilderImpl promoted() {
- compositeService = assemblyFactory.createCompositeService();
- compositeService.setName(getName());
- return this;
- }
-
- public ComponentServiceBuilder boundTo(String uri) {
- // TODO support bindings
- return this;
- }
-
- CompositeService getCompositeService() {
- return compositeService;
- }
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
deleted file mode 100644
index 709562cd72..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.dsl.ComponentBuilder;
-import org.apache.tuscany.sca.assembly.dsl.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.impl.CompositeImpl;
-
-public class CompositeBuilderImpl extends CompositeImpl implements CompositeBuilder {
-
- public CompositeBuilder contains(ComponentBuilder... componentBuilders) {
- List components = getComponents();
- for (ComponentBuilder componentBuilder: componentBuilders) {
- Component component = (Component)componentBuilder;
- components.add(component);
-
- for (ComponentService componentService: component.getServices()) {
- ComponentServiceBuilderImpl builder = (ComponentServiceBuilderImpl)componentService;
- if (builder.getCompositeService() != null)
- getServices().add(builder.getCompositeService());
- }
- for (ComponentReference componentReference: component.getReferences()) {
- ComponentReferenceBuilderImpl builder = (ComponentReferenceBuilderImpl)componentReference;
- if (builder.getCompositeReference() != null)
- getReferences().add(builder.getCompositeReference());
- }
- }
- return this;
- }
-
- public CompositeBuilder includes(CompositeBuilder... compositeBuilders) {
- List list = getIncludes();
- for (CompositeBuilder composite: compositeBuilders) {
- list.add((Composite)composite);
- }
- return this;
- }
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
deleted file mode 100644
index ba91fd2168..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-public interface AccountDataService {
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
deleted file mode 100644
index 4e239d03d3..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-public class AccountDataServiceImpl {
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
deleted file mode 100644
index 030c820ed2..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-public interface AccountService {
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
deleted file mode 100644
index 92f448ec87..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-public class AccountServiceImpl {
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
deleted file mode 100644
index b856201551..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-import org.apache.tuscany.sca.assembly.dsl.impl.AssemblyBuilderImpl;
-
-public class BigBankBuilder extends AssemblyBuilderImpl {
-
- public CompositeBuilder build() {
-
- CompositeBuilder bigbankAccount = composite("bigbank.account").contains(
-
- component("AccountServiceComponent").
- implementedBy(AccountServiceImpl.class).
- uses(
- reference("accountDataService").typedBy(AccountDataService.class).wiredTo("AccountDataServiceComponent/AccountDataService"),
- reference("stockQuoteService").promotedAs("StockQuoteService")
- ).
- provides(
- service("AccountDataService").typedBy(AccountService.class).promoted()
- ).
- declares(
- property("currency").ofType("string").configuredTo("USD")
- ),
-
- component("AccountDataServiceComponent").
- implementedBy(AccountDataServiceImpl.class).
- provides(
- service("AccountDataService").typedBy(AccountDataService.class)
- )
- );
-
- CompositeBuilder bigbankApp = composite("bigbank.app").
- contains(
- component("BigBankAccount").implementedBy(bigbankAccount)
- );
-
- CompositeBuilder domain = domain("http://bigbank.org").includes(bigbankApp);
-
- return domain;
- }
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
deleted file mode 100644
index 90a4292546..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-import junit.framework.TestCase;
-
-public class BigBankBuilderTestCase extends TestCase {
-
- public void testBuild() throws Exception {
-
- BigBankBuilder builder = new BigBankBuilder();
- CompositeBuilder domain = builder.build();
- assertNotNull(domain);
-
- //System.out.println();
- //new PrintUtil(System.out).print(domain);
- //System.out.println();
-
- }
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java b/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
deleted file mode 100644
index a0580095a0..0000000000
--- a/branches/sca-java-0.91/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.dsl;
-
-public interface StockQuoteService {
-
-}
diff --git a/branches/sca-java-0.91/modules/assembly-xml/.checkstyle b/branches/sca-java-0.91/modules/assembly-xml/.checkstyle
deleted file mode 100644
index 3e57539570..0000000000
--- a/branches/sca-java-0.91/modules/assembly-xml/.checkstyle
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/modules/assembly-xml/.pmd b/branches/sca-java-0.91/modules/assembly-xml/.pmd
deleted file mode 100644
index 2db10d6a6a..0000000000
--- a/branches/sca-java-0.91/modules/assembly-xml/.pmd
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-truefalse
\ No newline at end of file
diff --git a/branches/sca-java-0.91/modules/assembly-xml/.ruleset b/branches/sca-java-0.91/modules/assembly-xml/.ruleset
deleted file mode 100644
index 830b4cfee4..0000000000
--- a/branches/sca-java-0.91/modules/assembly-xml/.ruleset
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
-
- PMD Plugin preferences rule set
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/branches/sca-java-0.91/modules/assembly-xml/DISCLAIMER b/branches/sca-java-0.91/modules/assembly-xml/DISCLAIMER
deleted file mode 100644
index d68a410903..0000000000
--- a/branches/sca-java-0.91/modules/assembly-xml/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
diff --git a/branches/sca-java-0.91/modules/assembly-xml/LICENSE b/branches/sca-java-0.91/modules/assembly-xml/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-java-0.91/modules/assembly-xml/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-
-
diff --git a/branches/sca-java-0.91/modules/assembly-xml/NOTICE b/branches/sca-java-0.91/modules/assembly-xml/NOTICE
deleted file mode 100644
index 94481d6cfa..0000000000
--- a/branches/sca-java-0.91/modules/assembly-xml/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-0.91/modules/assembly-xml/pom.xml b/branches/sca-java-0.91/modules/assembly-xml/pom.xml
deleted file mode 100644
index e217368d96..0000000000
--- a/branches/sca-java-0.91/modules/assembly-xml/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-modules
- 0.91-incubating-SNAPSHOT
- ../pom.xml
-
- tuscany-assembly-xml
- Apache Tuscany SCA XML Assembly Support
-
-
-
- org.apache.tuscany.sca
- tuscany-assembly
- 0.91-incubating-SNAPSHOT
-
-
-
- org.apache.tuscany.sca
- tuscany-contribution
- 0.91-incubating-SNAPSHOT
-
-
-
- stax
- stax-api
- 1.0.1
-
-
-
- org.codehaus.woodstox
- wstx-asl
- 3.2.0
- runtime
-
-
-
-
diff --git a/branches/sca-java-0.91/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java b/branches/sca-java-0.91/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
deleted file mode 100644
index 9223fa8947..0000000000
--- a/branches/sca-java-0.91/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.assembly.xml;
-
-import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
-import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AbstractContract;
-import org.apache.tuscany.sca.assembly.AbstractProperty;
-import org.apache.tuscany.sca.assembly.AbstractReference;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * A base class with utility methods for the other artifact processors in this module.
- *
- * @version $Rev$ $Date$
- */
-abstract class BaseArtifactProcessor implements Constants {
-
- protected AssemblyFactory assemblyFactory;
- protected PolicyFactory policyFactory;
- protected StAXArtifactProcessor