geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r829796 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
Date Mon, 26 Oct 2009 13:47:20 GMT
Author: xuhaihong
Date: Mon Oct 26 13:47:19 2009
New Revision: 829796

URL: http://svn.apache.org/viewvc?rev=829796&view=rev
Log:
GERONIMO-4921 Revert the last change, should find a way to use mvn URL and the file reference
at the same time 

Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java?rev=829796&r1=829795&r2=829796&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
Mon Oct 26 13:47:19 2009
@@ -118,7 +118,7 @@
     }
 
     private String locateBundle(Artifact configurationId) throws NoSuchConfigException, IOException,
InvalidConfigException {
-        if (Boolean.valueOf(System.getProperty("geronimo.build.car"))) {
+        if (System.getProperty("geronimo.build.car") == null) {
             return "mvn:" + configurationId.getGroupId() + "/" + configurationId.getArtifactId()
+ "/" + configurationId.getVersion() + ("jar".equals(configurationId.getType())?  "": "/"
+ configurationId.getType());
         }
         for (Repository repo : repositories) {



Mime
View raw message