Copy fix for zip contributions from 1.x to 1.3.3

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@731540 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 86 insertions, 0 deletions

diff --git a/branches/sca-java-1.3.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java b/branches/sca-java-1.3.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
index 9f04c4af27..110450c469 100644
--- a/branches/sca-java-1.3.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
+++ b/branches/sca-java-1.3.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
@@ -51,6 +51,7 @@ public class PackageTypeDescriberImpl implements TypeDescriber {
     private void init() {
         contentTypeRegistry.put("JAR", PackageType.JAR);
         contentTypeRegistry.put("WAR", PackageType.JAR);
+        contentTypeRegistry.put("ZIP", PackageType.ZIP);
     }
 
     protected String resolveContentyTypeByExtension(URL resourceURL) {
diff --git a/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
index c0dd5431d7..26e23375b4 100644
--- a/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
+++ b/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
@@ -32,6 +32,11 @@ public interface PackageType {
     String JAR = "application/x-compressed";
 
     /**
+     * Zip archive contribution package
+     */
+    String ZIP = "application/x-compressed";
+
+    /**
      * Filesystem folder contribution package
      */
     String FOLDER = "application/vnd.tuscany.folder";
diff --git a/branches/sca-java-1.3.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java b/branches/sca-java-1.3.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
new file mode 100644
index 0000000000..8b0bd5fd73
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
@@ -0,0 +1,51 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.host.embedded;

+

+import junit.framework.TestCase;

+import sample.Helloworld;

+

+

+

+/**

+ * 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 SCADomainZipsTestCaseFIXME extends TestCase {

+

+    private SCADomain domain;

+    

+    @Override

+    protected void setUp() throws Exception {

+        domain = SCADomain.newInstance("myDomain", "src/test/resources/helloworld.jar", "META-INF/sca-deployables/Helloworld.composite" );

+    }

+

+    public void testInvoke() throws Exception {

+        Helloworld service = domain.getService(Helloworld.class, "HelloworldComponent");

+        assertEquals("Hello Petra", service.sayHello("Petra"));

+    }

+

+    @Override

+    protected void tearDown() throws Exception {

+        domain.close();

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/host-embedded/src/test/java/sample/Helloworld.java b/branches/sca-java-1.3.3/modules/host-embedded/src/test/java/sample/Helloworld.java
new file mode 100644
index 0000000000..386426df73
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/host-embedded/src/test/java/sample/Helloworld.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package sample;

+

+import org.osoa.sca.annotations.Remotable;

+

+@Remotable

+public interface Helloworld {

+    

+    String sayHello(String name);

+

+}

diff --git a/branches/sca-java-1.3.3/modules/host-embedded/src/test/resources/helloworld.jar b/branches/sca-java-1.3.3/modules/host-embedded/src/test/resources/helloworld.jar
new file mode 100644
index 0000000000..0e022a3e2c
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/host-embedded/src/test/resources/helloworld.jar
diff --git a/branches/sca-java-1.3.3/modules/host-embedded/src/test/resources/helloworld.zip b/branches/sca-java-1.3.3/modules/host-embedded/src/test/resources/helloworld.zip
new file mode 100644
index 0000000000..0e022a3e2c
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/host-embedded/src/test/resources/helloworld.zip