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/05/02 00:42:16 UTC
svn commit: r534269 - in /incubator/tuscany/java/sca/modules:
contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/
contribution/src/main/java/org/apache/tuscany/contribution/service/
Author: lresende
Date: Tue May 1 15:42:15 2007
New Revision: 534269
URL: http://svn.apache.org/viewvc?view=rev&rev=534269
Log:
Contribution Service - Providing implementation for addDeploymentComposite
Added:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/InvalidContributionURIException.java
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionService.java
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java?view=diff&rev=534269&r1=534268&r2=534269
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java Tue May 1 15:42:15 2007
@@ -181,17 +181,20 @@
this.contributionRegistry.remove(contribution);
}
- public void addDeploymentComposite(URI contribution, Object composite) {
- /*
- * CompositeComponentType model = (CompositeComponentType)composite; URI
- * compositeURI = contribution.resolve(model.getName() + ".composite");
- * DeployedArtifact artifact = new DeployedArtifact(compositeURI); //
- * FIXME: the namespace should be from the CompositeComponentType model
- * artifact.addModelObject(composite.getClass(), null, composite);
- * Contribution contributionObject =
- * (Contribution)getContribution(contribution);
- * contributionObject.addArtifact(artifact);
- */
+ public void addDeploymentComposite(URI contributionURI, Composite composite) throws ContributionException {
+ Contribution contribution = getContribution(contributionURI);
+
+ if(contribution == null) {
+ throw new InvalidContributionURIException("Invalid/Inexistent contribution uri '" + contributionURI.toString());
+ }
+
+ URI compositeURI = contributionURI.resolve(composite.getName().getLocalPart() + ".composite");
+ DeployedArtifact artifact = this.contributionFactory.createDeplyedArtifact(compositeURI);
+ artifact.setModelObject(composite);
+
+ contribution.addArtifact(artifact);
+
+ contribution.getDeployables().add(composite);
}
/*
@@ -234,6 +237,7 @@
URL sourceURL,
InputStream contributionStream,
boolean storeInRepository) throws IOException, ContributionException {
+
if (contributionStream == null && sourceURL == null) {
throw new IllegalArgumentException("The content of the contribution is null");
}
@@ -280,6 +284,15 @@
this.contributionRegistry.put(contribution.getUri(), contribution);
}
+ /**
+ * This utility method process each artifact and delegates to proper
+ * artifactProcessor to read the model and generate the in-memory representation
+ *
+ * @param contribution
+ * @param artifacts
+ * @throws ContributionException
+ * @throws MalformedURLException
+ */
private void processReadPhase(Contribution contribution, List<URI> artifacts) throws ContributionException,
MalformedURLException {
URL contributionURL = contribution.getLocation();
@@ -299,6 +312,13 @@
}
}
+ /**
+ * This utility method process each artifact and delegates to proper
+ * artifactProcessor to resolve the model references
+ *
+ * @param contribution
+ * @throws ContributionException
+ */
private void processResolvePhase(Contribution contribution) throws ContributionException {
// for each artifact that was processed on the contribution
for (DeployedArtifact artifact : contribution.getArtifacts().values()) {
@@ -319,6 +339,10 @@
contribution.getDeployables().addAll(resolvedDeployables);
}
+ /**
+ * @param contribution
+ * @throws ContributionException
+ */
private void processOptimizationPhase(Contribution contribution) throws ContributionException {
// for each artifact that was processed on the contribution
for (DeployedArtifact artifact : contribution.getArtifacts().values()) {
@@ -328,6 +352,13 @@
}
+ /**
+ * If there is no specific composite promoted as deployable in sca contribution metadata sidefile
+ * All composites are promoted as deployables
+ *
+ * @param contribution
+ * @throws ContributionException
+ */
private void processDeployables(Contribution contribution) throws ContributionException {
if (contribution.getDeployables() == null || contribution.getDeployables().size() == 0){
//Contribution metadata not available with a list of deployables
Added: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/InvalidContributionURIException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/InvalidContributionURIException.java?view=auto&rev=534269
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/InvalidContributionURIException.java (added)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/InvalidContributionURIException.java Tue May 1 15:42:15 2007
@@ -0,0 +1,58 @@
+/*
+ * 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.contribution.service.impl;
+
+import org.apache.tuscany.contribution.service.ContributionException;
+
+
+/**
+ * Exception that indicates that the supplied contribution URI is invalid or inexistent.
+ *
+ * @version $Rev: 511466 $ $Date: 2007-02-25 00:45:22 -0800 (Sun, 25 Feb 2007) $
+ */
+public class InvalidContributionURIException extends ContributionException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3184477070625689942L;
+
+ protected InvalidContributionURIException() {
+ }
+
+ protected InvalidContributionURIException(String message) {
+ super(message);
+ }
+
+ protected InvalidContributionURIException(String message, String identifier) {
+ super(message, identifier);
+ }
+
+ protected InvalidContributionURIException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ protected InvalidContributionURIException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
+ }
+
+ protected InvalidContributionURIException(Throwable cause) {
+ super(cause);
+ }
+}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionService.java?view=diff&rev=534269&r1=534268&r2=534269
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionService.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionService.java Tue May 1 15:42:15 2007
@@ -24,6 +24,7 @@
import java.net.URL;
import java.util.Map;
+import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.contribution.Contribution;
@@ -82,7 +83,7 @@
* matches the "name" attribute of the composite, with a ".composite"
* suffix.
*/
- void addDeploymentComposite(URI contribution, Object composite);
+ void addDeploymentComposite(URI contribution, Composite composite) throws ContributionException;
/**
* Remove a contribution from the SCA domain
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org