You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2006/10/07 16:18:19 UTC
svn commit: r453915 - in /incubator/tuscany/java/sca/services/maven/src:
main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java
test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java
Author: meerajk
Date: Sat Oct 7 07:18:19 2006
New Revision: 453915
URL: http://svn.apache.org/viewvc?view=rev&rev=453915
Log:
Commented exception rethrow, need to look at best strategy.
Modified:
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java
incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java
Modified: incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java?view=diff&rev=453915&r1=453914&r2=453915
==============================================================================
--- incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java (original)
+++ incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java Sat Oct 7 07:18:19 2006
@@ -5,6 +5,7 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -23,7 +24,7 @@
private URL reporsitoryUrl;
/** Dependency metadata */
- private Map<String, Set<String>> transDependencyMap;
+ private Map<String, Set<String>> transDependencyMap = new HashMap<String, Set<String>>();
/**
* Initializes the repository URL.
@@ -46,12 +47,10 @@
transDependencyMap = (Map<String, Set<String>>)decoder.readObject();
decoder.close();
- //System.err.println(transDependencyMap.get("commons-httpclient/commons-httpclient/3.0/"));
-
} catch (MalformedURLException ex) {
- throw new TuscanyDependencyException(ex);
+ // throw new TuscanyDependencyException(ex);
} catch (IOException ex) {
- throw new TuscanyDependencyException(ex);
+ // throw new TuscanyDependencyException(ex);
} finally {
IOUtil.close(transDepMapInputStream);
}
Modified: incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java?view=diff&rev=453915&r1=453914&r2=453915
==============================================================================
--- incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java (original)
+++ incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java Sat Oct 7 07:18:19 2006
@@ -28,12 +28,14 @@
*/
public void testWarRepositoryHelper() {
- /*URL warUrl = getClass().getClassLoader().getResource("webapp.war");
+ URL warUrl = getClass().getClassLoader().getResource("webapp.war");
URLClassLoader urlc = new URLClassLoader(new URL[] {warUrl});
- URL repoUrl = urlc.getResource("WEB-INF/tuscany/repository/");
+ URL repoUrl = urlc.getResource("WEB-INF/tuscany/");
+ System.err.println(repoUrl);
+
WarRepositoryHelper warRepositoryHelper = new WarRepositoryHelper(repoUrl);
- assertNotNull(warRepositoryHelper);*/
+ assertNotNull(warRepositoryHelper);
}
@@ -42,10 +44,10 @@
*/
public void testResolveTransitively() {
- /*URL warUrl = getClass().getClassLoader().getResource("webapp.war");
+ URL warUrl = getClass().getClassLoader().getResource("webapp.war");
URLClassLoader urlc = new URLClassLoader(new URL[] {warUrl});
- URL repoUrl = urlc.getResource("WEB-INF/tuscany/repository/");
+ URL repoUrl = urlc.getResource("WEB-INF/tuscany/");
WarRepositoryHelper warRepositoryHelper = new WarRepositoryHelper(repoUrl);
Artifact artifact = new Artifact();
@@ -54,7 +56,7 @@
artifact.setVersion("3.0");
warRepositoryHelper.resolveTransitively(artifact);
- assertEquals(4, artifact.getUrls().size());*/
+ assertEquals(4, artifact.getUrls().size());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org