You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2007/06/08 04:32:33 UTC
svn commit: r545373 -
/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Author: dwoods
Date: Thu Jun 7 19:32:31 2007
New Revision: 545373
URL: http://svn.apache.org/viewvc?view=rev&rev=545373
Log:
GERONIMO-2994 PluginInstallerGBean patch to use maven-metadata-local.xml files from local builds.
Modified:
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?view=diff&rev=545373&r1=545372&r2=545373
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Thu Jun 7 19:32:31 2007
@@ -1076,9 +1076,15 @@
String path = base +"/maven-metadata.xml";
URL metaURL = new URL(url.toString().trim().endsWith("/") ? url : new URL(url.toString().trim()+"/"), path);
InputStream in = connect(metaURL, username, password, monitor);
+ if (in == null) {
+ path=base+"/maven-metadata-local.xml";
+ metaURL = new URL(url.toString().endsWith("/") ? url : new URL(url.toString()+"/"), path);
+ in = connect(metaURL, username, password, monitor);
+ }
if(in == null) {
return null;
}
+
// Don't use the validating parser that we normally do
DocumentBuilder builder = XmlUtil.newDocumentBuilderFactory().newDocumentBuilder();
Document doc = builder.parse(in);
@@ -1098,6 +1104,10 @@
URL metadataURL = new URL(url.toString()+base+"/"+version+"/maven-metadata.xml");
InputStream metadataStream = connect(metadataURL, username, password, monitor);
+ if (metadataStream == null) {
+ metadataURL = new URL(url.toString()+base+"/"+version+"/maven-metadata-local.xml");
+ metadataStream = connect(metadataURL, username, password, monitor);
+ }
// check for a snapshot qualifier
if (metadataStream != null) {
DocumentBuilder metadatabuilder = XmlUtil.newDocumentBuilderFactory().newDocumentBuilder();