Author: jsdelfino
Date: Sun Apr 27 12:21:09 2008
New Revision: 652004

URL: http://svn.apache.org/viewvc?rev=652004&view=rev
Log:
Improving usability of the domain manager app. Show some feedback when 
starting/stopping nodes, display node status and a link to the node log if the 
node is started. Reordered some columns. Fixed terminology to be more 
consistent with node2-impl, renamed node-image to node-config in the UI and the 
domain manager URLs.

Added:
    
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
   (contents, props changed)
      - copied, changed from r651780, 
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeImageCollectionImpl.java
Removed:
    
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeImageCollectionImpl.java
Modified:
    
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/resources/DomainManager.composite
    
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/cloud.html
    
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/composite.html
    
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
    
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
    
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
    incubator/tuscany/java/sca/samples/calculator-distributed/README
    
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
    
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
    
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
    
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
    
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
    
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogMediationNode.java
    incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogsNode.java
    incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCurrencyNode.java
    incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreDBNode.java
    incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreEUNode.java
    incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMarketNode.java
    incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMashupNode.java
    incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMergerNode.java
    incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreNode.java
    
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreSupplierNode.java

Copied: 
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
 (from r651780, 
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/CompositeConfigurationCollectionImpl.java?p2=incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java&p1=incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeImageCollectionImpl.java&r1=651780&r2=652004&rev=652004&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/CompositeConfigurationCollectionImpl.java
 Sun Apr 27 12:21:09 2008
@@ -47,16 +47,16 @@
 import org.osoa.sca.annotations.Service;
 
 /**
- * Implementation of a composite install image collection service. 
+ * Implementation of a composite configuration collection service. 
  *
  * @version $Rev$ $Date$
  */
 @Scope("COMPOSITE")
 @Service(interfaces={ItemCollection.class, LocalItemCollection.class, 
Servlet.class})
-public class CompositeImageCollectionImpl extends HttpServlet implements 
ItemCollection, LocalItemCollection, Servlet {
+public class CompositeConfigurationCollectionImpl extends HttpServlet 
implements ItemCollection, LocalItemCollection, Servlet {
     private static final long serialVersionUID = 1L;
 
-    private final static Logger logger = 
Logger.getLogger(CompositeImageCollectionImpl.class.getName());    
+    private final static Logger logger = 
Logger.getLogger(CompositeConfigurationCollectionImpl.class.getName());    
 
     @Reference
     public LocalItemCollection contributionCollection;
@@ -141,7 +141,7 @@
         logger.info("get " + key);
         
         // The key contains a node name, redirect 
-        // to the corresponding composite image
+        // to the corresponding composite config
             
         // Get the collection of cloud composites
         Entry<String, Item>[] cloudEntries = cloudCollection.getAll();
@@ -156,9 +156,9 @@
                 int i = related.indexOf("composite:");
                 if (i != -1) {
                     
-                    // Redirect to its composite image
-                    String compositeImage = "/composite-image/?composite=" + 
related.substring(i);
-                    response.sendRedirect(compositeImage);
+                    // Redirect to its composite config
+                    String compositeConfiguration = 
"/composite-config/?composite=" + related.substring(i);
+                    response.sendRedirect(compositeConfiguration);
                     return;
                 }
             }

Propchange: 
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

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=652004&r1=652003&r2=652004&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
 Sun Apr 27 12:21:09 2008
@@ -29,6 +29,7 @@
 import static 
org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.newRuntime;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
@@ -71,9 +72,13 @@
 import 
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
 import 
org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
 import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
 import 
org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionListener;
+import 
org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint;
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionRepository;
 import 
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import 
org.apache.tuscany.sca.contribution.xml.ContributionGeneratedMetadataDocumentProcessor;
 import 
org.apache.tuscany.sca.contribution.xml.ContributionMetadataDocumentProcessor;
@@ -131,6 +136,7 @@
     private StAXArtifactProcessor<Composite> compositeProcessor;
     private XMLOutputFactory outputFactory;
     private ContributionDependencyBuilder contributionDependencyBuilder;
+    private List<ContributionListener> contributionListeners; 
     private CompositeBuilder compositeBuilder;
     private CompositeBuilder compositeIncludeBuilder;
     private CompositeBuilder nodeConfigurationBuilder;
@@ -184,6 +190,9 @@
         compositeBuilder = new CompositeBuilderImpl(assemblyFactory, 
scaBindingFactory, intentAttachPointTypeFactory, contractMapper, monitor);
         compositeIncludeBuilder = new CompositeIncludeBuilderImpl(monitor);
         nodeConfigurationBuilder = new 
NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, contractMapper, 
null, monitor);
+        
+        //FIXME Remove this later
+        contributionListeners = 
extensionPoints.getExtensionPoint(ContributionListenerExtensionPoint.class).getContributionListeners();
     }
     
     public Entry<String, Item>[] getAll() {
@@ -311,7 +320,7 @@
         QName qname = compositeQName(key);
         
         // Somewhere to store the composite we expect to write out at the end
-        Composite compositeImage = null;
+        Composite compositeConfiguration = null;
 
         // Create a domain composite model
         Composite domainComposite = assemblyFactory.createComposite();
@@ -385,12 +394,12 @@
             
             // store away the composite we are generating the deployable XML 
for. 
             if (qname.equals(deployable.getName())){
-                compositeImage = deployable;
+                compositeConfiguration = deployable;
             }
         }
         
         // Composite not found
