Author: jsdelfino
Date: Wed Mar 12 15:51:43 2008
New Revision: 636557
URL: http://svn.apache.org/viewvc?rev=636557&view=rev
Log:
Minor fixes, renamed directory from contributions to files, fixed titles of the
feeds, added missing call to delete files when a composite entry is deleted.
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java
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/DeployableCompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/Admin.composite
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java?rev=636557&r1=636556&r2=636557&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java
Wed Mar 12 15:51:43 2008
@@ -138,7 +138,7 @@
* @return
*/
private static String title(String uri, QName qname) {
- return "Composite " + uri + " - " + qname.getNamespaceURI() + ";" +
qname.getLocalPart();
+ return uri + " - " + qname.getNamespaceURI() + ";" +
qname.getLocalPart();
}
}
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=636557&r1=636556&r2=636557&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
Wed Mar 12 15:51:43 2008
@@ -352,7 +352,7 @@
* @return
*/
private static String title(Contribution contribution) {
- return "Contribution " + contribution.getURI();
+ return contribution.getURI();
}
/**
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=636557&r1=636556&r2=636557&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 12 15:51:43 2008
@@ -723,9 +723,9 @@
*/
private static String title(String uri, QName qname) {
if (uri.equals(deploymentContributionURI)) {
- return "Node " + qname.getLocalPart();
+ return qname.getLocalPart();
} else {
- return "Composite " + uri + " - " + qname.getNamespaceURI() + ";"
+ qname.getLocalPart();
+ return uri + " - " + qname.getNamespaceURI() + ";" +
qname.getLocalPart();
}
}
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java?rev=636557&r1=636556&r2=636557&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
Wed Mar 12 15:51:43 2008
@@ -83,6 +83,8 @@
public class DeployedCompositeCollectionImpl extends HttpServlet implements
ItemCollection, LocalItemCollection {
private static final long serialVersionUID = -3477992129462720901L;
+ private static final String deploymentContributionURI =
Constants.SCA10_TUSCANY_NS + "/cloud";
+
@Property
public String compositeFile;
@@ -264,6 +266,13 @@
if (contributionURI.equals(composite.getURI()) &&
qname.equals(composite.getName())) {
composites.remove(i);
+ if (deploymentContributionDirectory != null &&
contributionURI.equals(deploymentContributionURI)) {
+ File file = new File(deploymentContributionDirectory,
qname.getLocalPart() + ".composite");
+ if (file.exists()) {
+ file.delete();
+ }
+ }
+
// Write the domain composite
writeCompositeCollection(compositeCollection);
return;
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/Admin.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/Admin.composite?rev=636557&r1=636556&r2=636557&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/Admin.composite
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/Admin.composite
Wed Mar 12 15:51:43 2008
@@ -77,7 +77,7 @@
<property name="workspaceFile">workspace.xml</property>
<property name="deploymentContributionDirectory">cloud</property>
<service name="ItemCollection">
- <t:binding.atom uri="http://localhost:9990/workspace"/>
+ <t:binding.atom uri="http://localhost:9990/workspace";
title="Contributions"/>
</service>
<service name="Servlet">
<t:binding.http
uri="http://localhost:9990/contribution"/>
@@ -86,9 +86,9 @@
<component name="FileCollectionComponent">
<implementation.java
class="org.apache.tuscany.sca.workspace.admin.impl.FileCollectionImpl"/>
- <property name="directoryName">contributions</property>
+ <property name="directoryName">files</property>
<service name="ItemCollection">
- <t:binding.atom uri="http://localhost:9990/feed/files"/>
+ <t:binding.atom uri="http://localhost:9990/feed/files";
title="Files"/>
</service>
</component>
@@ -104,7 +104,7 @@
<implementation.java
class="org.apache.tuscany.sca.workspace.admin.impl.DeployedCompositeCollectionImpl"/>
<property name="compositeFile">domain.composite</property>
<service name="ItemCollection">
- <t:binding.atom uri="http://localhost:9990/composite"/>
+ <t:binding.atom uri="http://localhost:9990/composite";
title="Domain Composites"/>
</service>
<service name="Servlet">
<t:binding.http
uri="http://localhost:9990/composite-source"/>
@@ -115,7 +115,7 @@
<component name="DeployableCompositeCollectionComponent">
<implementation.java
class="org.apache.tuscany.sca.workspace.admin.impl.DeployableCompositeCollectionImpl"/>
<service name="ItemCollection">
- <t:binding.atom uri="http://localhost:9990/deployable"/>
+ <t:binding.atom uri="http://localhost:9990/deployable";
title="Deployable Composites"/>
</service>
<service name="Servlet">
<t:binding.http
uri="http://localhost:9990/composite-resolved"/>
@@ -130,7 +130,7 @@
<property name="compositeFile">cloud.composite</property>
<property name="deploymentContributionDirectory">cloud</property>
<service name="ItemCollection">
- <t:binding.atom uri="http://localhost:9990/cloud"/>
+ <t:binding.atom uri="http://localhost:9990/cloud";
title="Nodes"/>
</service>
<service name="Servlet">
<t:binding.http
uri="http://localhost:9990/cloud-source"/>
@@ -141,7 +141,7 @@
<component name="CompositeImageCollectionComponent">
<implementation.java
class="org.apache.tuscany.sca.workspace.admin.impl.CompositeImageCollectionImpl"/>
<service name="ItemCollection">
- <t:binding.atom
uri="http://localhost:9990/composite-image"/>
+ <t:binding.atom
uri="http://localhost:9990/composite-image"; title="Composite Images"/>
</service>
<reference name="contributionCollection"
target="ContributionCollectionComponent/LocalItemCollection"/>
</component>
@@ -149,7 +149,7 @@
<component name="NodeProcessCollectionComponent">
<implementation.java
class="org.apache.tuscany.sca.workspace.admin.impl.NodeProcessCollectionImpl"/>
<service name="ItemCollection">
- <t:binding.atom uri="http://localhost:9990/process"/>
+ <t:binding.atom uri="http://localhost:9990/process";
title="Running Nodes"/>
</service>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
