Author: jsdelfino
Date: Tue Apr 1 20:59:43 2008
New Revision: 643717
URL: http://svn.apache.org/viewvc?rev=643717&view=rev
Log:
Fix for TUSCANY-2178. Merged changes from trunk.
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/DomainManager.composite
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/cloud.html
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java?rev=643717&r1=643716&r2=643717&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
Tue Apr 1 20:59:43 2008
@@ -100,6 +100,9 @@
@Reference
public LocalItemCollection deployableCollection;
+
+ @Reference(required=false)
+ public LocalItemCollection processCollection;
private ModelFactoryExtensionPoint modelFactories;
private AssemblyFactory assemblyFactory;
@@ -295,6 +298,11 @@
String contributionURI = contributionURI(key);
QName qname = compositeQName(key);
+
+ // Delete/stop the corresponding process, if any
+ try {
+ processCollection.delete(qname.getLocalPart());
+ } catch (Exception e) {}
// Delete a composite from the composite collection
Composite compositeCollection = readCompositeCollection();
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/DomainManager.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/DomainManager.composite?rev=643717&r1=643716&r2=643717&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/DomainManager.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/DomainManager.composite
Tue Apr 1 20:59:43 2008
@@ -136,6 +136,7 @@
<t:binding.http
uri="http://localhost:9990/cloud-source"/>
</service>
<reference name="deployableCollection"
target="DeployableCompositeCollectionComponent/LocalItemCollection"/>
+ <reference name="processCollection"
target="NodeProcessCollectionFacadeComponent/LocalItemCollection"/>
</component>
<component name="CompositeImageCollectionComponent">
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/cloud.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/cloud.html?rev=643717&r1=643716&r2=643717&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/cloud.html
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/cloud.html
Tue Apr 1 20:59:43 2008
@@ -116,8 +116,6 @@
var composites = array(document.cloudCompositeForm.composites);
for (var i = 0; i < composites.length; i++) {
if (composites[i].checked) {
- var id = nodeNames[i];
- processCollection.del(id,
stopCompositeResponse);
var id = composites[i].value;
cloudComposite.del(id, deleteCompositeResponse);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