-        if (compositeImage == null) {
+        if (compositeConfiguration == null) {
             response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
             return;
         }
@@ -449,12 +458,12 @@
         // we have to reverse the flattening that went on when the domain
         // composite was built
         List<Component> tempComponentList = new ArrayList<Component>();
-        tempComponentList.addAll(compositeImage.getComponents());
-        compositeImage.getComponents().clear();
+        tempComponentList.addAll(compositeConfiguration.getComponents());
+        compositeConfiguration.getComponents().clear();
         for (Component inputComponent : tempComponentList){
             for (Component deployComponent : domainComposite.getComponents()){
                 if 
(deployComponent.getName().equals(inputComponent.getName())){
-                    compositeImage.getComponents().add(deployComponent);
+                    
compositeConfiguration.getComponents().add(deployComponent);
                 }
             }
         }
@@ -463,7 +472,7 @@
         try {
             response.setContentType("text/xml");
             XMLStreamWriter writer = 
outputFactory.createXMLStreamWriter(response.getOutputStream());
-            compositeProcessor.write(compositeImage, writer);
+            compositeProcessor.write(compositeConfiguration, writer);
         } catch (Exception e) {
             response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, 
e.toString());
             return;
@@ -540,6 +549,13 @@
             // Resolve the contribution dependencies
             
contributionDependencyBuilder.buildContributionDependencies(contribution, 
workspace);
             
+            // FIXME simplify this later
+            // Fix up contribution imports
+            ContributionRepository dummyRepository = new 
DummyContributionRepository(workspace.getContributions());
+            for (ContributionListener listener: contributionListeners) {
+                listener.contributionAdded(dummyRepository, contribution);
+            }            
+            
             contributionContentProcessor.resolve(contribution, 
workspace.getModelResolver());
             return contribution;
 
@@ -561,7 +577,21 @@
      * @throws NotFoundException
      */
     private Contribution contribution(String contributionURI, String 
contributionLocation) throws ContributionReadException {
-        return contribution(workspaceFactory.createWorkspace(), 
contributionURI, contributionLocation);
+        try {
+            URI uri = URI.create(contributionURI);
+            URL location = locationURL(contributionLocation);
+            Contribution contribution = 
(Contribution)contributionContentProcessor.read(null, uri, location);
+            
+            contributionContentProcessor.resolve(contribution, new 
DefaultModelResolver());
+            return contribution;
+
+        } catch (ContributionReadException e) {
+            throw e;
+        } catch (ContributionResolveException e) {
+            throw new ContributionReadException(e);
+        } catch (MalformedURLException e) {
+            throw new ContributionReadException(e);
+        }
     }
     
     /**
@@ -657,6 +687,46 @@
         item.setAlternate(compositeAlternateLink(contributionLocation, 
deployableURI));
         item.setRelated(relatedLink(deployable));
         return item;
+    }
+
+    /**
+     * FIXME Remove this later DummyContributionRepository
+     */
+    private class DummyContributionRepository implements 
ContributionRepository {
+        private List<Contribution> contributions;
+
+        public DummyContributionRepository(List<Contribution> contributions) {
+            this.contributions = contributions;
+        }
+        public void addContribution(Contribution contribution) {
+        }
+        public URL find(String contribution) {
+            return null;
+        }
+        public Contribution getContribution(String uri) {
+            return null;
+        }
+        public List<Contribution> getContributions() {
+            return contributions;
+        }
+        public URI getDomain() {
+            return null;
+        }
+        public List<String> list() {
+            return null;
+        }
+        public void remove(String contribution) {
+        }
+        public void removeContribution(Contribution contribution) {
+        }
+        public URL store(String contribution, URL sourceURL, InputStream 
contributionStream) throws IOException {
+            return null;
+        }
+        public URL store(String contribution, URL sourceURL) throws 
IOException {
+            return null;
+        }
+        public void updateContribution(Contribution contribution) {
+        }
     }
 
 }

