You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/04/26 03:46:47 UTC
svn commit: r651780 -
/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/
Author: jsdelfino
Date: Fri Apr 25 18:46:44 2008
New Revision: 651780
URL: http://svn.apache.org/viewvc?rev=651780&view=rev
Log:
Renamed DomainAdminUtil to DomainManagerUtil to be consistent with the other names in that module.
Added:
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java (contents, props changed)
- copied, changed from r651678, incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainAdminUtil.java
Removed:
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainAdminUtil.java
Modified:
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeImageCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeImageCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeImageCollectionImpl.java?rev=651780&r1=651779&r2=651780&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeImageCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeImageCollectionImpl.java Fri Apr 25 18:46:44 2008
@@ -19,9 +19,9 @@
package org.apache.tuscany.sca.domain.manager.impl;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeTitle;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.contributionURI;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeTitle;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.contributionURI;
import java.io.IOException;
import java.net.URLDecoder;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java?rev=651780&r1=651779&r2=651780&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java Fri Apr 25 18:46:44 2008
@@ -19,10 +19,10 @@
package org.apache.tuscany.sca.domain.manager.impl;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.DEPLOYMENT_CONTRIBUTION_URI;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeSimpleTitle;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeSourceLink;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.locationURL;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.DEPLOYMENT_CONTRIBUTION_URI;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeSimpleTitle;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeSourceLink;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.locationURL;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java?rev=651780&r1=651779&r2=651780&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java Fri Apr 25 18:46:44 2008
@@ -19,14 +19,14 @@
package org.apache.tuscany.sca.domain.manager.impl;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeAlternateLink;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeKey;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeSourceLink;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeTitle;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.contributionURI;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.locationURL;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.newRuntime;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeAlternateLink;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeKey;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeSourceLink;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeTitle;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.contributionURI;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.locationURL;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.newRuntime;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -633,7 +633,7 @@
*/
private static Entry<String, Item> entry(Contribution contribution, Composite deployable) {
Entry<String, Item> entry = new Entry<String, Item>();
- entry.setKey(DomainAdminUtil.compositeKey(contribution.getURI(), deployable.getName()));
+ entry.setKey(DomainManagerUtil.compositeKey(contribution.getURI(), deployable.getName()));
entry.setData(item(contribution, deployable));
return entry;
}
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java?rev=651780&r1=651779&r2=651780&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java Fri Apr 25 18:46:44 2008
@@ -19,12 +19,12 @@
package org.apache.tuscany.sca.domain.manager.impl;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.DEPLOYMENT_CONTRIBUTION_URI;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeKey;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeSourceLink;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeTitle;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.contributionURI;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.DEPLOYMENT_CONTRIBUTION_URI;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeKey;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeSourceLink;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeTitle;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.contributionURI;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java (from r651678, incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainAdminUtil.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java?p2=incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java&p1=incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainAdminUtil.java&r1=651678&r2=651780&rev=651780&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainAdminUtil.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java Fri Apr 25 18:46:44 2008
@@ -46,7 +46,7 @@
*
* @version $Rev$ $Date$
*/
-public final class DomainAdminUtil {
+public final class DomainManagerUtil {
static final String DEPLOYMENT_CONTRIBUTION_URI = "http://tuscany.apache.org/cloud";
@@ -110,7 +110,7 @@
* @return
*/
static String compositeSimpleTitle(String uri, QName qname) {
- if (uri.equals(DomainAdminUtil.DEPLOYMENT_CONTRIBUTION_URI)) {
+ if (uri.equals(DomainManagerUtil.DEPLOYMENT_CONTRIBUTION_URI)) {
return qname.getLocalPart();
} else {
return qname.getNamespaceURI() + ";" + qname.getLocalPart();
Propchange: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java?rev=651780&r1=651779&r2=651780&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java Fri Apr 25 18:46:44 2008
@@ -19,10 +19,10 @@
package org.apache.tuscany.sca.domain.manager.impl;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.dynamicReference;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.newRuntime;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.nodeURI;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.dynamicReference;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.newRuntime;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.nodeURI;
import java.net.URI;
import java.util.ArrayList;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java?rev=651780&r1=651779&r2=651780&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java Fri Apr 25 18:46:44 2008
@@ -19,10 +19,10 @@
package org.apache.tuscany.sca.domain.manager.impl;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeKey;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.contributionURI;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainAdminUtil.nodeURI;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeKey;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.contributionURI;
+import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.nodeURI;
import java.io.IOException;
import java.net.URI;