You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2006/05/15 04:05:11 UTC
svn commit: r406499 - in /geronimo/branches/1.1/modules/service-builder/src:
java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
Author: ammulder
Date: Sun May 14 19:05:09 2006
New Revision: 406499
URL: http://svn.apache.org/viewcvs?rev=406499&view=rev
Log:
Don't assume that a dependency is a JAR (may well be a CAR, RAR, etc.)
GERONIMO-1934
Modified:
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java?rev=406499&r1=406498&r2=406499&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java (original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java Sun May 14 19:05:09 2006
@@ -196,7 +196,7 @@
}
private static Dependency toDependency(ArtifactType artifactType) {
- Artifact artifact = toArtifact(artifactType, "jar");
+ Artifact artifact = toArtifact(artifactType, null);
if (ImportType.CLASSES.equals(artifactType.getImport())) {
return new Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.CLASSES);
} else if (ImportType.SERVICES.equals(artifactType.getImport())) {
Modified: geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java?rev=406499&r1=406498&r2=406499&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java Sun May 14 19:05:09 2006
@@ -147,7 +147,11 @@
public SortedSet list(Artifact query) {
System.out.println("LOOKING FOR "+query);
- return new TreeSet();
+ SortedSet set = new TreeSet();
+ if(query.getGroupId() != null && query.getArtifactId() != null && query.getVersion() != null && query.getType() == null) {
+ set.add(new Artifact(query.getGroupId(), query.getArtifactId(), query.getVersion(), "jar"));
+ }
+ return set;
}
}
private static class MockReferenceCollection extends ArrayList implements ReferenceCollection {