Modified: 
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite
 (original)
+++ 
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite
 Sun Apr 27 12:21:09 2008
@@ -145,13 +145,13 @@
         <reference name="processCollection" 
target="NodeProcessCollectionFacadeComponent/LocalItemCollection"/>
     </component>
 
-    <component name="CompositeImageCollectionComponent">
-        <implementation.java 
class="org.apache.tuscany.sca.domain.manager.impl.CompositeImageCollectionImpl"/>
+    <component name="CompositeConfigurationCollectionComponent">
+        <implementation.java 
class="org.apache.tuscany.sca.domain.manager.impl.CompositeConfigurationCollectionImpl"/>
                <service name="ItemCollection">
-                       <t:binding.atom 
uri="http://localhost:9990/composite-image"; title="Install Image"/>
+                       <t:binding.atom 
uri="http://localhost:9990/composite-config"; title="Node Configuration"/>
                </service>
                <service name="Servlet">
-                       <t:binding.http uri="http://localhost:9990/node-image"/>
+                       <t:binding.http 
uri="http://localhost:9990/node-config"/>
                </service>
                <reference name="contributionCollection" 
target="ContributionCollectionComponent/LocalItemCollection"/>
                <reference name="cloudCollection" 
target="CloudCollectionComponent/LocalItemCollection"/>

Modified: 
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/cloud.html
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/cloud.html?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/cloud.html 
(original)
+++ 
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/cloud.html 
Sun Apr 27 12:21:09 2008
@@ -62,8 +62,8 @@
                        var entries = feed.getElementsByTagName("entry");
                        var composites = "";
                        composites += '<table width="100%">';
