Author: jsdelfino
Date: Wed Feb 27 08:58:39 2008
New Revision: 631644
URL: http://svn.apache.org/viewvc?rev=631644&view=rev
Log:
Changed the composite collection to reference contribution URIs instead of
contribution locations.
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/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/workspace.html
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=631644&r1=631643&r2=631644&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 Feb 27 08:58:39 2008
@@ -119,7 +119,7 @@
entry.setKey(name(composite.getName()));
Item item = new Item();
item.setTitle(name(composite.getName()));
- item.setLink(composite.getURI());
+ item.setLink("/workspace/" + composite.getURI());
entry.setData(item);
entries.add(entry);
}
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=631644&r1=631643&r2=631644&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 Feb 27 08:58:39 2008
@@ -65,7 +65,7 @@
function addComposite() {
var id = document.newCompositeForm.compositeQName.value;
- var location =
document.newCompositeForm.compositeLocation.value;
+ var location = document.newCompositeForm.contributionURI.value;
var entry = '<entry xmlns="http://www.w3.org/2005/Atom";>' +
'<title>Contribution - ' + id +'</title>' +
'<id>' + id + '</id>' +
@@ -77,7 +77,7 @@
function addCompositeResponse() {
document.newCompositeForm.compositeQName.value = "";
- document.newCompositeForm.compositeLocation.value = "";
+ document.newCompositeForm.contributionURI.value = "";
getComposites();
}
@@ -101,7 +101,7 @@
<form name="newCompositeForm">
<table border="0">
<tr><td>QName:</td><td><input type="text" name="compositeQName"
/></td></tr>
- <tr><td>Address:</td><td><input type="text" name="compositeLocation"
/></td></tr>
+ <tr><td>Contribution URI:</td><td><input type="text"
name="contributionURI" /></td></tr>
</table>
<br/>
<input type="button" onClick="addComposite()" value="Add" />
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=631644&r1=631643&r2=631644&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 Feb 27 08:58:39 2008
@@ -65,7 +65,7 @@
function addComposite() {
var id = document.newCompositeForm.compositeQName.value;
- var location =
document.newCompositeForm.compositeLocation.value;
+ var location = document.newCompositeForm.contributionURI.value;
var entry = '<entry xmlns="http://www.w3.org/2005/Atom";>' +
'<title>Contribution - ' + id +'</title>' +
'<id>' + id + '</id>' +
@@ -77,7 +77,7 @@
function addCompositeResponse() {
document.newCompositeForm.compositeQName.value = "";
- document.newCompositeForm.compositeLocation.value = "";
+ document.newCompositeForm.contributionURI.value = "";
getComposites();
}
@@ -101,7 +101,7 @@
<form name="newCompositeForm">
<table border="0">
<tr><td>QName:</td><td><input type="text" name="compositeQName"
/></td></tr>
- <tr><td>Address:</td><td><input type="text" name="compositeLocation"
/></td></tr>
+ <tr><td>Contribution URI:</td><td><input type="text"
name="contributionURI" /></td></tr>
</table>
<br/>
<input type="button" onClick="addComposite()" value="Add" />
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=631644&r1=631643&r2=631644&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
Wed Feb 27 08:58:39 2008
@@ -101,7 +101,7 @@
<b>Add Contribution</b>
<form name="newContributionForm">
<table border="0">
- <tr><td>Id:</td><td><input type="text" name="contributionID" /></td></tr>
+ <tr><td>Contribution URI:</td><td><input type="text" name="contributionID"
/></td></tr>
<tr><td>Address:</td><td><input type="text" name="contributionLocation"
/></td></tr>
</table>
<br/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
