You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2012/04/10 04:30:15 UTC
svn commit: r1311557 -
/geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
Author: xuhaihong
Date: Tue Apr 10 02:30:14 2012
New Revision: 1311557
URL: http://svn.apache.org/viewvc?rev=1311557&view=rev
Log:
Remove debug log info committed by accident
Modified:
geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java?rev=1311557&r1=1311556&r2=1311557&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java Tue Apr 10 02:30:14 2012
@@ -214,9 +214,8 @@ public class DependencyManager implement
return new Artifact(artifactFragments[0], artifactFragments[1], artifactFragments.length > 2 ? artifactFragments[2] : "",
artifactFragments.length > 3 && artifactFragments[3].length() > 0 ? artifactFragments[3] : "jar");
} else if(installationLocation.startsWith(BundleUtil.REFERENCE_SCHEME)) {
- log.info("reference:file checking");
//TODO a better way for this ???
- String bundleFilePath = BundleUtil.toFile(installationLocation).getAbsolutePath();
+ String bundleFilePath = BundleUtil.toFile(installationLocation).getAbsolutePath();
for (Repository repo : repositories) {
if (repo instanceof AbstractRepository) {
File rootFile = ((AbstractRepository) repo).getRootFile();
@@ -300,7 +299,6 @@ public class DependencyManager implement
} else {
artifact = pluginArtifactType.getModuleId().toArtifact();
}
- log.info(bundle.getLocation() + " ---> " + artifact);
if (artifact != null) {
artifactBundleMap.put(artifact, bundle);
bundleIdArtifactMap.put(bundle.getBundleId(), artifact);
@@ -533,7 +531,7 @@ public class DependencyManager implement
}
}
- private String locateBundle(Artifact configurationId) throws NoSuchConfigException, IOException, InvalidConfigException {
+ private String locateBundle(Artifact configurationId) throws NoSuchConfigException, IOException, InvalidConfigException {
for (Repository repo : repositories) {
if (repo.contains(configurationId)) {
return BundleUtil.toReferenceFileLocation(repo.getLocation(configurationId));