epugh 2004/02/14 06:22:00
Modified: configuration/impl/src/test configuration.xml
configuration/impl/src/java/org/apache/fulcrum/configuration
DefaultConfigurationService.java
configuration/impl/conf block.xml config.xml
configuration/impl/src/test/org/apache/fulcrum/configuration
ConfigTest.java
configuration/impl project.xml
Log:
Updated to try and fix merlin issues.. still fails.
Revision Changes Path
1.2 +2 -2
jakarta-turbine-fulcrum/configuration/impl/src/test/configuration.xml
Index: configuration.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/configuration/impl/src/test/configuration.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configuration.xml 12 Nov 2003 11:27:07 -0000 1.1
+++ configuration.xml 14 Feb 2004 14:21:59 -0000 1.2
@@ -3,10 +3,10 @@
<configuration>
<properties
className="org.apache.commons.configuration.PropertiesConfiguration"
- fileName="../../src/test/org/test.properties"/>
+ fileName="../../../src/test/org/test.properties"/>
<dom4j
className="org.apache.commons.configuration.DOM4JConfiguration"
- fileName="../../src/test/org/test.xml"/>
+ fileName="../../../src/test/org/test.xml"/>
</configuration>
1.3 +12 -4
jakarta-turbine-fulcrum/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
Index: DefaultConfigurationService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultConfigurationService.java 2 Jan 2004 15:35:29 -0000 1.2
+++ DefaultConfigurationService.java 14 Feb 2004 14:22:00 -0000 1.3
@@ -451,16 +451,24 @@
public void configure(Configuration conf) throws ConfigurationException
{
String confPath = conf.getAttribute(CONFIGURATION_PATH);
+ /*
File confFile = new File(confPath);
if(!confFile.exists()){
confFile = new File(applicationRoot,confPath);
}
- if(!confFile.exists()){
- throw new ConfigurationException("XML file for ConfigurationFactory can
not be found:" +confFile);
+ */
+ System.out.println( "PATH: " + confPath );
+ System.out.println( "HOME: " + applicationRoot );
+ File file = new File( applicationRoot, confPath );
+ System.out.println( "REAL: " + file.getAbsolutePath());
+
+
+ if(!file.exists()){
+ throw new ConfigurationException("XML file for ConfigurationFactory can
not be found:" +file.getAbsolutePath());
}
ConfigurationFactory configurationFactory =
- new ConfigurationFactory(confFile.getAbsolutePath());
+ new ConfigurationFactory(file.getAbsolutePath());
configurationFactory.setBasePath(applicationRoot);
try
{
1.2 +1 -1 jakarta-turbine-fulcrum/configuration/impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 12 Nov 2003 11:27:08 -0000 1.1
+++ block.xml 14 Feb 2004 14:22:00 -0000 1.2
@@ -1,5 +1,5 @@
-<container name="config">
+<container name="conf">
<classloader>
<classpath>
1.2 +1 -1 jakarta-turbine-fulcrum/configuration/impl/conf/config.xml
Index: config.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/conf/config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.xml 12 Nov 2003 11:27:08 -0000 1.1
+++ config.xml 14 Feb 2004 14:22:00 -0000 1.2
@@ -3,7 +3,7 @@
<target path="/config/conf">
<categories priority="INFO"/>
- <configuration configurationPath="../../src/test/configuration.xml"/>
+ <configuration configurationPath="../../../src/test/configuration.xml"/>
</target>
</targets>
1.2 +4 -9
jakarta-turbine-fulcrum/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java
Index: ConfigTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigTest.java 12 Nov 2003 11:27:08 -0000 1.1
+++ ConfigTest.java 14 Feb 2004 14:22:00 -0000 1.2
@@ -77,12 +77,7 @@
*/
public ConfigTest(String name)
{
- super(
- MAVEN_TARGET_CLASSES_DIR,
- MERLIN_DEFAULT_CONFIG_FILE,
- MERLIN_INFO_OFF,
- MERLIN_DEBUG_OFF,
- name );
+ super( name );
}
/**
* Factory method for creating a TestSuite for this class.
@@ -99,7 +94,8 @@
super.setUp();
try
{
- config = (Configuration) this.resolve( "conf" );
+ config = (Configuration) this.resolve( "/config/conf" );
+
}
catch (ComponentException e)
{
@@ -117,7 +113,6 @@
assertEquals(10.25,config.getDouble("test.double"),0);
assertEquals(
"I'm complex!",config.getString("element2.subelement.subsubelement"));
- getLogger().info( "OK" );
}
}
1.4 +1 -1 jakarta-turbine-fulcrum/configuration/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 18 Jan 2004 15:05:14 -0000 1.3
+++ project.xml 14 Feb 2004 14:22:00 -0000 1.4
@@ -60,7 +60,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.2-dev</version>
+ <version>3.2.10</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
