You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/03/09 17:39:58 UTC
svn commit: r635278 -
/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCollectionImpl.java
Author: jsdelfino
Date: Sun Mar 9 09:39:57 2008
New Revision: 635278
URL: http://svn.apache.org/viewvc?rev=635278&view=rev
Log:
Set the composite URI on the domain composite so that it shows in validation messages.
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCollectionImpl.java
Modified: incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCollectionImpl.java?rev=635278&r1=635277&r2=635278&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCollectionImpl.java Sun Mar 9 09:39:57 2008
@@ -59,6 +59,7 @@
import org.apache.tuscany.sca.assembly.builder.Problem.Severity;
import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
import org.apache.tuscany.sca.assembly.builder.impl.CompositeConfigurationBuilderImpl;
+import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.contribution.Artifact;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.ContributionFactory;
@@ -204,7 +205,6 @@
monitor);
} catch (Exception e) {
- e.printStackTrace();
throw new ContributionReadException(e);
}
}
@@ -332,13 +332,16 @@
// Somewhere to store the composite we expect to write out at the end
Composite deployableComposite = null;
- // Create a local domain composite
+ // Create a domain composite model
Composite domainComposite = assemblyFactory.createComposite();
+ URL url = new URL(request.getRequestURL().toString());
+ url= new URL(url.getProtocol(), url.getHost(), url.getPort(), "");
+ domainComposite.setName(new QName(url.toString(), "domain"));
// Get the domain composite items
Entry<String, Item>[] domainComposites = domainCompositeCollection.getAll();
- // Create the domain composite
+ // Populate the domain composite
for (int i=0; i < domainComposites.length; i++) {
// Load the required contributions
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org