-                       composites += 
'<tr><th>Node</th><th>Composite</th><th>Contribution</th><th>Install 
Image</th>' +
-                       '<th>Log</th></tr>';
+                       composites += 
'<tr><th>Node</th><th>Status</th><th>Composite</th>' +
+                       '<th>Contribution</th><th>Node Config</th></tr>';
                        
                        for (var i=0; i<entries.length; i++) {
                                var nodeId = 
entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
@@ -98,20 +98,45 @@
                                if (content.indexOf('<span id="problem"') != 
-1) {
                                        composites += '<td><input 
name="composites" type="checkbox" value="' + nodeId + '">' +
                                                                                
        '<a href=\"' + nodeLink + '\">' + nodeName + '</a></td>';
+                                       composites += '<td><span id="status_' + 
nodeName + '">unknown</span></td>';
                                        composites += '<td>' + content + 
'</td>';
                                        composites += '<td>' + uri + '</td>';
                                } else {
                                        composites += '<td><input 
name="composites" type="checkbox" value="' + nodeId + '">' +
                                                                                
        '<a href=\"' + nodeLink + '\">' + nodeName + '</a></td>';
+                                       composites += '<td><span id="status_' + 
nodeName + '">unknown</span></td>';
                                        composites += '<td><a href=\"' + 
compositeLink + '\">' + qname + '</a></td>';
                                        composites += '<td><a 
href="/contribution/' + uri + '">' + uri + '</a></td>';
                                }
-                               composites += '<td><a href="/node-image/' + 
nodeName + '"><img src="icons/feed-icon.png" border="0"></a></td>';
-                               composites += '<td><a href="/processes/?node=' 
+ nodeName + '"><img src="icons/feed-icon.png" border="0"></a></td>';
+                               composites += '<td><a href="/node-config/' + 
nodeName + '"><img src="icons/feed-icon.png" border="0"></a></td>';
                                composites += '</tr>';
                        }
                        composites += '</table>';
                        document.getElementById("composites").innerHTML = 
composites;
+
+                       processCollection.get("", getProcessesResponse);
+               }
+       }
+       
+       function getProcessesResponse(feed) {
+               if (feed != null) {
+                       var nodeStatus = new Array();
+                       
+                       var entries = feed.getElementsByTagName("entry");
+                       for (var i=0; i<entries.length; i++) {
+                               var nodeName = 
entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
+                               nodeStatus[nodeName] = 'started';
+                       }
+
+                       for (var i = 0; i < nodeNames.length; i++) {
+                               var element = document.getElementById('status_' 
+ nodeNames[i]);
+                               var nodeName = nodeNames[i];
+                               if (nodeStatus[nodeName] == null) {
+                                       element.innerHTML = 
'<span>stopped</span>';
+                               } else {
+                                       element.innerHTML = '<span><a 
style="color: green" href="/processes/?node=' + nodeName + 
'">started</a></span>';
+                               }
+                       }
                }
        }
 
