summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5/itest/validation/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/Customer.java35
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java57
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddService.java27
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java31
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldService.java26
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java27
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddService.java32
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java44
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java46
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorClient.java45
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorService.java35
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java70
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideService.java28
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java35
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyService.java28
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java35
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyService.java29
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java41
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractService.java28
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java35
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java38
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddService.java29
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddServiceImpl.java44
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorClient.java45
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorService.java35
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java75
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideService.java28
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideServiceImpl.java35
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyService.java28
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java35
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractService.java28
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java35
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java50
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java31
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java65
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorld.java36
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java41
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java36
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java35
-rw-r--r--branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java75
40 files changed, 0 insertions, 1558 deletions
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/Customer.java b/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/Customer.java
deleted file mode 100644
index acb74c38ae..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/Customer.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 binding.ejb.account;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Customer {
-
- /**
- * This method deposits the amount. method accesses external EJB to get the
- * current balance and add the amount to existing balance.
- *
- * @param String amount to be deposited
- * @return total amount in customer account after deposit
- */
- Double depositAmount(java.lang.String accountNo, Double amount);
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
deleted file mode 100644
index 52ddfa9aba..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.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 binding.ejb.account;
-
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import binding.ejb.calculator.AddService;
-
-@Service(Customer.class)
-public class CustomerImpl implements Customer {
-
- private AddService extEJBService = null;
-
- public AddService getExtEJBService() {
- return extEJBService;
- }
-
- @Reference
- public void setExtEJBService(AddService extEJBService) {
- this.extEJBService = extEJBService;
- }
-
- // this method invokes external EJB through EJB reference binding
- public Double depositAmount(java.lang.String accountNo, Double amount) {
-
- Double total = null;
-
- System.out.println("In component implementation. Invoking external EJB through EJB reference binding ");
-
- try {
- Double balance = extEJBService.add(amount.doubleValue(), 1000); //invoke external ejb through ejb reference binding
- total = balance + amount;
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- return total;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
deleted file mode 100644
index aec8998083..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddService.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 binding.ejb.calculator;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface AddService {
- double add(double n1, double n2);
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
deleted file mode 100644
index 5df24b6379..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.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 binding.ejb.calculator;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-public interface AddServiceHome extends EJBHome {
-
- AddService create() throws CreateException, RemoteException;
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldService.java
deleted file mode 100644
index 33bfe1d0ea..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldService.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 binding.jms;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorldService {
- String sayHello(String name);
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index a6a40b0ed1..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.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 binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- return "jmsHello " + name;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddService.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddService.java
deleted file mode 100644
index 35ba2cbfac..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddService.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 calculator.warning;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
- double add(double n1, double n2);
- String getServiceName();
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
deleted file mode 100644
index ef305370cc..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImpl.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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.Property;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
- @Property(name="serviceName")
- protected String serviceName = "addService";
-
- public double add(double n1, double n2) {
- Logger logger = Logger.getLogger("calculator");
- logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
- return n1 + n2;
- }
-
- public String getServiceName(){
- return serviceName;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
deleted file mode 100644
index aacde27842..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.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.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of the Add service
- */
-@Service(AddService.class)
-public class AddServiceImplWithServiceName implements AddService {
-
- @Property(name="serviceName")
- protected String serviceName = "addService";
-
- public double add(double n1, double n2) {
- Logger logger = Logger.getLogger("calculator");
- logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
- return n1 + n2;
- }
-
- public String getServiceName(){
- return serviceName;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
deleted file mode 100644
index 185f17a5ca..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorClient.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 calculator.warning;
-
-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 scaDomain = SCADomain.newInstance("Calculator.composite");
-
- CalculatorService calculatorService =
- scaDomain.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));
-
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorService.java
deleted file mode 100644
index f472d6aaf6..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/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.warning;
-
-
-/**
- * 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-1.5/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
deleted file mode 100644
index 77aafe83de..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/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.warning;
-
-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-1.5/itest/validation/src/main/java/calculator/warning/DivideService.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideService.java
deleted file mode 100644
index a93d23e61c..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideService.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 calculator.warning;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
deleted file mode 100644
index 080594034b..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.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.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
- public double divide(double n1, double n2) {
- Logger logger = Logger.getLogger("calculator");
- logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
- return n1 / n2;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyService.java
deleted file mode 100644
index 20d48e93d5..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyService.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 calculator.warning;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
deleted file mode 100644
index 96f0b55fa2..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.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.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
- public double multiply(double n1, double n2) {
- Logger logger = Logger.getLogger("calculator");
- logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
- return n1 * n2;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyService.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyService.java
deleted file mode 100644
index 4f1ccc96f8..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyService.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 calculator.warning;
-
-/**
- * The Property service interface
- */
-public interface PropertyService {
-
- String getFirstName();
- String getLastName();
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
deleted file mode 100644
index 429daf5f2d..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.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 calculator.warning;
-
-import org.osoa.sca.annotations.Property;
-
-/**
- * An implementation of the Property service
- */
-public class PropertyServiceImpl implements PropertyService {
-
- @Property(name="firstName", required=false)
- protected String firstName;
-
- @Property(name="lastName", required=true)
- protected String lastName;
-
- public String getFirstName(){
- return firstName;
- }
-
- public String getLastName(){
- return lastName;
- }
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractService.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractService.java
deleted file mode 100644
index 40e382dc74..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractService.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 calculator.warning;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
deleted file mode 100644
index 8cdbe0813d..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.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.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
- public double subtract(double n1, double n2) {
- Logger logger = Logger.getLogger("calculator");
- logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
- return n1 - n2;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
deleted file mode 100644
index d5e9fcf020..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of the subtract service.
- */
-@Service(SubtractService.class)
-public class SubtractServiceImplWithServiceName implements SubtractService {
-
- public double subtract(double n1, double n2) {
- Logger logger = Logger.getLogger("calculator");
- logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
- return n1 - n2;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddService.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddService.java
deleted file mode 100644
index 0db8ce4f5c..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddService.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 impl.java;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
- double add(double n1, double n2);
- String getServiceName();
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddServiceImpl.java
deleted file mode 100644
index 83f2685d54..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddServiceImpl.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 impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.Property;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
- @Property(name="serviceName")
- protected String serviceName = "addService";
-
- public double add(double n1, double n2) {
- Logger logger = Logger.getLogger("calculator");
- logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
- return n1 + n2;
- }
-
- public String getServiceName(){
- return serviceName;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorClient.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorClient.java
deleted file mode 100644
index e34ce3db26..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorClient.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 impl.java;
-
-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 scaDomain = SCADomain.newInstance("Calculator.composite");
-
- CalculatorService calculatorService =
- scaDomain.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));
-
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorService.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorService.java
deleted file mode 100644
index 5d583fd604..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/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 impl.java;
-
-
-/**
- * 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-1.5/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
deleted file mode 100644
index 0183e2a259..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,75 +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 impl.java;
-
-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;
- }
-
- @Reference
- private void add(int n1, int n2) {
-
- }
-
- 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-1.5/itest/validation/src/main/java/impl/java/DivideService.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideService.java
deleted file mode 100644
index 85ebadc9a0..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideService.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 impl.java;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
deleted file mode 100644
index 863c298234..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideServiceImpl.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 impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
- public double divide(double n1, double n2) {
- Logger logger = Logger.getLogger("calculator");
- logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
- return n1 / n2;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyService.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyService.java
deleted file mode 100644
index e1bf7fbddc..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyService.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 impl.java;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
deleted file mode 100644
index 6346ea3582..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.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 impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
- public double multiply(double n1, double n2) {
- Logger logger = Logger.getLogger("calculator");
- logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
- return n1 * n2;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractService.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractService.java
deleted file mode 100644
index 57759bb496..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractService.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 impl.java;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
deleted file mode 100644
index 16e3e6a23d..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractServiceImpl.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 impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
- public double subtract(double n1, double n2) {
- Logger logger = Logger.getLogger("calculator");
- logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
- return n1 - n2;
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
deleted file mode 100644
index 6f9df2c034..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.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 impl.osgi;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- *
- * Test class - Implementation of an OSGi service
- *
- */
-public class OSGiTestImpl implements OSGiTestInterface, BundleActivator {
-
- public String testService() {
-
- return OSGiTestImpl.class.getName();
-
- }
-
- public void start(BundleContext bc) throws Exception {
-
- bc.registerService(OSGiTestInterface.class.getName(), this, new Hashtable<String, Object>());
-
- }
-
- public void stop(BundleContext bc) throws Exception {
- }
-
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
deleted file mode 100644
index bafff878cd..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.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 impl.osgi;
-
-/**
- *
- * Test class - Interface for an OSGi service
- *
- */
-public interface OSGiTestInterface {
-
- String testService() throws Exception ;
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
deleted file mode 100644
index e44d93e6be..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
+++ /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 impl.osgi;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osoa.sca.annotations.Property;
-
-/**
- *
- * Test class - Implementation of an OSGi service
- *
- */
-public class OSGiTestWithPropertyImpl implements OSGiTestInterface, BundleActivator {
-
- @Property
- public double exchangeRate;
-
- private String currency;
-
- @Property
- public void setCurrency(String currency) {
- this.currency = currency;
- }
-
- public String testService() throws Exception {
-
- if (exchangeRate != 2.0)
- throw new Exception("Property exchangeRate not set correctly, expected 2.0, got " + exchangeRate);
- if (!"USD".equals(currency))
- throw new Exception("Property currency not set correctly, expected USD, got " + currency);
- return OSGiTestWithPropertyImpl.class.getName();
-
- }
-
- public void start(BundleContext bc) throws Exception {
-
- bc.registerService(OSGiTestInterface.class.getName(), this, new Hashtable<String, Object>());
-
- }
-
- public void stop(BundleContext bc) throws Exception {
- }
-
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorld.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorld.java
deleted file mode 100644
index ef0b491617..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorld.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 impl.spring;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Interface for the "hello world" service - predictably simple with a single operation
- * "sayHello"
- *
- */
-@Remotable
-public interface HelloWorld {
-
- @OneWay
- String sayHello(String s);
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
deleted file mode 100644
index 2e3458f0d3..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorldProxy.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 impl.spring;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * A simple proxy Java class which implements the HelloWorld interface but which uses
- * a reference "delegate" to actually provide the HelloWorld service
- *
- */
-public class HelloWorldProxy implements HelloWorld {
-
- // Here is the reference "delegate" - it implements the HelloWorld interface...
- @Reference
- public HelloWorld delegate;
-
- public String sayHello(String s) {
- // Simply call the reference to satisfy the service request...
- System.out.println("HelloWorldProxy - calling sayHello");
- return delegate.sayHello(s);
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
deleted file mode 100644
index 87904f2a72..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.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 impl.spring;
-
-/**
- * A simple test Spring bean which provides the HelloWorld service
- *
- */
-
-public class TestHelloWorldBean implements HelloWorld {
-
- static String hello = "Hello ";
-
- // Classic "Hello xxx" response to any input message
- public String sayHello(String message) {
- System.out.println("TestHelloWorldBean - sayHello called");
- return (hello + message);
- }
-
-} // end class TestHelloWorldBean
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
deleted file mode 100644
index fa1a621f12..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/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 interfacejava.xml;
-
-import org.osoa.sca.annotations.OneWay;
-/**
- * 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);
-
- @OneWay
- double divide(double n1, double n2);
-}
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
deleted file mode 100644
index ebf7a79589..0000000000
--- a/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,75 +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 interfacejava.xml;
-
-import org.osoa.sca.annotations.Reference;
-
-import calculator.warning.AddService;
-import calculator.warning.DivideService;
-import calculator.warning.MultiplyService;
-import calculator.warning.SubtractService;
-
-
-/**
- * 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);
- }
-
-}