henning 2004/08/16 15:57:51
Modified: . Tag: TURBINE_2_3_BRANCH project.xml
xdocs Tag: TURBINE_2_3_BRANCH changes.xml
src/java/org/apache/turbine/services/assemblerbroker Tag:
TURBINE_2_3_BRANCH
TurbineAssemblerBrokerService.java
src/java/org/apache/turbine/services/assemblerbroker/util/java
Tag: TURBINE_2_3_BRANCH JavaBaseFactory.java
src/java/org/apache/turbine/services/avaloncomponent Tag:
TURBINE_2_3_BRANCH
TurbineAvalonComponentService.java
src/java/org/apache/turbine/services/factory Tag:
TURBINE_2_3_BRANCH TurbineFactoryService.java
src/java/org/apache/turbine/services/intake Tag:
TURBINE_2_3_BRANCH TurbineIntakeService.java
src/java/org/apache/turbine/services/resources Tag:
TURBINE_2_3_BRANCH TurbineResources.java
src/java/org/apache/turbine/services/schedule Tag:
TURBINE_2_3_BRANCH
TurbineNonPersistentSchedulerService.java
src/java/org/apache/turbine/services/velocity Tag:
TURBINE_2_3_BRANCH TurbineVelocityService.java
src/java/org/apache/turbine/services/xmlrpc Tag:
TURBINE_2_3_BRANCH TurbineXmlRpcService.java
src/java/org/apache/turbine/modules Tag: TURBINE_2_3_BRANCH
ActionLoader.java LayoutLoader.java
NavigationLoader.java PageLoader.java
ScheduledJobLoader.java ScreenLoader.java
src/java/org/apache/turbine/modules/pages Tag:
TURBINE_2_3_BRANCH DefaultPage.java
conf/test Tag: TURBINE_2_3_BRANCH TurbineConfiguration.xml
src/test/org/apache/turbine Tag: TURBINE_2_3_BRANCH
ConfigurationTest.java
Log:
Move to commons-configuration 1.0-rc1
Revision Changes Path
No revision
No revision
1.136.2.7 +4 -4 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.136.2.6
retrieving revision 1.136.2.7
diff -u -r1.136.2.6 -r1.136.2.7
--- project.xml 14 Aug 2004 20:57:56 -0000 1.136.2.6
+++ project.xml 16 Aug 2004 22:57:47 -0000 1.136.2.7
@@ -353,15 +353,15 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>2.1</version>
+ <version>3.0</version>
<url>http://jakarta.apache.org/commons/collections.html</url>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>20030706.202021</version>
- <url>http://jakarta.apache.org/commons/sandbox/configuration/index.html</url>
+ <version>1.0-rc1</version>
+ <url>http://jakarta.apache.org/commons/configuration/index.html</url>
<type>jar</type>
</dependency>
<dependency>
@@ -388,7 +388,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>1.0.1</version>
+ <version>2.0</version>
<url>http://jakarta.apache.org/commons/lang.html</url>
<type>jar</type>
</dependency>
No revision
No revision
1.60.2.16 +17 -0 jakarta-turbine-2/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/changes.xml,v
retrieving revision 1.60.2.15
retrieving revision 1.60.2.16
diff -u -r1.60.2.15 -r1.60.2.16
--- changes.xml 20 May 2004 03:34:26 -0000 1.60.2.15
+++ changes.xml 16 Aug 2004 22:57:47 -0000 1.60.2.16
@@ -79,6 +79,23 @@
Changes between Turbine 2.3 and 2.3.1.
</p>
+<subsection name="Changes that could break older environments">
+<p>
+ <ul>
+ <li>commons-configuration was upgraded to 1.0-rc1. All getVector() method calls
on the
+ Configuration interface must be replaced with getList().
+ </li>
+ <li>commons-lang was upgraded to 2.0.
+ </li>
+ <li>commons-collections was upgraded to 3.0.
+ </li>
+ <li>stratum was upgraded to 1.0-b5.
+ </li>
+ <li>commons-logging was upgraded to 1.0.4.
+ </li>
+ </ul>
+</p>
+</subsection>
<subsection name="Other changes">
<p>
<ul>
No revision
No revision
1.7.2.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
Index: TurbineAssemblerBrokerService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- TurbineAssemblerBrokerService.java 20 May 2004 03:05:19 -0000 1.7.2.2
+++ TurbineAssemblerBrokerService.java 16 Aug 2004 22:57:48 -0000 1.7.2.3
@@ -76,7 +76,7 @@
private void registerFactories(String type)
throws TurbineException
{
- List names = getConfiguration().getVector(type);
+ List names = getConfiguration().getList(type);
log.info("Registering " + names.size() + " " + type + " factories.");
No revision
No revision
1.8.2.3 +4 -5
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java
Index: JavaBaseFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- JavaBaseFactory.java 20 May 2004 03:05:16 -0000 1.8.2.2
+++ JavaBaseFactory.java 16 Aug 2004 22:57:48 -0000 1.8.2.3
@@ -17,10 +17,9 @@
*/
import java.util.Iterator;
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -43,8 +42,8 @@
implements AssemblerFactory
{
/** A vector of packages. */
- private static Vector packages =
- Turbine.getConfiguration().getVector(TurbineConstants.MODULE_PACKAGES);
+ private static List packages =
+ Turbine.getConfiguration().getList(TurbineConstants.MODULE_PACKAGES);
/** Logging */
protected Log log = LogFactory.getLog(this.getClass());
No revision
No revision
1.17.2.3 +7 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java
Index: TurbineAvalonComponentService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -r1.17.2.2 -r1.17.2.3
--- TurbineAvalonComponentService.java 20 May 2004 03:05:18 -0000
1.17.2.2
+++ TurbineAvalonComponentService.java 16 Aug 2004 22:57:48 -0000
1.17.2.3
@@ -17,8 +17,12 @@
*/
import java.util.Iterator;
+import java.util.List;
import java.util.Vector;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.avalon.excalibur.component.DefaultRoleManager;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
import org.apache.avalon.excalibur.logger.Log4JLoggerManager;
@@ -32,12 +36,9 @@
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.Turbine;
/**
* An implementation of AvalonComponentService which loads all the
@@ -176,7 +177,7 @@
// Init ECM!!!!
manager.initialize();
- Vector lookupComponents = conf.getVector(COMPONENT_LOOKUP_KEY,
+ List lookupComponents = conf.getList(COMPONENT_LOOKUP_KEY,
new Vector());
for (Iterator it = lookupComponents.iterator(); it.hasNext();)
No revision
No revision
1.9.2.3 +3 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/factory/TurbineFactoryService.java
Index: TurbineFactoryService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/factory/TurbineFactoryService.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- TurbineFactoryService.java 20 May 2004 03:05:18 -0000 1.9.2.2
+++ TurbineFactoryService.java 16 Aug 2004 22:57:48 -0000 1.9.2.3
@@ -19,11 +19,10 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.configuration.Configuration;
@@ -110,7 +109,7 @@
Configuration conf = getConfiguration();
if (conf != null)
{
- Vector loaders = conf.getVector(CLASS_LOADERS);
+ List loaders = conf.getList(CLASS_LOADERS);
if (loaders != null)
{
for (int i = 0; i < loaders.size(); i++)
No revision
No revision
1.14.2.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java
Index: TurbineIntakeService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- TurbineIntakeService.java 20 May 2004 03:16:39 -0000 1.14.2.2
+++ TurbineIntakeService.java 16 Aug 2004 22:57:49 -0000 1.14.2.3
@@ -109,7 +109,7 @@
defaultXmlPathes.add(XML_PATH_DEFAULT);
List xmlPathes = getConfiguration()
- .getVector(XML_PATH, defaultXmlPathes);
+ .getList(XML_PATH, defaultXmlPathes);
Map appDataElements = null;
No revision
No revision
1.12.2.3 +7 -8
jakarta-turbine-2/src/java/org/apache/turbine/services/resources/Attic/TurbineResources.java
Index: TurbineResources.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/resources/Attic/TurbineResources.java,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- TurbineResources.java 20 May 2004 03:06:51 -0000 1.12.2.2
+++ TurbineResources.java 16 Aug 2004 22:57:49 -0000 1.12.2.3
@@ -17,13 +17,12 @@
*/
import java.util.Iterator;
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.configuration.Configuration;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.services.security.SecurityService;
/**
@@ -295,9 +294,9 @@
* @param name The resource name.
* @return The value of the resource as a vector.
*/
- public static Vector getVector(String name)
+ public static List getList(String name)
{
- return Turbine.getConfiguration().getVector(name);
+ return Turbine.getConfiguration().getList(name);
}
/**
@@ -308,10 +307,10 @@
* @param def The default value of the resource.
* @return The value of the resource as a vector.
*/
- public static Vector getVector(String name,
- Vector def)
+ public static List getList(String name,
+ List def)
{
- return Turbine.getConfiguration().getVector(name, def);
+ return Turbine.getConfiguration().getList(name, def);
}
/**
No revision
No revision
1.16.2.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/Attic/TurbineNonPersistentSchedulerService.java
Index: TurbineNonPersistentSchedulerService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/Attic/TurbineNonPersistentSchedulerService.java,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -r1.16.2.2 -r1.16.2.3
--- TurbineNonPersistentSchedulerService.java 20 May 2004 03:06:49 -0000
1.16.2.2
+++ TurbineNonPersistentSchedulerService.java 16 Aug 2004 22:57:49 -0000
1.16.2.3
@@ -101,7 +101,7 @@
scheduleQueue = new JobQueue();
mainLoop = new MainLoop();
- List jobProps = conf.getVector("scheduler.jobs");
+ List jobProps = conf.getList("scheduler.jobs");
List jobs = new Vector();
// If there are scheduler.jobs defined then set up a job vector
// for the scheduleQueue
No revision
No revision
1.27.2.3 +10 -14
jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -r1.27.2.2 -r1.27.2.3
--- TurbineVelocityService.java 20 May 2004 03:06:50 -0000 1.27.2.2
+++ TurbineVelocityService.java 16 Aug 2004 22:57:49 -0000 1.27.2.3
@@ -21,21 +21,24 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
-
import java.util.Iterator;
-import java.util.Vector;
+import java.util.List;
import javax.servlet.ServletConfig;
import org.apache.commons.collections.ExtendedProperties;
-
import org.apache.commons.configuration.Configuration;
-
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.apache.velocity.app.event.EventCartridge;
+import org.apache.velocity.app.event.MethodExceptionEventHandler;
+import org.apache.velocity.context.Context;
+import org.apache.velocity.runtime.log.SimpleLog4JLogSystem;
+
import org.apache.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.pull.PullService;
@@ -44,13 +47,6 @@
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.app.event.MethodExceptionEventHandler;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.runtime.log.SimpleLog4JLogSystem;
-
/**
* This is a Service that can process Velocity templates from within a
* Turbine Screen. It is used in conjunction with the templating service
@@ -531,7 +527,7 @@
continue; // for()
}
- Vector paths = conf.getVector(key, null);
+ List paths = conf.getList(key, null);
if (paths == null)
{
// We don't copy this into VeloProperties, because
No revision
No revision
1.20.2.3 +10 -14
jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java
Index: TurbineXmlRpcService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- TurbineXmlRpcService.java 20 May 2004 03:06:51 -0000 1.20.2.2
+++ TurbineXmlRpcService.java 16 Aug 2004 22:57:49 -0000 1.20.2.3
@@ -17,37 +17,33 @@
*/
import java.io.InputStream;
-
import java.net.InetAddress;
import java.net.Socket;
import java.net.URL;
import java.net.UnknownHostException;
-
import java.util.Iterator;
+import java.util.List;
import java.util.Vector;
import javax.servlet.ServletConfig;
import org.apache.commons.configuration.Configuration;
-
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.xmlrpc.util.FileTransfer;
-import org.apache.turbine.util.TurbineException;
-
import org.apache.xerces.parsers.SAXParser;
-
import org.apache.xmlrpc.WebServer;
import org.apache.xmlrpc.XmlRpc;
import org.apache.xmlrpc.XmlRpcClient;
import org.apache.xmlrpc.XmlRpcServer;
import org.apache.xmlrpc.secure.SecureWebServer;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.TurbineBaseService;
+import org.apache.turbine.services.xmlrpc.util.FileTransfer;
+import org.apache.turbine.util.TurbineException;
+
/**
* This is a service which will make an xml-rpc call to a remote
* server.
@@ -193,8 +189,8 @@
// Set the list of clients that can connect
// to the xmlrpc server. The accepted client list
// will only be consulted if we are paranoid.
- Vector acceptedClients =
- conf.getVector("acceptClient");
+ List acceptedClients =
+ conf.getList("acceptClient");
for (int i = 0; i < acceptedClients.size(); i++)
{
@@ -211,7 +207,7 @@
// Set the list of clients that can connect
// to the xmlrpc server. The denied client list
// will only be consulted if we are paranoid.
- Vector deniedClients = conf.getVector("denyClient");
+ List deniedClients = conf.getList("denyClient");
for (int i = 0; i < deniedClients.size(); i++)
{
No revision
No revision
1.9.2.3 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionLoader.java
Index: ActionLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionLoader.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- ActionLoader.java 20 May 2004 03:03:52 -0000 1.9.2.2
+++ ActionLoader.java 16 Aug 2004 22:57:50 -0000 1.9.2.3
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -139,8 +139,8 @@
// the user a reason for that...
// FIX ME: The AssemblerFactories should each add it's
// own string here...
- Vector packages = Turbine.getConfiguration()
- .getVector(TurbineConstants.MODULE_PACKAGES);
+ List packages = Turbine.getConfiguration()
+ .getList(TurbineConstants.MODULE_PACKAGES);
ObjectUtils.addOnce(packages,
GenericLoader.getBasePackage());
1.9.2.3 +4 -6
jakarta-turbine-2/src/java/org/apache/turbine/modules/LayoutLoader.java
Index: LayoutLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/LayoutLoader.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- LayoutLoader.java 20 May 2004 03:03:52 -0000 1.9.2.2
+++ LayoutLoader.java 16 Aug 2004 22:57:50 -0000 1.9.2.3
@@ -16,17 +16,15 @@
* limitations under the License.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
-
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.RunData;
@@ -162,8 +160,8 @@
// the user a reason for that...
// FIX ME: The AssemblerFactories should each add it's
// own string here...
- Vector packages = Turbine.getConfiguration()
- .getVector(TurbineConstants.MODULE_PACKAGES);
+ List packages = Turbine.getConfiguration()
+ .getList(TurbineConstants.MODULE_PACKAGES);
ObjectUtils.addOnce(packages,
GenericLoader.getBasePackage());
1.9.2.3 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/NavigationLoader.java
Index: NavigationLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/NavigationLoader.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- NavigationLoader.java 20 May 2004 03:03:52 -0000 1.9.2.2
+++ NavigationLoader.java 16 Aug 2004 22:57:50 -0000 1.9.2.3
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -179,8 +179,8 @@
// the user a reason for that...
// FIX ME: The AssemblerFactories should each add it's
// own string here...
- Vector packages = Turbine.getConfiguration()
- .getVector(TurbineConstants.MODULE_PACKAGES);
+ List packages = Turbine.getConfiguration()
+ .getList(TurbineConstants.MODULE_PACKAGES);
ObjectUtils.addOnce(packages,
GenericLoader.getBasePackage());
1.8.2.3 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/PageLoader.java
Index: PageLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/PageLoader.java,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- PageLoader.java 20 May 2004 03:03:52 -0000 1.8.2.2
+++ PageLoader.java 16 Aug 2004 22:57:50 -0000 1.8.2.3
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -160,8 +160,8 @@
// the user a reason for that...
// FIX ME: The AssemblerFactories should each add it's
// own string here...
- Vector packages = Turbine.getConfiguration()
- .getVector(TurbineConstants.MODULE_PACKAGES);
+ List packages = Turbine.getConfiguration()
+ .getList(TurbineConstants.MODULE_PACKAGES);
ObjectUtils.addOnce(packages,
GenericLoader.getBasePackage());
1.7.2.3 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
Index: ScheduledJobLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ScheduledJobLoader.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- ScheduledJobLoader.java 20 May 2004 03:03:52 -0000 1.7.2.2
+++ ScheduledJobLoader.java 16 Aug 2004 22:57:50 -0000 1.7.2.3
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -163,8 +163,8 @@
// the user a reason for that...
// FIX ME: The AssemblerFactories should each add it's
// own string here...
- Vector packages = Turbine.getConfiguration()
- .getVector(TurbineConstants.MODULE_PACKAGES);
+ List packages = Turbine.getConfiguration()
+ .getList(TurbineConstants.MODULE_PACKAGES);
ObjectUtils.addOnce(packages, GenericLoader.getBasePackage());
1.10.2.3 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/ScreenLoader.java
Index: ScreenLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ScreenLoader.java,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- ScreenLoader.java 20 May 2004 03:03:52 -0000 1.10.2.2
+++ ScreenLoader.java 16 Aug 2004 22:57:50 -0000 1.10.2.3
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -181,8 +181,8 @@
// the user a reason for that...
// FIX ME: The AssemblerFactories should each add it's
// own string here...
- Vector packages = Turbine.getConfiguration()
- .getVector(TurbineConstants.MODULE_PACKAGES);
+ List packages = Turbine.getConfiguration()
+ .getList(TurbineConstants.MODULE_PACKAGES);
ObjectUtils.addOnce(packages,
GenericLoader.getBasePackage());
No revision
No revision
1.10.2.3 +7 -10
jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/DefaultPage.java
Index: DefaultPage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/DefaultPage.java,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- DefaultPage.java 20 May 2004 03:03:53 -0000 1.10.2.2
+++ DefaultPage.java 16 Aug 2004 22:57:50 -0000 1.10.2.3
@@ -16,10 +16,9 @@
* limitations under the License.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -27,13 +26,11 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.modules.ActionLoader;
import org.apache.turbine.modules.LayoutLoader;
import org.apache.turbine.modules.Page;
import org.apache.turbine.modules.Screen;
import org.apache.turbine.modules.ScreenLoader;
-
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
@@ -210,8 +207,8 @@
{
String errMsg =
"default.doctype property not set properly in
TurbineResources.properties!";
- Vector doctypeProperty =
-
Turbine.getConfiguration().getVector(TurbineConstants.DEFAULT_DOCUMENT_TYPE_KEY);
+ List doctypeProperty =
+
Turbine.getConfiguration().getList(TurbineConstants.DEFAULT_DOCUMENT_TYPE_KEY);
if (doctypeProperty != null)
{
@@ -224,7 +221,7 @@
}
case 1:
{
- String doc = (String) doctypeProperty.firstElement();
+ String doc = (String) doctypeProperty.get(0);
if
(doc.equalsIgnoreCase(TurbineConstants.DOCUMENT_TYPE_HTML40TRANSITIONAL))
{
data.getPage().setDoctype(new Doctype.Html40Transitional());
@@ -247,8 +244,8 @@
{
data.getPage()
.setDoctype(new Doctype()
- .setIdentifier((String)
doctypeProperty.elementAt(0))
- .setUri((String) doctypeProperty.elementAt(1)));
+ .setIdentifier((String) doctypeProperty.get(0))
+ .setUri((String) doctypeProperty.get(1)));
break;
}
default:
No revision
No revision
1.2.2.1 +1 -1 jakarta-turbine-2/conf/test/TurbineConfiguration.xml
Index: TurbineConfiguration.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/test/TurbineConfiguration.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TurbineConfiguration.xml 9 Jun 2003 12:07:28 -0000 1.2
+++ TurbineConfiguration.xml 16 Aug 2004 22:57:51 -0000 1.2.2.1
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<configuration>
- <dom4j className="org.apache.commons.configuration.DOM4JConfiguration"
fileName="conf/test/TurbineResources.xml"/>
+ <xml fileName="conf/test/TurbineResources.xml"/>
<properties className="org.apache.commons.configuration.PropertiesConfiguration"
fileName="conf/test/TemplateService.properties"/>
</configuration>
No revision
No revision
1.9.2.3 +5 -1
jakarta-turbine-2/src/test/org/apache/turbine/ConfigurationTest.java
Index: ConfigurationTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/ConfigurationTest.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- ConfigurationTest.java 20 May 2004 03:30:06 -0000 1.9.2.2
+++ ConfigurationTest.java 16 Aug 2004 22:57:51 -0000 1.9.2.3
@@ -16,10 +16,13 @@
* limitations under the License.
*/
+import java.util.List;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.configuration.Configuration;
+
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.TurbineXmlConfig;
@@ -68,6 +71,7 @@
// overridden value
String key = "module.cache";
+
assertEquals("Read a config value " + key + ", received:" +
configuration.getString(key), "true", configuration.getString(key));
// non overridden value
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
