You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/11/25 19:44:32 UTC
svn commit: r348996 - in /geronimo/trunk/modules/service-builder/src:
java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
test/org/apache/geronimo/deployment/service/ParentIDTest.java
Author: djencks
Date: Fri Nov 25 10:44:28 2005
New Revision: 348996
URL: http://svn.apache.org/viewcvs?rev=348996&view=rev
Log:
rolling back experimental changes committed in error
Modified:
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ParentIDTest.java
Modified: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=348996&r1=348995&r2=348996&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Fri Nov 25 10:44:28 2005
@@ -421,7 +421,7 @@
String type = dep.isSetType() ? dep.getType() : "jar";
String artifactId = dep.getArtifactId();
String version = dep.getVersion();
- String id = groupId + "/" + artifactId + "/" + version + "/" + type;
+ String id = groupId + "/" + type + "s/" + artifactId + '-' + version + "." + type;
try {
uri = new URI(id);
} catch (URISyntaxException e) {
Modified: geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ParentIDTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ParentIDTest.java?rev=348996&r1=348995&r2=348996&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ParentIDTest.java (original)
+++ geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ParentIDTest.java Fri Nov 25 10:44:28 2005
@@ -53,7 +53,7 @@
anImport.setVersion("version");
List parentId = ServiceConfigBuilder.getParentID(null, new DependencyType[] {anImport});
assertEquals(1, parentId.size());
- assertEquals("groupId/artifactId/version/type", ((URI)parentId.get(0)).getPath());
+ assertEquals("groupId/types/artifactId-version.type", ((URI)parentId.get(0)).getPath());
}
public void testBothParent() throws Exception {