brett 2004/01/06 00:07:03
Modified: src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenConstants.java MavenUtils.java
Log:
PR: MAVEN-1107
Add / to paths, use correct classloader for maven.jar
Revision Changes Path
No revision
No revision
1.30.4.3 +3 -3 maven/src/java/org/apache/maven/MavenConstants.java
Index: MavenConstants.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenConstants.java,v
retrieving revision 1.30.4.2
retrieving revision 1.30.4.3
diff -u -r1.30.4.2 -r1.30.4.3
--- MavenConstants.java 5 Jan 2004 03:20:06 -0000 1.30.4.2
+++ MavenConstants.java 6 Jan 2004 08:07:03 -0000 1.30.4.3
@@ -115,13 +115,13 @@
public static final String SNAPSHOT_SIGNIFIER = "SNAPSHOT";
/** Driver properties */
- public static final String DRIVER_PROPERTIES = "driver.properties";
+ public static final String DRIVER_PROPERTIES = "/driver.properties";
/** Project build file name. (maven.xml) */
public static final String BUILD_FILE_NAME = "maven.xml";
/** Defaults properties */
- public static final String DEFAULTS_PROPERTIES = "defaults.properties";
+ public static final String DEFAULTS_PROPERTIES = "/defaults.properties";
// Context tags.
1.107.4.5 +3 -3 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.107.4.4
retrieving revision 1.107.4.5
diff -u -r1.107.4.4 -r1.107.4.5
--- MavenUtils.java 31 Dec 2003 01:32:36 -0000 1.107.4.4
+++ MavenUtils.java 6 Jan 2004 08:07:03 -0000 1.107.4.5
@@ -723,11 +723,11 @@
Properties projectBuildProperties = loadProjectBuildProperties(
descriptorDirectory );
Properties driverProperties = loadProperties(
- MavenUtils.class.getClassLoader().getResourceAsStream(
+ MavenUtils.class.getResourceAsStream(
MavenConstants.DRIVER_PROPERTIES ) );
Properties defaultProperties = loadProperties(
- MavenUtils.class.getClassLoader().getResourceAsStream(
+ MavenUtils.class.getResourceAsStream(
MavenConstants.DEFAULTS_PROPERTIES ) );
Map result = MavenUtils.mergeMaps( new Map[]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