@@ -188,6 +213,8 @@
        }
 
        function startNodeResponse() {
+               processCollection.get("", getProcessesResponse);
+               
                for (var i = 0; i < composites.length; i++) {
                        if (composites[i].checked) {
                          composites[i].checked = false;
@@ -206,6 +233,8 @@
        }
 
        function stopNodeResponse() {
+               processCollection.get("", getProcessesResponse);
+               
                for (var i = 0; i < composites.length; i++) {
                        if (composites[i].checked) {
                          composites[i].checked = false;

Modified: 
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/composite.html
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/composite.html?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/composite.html
 (original)
+++ 
incubator/tuscany/java/sca/modules/domain-manager/src/main/resources/composite.html
 Sun Apr 27 12:21:09 2008
@@ -54,7 +54,7 @@
                        '<th>Contribution</th>' +
                        '<th>Components</th>' +
                        '</tr>';
-                       //'<th>Composite Install Image</th>' +
+                       //'<th>Composite Configuration</th>' +
                        
                        for (var i=0; i<entries.length; i++) {
                                var id = 
entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
@@ -84,7 +84,7 @@
                                composites += '<a href=\"' + link + '\">' + 
qname + '</a></td>';
                                composites += '<td><a href="/contribution/' + 
uri + '">' + uri + '</a></td>';
                                composites += '<td class=tdw>' + components + 
'</td>';
-                               //composites += '<td><a 
href="/composite-image/?composite=' + id + '"><img src="icons/feed-icon.png" 
border="0"></a></td>';
+                               //composites += '<td><a 
href="/composite-config/?composite=' + id + '"><img src="icons/feed-icon.png" 
border="0"></a></td>';
                                composites += '</tr>';
                        }
                        composites += '</table>';

Modified: 
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
 Sun Apr 27 12:21:09 2008
@@ -30,13 +30,13 @@
     private static final String DEFAULT_DOMAIN = "http://localhost:9990";;
 
     /**
-     * Determine the URI of a node image. The domain URI can be configured
+     * Determine the URI of a node configuration. The domain URI can be 
configured
      * using a TUSCANY_DOMAIN system property or environment variable.
      * 
      * @param nodeName
      * @return
      */
-    public static String nodeImageURI(String nodeName) {
+    public static String nodeConfigurationURI(String nodeName) {
         String domain = System.getProperty(TUSCANY_DOMAIN);
         if (domain == null || domain.length() == 0) {
             domain = System.getenv(TUSCANY_DOMAIN);
@@ -44,8 +44,8 @@
         if (domain == null || domain.length() ==0) {
             domain = DEFAULT_DOMAIN;
         }
-        String nodeImage = domain + "/node-image/" + nodeName;
-        return nodeImage;
+        String nodeConfiguration = domain + "/node-config/" + nodeName;
+        return nodeConfiguration;
     }
     
 }

Modified: 
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
 Sun Apr 27 12:21:09 2008
@@ -191,7 +191,7 @@
         Item item = new Item();
         String key = vm.getNodeName();
         item.setTitle(title(key));
-        item.setLink("/node-image/" + vm.getNodeName());
+        item.setLink("/node-config/" + vm.getNodeName());
         item.setContents("<span id=\"log\" style=\"white-space: nowrap; 
font-size: small\">" + vm.getLog().toString() + "</span>");
         return item;
     }
@@ -216,17 +216,17 @@
          */
         private void start() throws IOException {
 
-            // Determine the node image URI
-            String nodeImageURI = 
NodeImplementationLauncherUtil.nodeImageURI(nodeName);
+            // Determine the node configuration URI
+            String nodeConfigurationURI = 
NodeImplementationLauncherUtil.nodeConfigurationURI(nodeName);
             
             // Build the Java VM command line
             Properties props = System.getProperties();
             String java = props.getProperty("java.home") + "/bin/java";
             String cp = props.getProperty("java.class.path");
             String main = NodeLauncher.class.getName();
-            final String[] command = new String[]{ java, "-cp", cp, main , 
nodeImageURI};
+            final String[] command = new String[]{ java, "-cp", cp, main , 
nodeConfigurationURI};
 
-            logger.info("Starting " + "java " + main + " " + nodeImageURI);
+            logger.info("Starting " + "java " + main + " " + 
nodeConfigurationURI);
             
             // Start the VM
             ProcessBuilder builder = new ProcessBuilder(command);

Modified: 
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
 Sun Apr 27 12:21:09 2008
@@ -108,12 +108,12 @@
             nodeName = nodeName.substring(0, nodeName.length() - 1); 
         }
         
-        // Determine the node image URI
-        String nodeImage = 
NodeImplementationLauncherUtil.nodeImageURI(nodeName);
+        // Determine the node configuration URI
+        String nodeConfiguration = 
NodeImplementationLauncherUtil.nodeConfigurationURI(nodeName);
         
         // Create the SCA node
         SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(nodeImage);
+        node = nodeFactory.createSCANode(nodeConfiguration);
         
         // Register the Servlet host
         ServletHostExtensionPoint servletHosts = servletHosts(node);

Modified: incubator/tuscany/java/sca/samples/calculator-distributed/README
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/README?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/README (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/README Sun Apr 27 
12:21:09 2008
@@ -91,7 +91,7 @@
                                     you will see that the node is configured
                                     using a URL of the form:
                                     
-                                    http://localhost:9990/node-image/NodeA
+                                    http://localhost:9990/node-config/NodeA
                                     
                                     This retrieves the information required
                                     to configure NodeA from the domain.
@@ -249,10 +249,10 @@
      [java] INFO: Added Servlet mapping: http://L3AW203:9990/cloud-source/*
      [java] 26-Mar-2008 12:55:21 
org.apache.tuscany.sca.http.tomcat.TomcatServer
  addServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/composite-image/*
+     [java] INFO: Added Servlet mapping: http://L3AW203:9990/composite-config/*
      [java] 26-Mar-2008 12:55:21 
org.apache.tuscany.sca.http.tomcat.TomcatServer
  addServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/node-image/*
+     [java] INFO: Added Servlet mapping: http://L3AW203:9990/node-config/*
      [java] 26-Mar-2008 12:55:21 
org.apache.tuscany.sca.http.tomcat.TomcatServer
  addServletMapping
      [java] INFO: Added Servlet mapping: http://L3AW203:9990/quickstart/*
@@ -279,7 +279,7 @@
      [java] INFO: Apache Tuscany SCA Node starting...
      [java] 26-Mar-2008 12:55:42 
org.apache.tuscany.sca.node.launcher.NodeLaunch
 er main
-     [java] INFO: SCA Node configuration: 
http://localhost:9990/node-image/NodeB
+     [java] INFO: SCA Node configuration: 
http://localhost:9990/node-config/NodeB
 
      [java] 26-Mar-2008 12:55:42 
org.apache.tuscany.sca.node.launcher.NodeLaunch
 erUtil collectJARFiles
@@ -293,7 +293,7 @@
 .2-incubating-SNAPSHOT\modules
      [java] 26-Mar-2008 12:55:42 org.apache.tuscany.sca.node.impl.NodeImpl 
<init
 >
-     [java] INFO: Creating node: http://localhost:9990/node-image/NodeB
+     [java] INFO: Creating node: http://localhost:9990/node-config/NodeB
      [java] 26-Mar-2008 12:55:45 org.apache.tuscany.sca.node.impl.NodeImpl 
confi
 gureNode
      [java] INFO: Loading contribution: 
file:/C:/simon/tuscany/sca-java-1.2/dist
@@ -305,7 +305,7 @@
 mposite:nodeB;http://sample;CalculatorB
      [java] 26-Mar-2008 12:55:47 org.apache.tuscany.sca.node.impl.NodeImpl 
start
 
-     [java] INFO: Starting node: http://localhost:9990/node-image/NodeB
+     [java] INFO: Starting node: http://localhost:9990/node-config/NodeB
      [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
      [java] 26-Mar-2008 12:55:53 org.apache.tuscany.sca.http.jetty.JettyServer 
a
 ddServletMapping
@@ -325,7 +325,7 @@
      [java] INFO: Apache Tuscany SCA Node starting...
      [java] 26-Mar-2008 12:56:01 
org.apache.tuscany.sca.node.launcher.NodeLaunch
 er main
-     [java] INFO: SCA Node configuration: 
http://localhost:9990/node-image/NodeC
+     [java] INFO: SCA Node configuration: 
http://localhost:9990/node-config/NodeC
 
      [java] 26-Mar-2008 12:56:01 
org.apache.tuscany.sca.node.launcher.NodeLaunch
 erUtil collectJARFiles
@@ -339,7 +339,7 @@
 .2-incubating-SNAPSHOT\modules
      [java] 26-Mar-2008 12:56:01 org.apache.tuscany.sca.node.impl.NodeImpl 
<init
 >
-     [java] INFO: Creating node: http://localhost:9990/node-image/NodeC
+     [java] INFO: Creating node: http://localhost:9990/node-config/NodeC
      [java] 26-Mar-2008 12:56:03 org.apache.tuscany.sca.node.impl.NodeImpl 
confi
 gureNode
      [java] INFO: Loading contribution: 
file:/C:/simon/tuscany/sca-java-1.2/dist
@@ -351,7 +351,7 @@
 mposite:nodeC;http://sample;CalculatorC
      [java] 26-Mar-2008 12:56:04 org.apache.tuscany.sca.node.impl.NodeImpl 
start
 
-     [java] INFO: Starting node: http://localhost:9990/node-image/NodeC
+     [java] INFO: Starting node: http://localhost:9990/node-config/NodeC
      [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
      [java] 26-Mar-2008 12:56:10 org.apache.tuscany.sca.http.jetty.JettyServer 
a
 ddServletMapping
@@ -368,7 +368,7 @@
 runNodeA:
      [java] 26-Mar-2008 12:56:10 org.apache.tuscany.sca.node.impl.NodeImpl 
<init
 >
-     [java] INFO: Creating node: http://localhost:9990/node-image/NodeA
+     [java] INFO: Creating node: http://localhost:9990/node-config/NodeA
      [java] 26-Mar-2008 12:56:12 org.apache.tuscany.sca.node.impl.NodeImpl 
confi
 gureNode
      [java] INFO: Loading contribution: 
file:/C:/simon/tuscany/sca-java-1.2/dist
@@ -388,7 +388,7 @@
 service: AddServiceComponentB
      [java] 26-Mar-2008 12:56:14 org.apache.tuscany.sca.node.impl.NodeImpl 
start
 
-     [java] INFO: Starting node: http://localhost:9990/node-image/NodeA
+     [java] INFO: Starting node: http://localhost:9990/node-config/NodeA
      [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
      [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
      [java] CalculatorService - add 3.0 and 2.0
@@ -400,7 +400,7 @@
      [java] CalculatorService - divide 3.0 and 2.0
      [java] 3 / 2=1.5
      [java] 26-Mar-2008 12:56:20 org.apache.tuscany.sca.node.impl.NodeImpl stop
-     [java] INFO: Stopping node: http://localhost:9990/node-image/NodeA
+     [java] INFO: Stopping node: http://localhost:9990/node-config/NodeA
 
 Building And Running The Sample Using Maven 
 -------------------------------------------
@@ -413,7 +413,7 @@
 
 You should see the following output at the end of the test phase.
 
-INFO: Starting node: http://localhost:9990/node-image/NodeA
+INFO: Starting node: http://localhost:9990/node-config/NodeA
 CalculatorService - add 3.0 and 2.0
 AddService - add 3.0 and 2.0
 CalculatorService - subtract 3.0 and 2.0
@@ -421,11 +421,11 @@
 CalculatorService - multiply 3.0 and 2.0
 CalculatorService - divide 3.0 and 2.0
 26-Mar-2008 13:00:52 org.apache.tuscany.sca.node.impl.NodeImpl stop
-INFO: Stopping node: http://localhost:9990/node-image/NodeC
+INFO: Stopping node: http://localhost:9990/node-config/NodeC
 26-Mar-2008 13:00:52 org.apache.tuscany.sca.node.impl.NodeImpl stop
-INFO: Stopping node: http://localhost:9990/node-image/NodeB
+INFO: Stopping node: http://localhost:9990/node-config/NodeB
 26-Mar-2008 13:00:52 org.apache.tuscany.sca.node.impl.NodeImpl stop
-INFO: Stopping node: http://localhost:9990/node-image/NodeA
+INFO: Stopping node: http://localhost:9990/node-config/NodeA
 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.328 sec
 
 Results :

Modified: 
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
 (original)
+++ 
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
 Sun Apr 27 12:21:09 2008
@@ -33,7 +33,7 @@
         try {
             
             NodeLauncher nodeLauncher = NodeLauncher.newInstance();
-            node = 
nodeLauncher.createNode("http://localhost:9990/node-image/NodeA";);
+            node = 
nodeLauncher.createNode("http://localhost:9990/node-config/NodeA";);
 
             node.start();
             

Modified: 
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
 (original)
+++ 
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
 Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchCalculatorNodeB {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/NodeB"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/NodeB"});
     }
 }

Modified: 
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
 (original)
+++ 
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
 Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchCalculatorNodeC {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/NodeC"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/NodeC"});
     }
 }

Modified: 
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
 Sun Apr 27 12:21:09 2008
@@ -54,9 +54,9 @@
             manager.start();
             
             SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-            nodeC  = 
nodeFactory.createSCANode("http://localhost:9990/node-image/NodeC";);
-            nodeB  = 
nodeFactory.createSCANode("http://localhost:9990/node-image/NodeB";);
-            nodeA  = 
nodeFactory.createSCANode("http://localhost:9990/node-image/NodeA";);
+            nodeC  = 
nodeFactory.createSCANode("http://localhost:9990/node-config/NodeC";);
+            nodeB  = 
nodeFactory.createSCANode("http://localhost:9990/node-config/NodeB";);
+            nodeA  = 
nodeFactory.createSCANode("http://localhost:9990/node-config/NodeA";);
 
             nodeC.start();
             nodeB.start();

Modified: 
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
 Sun Apr 27 12:21:09 2008
@@ -182,7 +182,7 @@
 
         // Pass the URL of the node install image to the launcher
         
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
-                                   "http://localhost:9990/node-image/"; + 
nodeName);
+                                   "http://localhost:9990/node-config/"; + 
nodeName);
 
         // Save the configuration
         configuration.doSave();

Modified: 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogMediationNode.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogMediationNode.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogMediationNode.java
 (original)
+++ 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogMediationNode.java
 Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchCatalogMediationNode {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/CatalogMediationNode"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/CatalogMediationNode"});
     }
 }

Modified: 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogsNode.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogsNode.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogsNode.java 
(original)
+++ incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogsNode.java 
Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchCatalogsNode {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/CatalogsNode"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/CatalogsNode"});
     }
 }

Modified: 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCurrencyNode.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCurrencyNode.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCurrencyNode.java 
(original)
+++ incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCurrencyNode.java 
Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchCurrencyNode {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/CurrencyNode"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/CurrencyNode"});
     }
 }

Modified: 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreDBNode.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreDBNode.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreDBNode.java 
(original)
+++ incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreDBNode.java 
Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchStoreDBNode {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/StoreDBNode"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/StoreDBNode"});
     }
 }

Modified: 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreEUNode.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreEUNode.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreEUNode.java 
(original)
+++ incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreEUNode.java 
Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchStoreEUNode {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/StoreEUNode"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/StoreEUNode"});
     }
 }

Modified: 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMarketNode.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMarketNode.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMarketNode.java 
(original)
+++ 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMarketNode.java 
Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchStoreMarketNode {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/StoreMarketNode"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/StoreMarketNode"});
     }
 }

Modified: 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMashupNode.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMashupNode.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMashupNode.java 
(original)
+++ 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMashupNode.java 
Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchStoreMashupNode {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/StoreMashupNode"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/StoreMashupNode"});
     }
 }

Modified: 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMergerNode.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMergerNode.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMergerNode.java 
(original)
+++ 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreMergerNode.java 
Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchStoreMergerNode {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/StoreMergerNode"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/StoreMergerNode"});
     }
 }

Modified: incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreNode.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreNode.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreNode.java 
(original)
+++ incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreNode.java Sun 
Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchStoreNode {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/StoreNode"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/StoreNode"});
     }
 }

Modified: 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreSupplierNode.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreSupplierNode.java?rev=652004&r1=652003&r2=652004&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreSupplierNode.java 
(original)
+++ 
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreSupplierNode.java 
Sun Apr 27 12:21:09 2008
@@ -23,6 +23,6 @@
 
 public class LaunchStoreSupplierNode {
     public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-image/StoreSupplierNode"});
+        NodeLauncher.main(new String[] 
{"http://localhost:9990/node-config/StoreSupplierNode"});
     }
 }


Reply via email to