Author: antelder
Date: Fri Jan 23 01:28:36 2009
New Revision: 736977
URL: http://svn.apache.org/viewvc?rev=736977&view=rev
Log:
Add an itest for folder contributions and zip contributions containing jars
Added:
tuscany/branches/sca-java-1.x/itest/contribution-folder/ (with props)
tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/main/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/main/java/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/main/resources/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionZIPTestCaseFIXME.java
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/calculator/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository3/
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository3/contribution.zip
(with props)
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-folder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 23 01:28:36 2009
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Added: tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml?rev=736977&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml Fri Jan 23
01:28:36 2009
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>itest-contribution-folder</artifactId>
+ <name>Apache Tuscany SCA iTest Folder and ZIP Contribution</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-impl</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
Added:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java?rev=736977&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java
Fri Jan 23 01:28:36 2009
@@ -0,0 +1,35 @@
+
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+import calculator.CalculatorService;
+
+
+
+/**
+ * Test SCADomain.newInstance and invocation of a service.
+ *
+ * @version $Rev: 608205 $ $Date: 2008-01-02 20:29:05 +0000 (Wed, 02 Jan 2008)
$
+ */
+public class ContributionFolderTestCaseFIXME extends TestCase {
+
+ private SCADomain domain;
+
+ @Override
+ protected void setUp() throws Exception {
+ domain = SCADomain.newInstance("myDomain",
"src/test/resources/repository2/folderWithJars", null );
+ }
+
+ public void testInvoke() throws Exception {
+ CalculatorService service = domain.getService(CalculatorService.class,
"CalculatorServiceComponent");
+ assertEquals(3.0, service.add(1, 2));
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ domain.close();
+ }
+
+}
Added:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionZIPTestCaseFIXME.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionZIPTestCaseFIXME.java?rev=736977&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionZIPTestCaseFIXME.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionZIPTestCaseFIXME.java
Fri Jan 23 01:28:36 2009
@@ -0,0 +1,35 @@
+
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+import calculator.CalculatorService;
+
+
+
+/**
+ * Test SCADomain.newInstance and invocation of a service.
+ *
+ * @version $Rev: 608205 $ $Date: 2008-01-02 20:29:05 +0000 (Wed, 02 Jan 2008)
$
+ */
+public class ContributionZIPTestCaseFIXME extends TestCase {
+
+ private SCADomain domain;
+
+ @Override
+ protected void setUp() throws Exception {
+ domain = SCADomain.newInstance("myDomain",
"src/test/resources/repository3/contribution.zip", null );
+ }
+
+ public void testInvoke() throws Exception {
+ CalculatorService service = domain.getService(CalculatorService.class,
"CalculatorServiceComponent");
+ assertEquals(3.0, service.add(1, 2));
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ domain.close();
+ }
+
+}
Added:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/calculator/CalculatorService.java?rev=736977&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
Fri Jan 23 01:28:36 2009
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package calculator;
+
+public interface 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);
+
+}
Added:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite?rev=736977&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
Fri Jan 23 01:28:36 2009
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://sample";
+ xmlns:sample="http://sample";
+ name="Calculator">
+
+ <component name="CalculatorServiceComponent">
+ <implementation.java class="calculator.CalculatorServiceImpl"/>
+ <reference name="addService" target="AddServiceComponent" />
+ <reference name="subtractService" target="SubtractServiceComponent" />
+ <reference name="multiplyService" target="MultiplyServiceComponent" />
+ <reference name="divideService" target="DivideServiceComponent" />
+ </component>
+
+ <component name="AddServiceComponent">
+ <implementation.java class="calculator.AddServiceImpl"/>
+ </component>
+
+ <component name="SubtractServiceComponent">
+ <implementation.java class="calculator.SubtractServiceImpl"/>
+ </component>
+
+ <component name="MultiplyServiceComponent">
+ <implementation.java class="calculator.MultiplyServiceImpl"/>
+ </component>
+
+ <component name="DivideServiceComponent">
+ <implementation.java class="calculator.DivideServiceImpl"/>
+ </component>
+
+</composite>
Added:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml?rev=736977&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
Fri Jan 23 01:28:36 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:sample="http://sample";>
+ <deployable composite="sample:Calculator"/>
+</contribution>
\ No newline at end of file
Added:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar?rev=736977&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar?rev=736977&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository3/contribution.zip
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository3/contribution.zip?rev=736977&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository3/contribution.zip
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
