You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/07/24 19:42:01 UTC
svn commit: r559129 -
/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
Author: rfeng
Date: Tue Jul 24 10:41:59 2007
New Revision: 559129
URL: http://svn.apache.org/viewvc?view=rev&rev=559129
Log:
Make sure the URL is correctly encoded by the rule of URI
Modified:
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java?view=diff&rev=559129&r1=559128&r2=559129
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java Tue Jul 24 10:41:59 2007
@@ -40,7 +40,6 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.DeployedArtifact;
-import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
import org.apache.tuscany.sca.contribution.service.ContributionException;
import org.apache.tuscany.sca.contribution.service.ContributionService;
import org.apache.tuscany.sca.contribution.service.util.FileHelper;
@@ -64,7 +63,6 @@
public class DefaultSCADomain extends SCADomain {
private String uri;
- private String location;
private String[] composites;
private Composite domainComposite;
private Contribution contribution;
@@ -85,7 +83,6 @@
String contributionLocation,
String... composites) {
this.uri = domainURI;
- this.location = contributionLocation;
this.composites = composites;
// Create and start the runtime
@@ -101,8 +98,12 @@
ContributionService contributionService = runtime.getContributionService();
URL contributionURL;
try {
- contributionURL = getContributionLocation(applicationClassLoader, location, this.composites);
- } catch (MalformedURLException e) {
+ contributionURL = getContributionLocation(applicationClassLoader, contributionLocation, this.composites);
+ if (contributionURL != null) {
+ // Make sure the URL is correctly encoded (for example, escape the space characters)
+ contributionURL = contributionURL.toURI().toURL();
+ }
+ } catch (Exception e) {
throw new ServiceRuntimeException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org