mpoeschl 2004/01/21 06:24:07
Modified: src/test/org/apache/stratum/component
TestComponentLoader.java
. project.xml
src/java/org/apache/stratum/component ComponentLoader.java
Log:
make the buoild work with the cvs HEAd version of commons-configuration (to make
gump happy ;-)
Revision Changes Path
1.9 +1 -6
jakarta-turbine-stratum/src/test/org/apache/stratum/component/TestComponentLoader.java
Index: TestComponentLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-stratum/src/test/org/apache/stratum/component/TestComponentLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestComponentLoader.java 16 Apr 2002 20:58:16 -0000 1.8
+++ TestComponentLoader.java 21 Jan 2004 14:24:06 -0000 1.9
@@ -109,9 +109,6 @@
goodConfigFile,
null);
- assertNull("should be no key1 property for this component",
- comp.getConfiguration().getString("key1"));
-
// test that loadComponent() catches the IOException
cl.loadComponent(badClassName,goodConfigFile,null);
@@ -139,12 +136,10 @@
assertEquals("ensure key2 is present and correct",
"value2",
config.getProperty("key2"));
- assertNull("should be no other properties",
- config.getString("component.name"));
key1FinderCount++;
}
}
}
- assertEquals("should only find key1 once",key1FinderCount,1);
+ assertEquals("should only find key1 once", key1FinderCount,1);
}
}
1.37 +7 -6 jakarta-turbine-stratum/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/project.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- project.xml 5 Oct 2002 13:51:35 -0000 1.36
+++ project.xml 21 Jan 2004 14:24:06 -0000 1.37
@@ -87,30 +87,31 @@
<dependencies>
<dependency>
<id>commons-beanutils</id>
- <version>1.4</version>
+ <version>1.6.1</version>
+ <url>http://jakarta.apache.org/commons/beanutils.html</url>
</dependency>
<dependency>
<id>commons-collections</id>
- <version>2.0</version>
+ <version>2.1</version>
<url>http://jakarta.apache.org/commons/collections.html</url>
</dependency>
<dependency>
<id>commons-configuration</id>
- <version>1.0-dev</version>
+ <version>20040121.140929</version>
</dependency>
<dependency>
<id>commons-lang</id>
- <version>1.0</version>
+ <version>2.0</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
<id>commons-logging</id>
- <version>1.0.2</version>
+ <version>1.0.3</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
<id>log4j</id>
- <version>1.2.6</version>
+ <version>1.2.8</version>
<url>http://jakarta.apache.org/log4j/</url>
</dependency>
<dependency>
1.10 +6 -5
jakarta-turbine-stratum/src/java/org/apache/stratum/component/ComponentLoader.java
Index: ComponentLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/component/ComponentLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ComponentLoader.java 16 Apr 2002 20:58:16 -0000 1.9
+++ ComponentLoader.java 21 Jan 2004 14:24:06 -0000 1.10
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,10 +55,11 @@
*/
import java.io.IOException;
-import java.util.Vector;
-import org.apache.log4j.Category;
+import java.util.List;
+
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.log4j.Category;
import org.apache.stratum.lifecycle.Configurable;
import org.apache.stratum.lifecycle.Initializable;
@@ -157,7 +158,7 @@
*/
public Object[] load()
{
- Vector components = configuration.getVector(COMPONENT + '.' + NAME);
+ List components = configuration.getList(COMPONENT + '.' + NAME);
Object[] loadedComponents = new Object[components.size()];
String componentName;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
