You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/03/28 19:36:21 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/velocity TurbineVelocityService.java
epugh 2004/03/28 09:36:21
Modified: src/java/org/apache/turbine/services/security
BaseSecurityService.java TurbineSecurity.java
src/java/org/apache/turbine/services BaseServiceBroker.java
src/java/org/apache/turbine/modules ActionLoader.java
ScheduledJobLoader.java PageLoader.java
LayoutLoader.java ScreenLoader.java
NavigationLoader.java
src/java/org/apache/turbine/services/xmlrpc
TurbineXmlRpcService.java
src/java/org/apache/turbine/services/factory
TurbineFactoryService.java
src/java/org/apache/turbine/services/avaloncomponent
TurbineAvalonComponentService.java
src/java/org/apache/turbine/om OMTool.java
xdocs changes.xml
. project.xml
src/java/org/apache/turbine/modules/pages DefaultPage.java
src/java/org/apache/turbine/services/assemblerbroker
TurbineAssemblerBrokerService.java
src/java/org/apache/turbine/services/assemblerbroker/util/java
JavaBaseFactory.java
src/test/org/apache/turbine/pipeline
DetermineTargetValveTest.java
src/java/org/apache/turbine/util ObjectUtils.java
src/java/org/apache/turbine/services/intake
TurbineIntakeService.java
src/java/org/apache/turbine/services/velocity
TurbineVelocityService.java
Log:
Updated to use the latest Commons Configuration API. Ready for configuration 1.0
release. Fix Gump errors.
Revision Changes Path
1.36 +3 -8 jakarta-turbine-2/src/java/org/apache/turbine/services/security/BaseSecurityService.java
Index: BaseSecurityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/BaseSecurityService.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- BaseSecurityService.java 16 Feb 2004 07:06:26 -0000 1.35
+++ BaseSecurityService.java 28 Mar 2004 17:36:19 -0000 1.36
@@ -59,16 +59,13 @@
import javax.servlet.ServletConfig;
-import org.apache.avalon.framework.component.ComponentException;
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.fulcrum.crypto.CryptoAlgorithm;
+import org.apache.fulcrum.crypto.CryptoService;
import org.apache.torque.util.Criteria;
-
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
@@ -77,8 +74,6 @@
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
-import org.apache.fulcrum.crypto.CryptoAlgorithm;
-import org.apache.fulcrum.crypto.CryptoService;
import org.apache.turbine.services.factory.FactoryService;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.DataBackendException;
1.21 +1 -4 jakarta-turbine-2/src/java/org/apache/turbine/services/security/TurbineSecurity.java
Index: TurbineSecurity.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/TurbineSecurity.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TurbineSecurity.java 24 Oct 2003 13:33:03 -0000 1.20
+++ TurbineSecurity.java 28 Mar 2004 17:36:20 -0000 1.21
@@ -54,10 +54,7 @@
* <http://www.apache.org/>.
*/
-import java.util.List;
-
import org.apache.torque.util.Criteria;
-
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
1.17 +5 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/BaseServiceBroker.java
Index: BaseServiceBroker.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/BaseServiceBroker.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BaseServiceBroker.java 9 May 2003 11:02:47 -0000 1.16
+++ BaseServiceBroker.java 28 Mar 2004 17:36:20 -0000 1.17
@@ -536,8 +536,9 @@
if (service == null)
{
- String className = mapping.getString(name);
- if (StringUtils.isEmpty(className))
+
+ String className=null;
+ if (!mapping.containsKey(name))
{
throw new InstantiationException(
"ServiceBroker: unknown service " + name
@@ -545,6 +546,7 @@
}
try
{
+ className = mapping.getString(name);
service = (Service) services.get(className);
if (service == null)
1.11 +4 -5 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ActionLoader.java 19 Sep 2003 06:32:32 -0000 1.10
+++ ActionLoader.java 28 Mar 2004 17:36:20 -0000 1.11
@@ -54,11 +54,10 @@
* <http://www.apache.org/>.
*/
-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;
@@ -177,8 +176,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 +4 -5 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ScheduledJobLoader.java 19 Sep 2003 06:32:32 -0000 1.8
+++ ScheduledJobLoader.java 28 Mar 2004 17:36:20 -0000 1.9
@@ -54,11 +54,10 @@
* <http://www.apache.org/>.
*/
-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;
@@ -201,8 +200,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 +4 -5 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PageLoader.java 19 Sep 2003 06:32:32 -0000 1.9
+++ PageLoader.java 28 Mar 2004 17:36:20 -0000 1.10
@@ -54,11 +54,10 @@
* <http://www.apache.org/>.
*/
-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;
@@ -198,8 +197,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.11 +4 -7 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LayoutLoader.java 19 Sep 2003 06:32:32 -0000 1.10
+++ LayoutLoader.java 28 Mar 2004 17:36:20 -0000 1.11
@@ -54,17 +54,14 @@
* <http://www.apache.org/>.
*/
-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;
@@ -200,8 +197,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.12 +4 -6 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ScreenLoader.java 19 Sep 2003 06:32:32 -0000 1.11
+++ ScreenLoader.java 28 Mar 2004 17:36:20 -0000 1.12
@@ -54,13 +54,11 @@
* <http://www.apache.org/>.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.ecs.ConcreteElement;
-
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
@@ -219,8 +217,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.11 +4 -6 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NavigationLoader.java 19 Sep 2003 06:32:32 -0000 1.10
+++ NavigationLoader.java 28 Mar 2004 17:36:20 -0000 1.11
@@ -54,13 +54,11 @@
* <http://www.apache.org/>.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.ecs.ConcreteElement;
-
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
@@ -217,8 +215,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.21 +5 -4 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
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TurbineXmlRpcService.java 11 Apr 2003 11:57:14 -0000 1.20
+++ TurbineXmlRpcService.java 28 Mar 2004 17:36:20 -0000 1.21
@@ -62,6 +62,7 @@
import java.net.UnknownHostException;
import java.util.Iterator;
+import java.util.List;
import java.util.Vector;
import javax.servlet.ServletConfig;
@@ -231,8 +232,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++)
{
@@ -249,7 +250,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++)
{
1.10 +3 -5 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
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineFactoryService.java 11 Apr 2003 11:40:11 -0000 1.9
+++ TurbineFactoryService.java 28 Mar 2004 17:36:20 -0000 1.10
@@ -57,14 +57,12 @@
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;
-
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.util.TurbineException;
@@ -148,7 +146,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++)
1.19 +6 -7 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TurbineAvalonComponentService.java 16 Feb 2004 07:06:27 -0000 1.18
+++ TurbineAvalonComponentService.java 28 Mar 2004 17:36:20 -0000 1.19
@@ -54,8 +54,9 @@
* <http://www.apache.org/>.
*/
+import java.util.ArrayList;
import java.util.Iterator;
-import java.util.Vector;
+import java.util.List;
import org.apache.avalon.excalibur.component.DefaultRoleManager;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
@@ -69,13 +70,11 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
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
@@ -218,8 +217,8 @@
// Init ECM!!!!
manager.initialize();
- Vector lookupComponents = conf.getVector(COMPONENT_LOOKUP_KEY,
- new Vector());
+ List lookupComponents = conf.getList(COMPONENT_LOOKUP_KEY,
+ new ArrayList());
for (Iterator it = lookupComponents.iterator(); it.hasNext();)
{
1.6 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/om/OMTool.java
Index: OMTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/OMTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OMTool.java 14 Nov 2003 13:23:59 -0000 1.5
+++ OMTool.java 28 Mar 2004 17:36:20 -0000 1.6
@@ -57,7 +57,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.turbine.Turbine;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.util.pool.Recyclable;
1.81 +5 -0 jakarta-turbine-2/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/changes.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- changes.xml 5 Mar 2004 05:33:51 -0000 1.80
+++ changes.xml 28 Mar 2004 17:36:20 -0000 1.81
@@ -163,6 +163,11 @@
<p>
<ul>
<li>
+ Updated to use Stratum b5 which properly supports the upcoming 1.0 release of
+ Commons Configuration. Also removed uses of getVector which has been removed
+ from the Configuration API.
+ </li>
+ <li>
Backported the Pipeline from Turbine 3 to Turbine 2.4. The pipeline allows
you to define via an XML file all the stages for processing a request. This
makes it simple to add your own custom steps to be applied to each HTTP
1.154 +4 -4 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- project.xml 23 Feb 2004 20:35:07 -0000 1.153
+++ project.xml 28 Mar 2004 17:36:20 -0000 1.154
@@ -468,8 +468,8 @@
</dependency>
<dependency>
<id>commons-configuration</id>
- <version>20030706.202021</version>
- <url>http://jakarta.apache.org/commons/sandbox/configuration/index.html</url>
+ <version>20040328.175011</version>
+ <url>http://jakarta.apache.org/commons/configuration/index.html</url>
</dependency>
<dependency>
<id>commons-digester</id>
@@ -493,7 +493,7 @@
</dependency>
<dependency>
<id>commons-lang</id>
- <version>1.0.1</version>
+ <version>2.0</version>
<url>http://jakarta.apache.org/commons/lang.html</url>
</dependency>
<dependency>
@@ -680,7 +680,7 @@
</dependency>
<dependency>
<id>stratum</id>
- <version>1.0-b3</version>
+ <version>1.0-b5-dev</version>
<url>http://jakarta.apache.org/turbine/stratum/</url>
</dependency>
<dependency>
1.11 +7 -12 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
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultPage.java 3 Sep 2003 09:11:54 -0000 1.10
+++ DefaultPage.java 28 Mar 2004 17:36:20 -0000 1.11
@@ -54,24 +54,19 @@
* <http://www.apache.org/>.
*/
-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;
-
import org.apache.ecs.Doctype;
-
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;
@@ -248,8 +243,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)
{
@@ -262,7 +257,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());
@@ -285,8 +280,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:
1.8 +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
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineAssemblerBrokerService.java 11 Mar 2003 16:38:44 -0000 1.7
+++ TurbineAssemblerBrokerService.java 28 Mar 2004 17:36:20 -0000 1.8
@@ -114,7 +114,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.");
1.9 +4 -6 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
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JavaBaseFactory.java 3 Sep 2003 08:56:34 -0000 1.8
+++ JavaBaseFactory.java 28 Mar 2004 17:36:20 -0000 1.9
@@ -55,13 +55,11 @@
*/
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;
-
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.modules.Assembler;
@@ -81,8 +79,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());
1.2 +1 -2 jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java
Index: DetermineTargetValveTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DetermineTargetValveTest.java 23 Feb 2004 20:35:06 -0000 1.1
+++ DetermineTargetValveTest.java 28 Mar 2004 17:36:20 -0000 1.2
@@ -59,7 +59,6 @@
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletResponse;
-import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.test.BaseTestCase;
1.7 +5 -6 jakarta-turbine-2/src/java/org/apache/turbine/util/ObjectUtils.java
Index: ObjectUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/ObjectUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ObjectUtils.java 12 Aug 2003 23:04:47 -0000 1.6
+++ ObjectUtils.java 28 Mar 2004 17:36:20 -0000 1.7
@@ -62,10 +62,9 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-
import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.Vector;
+import java.util.List;
/**
* This is where common Object manipulation routines should go.
@@ -97,11 +96,11 @@
* @param o The object.
* @deprecated No replacement
*/
- public static void addOnce(Vector v, Object o)
+ public static void addOnce(List l, Object o)
{
- if (!v.contains(o))
+ if (!l.contains(o))
{
- v.addElement(o);
+ l.add(o);
}
}
1.16 +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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineIntakeService.java 14 Oct 2003 12:17:24 -0000 1.15
+++ TurbineIntakeService.java 28 Mar 2004 17:36:20 -0000 1.16
@@ -148,7 +148,7 @@
defaultXmlPathes.add(XML_PATH_DEFAULT);
List xmlPathes = getConfiguration()
- .getVector(XML_PATH, defaultXmlPathes);
+ .getList(XML_PATH, defaultXmlPathes);
Map appDataElements = null;
1.30 +3 -9 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TurbineVelocityService.java 30 Sep 2003 11:16:23 -0000 1.29
+++ TurbineVelocityService.java 28 Mar 2004 17:36:21 -0000 1.30
@@ -59,21 +59,16 @@
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.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.pull.PullService;
@@ -81,7 +76,6 @@
import org.apache.turbine.services.template.BaseTemplateEngineService;
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;
@@ -567,7 +561,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
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org