svn commit: r448698 - in /incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven: MavenArtifactRepository.java MavenHelper.java

[meerajk]

Author: meerajk
Date: Thu Sep 21 14:42:59 2006
New Revision: 448698

URL: http://svn.apache.org/viewvc?view=rev&rev=448698
Log:
Added support for deployed repository.

Modified:
    
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
    
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java

Modified: 
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java?view=diff&rev=448698&r1=448697&r2=448698
==============================================================================
--- 
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
 (original)
+++ 
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
 Thu Sep 21 14:42:59 2006
@@ -47,7 +47,7 @@
     public MavenArtifactRepository(@Property(name = "remoteRepoUrls")
     String[] remoteRepoUrls, @Autowire
     RuntimeInfo runtimeInfo) {
-        mavenHelper = new MavenHelper(remoteRepoUrls, runtimeInfo);
+        mavenHelper = new MavenHelper(remoteRepoUrls, 
runtimeInfo.getBaseURL());
         mavenHelper.start();
     }
 

Modified: 
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java?view=diff&rev=448698&r1=448697&r2=448698
==============================================================================
--- 
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java
 (original)
+++ 
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java
 Thu Sep 21 14:42:59 2006
@@ -20,6 +20,7 @@
 
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -55,8 +56,11 @@
     /** Local repository */
     private static final File LOCAL_REPO = new 
File(System.getProperty("user.home") + File.separator + "m2" + File.separator + 
"repository");
 
-    /** Remote repositories */
-    private String[] remoteRepositoryUrls;
+    /** Remote repository URLs */
+    private final String[] remoteRepositoryUrls;
+    
+    /** Deployed repository URL */
+    private final URL deployedRepositoryUrl;
 
     /** Maven metadata source */
     private ArtifactMetadataSource metadataSource;
@@ -67,6 +71,9 @@
     /** Local artifact repository */
     private ArtifactRepository localRepository;
 
+    /** Repository from the deployed unit like a WAR or standalobe 
distribution */
+    private ArtifactRepository deployedRepository;
+
     /** Remote artifact repositories */
     private List<ArtifactRepository> remoteRepositories = new 
LinkedList<ArtifactRepository>();
 
@@ -80,8 +87,13 @@
      *            Remote repository URLS.
      * @param runtimeInfo Runtime information.
      */
-    public MavenHelper(String[] remoteRepositoryUrls, RuntimeInfo runtimeInfo) 
{
-        this.remoteRepositoryUrls = remoteRepositoryUrls;
+    public MavenHelper(String[] remoteRepositoryUrls, URL baseUrl) {
+        try {
+            this.remoteRepositoryUrls = remoteRepositoryUrls;
+            this.deployedRepositoryUrl = new URL(baseUrl, "repository");
+        } catch (MalformedURLException ex) {
+            throw new TuscanyMavenException(ex);
+        }
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]