You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/03/26 23:33:40 UTC
svn commit: r522633 - in
/incubator/tuscany/java/sca/runtime/services/contribution: ./
contribution-framework/
contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/
contribution/src/main/java/org/apache/tuscany/services/con...
Author: lresende
Date: Mon Mar 26 14:33:39 2007
New Revision: 522633
URL: http://svn.apache.org/viewvc?view=rev&rev=522633
Log:
More fixes/clean-up on contribution services
Added:
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/UnsupportedContentTypeException.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/deployment/UnsupportedContentTypeException.java
incubator/tuscany/java/sca/runtime/services/contribution/pom.xml
Modified:
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/pom.xml
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionProcessorRegistryImpl.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessorTestCase.java
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/pom.xml?view=diff&rev=522633&r1=522632&r2=522633
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/pom.xml Mon Mar 26 14:33:39 2007
@@ -35,6 +35,10 @@
<artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/UnsupportedContentTypeException.java (from r522410, incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/deployment/UnsupportedContentTypeException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/UnsupportedContentTypeException.java?view=diff&rev=522633&p1=incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/deployment/UnsupportedContentTypeException.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/UnsupportedContentTypeException.java&r2=522633
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/deployment/UnsupportedContentTypeException.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/UnsupportedContentTypeException.java Mon Mar 26 14:33:39 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.host.deployment;
+package org.apache.tuscany.services.contribution.spi;
/**
* Exception thrown to indicate that a Content-Type is not supported by this SCA Domain.
@@ -24,7 +24,7 @@
*
* @version $Rev$ $Date$
*/
-public class UnsupportedContentTypeException extends DeploymentException {
+public class UnsupportedContentTypeException extends ContributionException {
private static final long serialVersionUID = -1831797280021355672L;
/**
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java?view=diff&rev=522633&r1=522632&r2=522633
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java Mon Mar 26 14:33:39 2007
@@ -26,6 +26,7 @@
import java.util.Map;
import org.apache.tuscany.services.contribution.model.ContentType;
+import org.apache.tuscany.services.contribution.model.Contribution;
import org.apache.tuscany.services.contribution.spi.ContentTypeDescriber;
import org.apache.tuscany.services.contribution.util.FileHelper;
import org.osoa.sca.annotations.EagerInit;
@@ -65,10 +66,11 @@
}
/**
- * Build contentType for a specific resource. We first check if the file is a supported one (looking into our
- * registry based on resource extension) If not found, we try to check file contentType Or we return
+ * Build contentType for a specific resource. We first check if the file is
+ * a supported one (looking into our registry based on resource extension)
+ * If not found, we try to check file contentType Or we return
* defaultContentType provided
- *
+ *
* @param url
* @param defaultContentType
* @return
@@ -77,20 +79,29 @@
URLConnection connection = null;
String contentType = defaultContentType;
- contentType = resolveContentyTypeByExtension(resourceURL);
- if (contentType == null) {
- try {
- connection = resourceURL.openConnection();
- contentType = connection.getContentType();
-
- if (contentType == null || contentType.equals(ContentType.UNKNOWN)) {
- // here we couldn't figure out from our registry or from URL
- // return defaultContentType if provided
- contentType = defaultContentType;
+ if (resourceURL.getProtocol().equals("file") && FileHelper.toFile(resourceURL).isDirectory()) {
+ // Special case : contribution is a folder
+ contentType = ContentType.FOLDER;
+ } else if (resourceURL.toExternalForm().endsWith(Contribution.SCA_CONTRIBUTION_META)
+ || resourceURL.toExternalForm().endsWith(Contribution.SCA_CONTRIBUTION_GENERATED_META)) {
+ // Special case : contribution metadata
+ contentType = ContentType.CONTRIBUTION_METADATA;
+ } else {
+ contentType = resolveContentyTypeByExtension(resourceURL);
+ if (contentType == null) {
+ try {
+ connection = resourceURL.openConnection();
+ contentType = connection.getContentType();
+
+ if (contentType == null || contentType.equals("content/unknown")) {
+ // here we couldn't figure out from our registry or from URL and it's not a special file
+ // return defaultContentType if provided
+ contentType = defaultContentType;
+ }
+ } catch (IOException io) {
+ // could not access artifact, just ignore and we will return
+ // null contentType
}
- } catch (IOException io) {
- // could not access artifact, just ignore and we will return
- // null contentType
}
}
return contentType == null ? defaultContentType : contentType;
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionProcessorRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionProcessorRegistryImpl.java?view=diff&rev=522633&r1=522632&r2=522633
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionProcessorRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionProcessorRegistryImpl.java Mon Mar 26 14:33:39 2007
@@ -26,18 +26,16 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.tuscany.services.contribution.model.Contribution;
+import org.apache.tuscany.services.contribution.spi.ContentTypeDescriber;
+import org.apache.tuscany.services.contribution.spi.ContributionException;
+import org.apache.tuscany.services.contribution.spi.ContributionProcessor;
+import org.apache.tuscany.services.contribution.spi.ContributionProcessorRegistry;
+import org.apache.tuscany.services.contribution.spi.UnsupportedContentTypeException;
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.spi.deployer.ContentTypeDescriber;
-import org.apache.tuscany.spi.deployer.ContributionProcessor;
-import org.apache.tuscany.spi.deployer.ContributionProcessorRegistry;
-import org.apache.tuscany.spi.model.Contribution;
-
-import org.apache.tuscany.host.deployment.DeploymentException;
-import org.apache.tuscany.host.deployment.UnsupportedContentTypeException;
-
/**
* Default implementation of ContributionProcessorRegistry
*
@@ -72,7 +70,7 @@
}
public void processContent(Contribution contribution, URI source, InputStream inputStream)
- throws DeploymentException, IOException {
+ throws ContributionException, IOException {
URL locationURL = contribution.getArtifact(source).getLocation();
String contentType = this.contentTypeDescriber.getContentType(locationURL, null);
@@ -89,7 +87,7 @@
}
- public void processModel(Contribution contribution, URI source, Object modelObject) throws DeploymentException,
+ public void processModel(Contribution contribution, URI source, Object modelObject) throws ContributionException,
IOException {
}
}
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java?view=diff&rev=522633&r1=522632&r2=522633
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java Mon Mar 26 14:33:39 2007
@@ -31,7 +31,6 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.services.contribution.model.Contribution;
-import org.apache.tuscany.services.contribution.model.DeployedArtifact;
import org.apache.tuscany.services.contribution.spi.ContributionException;
import org.apache.tuscany.services.contribution.spi.ContributionProcessorRegistry;
import org.apache.tuscany.services.contribution.spi.ContributionRepository;
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessorTestCase.java?view=diff&rev=522633&r1=522632&r2=522633
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessorTestCase.java Mon Mar 26 14:33:39 2007
@@ -18,14 +18,7 @@
*/
package org.apache.tuscany.services.contribution.processor;
-import java.net.URI;
-import java.net.URL;
-
import junit.framework.TestCase;
-
-import org.apache.tuscany.spi.deployer.ContributionProcessorRegistry;
-import org.apache.tuscany.spi.model.Contribution;
-import org.easymock.EasyMock;
public class JarContributionProcessorTestCase extends TestCase {
private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
Added: incubator/tuscany/java/sca/runtime/services/contribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/pom.xml?view=auto&rev=522633
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/pom.xml (added)
+++ incubator/tuscany/java/sca/runtime/services/contribution/pom.xml Mon Mar 26 14:33:39 2007
@@ -0,0 +1,39 @@
+<?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>
+ <parent>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
+ <artifactId>services</artifactId>
+ <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.services.contribution</groupId>
+ <artifactId>contribution</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany SCA Contribution Services</name>
+ <description>Apache Tuscany SCA Contribution Services</description>
+
+ <modules>
+ <module>contribution-framework</module>
+ <module>contribution</module>
+ </modules>
+
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org