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/06 04:43:10 UTC
svn commit: r634144 - in
/incubator/tuscany/java/sca/modules/workspace-admin/src/main:
java/org/apache/tuscany/sca/workspace/admin/impl/ resources/
Author: jsdelfino
Date: Wed Mar 5 19:43:09 2008
New Revision: 634144
URL: http://svn.apache.org/viewvc?rev=634144&view=rev
Log:
List components beside each composite.
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/cloud.html
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/utils.js
Modified: incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeCollectionImpl.java?rev=634144&r1=634143&r2=634144&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeCollectionImpl.java Wed Mar 5 19:43:09 2008
@@ -119,9 +119,7 @@
QName qname = composite.getName();
String key = key(contributionURI, qname);
entry.setKey(key);
- Item item = new Item();
- item.setTitle(title(contributionURI, qname));
- item.setLink(compositeLink(contributionURI, qname));
+ Item item = compositeItem(contributionURI, qname);
entry.setData(item);
entries.add(entry);
}
@@ -135,9 +133,7 @@
// Returns the composite with the given name key
for (Composite composite: compositeCollection.getIncludes()) {
if (contributionURI.equals(composite.getURI()) && qname.equals(composite.getName())) {
- Item item = new Item();
- item.setTitle(title(contributionURI, qname));
- item.setLink(compositeLink(composite.getURI(), qname));
+ Item item = compositeItem(composite.getURI(), qname);
return item;
}
}
@@ -236,12 +232,12 @@
}
}
- private String compositeLink(String contributionURI, QName qname) {
+ private Item compositeItem(String contributionURI, QName qname) {
String key = key(contributionURI, qname);
Entry<String, Item>[] entries = deployableCompositeCollection.query("contribution=" + contributionURI);
for (Entry<String, Item> entry: entries) {
if (key.equals(entry.getKey())) {
- return entry.getData().getLink();
+ return entry.getData();
}
}
return null;
@@ -276,15 +272,6 @@
*/
private static String key(String uri, QName qname) {
return "composite:" + uri + ';' + qname.getNamespaceURI() + ';' + qname.getLocalPart();
- }
-
- /**
- * Returns a composite title expressed as contributionURI - namespace;localpart.
- * @param qname
- * @return
- */
- private static String title(String uri, QName qname) {
- return uri + " - " + qname.getNamespaceURI() + ';' + qname.getLocalPart();
}
}
Modified: incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java?rev=634144&r1=634143&r2=634144&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java Wed Mar 5 19:43:09 2008
@@ -45,6 +45,7 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
@@ -165,15 +166,6 @@
// Read contribution metadata
for (Entry<String, Item> contributionEntry: contributionEntries) {
Contribution contribution = contribution(contributionEntry.getKey(), contributionEntry.getData().getLink());
- try {
- URI uri = URI.create(contributionEntry.getKey());
- URL url = url(contributionEntry.getData().getLink());
- contribution = (Contribution)contributionContentProcessor.read(null, uri, url);
- ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
- contributionContentProcessor.resolve(contribution, modelResolver);
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
// Create entries for the deployable composites
for (Composite deployable: contribution.getDeployables()) {
@@ -184,7 +176,9 @@
entry.setKey(key);
Item item = new Item();
item.setTitle(title(contributionURI, qname));
- item.setLink(deployableLink(contribution.getLocation(), deployable.getURI()));
+ item.setContents(components(deployable));
+ item.setLink(link(contribution.getLocation(), deployable.getURI()));
+ item.setContents(components(deployable));
entry.setData(item);
entries.add(entry);
}
@@ -210,7 +204,8 @@
// Return an item describing the deployable composite
Item item = new Item();
item.setTitle(title(contributionURI, qname));
- item.setLink(deployableLink(contribution.getLocation(), deployable.getURI()));
+ item.setContents(components(deployable));
+ item.setLink(link(contribution.getLocation(), deployable.getURI()));
return item;
}
}
@@ -257,7 +252,8 @@
entry.setKey(key);
Item item = new Item();
item.setTitle(title(contributionURI, qname));
- item.setLink(deployableLink(contribution.getLocation(), deployable.getURI()));
+ item.setContents(components(deployable));
+ item.setLink(link(contribution.getLocation(), deployable.getURI()));
entry.setData(item);
entries.add(entry);
}
@@ -372,7 +368,7 @@
* @param deployableURI
* @return
*/
- private static String deployableLink(String contributionLocation, String deployableURI) {
+ private static String link(String contributionLocation, String deployableURI) {
URI uri = URI.create(contributionLocation);
if ("file".equals(uri.getScheme())) {
if (new File(uri).isDirectory()) {
@@ -387,6 +383,23 @@
return "/files/" + contributionLocation + "!/" + deployableURI;
}
}
+ }
+
+ /**
+ * Returns the list of components in a composite.
+ *
+ * @param composite
+ * @return
+ */
+ private static String components(Composite composite) {
+ StringBuffer sb = new StringBuffer();
+ for (Component component: composite.getComponents()) {
+ if (sb.length() != 0) {
+ sb.append(" ");
+ }
+ sb.append(component.getName());
+ }
+ return sb.toString();
}
/**
Modified: incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/cloud.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/cloud.html?rev=634144&r1=634143&r2=634144&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/cloud.html (original)
+++ incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/cloud.html Wed Mar 5 19:43:09 2008
@@ -18,7 +18,7 @@
-->
<html>
<head>
-<title>SCA Domain - Node Clouds</title>
+<title>SCA Domain - Clouds</title>
<script type="text/javascript" src="cloud.js"></script>
<script type="text/javascript" src="utils.js"></script>
@@ -53,13 +53,14 @@
for (var i=0; i<entries.length; i++) {
var id = entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
var location = entries[i].getElementsByTagName("link")[0].getAttribute("href");
+ var components = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
var uri = contributionURI(id);
var qname = compositeName(id);
composites += '<tr valign="bottom">'
composites += '<td><input name="composites" type="checkbox" value="' + id + '">' +
'<a href=\"' + location + '\">' + qname + '</a></td>';
- composites += '<td> Node1, Node2, Node3</td>';
+ composites += '<td> ' + components + '</td>';
composites += '<td align="center"><img src="icons/feed-icon.png" border="0"></td>';
composites += '</tr>';
}
@@ -112,9 +113,9 @@
<div id="cloudComposite">
<p style="font-size:150%">
- <b>SCA Domain</b><br><br><b>Node Clouds</b> <a href="/cloud/"><img src="icons/feed-icon.png" border="0"></a>
+ <b>SCA Domain</b><br><br><b>Clouds</b> <a href="/cloud/"><img src="icons/feed-icon.png" border="0"></a>
</p>
- Here is the list of nodes configured in SCA node clouds.
+ Here is the list of nodes configured in SCA clouds.
<br><br>
<form name="cloudCompositeForm">
@@ -127,9 +128,9 @@
</form>
<br/>
- <p><b>Add a Node Cloud</b>
+ <p><b>Add a Cloud</b>
</p>
- Add a node cloud. A cloud is composed of one or more nodes.
+ Add a cloud. A cloud is composed of one or more nodes.
<br><br>
<form name="newCompositeForm">
Modified: incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html?rev=634144&r1=634143&r2=634144&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html (original)
+++ incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html Wed Mar 5 19:43:09 2008
@@ -49,10 +49,12 @@
composites += '<table border="0">';
composites += '<tr valign="bottom"><td><b>Composite</b></td>' +
'<td> <b>Contribution</b></td>' +
+ '<td> <b>Components</b></td>' +
'<td> <b>Deployment</b></td></tr>';
for (var i=0; i<entries.length; i++) {
var id = entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
var location = entries[i].getElementsByTagName("link")[0].getAttribute("href");
+ var components = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
var uri = contributionURI(id);
var qname = compositeName(id);
@@ -60,6 +62,7 @@
composites += '<td><input name="composites" type="checkbox" value="' + id + '">';
composites += '<a href=\"' + location + '\">' + qname + '</a></td>';
composites += '<td> ' + uri + '</td>';
+ composites += '<td> ' + components + '</td>';
composites += '<td align="center"> <a href="/package/?deployable=' + id + '"><img src="icons/feed-icon.png" border="0"></a></td>';
composites += '</tr>';
}
Modified: incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/utils.js
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/utils.js?rev=634144&r1=634143&r2=634144&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/utils.js (original)
+++ incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/utils.js Wed Mar 5 19:43:09 2008
@@ -68,7 +68,7 @@
var tools = new Array();
tools[0] = new Tool("Contributions", "/ui/workspace");
tools[1] = new Tool("Composites", "/ui/composite");
-tools[2] = new Tool("Nodes", "/ui/cloud");
+tools[2] = new Tool("Clouds", "/ui/cloud");
tools[3] = new Tool("Files", "/ui/files");
var home = new Tool("Home", "/ui/home");
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org