Author: antelder
Date: Mon Jan 5 04:15:31 2009
New Revision: 731540
URL: http://svn.apache.org/viewvc?rev=731540&view=rev
Log:
Copy fix for zip contributions from 1.x to 1.3.3
Added:
tuscany/branches/sca-java-1.3.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
- copied unchanged from r713736,
tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
tuscany/branches/sca-java-1.3.3/modules/host-embedded/src/test/java/sample/
- copied from r713736,
tuscany/java/sca/modules/host-embedded/src/test/java/sample/
tuscany/branches/sca-java-1.3.3/modules/host-embedded/src/test/java/sample/Helloworld.java
- copied unchanged from r713736,
tuscany/java/sca/modules/host-embedded/src/test/java/sample/Helloworld.java
tuscany/branches/sca-java-1.3.3/modules/host-embedded/src/test/resources/helloworld.jar
- copied unchanged from r713736,
tuscany/java/sca/modules/host-embedded/src/test/resources/helloworld.jar
tuscany/branches/sca-java-1.3.3/modules/host-embedded/src/test/resources/helloworld.zip
- copied unchanged from r713736,
tuscany/java/sca/modules/host-embedded/src/test/resources/helloworld.zip
Modified:
tuscany/branches/sca-java-1.3.3/modules/contribution/ (props changed)
tuscany/branches/sca-java-1.3.3/modules/contribution-impl/ (props changed)
tuscany/branches/sca-java-1.3.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
tuscany/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
tuscany/branches/sca-java-1.3.3/modules/host-embedded/ (props changed)
Propchange: tuscany/branches/sca-java-1.3.3/modules/contribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jan 5 04:15:31 2009
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/contribution:673298,674894-674933,675006,675061,694165,695536,698102-698108,713740
Propchange: tuscany/branches/sca-java-1.3.3/modules/contribution-impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jan 5 04:15:31 2009
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/contribution-impl:673298,674894-674933,675006,675061,694165,695536,698102-698108,713741
Modified:
tuscany/branches/sca-java-1.3.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java?rev=731540&r1=731539&r2=731540&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
(original)
+++
tuscany/branches/sca-java-1.3.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
Mon Jan 5 04:15:31 2009
@@ -51,6 +51,7 @@
private void init() {
contentTypeRegistry.put("JAR", PackageType.JAR);
contentTypeRegistry.put("WAR", PackageType.JAR);
+ contentTypeRegistry.put("ZIP", PackageType.ZIP);
}
protected String resolveContentyTypeByExtension(URL resourceURL) {
Modified:
tuscany/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java?rev=731540&r1=731539&r2=731540&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
(original)
+++
tuscany/branches/sca-java-1.3.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
Mon Jan 5 04:15:31 2009
@@ -32,6 +32,11 @@
String JAR = "application/x-compressed";
/**
+ * Zip archive contribution package
+ */
+ String ZIP = "application/x-compressed";
+
+ /**
* Filesystem folder contribution package
*/
String FOLDER = "application/vnd.tuscany.folder";
Propchange: tuscany/branches/sca-java-1.3.3/modules/host-embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jan 5 04:15:31 2009
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/host-embedded:673298,674894-674933,675006,675061,694165,695536,698102-698108,713736
