From 8cffabba27bee2b886cee552a3840f53dc0ec1fb Mon Sep 17 00:00:00 2001 From: ramkumar Date: Thu, 7 May 2009 17:30:40 +0000 Subject: Refactoring Spring Module git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@772717 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/implementation-spring/README | 9 +++ .../modules/implementation-spring/pom.xml | 28 +++----- ...ca.contribution.processor.StAXArtifactProcessor | 38 +++++------ ...cany.sca.provider.ImplementationProviderFactory | 2 +- .../spring/itests/AbstractSCATestCase.java | 55 ---------------- .../helloworld/AbstractHelloWorldTestCase.java | 43 ------------ .../spring/itests/helloworld/HelloWorld.java | 35 ---------- .../spring/itests/helloworld/HelloWorldImpl.java | 38 ----------- .../spring/itests/helloworld/HelloWorldProxy.java | 42 ------------ .../helloworld/SpringContextAccessTestCase.java | 35 ---------- .../SpringExplicitHelloWorldTestCase.java | 34 ---------- .../SpringExplicitReferenceTestCase.java | 39 ----------- .../helloworld/SpringHelloWorldTestCase.java | 32 --------- .../SpringImplicitReferenceTestCase.java | 42 ------------ .../helloworld/SpringImportHelloWorldTestCase.java | 32 --------- .../helloworld/SpringSCAPropertyTestCase.java | 39 ----------- .../spring/itests/mock/TestBean.java | 31 --------- .../spring/itests/mock/TestBeanImpl.java | 42 ------------ .../spring/itests/mock/TestContextAccessBean.java | 77 ---------------------- .../spring/itests/mock/TestHelloWorldBean.java | 39 ----------- .../spring/itests/mock/TestReference.java | 27 -------- .../spring/itests/mock/TestReferenceBean.java | 57 ---------------- .../spring/itests/mock/TestSCAPropertyBean.java | 55 ---------------- .../META-INF/sca/SpringContextAccess-context.xml | 31 --------- .../sca/SpringExplicitHelloWorld-context.xml | 39 ----------- .../sca/SpringExplicitReference-context.xml | 33 ---------- .../sca/SpringHelloWorld-Imported-context.xml | 31 --------- .../META-INF/sca/SpringHelloWorld-context.xml | 31 --------- .../sca/SpringImplicitReference-context.xml | 34 ---------- .../sca/SpringImportHelloWorld-context.xml | 29 -------- .../META-INF/sca/testReferenceContext.xml | 33 ---------- .../resources/META-INF/sca/testServiceContext.xml | 31 --------- .../helloworld/SpringContextAccess.composite | 35 ---------- .../helloworld/SpringExplicitHelloWorld.composite | 33 ---------- .../helloworld/SpringExplicitReference.composite | 32 --------- .../itests/helloworld/SpringHelloWorld.composite | 32 --------- .../helloworld/SpringImplicitReference.composite | 39 ----------- .../helloworld/SpringImportHelloWorld.composite | 32 --------- .../itests/helloworld/SpringSCAProperty.composite | 39 ----------- .../src/test/resources/spring/META-INF/MANIFEST.MF | 3 - .../META-INF/spring/SpringSCAProperty-context.xml | 38 ----------- .../src/test/resources/test.xml | 27 -------- 42 files changed, 38 insertions(+), 1435 deletions(-) create mode 100644 branches/sca-java-1.x/modules/implementation-spring/README delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringContextAccess-context.xml delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/spring/META-INF/MANIFEST.MF delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml delete mode 100644 branches/sca-java-1.x/modules/implementation-spring/src/test/resources/test.xml diff --git a/branches/sca-java-1.x/modules/implementation-spring/README b/branches/sca-java-1.x/modules/implementation-spring/README new file mode 100644 index 0000000000..e1b1f98fe0 --- /dev/null +++ b/branches/sca-java-1.x/modules/implementation-spring/README @@ -0,0 +1,9 @@ +Note that the implementation spring modules have a different structure from other extensions. + +The aim is to have the Tuscany runtime embedded in a container with the Tuscany classes hidden +from user applications and the Spring jar's packaged with the application. That means that the +Tuscany code has no visibilty of the Spring classes and visa-versa. To implement that the +implementation-spring module has no dependencies on Spring and the implementation-spring-runtime +module has no dependencies on Tuscany (other than the sca-api), and reflection is used to call +methods between the modules. + diff --git a/branches/sca-java-1.x/modules/implementation-spring/pom.xml b/branches/sca-java-1.x/modules/implementation-spring/pom.xml index c0ad185366..0853d4ff81 100644 --- a/branches/sca-java-1.x/modules/implementation-spring/pom.xml +++ b/branches/sca-java-1.x/modules/implementation-spring/pom.xml @@ -29,6 +29,15 @@ Apache Tuscany SCA Spring Framework Implementation Extension + + + + + + + + + org.apache.tuscany.sca tuscany-assembly @@ -75,25 +84,6 @@ tuscany-host-embedded 1.6-SNAPSHOT - - - - org.springframework - spring-core - 2.5.5 - - - - org.springframework - spring-beans - 2.5.5 - - - - org.springframework - spring-context - 2.5.5 - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 4b71cef6c4..99e362fea4 100644 --- a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -1,19 +1,19 @@ -# 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. - -# Implementation class for the artifact processor extension -org.apache.tuscany.sca.implementation.spring.SpringImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.spring,model=org.apache.tuscany.sca.implementation.spring.SpringImplementation +# 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. + +# Implementation class for the artifact processor extension +org.apache.tuscany.sca.implementation.spring.xml.SpringImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.spring,model=org.apache.tuscany.sca.implementation.spring.SpringImplementation diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory index ab707cfd68..41e20e531f 100644 --- a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory +++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory @@ -16,4 +16,4 @@ # under the License. # Implementation class for the implementation extension -org.apache.tuscany.sca.implementation.spring.SpringImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.spring.SpringImplementation +org.apache.tuscany.sca.implementation.spring.invocation.SpringImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.spring.SpringImplementation diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java deleted file mode 100644 index 6b2d114756..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.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.implementation.spring.itests; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * - * @version $Rev$ $Date$ - */ -public abstract class AbstractSCATestCase extends TestCase { - - protected SCADomain domain; - protected T service; - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance(getCompositeName()); - service = (T)domain.getService(getServiceClass(), "ClientComponent"); - } - - protected abstract Class getServiceClass(); - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - - protected String getCompositeName() { - String className = this.getClass().getName(); - String compositeName = className.substring(0, className.length() - 8).replace('.', '/') + ".composite"; - System.out.println("Using composite: " + compositeName); - return compositeName; - } - -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java deleted file mode 100644 index c9b30b1688..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.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.implementation.spring.itests.helloworld; - -import org.apache.tuscany.sca.implementation.spring.itests.AbstractSCATestCase; - -/** - * Basic "hello world" style test case for testing Spring component implementation - * - * @version $Rev$ $Date$ - */ -public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase { - - /** - * Calls the hello world service and checks that it gives the right response... - */ - public void testCalculator() throws Exception { - assertEquals("Hello petra", service.sayHello("petra")); - System.out.println("Test " + this.getClass().getSimpleName() + " completed successfully"); - } - - @Override - protected Class getServiceClass() { - return HelloWorld.class; - } -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java deleted file mode 100644 index fd295daaf6..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.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.implementation.spring.itests.helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * Interface for the "hello world" service - predictably simple with a single operation - * "sayHello" - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface HelloWorld { - - String sayHello(String s); - -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java deleted file mode 100644 index 65ab096855..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.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.implementation.spring.itests.helloworld; - -/** - * A simple proxy Java class which implements the HelloWorld interface but which uses - * a reference "delegate" to actually provide the HelloWorld service - * - * @version $Rev$ $Date$ - */ -public class HelloWorldImpl implements HelloWorld { - - static String hello = "Hello "; - - public String sayHello(String s) { - // Simply call the reference to satisfy the service request... - System.out.println("HelloWorldImpl - sayHello called"); - return (hello + s); - } - -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java deleted file mode 100644 index bd35e9f3b9..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.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.implementation.spring.itests.helloworld; - -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 - * - * @version $Rev$ $Date$ - */ -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.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java deleted file mode 100644 index d77f183a66..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.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.implementation.spring.itests.helloworld; - -/** - * A test case to check the ability of Spring Beans used as an SCA implementation - * to access the Spring application context without problems: - * 1) A composite containing a component with a Spring implementation - * 2) The composite has a component with a Java POJO implementation which uses the - * Spring implementation to satisfy a reference - * 3) The Spring Bean accesses the Spring application context and only returns data - * if it is successful - * - * @version $Rev$ $Date$ - */ -public class SpringContextAccessTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java deleted file mode 100644 index 86f979fe15..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.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.implementation.spring.itests.helloworld; - -/** - * A basic test case of: - * 1) A composite containing a component with a Spring implementation - * 2) The composite has a component with a Java POJO implementation which uses the - * Spring implementation to satisfy a reference - * 3) The element references an application context that - * uses an explicit sca: element to identify the service offered by the Spring application - * - * @version $Rev$ $Date$ - */ -public class SpringExplicitHelloWorldTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java deleted file mode 100644 index 44016ad249..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.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.implementation.spring.itests.helloworld; - -/** - * A test case designed to test the implementation of References from a Spring application - * context, where the references are explicit, through the presence of an sca:reference - * element within the Spring application context - * - * The artifacts involved in this test are: - * - * 1) A composite containing a component with a Spring implementation which makes - * a reference to a second component - * 2) The composite has a component with a Java POJO implementation which satisfies the reference - * 3) The element references an application context that - * uses an explicit sca:reference element to identify the reference made by the Spring application - * - * @version $Rev$ $Date$ - */ -public class SpringExplicitReferenceTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java deleted file mode 100644 index 74dcf32723..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.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.implementation.spring.itests.helloworld; - -/** - * A basic test case of: - * 1) A composite containing a component with a Spring implementation - * 2) The composite has a component with a Java POJO implementation which uses the - * Spring implementation to satisfy a reference - * - * @version $Rev$ $Date$ - */ -public class SpringHelloWorldTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java deleted file mode 100644 index 97f91ff91e..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.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.implementation.spring.itests.helloworld; - -/** - * A test case designed to test the implementation of References from a Spring application - * context, where the references are implicit, through the presence of Bean properties with a - * ref attribute which is not satisfied by a Bean within the application context. - * - * The artifacts involved in this test are: - * - * 1) A composite containing a component with a Spring implementation which makes - * a reference to a second component - * 2) The composite has a component with a Java POJO implementation which satisfies the reference - * 3) The element references an application context that - * does not use an explicit sca:reference element to identify the reference made by the - * Spring application, but relies on an unsatisfied Bean property with a ref attribute. - * - * @version $Rev$ $Date$ - */ -public class SpringImplicitReferenceTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name -} - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java deleted file mode 100644 index bfe3d64cf3..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.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.implementation.spring.itests.helloworld; - -/** - * A basic test case of: - * 1) A composite containing a component with a Spring implementation - * 2) The composite has a component with a Java POJO implementation which uses the - * Spring implementation to satisfy a reference - * - * @version $Rev$ $Date$ - */ -public class SpringImportHelloWorldTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java deleted file mode 100644 index 2c46f8c066..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.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.implementation.spring.itests.helloworld; - -/** - * A test case designed to test the implementation of Properties from a Spring application - * context, where the properties are explicit, through the presence of an sca:property - * element within the Spring application context - * - * The artifacts involved in this test are: - * - * 1) A composite containing a component with a Spring implementation - * 2) The element references an application context that - * uses an explicit sca:property element which is used to compute the response to an invocation - * of the service of the implementation - * - * @version $Rev$ $Date$ - */ -public class SpringSCAPropertyTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name -} - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java deleted file mode 100644 index 4d60bffef8..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.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.implementation.spring.itests.mock; - -/** - * @version $Rev: 430937 $ $Date: 2006-08-12 02:17:56 +0100 (Sat, 12 Aug 2006) $ - */ -public interface TestBean { - String echo(String msg); - - TestBean getBean(); - - void setBean(TestBean bean); - -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java deleted file mode 100644 index acad9f2fea..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.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.implementation.spring.itests.mock; - -/** - * @version $Rev: 441406 $ $Date: 2006-09-08 08:20:10 +0100 (Fri, 08 Sep 2006) $ - */ -public class TestBeanImpl implements TestBean { - - private TestBean bean; - - public TestBeanImpl() { - } - - public String echo(String msg) { - return msg; - } - - public TestBean getBean() { - return bean; - } - - public void setBean(TestBean bean) { - this.bean = bean; - } -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java deleted file mode 100644 index 79de2b32a0..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.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.implementation.spring.itests.mock; - -/** - * Spring bean test class for testing the access to the Spring Context from within - * a Spring Bean running as part of an SCA Component. - * - * This class accesses the Spring Context and only returns non-null data if the - * Context is successfully accessed. - * - * The design to receive the application context is as follows: - * - the Bean implements the ApplicationContextAware interface - * - this interface provides getter and setter methods for the Spring application - * context - * - when the Bean is created at runtime, the setter method is called, injecting - * the context - */ - -import org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld; - -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; - - -public class TestContextAccessBean implements HelloWorld, ApplicationContextAware { - - private static ApplicationContext ctx; - static String hello = "Hello "; - - // Return the hello string only if the application context is successfully accessed - public String sayHello(String message) { - System.out.println("TestContextAccessBean - sayHello called"); - ApplicationContext theContext = getApplicationContext(); - - if( theContext == null ) return null; - - // A simple check to see if the context contains this bean, which it should... - if ( !theContext.containsBean( "testBean" ) ) return null; - - return (hello + message); - } // end sayHello() - - /** - * Application context setter - */ - public void setApplicationContext(ApplicationContext appContext) throws BeansException { - // Wiring the ApplicationContext into a static method - ctx = appContext; - } - - /** - * Application context getter - * @return - */ - public static ApplicationContext getApplicationContext() { - return ctx; - } - -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java deleted file mode 100644 index f165bb8b75..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.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.implementation.spring.itests.mock; - -/** - * A simple test Spring bean which provides the HelloWorld service - * - * @version $Rev$ $Date$ - */ - -import org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld; - -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.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java deleted file mode 100644 index a1d9b5a2f4..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.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.implementation.spring.itests.mock; - -/** - * @version $Rev: 536115 $ $Date: 2007-05-08 09:04:20 +0100 (Tue, 08 May 2007) $ - */ -public interface TestReference { - String echo(String msg); -} diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java deleted file mode 100644 index ab4c07d059..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.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.implementation.spring.itests.mock; - -/** - * A test Spring bean which provides the HelloWorld service by calling a reference - * to provide the content of the response - * - * @version $Rev$ $Date$ - */ - -import org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld; - -public class TestReferenceBean implements HelloWorld { - - // The reference - private HelloWorld bean; - - // Classic "Hello xxx" response to any input message - public String sayHello(String message) { - System.out.println("TestReferenceBean - sayHello called"); - return (bean.sayHello(message)); - } - - /** - * Setter for the bean reference - * @param theBean - */ - public void setBean(HelloWorld theBean) { - this.bean = theBean; - } - - /** - * Getter for the reference - * @return - */ - public HelloWorld getBean() { - return this.bean; - } - -} // end class TestReferenceBean diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java deleted file mode 100644 index 0f00c7e480..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.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.implementation.spring.itests.mock; - -/** - * A test Spring bean which provides the HelloWorld service. - * This bean has a single String property called "hello" which must be set through - * external configuration to give the correct response message, otherwise an (incorrect) - * default message is generated - * - * @version $Rev$ $Date$ - */ - -import org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld; - -public class TestSCAPropertyBean implements HelloWorld { - - private String hello = "Go away"; - - /** - * Provides the operation of the "HelloWorld" interface - a simple string response - * to a string input message, where the response is a greeting followed by the original - * input message. - */ - public String sayHello(String message) { - System.out.println("TestHelloWorldBean - sayHello called"); - return (hello + " " + message); - } - - /** - * Public setter for the (unannotated) field "hello" which constitutes an SCA - * property - * @param message - the message to use for the response to "sayHello" - */ - public void setHello(String message) { - hello = message; - } - -} // end class TestSCAPropertyBean diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringContextAccess-context.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringContextAccess-context.xml deleted file mode 100644 index a7d30bf201..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringContextAccess-context.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml deleted file mode 100644 index 7c358ac01c..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml deleted file mode 100644 index 38e90b41fa..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml deleted file mode 100644 index 18ce21805c..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml deleted file mode 100644 index 18ce21805c..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml deleted file mode 100644 index e6b69e8cad..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml deleted file mode 100644 index 8e18a56cca..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml deleted file mode 100644 index fdbbeeced2..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml deleted file mode 100644 index 6b3f1f9890..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite deleted file mode 100644 index 0b260b5dcf..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite deleted file mode 100644 index 79f4041fe6..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite deleted file mode 100644 index 87353b69ea..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite deleted file mode 100644 index ebb693d243..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite deleted file mode 100644 index 9f51277d22..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite deleted file mode 100644 index 95dd9131eb..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite deleted file mode 100644 index af1b3be0a5..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - Hello - - - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/spring/META-INF/MANIFEST.MF b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/spring/META-INF/MANIFEST.MF deleted file mode 100644 index 950dbeba4c..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/spring/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Spring-Context: META-INF/spring/SpringSCAProperty-context.xml - diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml deleted file mode 100644 index 6950f3e26a..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/test.xml b/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/test.xml deleted file mode 100644 index f2d684f766..0000000000 --- a/branches/sca-java-1.x/modules/implementation-spring/src/test/resources/test.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - -- cgit v1.2.3