Author: jsdelfino
Date: Fri Mar 7 03:55:41 2008
New Revision: 634627
URL: http://svn.apache.org/viewvc?rev=634627&view=rev
Log:
Minor URL format and UI adjustments. Do not return anymore a contribution in
its own list of dependencies.
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionFileServiceImpl.java
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/PackageCollectionImpl.java
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html
incubator/tuscany/java/sca/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java?rev=634627&r1=634626&r2=634627&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java
Fri Mar 7 03:55:41 2008
@@ -219,12 +219,12 @@
}
public Entry<String, Item>[] query(String queryString) {
- if (queryString.startsWith("requiredBy=")) {
+ if (queryString.startsWith("dependencies=") ||
queryString.startsWith("alldependencies=")) {
// Return the collection of dependencies of the specified
contribution
List<Entry<String, Item>> entries = new
ArrayList<Entry<String,Item>>();
- // Read the contribution metadata into a temporary workspace
+ // Read the metadata for all the contributions into a temporary
workspace
Workspace dependencyWorkspace = workspaceFactory.createWorkspace();
try {
for (Contribution c: workspace.getContributions()) {
@@ -237,15 +237,24 @@
throw new ServiceRuntimeException(e);
}
- // Calculate the contribution dependencies
- String key = queryString.substring(11);
+ // Look for the specified contribution
+ int e = queryString.indexOf('=');
+ String key = queryString.substring(e+1);
for (Contribution contribution:
dependencyWorkspace.getContributions()) {
if (key.equals(contribution.getURI())) {
+
+ // Compute the contribution dependencies
ContributionDependencyAnalyzer analyzer = new
ContributionDependencyAnalyzer();
List<Contribution> dependencies =
analyzer.calculateContributionDependencies(dependencyWorkspace, contribution);
- // Build the collection of dependencies
+ // Returns entries for the dependencies
+ // optionally skip the specified contribution
+ boolean allDependencies =
queryString.startsWith("alldependencies=");
for (Contribution dependency: dependencies) {
+ if (!allDependencies && dependency == contribution) {
+ // Skip the specified contribution
+ continue;
+ }
entries.add(entry(dependency));
}
break;
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionFileServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionFileServiceImpl.java?rev=634627&r1=634626&r2=634627&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionFileServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionFileServiceImpl.java
Fri Mar 7 03:55:41 2008
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.net.URLConnection;
import java.net.URLDecoder;
import java.util.List;
@@ -122,7 +123,10 @@
}
// Read the file and write to response
- InputStream is = uri.toURL().openStream();
+ URLConnection connection = uri.toURL().openConnection();
+ connection.setUseCaches(false);
+ connection.connect();
+ InputStream is = connection.getInputStream();
ServletOutputStream os = response.getOutputStream();
byte[] buffer = new byte[4096];
for (;;) {
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/PackageCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/PackageCollectionImpl.java?rev=634627&r1=634626&r2=634627&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/PackageCollectionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/PackageCollectionImpl.java
Fri Mar 7 03:55:41 2008
@@ -75,11 +75,12 @@
}
public Entry<String, Item>[] query(String queryString) {
- if (queryString.startsWith("deployable=")) {
+ if (queryString.startsWith("composite=")) {
// Expecting a key in the form:
// composite:contributionURI;namespace;localName
- String key = queryString.substring(11);
+ int e = queryString.indexOf('=');
+ String key = queryString.substring(e + 1);
String contributionURI = uri(key);
QName qname = qname(key);
@@ -98,7 +99,7 @@
entries.add(compositeEntry);
// Get the collection of required contributions
- Entry<String, Item>[] contributionEntries =
contributionCollection.query("requiredBy=" + contributionURI);
+ Entry<String, Item>[] contributionEntries =
contributionCollection.query("alldependencies=" + contributionURI);
for (Entry<String, Item> entry: contributionEntries) {
entries.add(entry);
}
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=634627&r1=634626&r2=634627&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
Fri Mar 7 03:55:41 2008
@@ -50,7 +50,7 @@
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>';
+ '<td> <b>Install Image</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");
@@ -63,7 +63,7 @@
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 += '<td
align="center"> <a href="/package/?composite=' + id + '"><img
src="icons/feed-icon.png" border="0"></a></td>';
composites += '</tr>';
}
composites += '</table>';
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html?rev=634627&r1=634626&r2=634627&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html
Fri Mar 7 03:55:41 2008
@@ -46,7 +46,7 @@
contributions += '<tr valign="bottom">';
contributions += '<td><input
name="contributions" type="checkbox" value="' + id + '">' +
'<a href=\"' + location + '\">' + id + '</a></td>';
- contributions += '<td
align="center"> <a href=\"/workspace/?requiredBy=' + id +
'\"><img src="icons/feed-icon.png" border="0"></a></td>';
+ contributions += '<td
align="center"> <a href=\"/workspace/?dependencies=' + id +
'\"><img src="icons/feed-icon.png" border="0"></a></td>';
contributions += '<td
align="center"> <a href=\"/deployable/?contribution=' + id +
'\"><img src="icons/feed-icon.png" border="0"></a></td>';
contributions += '</tr>';
}
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java?rev=634627&r1=634626&r2=634627&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
Fri Mar 7 03:55:41 2008
@@ -86,12 +86,12 @@
}
public void testDependencies1() {
- Entry<String, Item>[] entries =
contributionCollection.query("requiredBy=store");
+ Entry<String, Item>[] entries =
contributionCollection.query("alldependencies=store");
assertEquals(2, entries.length);
}
public void testDependencies2() {
- Entry<String, Item>[] entries =
contributionCollection.query("requiredBy=assets");
+ Entry<String, Item>[] entries =
contributionCollection.query("alldependencies=assets");
assertEquals(1, entries.length);
assertEquals("assets", entries[0].getKey());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
