You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/05/17 10:11:41 UTC

svn commit: r538825 - in /incubator/tuscany/java/sca/modules: contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java

Author: antelder
Date: Thu May 17 01:11:40 2007
New Revision: 538825

URL: http://svn.apache.org/viewvc?view=rev&rev=538825
Log:
Fix problem with trailing slash and webapp urls

Modified:
    incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java?view=diff&rev=538825&r1=538824&r2=538825
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java Thu May 17 01:11:40 2007
@@ -253,7 +253,7 @@
         
         // Add all composites under META-INF/sca-deployables to the
         // list of deployables
-        String prefix = Contribution.SCA_CONTRIBUTION_DEPLOYABLES + '/';
+        String prefix = Contribution.SCA_CONTRIBUTION_DEPLOYABLES;
         for (DeployedArtifact artifact : contribution.getArtifacts()) {
             if (artifact.getModel() instanceof Composite) {
                 if (artifact.getURI().startsWith(prefix)) {

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java?view=diff&rev=538825&r1=538824&r2=538825
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java Thu May 17 01:11:40 2007
@@ -32,7 +32,7 @@
 public interface Contribution extends Artifact {
     String SCA_CONTRIBUTION_META = "META-INF/sca-contribution.xml";
     String SCA_CONTRIBUTION_GENERATED_META = "META-INF/sca-contribution-generated.xml";
-    String SCA_CONTRIBUTION_DEPLOYABLES = "META-INF/sca-deployables";
+    String SCA_CONTRIBUTION_DEPLOYABLES = "META-INF/sca-deployables/";
 
     
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org