geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r395290 [2/2] - in /geronimo/branches/1.1: assemblies/j2ee-jetty-server/ etc/ modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ modules/client-builder/src/java/org/apache/geronimo/client/builder/ modules/connector-builder/src/...
Date Wed, 19 Apr 2006 16:18:16 GMT
Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShell.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShell.java?rev=395290&r1=395289&r2=395290&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShell.java
(original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShell.java
Wed Apr 19 09:18:12 2006
@@ -40,6 +40,7 @@
  * @version $Rev$ $Date$
  */
 public class PackageBuilderShell {
+    private static final String PACKAGING_CLASSPATH_PROPERTY = "packaging.classpath";
     private static Log log = LogFactory.getLog(PlanProcessor.class);
 
     private List artifacts;
@@ -59,7 +60,7 @@
     private String classPath;
     private String endorsedDirs;
     private String extensionDirs;
-    private static final String PACKAGING_CLASSPATH_PROPERTY = "packaging.classpath";
+    private String explicitResolutionLocation;
 
     public File getRepository() {
         return repository;
@@ -200,6 +201,14 @@
         this.context = context;
     }
 
+    public String getExplicitResolutionLocation() {
+        return explicitResolutionLocation;
+    }
+
+    public void setExplicitResolutionLocation(String explicitResolutionLocation) {
+        this.explicitResolutionLocation = explicitResolutionLocation;
+    }
+
     public void execute() throws Exception {
         try {
             Object packageBuilder = getPackageBuilder();
@@ -215,6 +224,7 @@
             set("setRepository", repository, File.class, packageBuilder);
             set("setRepositoryClass", Maven1Repository.class.getName(), String.class, packageBuilder);
             set("setConfigurationStoreClass", MavenConfigStore.class.getName(), String.class,
packageBuilder);
+            set("setExplicitResolutionLocation", explicitResolutionLocation, String.class,
packageBuilder);
 
             Method m = packageBuilder.getClass().getMethod("execute", new Class[]{});
             m.invoke(packageBuilder, new Object[]{});

Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java?rev=395290&r1=395289&r2=395290&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java
(original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java
Wed Apr 19 09:18:12 2006
@@ -269,7 +269,7 @@
     private static org.apache.geronimo.kernel.repository.Artifact toGeronimoArtifact(Dependency
dependency) {
         String groupId = dependency.getGroupId();
         String artifactId = dependency.getArtifactId();
-        String version = dependency.getVersion();
+        String version = null;
         String type = dependency.getType();
         return new org.apache.geronimo.kernel.repository.Artifact(groupId, artifactId, version,
type);
     }



Mime
View raw message