Author: ate
Date: Fri Jul 29 09:04:04 2005
New Revision: 226388
URL: http://svn.apache.org/viewcvs?rev=226388&view=rev
Log:
Fix to "really" use the different property files instead of only the user
build.properties.
Modified:
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java
Modified:
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java?rev=226388&r1=226387&r2=226388&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java
(original)
+++
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java
Fri Jul 29 09:04:04 2005
@@ -24,10 +24,10 @@
Configuration userBuildProps = loadConfiguration(userBuildFile);
File mavenBuildFile = new File("../../build.properties");
- Configuration mavenBuildProps = loadConfiguration(userBuildFile);
+ Configuration mavenBuildProps = loadConfiguration(mavenBuildFile);
File mavenProjectFile = new File("../../project.properties");
- Configuration mavenProjectProps = loadConfiguration(userBuildFile);
+ Configuration mavenProjectProps =
loadConfiguration(mavenProjectFile);
USER_PROPERTIES = new CompositeConfiguration();
USER_PROPERTIES.addConfiguration(userBuildProps);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
