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/01/31 02:43:49 UTC
cvs commit: jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/xmlrpc TurbineXmlRpcService.java
epugh 2004/01/30 17:43:49
Modified: src/java/org/apache/fulcrum/factory Tag: PRE_AVALON_BRANCH
TurbineFactoryService.java
. Tag: PRE_AVALON_BRANCH project.xml
project.properties
src/java/org/apache/fulcrum/velocity Tag: PRE_AVALON_BRANCH
TurbineVelocityService.java
src/java/org/apache/fulcrum/schedule Tag: PRE_AVALON_BRANCH
TurbineNonPersistentSchedulerService.java
src/java/org/apache/fulcrum/xmlrpc Tag: PRE_AVALON_BRANCH
TurbineXmlRpcService.java
Log:
Use latest commons-configuration. fixed a couple of api changes.
Revision Changes Path
No revision
No revision
1.1.1.1.2.2 +3 -2 jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/factory/TurbineFactoryService.java
Index: TurbineFactoryService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/factory/TurbineFactoryService.java,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- TurbineFactoryService.java 24 Nov 2003 14:15:03 -0000 1.1.1.1.2.1
+++ TurbineFactoryService.java 31 Jan 2004 01:43:49 -0000 1.1.1.1.2.2
@@ -56,6 +56,7 @@
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Vector;
import java.util.ArrayList;
import java.io.ByteArrayInputStream;
@@ -149,7 +150,7 @@
{
if (getConfiguration() != null)
{
- Vector loaders = getConfiguration().getVector(CLASS_LOADERS);
+ List loaders = getConfiguration().getList(CLASS_LOADERS);
if (loaders != null)
{
for (int i = 0; i < loaders.size(); i++)
No revision
No revision
1.52.2.5 +1 -1 jakarta-turbine-fulcrum/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
retrieving revision 1.52.2.4
retrieving revision 1.52.2.5
diff -u -r1.52.2.4 -r1.52.2.5
--- project.xml 24 Nov 2003 14:16:42 -0000 1.52.2.4
+++ project.xml 31 Jan 2004 01:43:49 -0000 1.52.2.5
@@ -111,7 +111,7 @@
</dependency>
<dependency>
<id>commons-configuration</id>
- <version>1.0-dev-3.20030607.194155</version>
+ <version>20040130.152659</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
1.5.2.2 +1 -1 jakarta-turbine-fulcrum/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.properties,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- project.properties 12 Nov 2003 19:37:07 -0000 1.5.2.1
+++ project.properties 31 Jan 2004 01:43:49 -0000 1.5.2.2
@@ -1,5 +1,5 @@
maven.checkstyle.format = turbine
-
+maven.repo.remote=http://www.ibiblio.org/maven/,http://jakarta.apache.org/turbine/repo
# display the date on the site
maven.xdoc.date = left
No revision
No revision
1.1.1.1.2.1 +8 -7 jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/velocity/TurbineVelocityService.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- TurbineVelocityService.java 30 May 2002 02:27:39 -0000 1.1.1.1
+++ TurbineVelocityService.java 31 Jan 2004 01:43:49 -0000 1.1.1.1.2.1
@@ -54,6 +54,7 @@
* <http://www.apache.org/>.
*/
+import java.util.List;
import java.util.Vector;
import java.util.Iterator;
import java.util.Enumeration;
@@ -437,8 +438,8 @@
{
eventCartridge = new EventCartridge();
- Vector ecconfig = getConfiguration()
- .getVector("eventCartridge.classes", null);
+ List ecconfig = getConfiguration()
+ .getList("eventCartridge.classes", null);
if (ecconfig == null)
{
getCategory().info("No Velocity EventCartridges configured.");
@@ -447,9 +448,9 @@
Object obj = null;
String className = null;
- for (Enumeration e = ecconfig.elements() ; e.hasMoreElements() ;)
+ for (Iterator i = ecconfig.iterator() ; i.hasNext() ;)
{
- className = (String) e.nextElement();
+ className = (String) i.next();
try
{
boolean result = false;
@@ -527,12 +528,12 @@
// Loop through all template paths, clear the corresponding
// velocity properties and translate them all to the webapp space.
int ind;
- Vector paths;
+ List paths;
String entry;
for (Iterator i = keys.iterator(); i.hasNext();)
{
key = (String) i.next();
- paths = getConfiguration().getVector(key,null);
+ paths = getConfiguration().getList(key,null);
if (paths != null)
{
velocityEngine.clearProperty(key);
No revision
No revision
1.1.1.1.2.2 +3 -2 jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/schedule/TurbineNonPersistentSchedulerService.java
Index: TurbineNonPersistentSchedulerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/schedule/TurbineNonPersistentSchedulerService.java,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- TurbineNonPersistentSchedulerService.java 24 Nov 2003 14:15:02 -0000 1.1.1.1.2.1
+++ TurbineNonPersistentSchedulerService.java 31 Jan 2004 01:43:49 -0000 1.1.1.1.2.2
@@ -54,6 +54,7 @@
* <http://www.apache.org/>.
*/
+import java.util.List;
import java.util.Vector;
import org.apache.fulcrum.InitializationException;
@@ -123,7 +124,7 @@
scheduleQueue = new JobQueue();
mainLoop = new MainLoop();
- Vector jobProps = getConfiguration().getVector("scheduler.jobs");
+ List jobProps = getConfiguration().getList("scheduler.jobs");
Vector jobs = new Vector();
// If there are scheduler.jobs defined then set up a job vector
// for the scheduleQueue
@@ -131,7 +132,7 @@
{
for (int i=0;i<jobProps.size();i++)
{
- String jobName = (String)jobProps.elementAt(i);
+ String jobName = (String)jobProps.get(i);
String jobPrefix = "scheduler.job." + jobName ;
if ( (getConfiguration().getString(jobPrefix + ".ID", null)) == null)
No revision
No revision
1.3.2.2 +6 -5 jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/xmlrpc/TurbineXmlRpcService.java
Index: TurbineXmlRpcService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/xmlrpc/TurbineXmlRpcService.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- TurbineXmlRpcService.java 24 Nov 2003 14:15:02 -0000 1.3.2.1
+++ TurbineXmlRpcService.java 31 Jan 2004 01:43:49 -0000 1.3.2.2
@@ -62,6 +62,7 @@
import java.net.URL;
import java.net.UnknownHostException;
import java.util.Iterator;
+import java.util.List;
import java.util.Vector;
import org.apache.commons.configuration.Configuration;
@@ -201,8 +202,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 =
- getConfiguration().getVector("acceptClient");
+ List acceptedClients =
+ getConfiguration().getList("acceptClient");
for (int i = 0; i < acceptedClients.size(); i++)
{
@@ -219,8 +220,8 @@
// 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 =
- getConfiguration().getVector("denyClient");
+ List deniedClients =
+ getConfiguration().getList("denyClient");
for (int i = 0; i < deniedClients.size(); i++)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org