svn commit: r815725 - /tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java

[sl...@apache.org]

Author: slaws
Date: Wed Sep 16 11:19:49 2009
New Revision: 815725

URL: http://svn.apache.org/viewvc?rev=815725&view=rev
Log:
TUSCANY-3266 use the last fragment of the composite URI path to compare against the composite from the composite collection to give a better chance of finding the right composite. 

Modified:
    tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java

Modified: tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java?rev=815725&r1=815724&r2=815725&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java (original)
+++ tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java Wed Sep 16 11:19:49 2009
@@ -100,16 +100,17 @@
             String compositeURI = request.getParameter("composite");
             String start = request.getParameter("start");
     
-            logger.fine("Composite Quick Start.");
-            logger.fine("Contribution URI: " + contributionURI);
-            logger.fine("Contribution location: " + contributionLocation);
-            logger.fine("Composite URI: " + compositeURI);
+            logger.info("Composite Quick Start.");
+            logger.info("Contribution URI: " + contributionURI);
+            logger.info("Contribution location: " + contributionLocation);
+            logger.info("Composite URI: " + compositeURI);
             
             // Look for the contribution in the workspace
             Entry<String, Item>[] contributionEntries = contributionCollection.getAll();
             Entry<String, Item> contributionEntry = null;
             for (Entry<String, Item> entry: contributionEntries) {
-                if (contributionURI.equals(entry.getKey())) {
+                if (entry.getKey() != null && 
+                    contributionURI.equals(entry.getKey())) {
                     contributionEntry = entry;
                     break;
                 }
@@ -127,13 +128,17 @@
             Entry<String, Item>[] deployableEntries = deployableCollection.query("contribution=" + contributionURI);
             for (Entry<String, Item> entry: deployableEntries) {
                 Item item = entry.getData();
-                if (contributionURI.equals(contributionURI(entry.getKey())) && item.getAlternate().endsWith(compositeURI)) {
+                String compositeFileName = compositeURI.substring(compositeURI.lastIndexOf("/") + 1);
+                if (contributionURI.equals(contributionURI(entry.getKey())) && 
+                    (item.getAlternate().endsWith(compositeURI) ||
+                     item.getAlternate().endsWith(compositeFileName))) {
                     compositeKey = entry.getKey();
                     break;
                 }
             }
             
             if (compositeKey == null) {
+            	logger.info("Composite not found");
                 response.sendError(HttpServletResponse.SC_NOT_FOUND, compositeURI);
                 return;
             }