Author: jsdelfino
Date: Fri Feb 22 09:00:52 2008
New Revision: 630251
URL: http://svn.apache.org/viewvc?rev=630251&view=rev
Log:
Add some links. Fix compile error on JDK 5.
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionFileCollectionImpl.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/WorkspaceCollectionImpl.java
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/files.html
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionFileCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionFileCollectionImpl.java?rev=630251&r1=630250&r2=630251&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionFileCollectionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionFileCollectionImpl.java
Fri Feb 22 09:00:52 2008
@@ -92,12 +92,6 @@
}
public Entry<String, Item>[] query(String queryString) {
- if (queryString.startsWith("importedBy=")) {
- //FIXME Invoke the ContributionDependency code from workspace-impl
-
- } else if (queryString.startsWith("imports=")) {
- //FIXME Invoke the ContributionDependency code from workspace-impl
- }
throw new UnsupportedOperationException();
}
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=630251&r1=630250&r2=630251&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 Feb 22 09:00:52 2008
@@ -75,7 +75,7 @@
response.sendRedirect("/ui/files");
}
catch (Exception e) {
- throw new IOException(e);
+ throw new IOException(e.toString());
}
}
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/WorkspaceCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/WorkspaceCollectionImpl.java?rev=630251&r1=630250&r2=630251&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/WorkspaceCollectionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/WorkspaceCollectionImpl.java
Fri Feb 22 09:00:52 2008
@@ -181,9 +181,12 @@
}
public Entry<String, Item>[] query(String queryString) {
-
- //TODO Implement later
- return null;
+ if (queryString.startsWith("importedBy=")) {
+ //FIXME Invoke the ContributionDependency code from workspace-impl
+ return getAll();
+ } else {
+ throw new UnsupportedOperationException();
+ }
}
/**
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/files.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/files.html?rev=630251&r1=630250&r2=630251&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/files.html
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/files.html
Fri Feb 22 09:00:52 2008
@@ -37,9 +37,9 @@
var list = "";
for (var i=0; i<entries.length; i++) {
var id =
entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
- var uri =
entries[i].getElementsByTagName("link")[0].getAttribute("href");
+ var location =
entries[i].getElementsByTagName("link")[0].getAttribute("href");
list += '<input name="files" type="checkbox"
value="' + id + '">' +
-
'<a href=\"' + uri + '\">' + id + '</a><br/>';
+
'<a href=\"' + location + '\">' + id + '</a><br/>';
}
document.getElementById("files").innerHTML = list;
}
@@ -79,7 +79,7 @@
</form>
<br/>
- <h2>Upload SCA Contribution File</h2>
+ <b>Upload SCA Contribution File</b>
<form method="post" name="uploadFileForm" enctype='multipart/form-data'
action='/files'>
<table border="0">
<tr><td>File:</td><td><input type="file" name="file" /></td></tr>
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=630251&r1=630250&r2=630251&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 Feb 22 09:00:52 2008
@@ -37,9 +37,11 @@
var contributions = "";
for (var i=0; i<entries.length; i++) {
var id =
entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
- var uri =
entries[i].getElementsByTagName("link")[0].getAttribute("href");
+ var location =
entries[i].getElementsByTagName("link")[0].getAttribute("href");
contributions += '<input name="contributions"
type="checkbox" value="' + id + '">' +
-
'<a href=\"' + uri + '\">' + id + '</a><br/>';
+
'<a href=\"' + location + '\">' + id + '</a> ';
+ contributions += '<a
href=\"/workspace/?importedBy=' + id + '\">dependencies</a>';
+ contributions += '<br/>';
}
document.getElementById("contributions").innerHTML =
contributions;
}
@@ -93,11 +95,11 @@
</form>
<br/>
- <h2>Add Contribution</h2>
+ <b>Add Contribution</b>
<form name="newContributionForm">
<table border="0">
<tr><td>Id:</td><td><input type="text" name="contributionID" /></td></tr>
- <tr><td>Location:</td><td><input type="file" name="contributionLocation"
/></td></tr>
+ <tr><td>Address:</td><td><input type="text" name="contributionLocation"
/></td></tr>
</table>
<br/>
<input type="button" onClick="addContribution()" value="Add" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
