jvanzyl 02/04/16 15:24:02
Modified: . project.xml
src/java/org/apache/turbine Turbine.java
src/java/org/apache/turbine/modules ModuleLoader.java
src/java/org/apache/turbine/pipeline
DefaultSessionTimeoutValve.java
DefaultTargetValve.java
src/java/org/apache/turbine/services/pull
TurbinePullService.java
Log:
Updating to commons-configuration and commons-xo
Revision Changes Path
1.22 +12 -0 jakarta-turbine-3/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 10 Apr 2002 12:29:43 -0000 1.21
+++ project.xml 16 Apr 2002 22:24:01 -0000 1.22
@@ -124,6 +124,18 @@
<jar>commons-collections.jar</jar>
</dependency>
<dependency>
+ <name>commons-configuration</name>
+ <type>required</type>
+ <version>1.0-dev</version>
+ <jar>commons-configuration-1.0-dev.jar</jar>
+ </dependency>
+ <dependency>
+ <name>commons-xo</name>
+ <type>required</type>
+ <version>1.0-dev</version>
+ <jar>commons-xo-1.0-dev.jar</jar>
+ </dependency>
+ <dependency>
<name>commons-lang</name>
<type>required</type>
<version>0.1</version>
1.36 +7 -4 jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Turbine.java 10 Apr 2002 12:52:52 -0000 1.35
+++ Turbine.java 16 Apr 2002 22:24:01 -0000 1.36
@@ -71,11 +71,14 @@
import org.apache.commons.lang.Strings;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.xo.Mapper;
+
import org.apache.fulcrum.ServiceManager;
import org.apache.fulcrum.TurbineServices;
-import org.apache.stratum.configuration.Configuration;
-import org.apache.stratum.configuration.PropertiesConfiguration;
-import org.apache.stratum.xo.Mapper;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.PropertiesConfiguration;
+
import org.apache.turbine.modules.ModuleLoader;
import org.apache.turbine.pipeline.TurbinePipeline;
import org.apache.turbine.services.rundata.RunDataService;
@@ -121,7 +124,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: Turbine.java,v 1.35 2002/04/10 12:52:52 brekke Exp $
+ * @version $Id: Turbine.java,v 1.36 2002/04/16 22:24:01 jvanzyl Exp $
*/
public class Turbine
extends HttpServlet
1.11 +2 -2
jakarta-turbine-3/src/java/org/apache/turbine/modules/ModuleLoader.java
Index: ModuleLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/ModuleLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ModuleLoader.java 9 Apr 2002 17:29:34 -0000 1.10
+++ ModuleLoader.java 16 Apr 2002 22:24:02 -0000 1.11
@@ -58,7 +58,7 @@
import java.util.List;
import java.util.Vector;
import java.util.Map;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineException;
import org.apache.commons.collections.FastArrayList;
@@ -73,7 +73,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: ModuleLoader.java,v 1.10 2002/04/09 17:29:34 jtaylor Exp $
+ * @version $Id: ModuleLoader.java,v 1.11 2002/04/16 22:24:02 jvanzyl Exp $
*/
public class ModuleLoader
{
1.7 +2 -2
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java
Index: DefaultSessionTimeoutValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultSessionTimeoutValve.java 9 Apr 2002 17:29:34 -0000 1.6
+++ DefaultSessionTimeoutValve.java 16 Apr 2002 22:24:02 -0000 1.7
@@ -56,7 +56,7 @@
import java.io.IOException;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.RunData;
@@ -70,7 +70,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: DefaultSessionTimeoutValve.java,v 1.6 2002/04/09 17:29:34 jtaylor
Exp $
+ * @version $Id: DefaultSessionTimeoutValve.java,v 1.7 2002/04/16 22:24:02 jvanzyl
Exp $
*/
public class DefaultSessionTimeoutValve
extends AbstractValve
1.15 +2 -2
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java
Index: DefaultTargetValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultTargetValve.java 9 Apr 2002 17:29:34 -0000 1.14
+++ DefaultTargetValve.java 16 Apr 2002 22:24:02 -0000 1.15
@@ -59,7 +59,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.util.AccessControlList;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
import org.apache.turbine.Turbine;
@@ -77,7 +77,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Mike Haberman</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: DefaultTargetValve.java,v 1.14 2002/04/09 17:29:34 jtaylor Exp $
+ * @version $Id: DefaultTargetValve.java,v 1.15 2002/04/16 22:24:02 jvanzyl Exp $
*/
public class DefaultTargetValve
extends AbstractValve
1.12 +2 -2
jakarta-turbine-3/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Index: TurbinePullService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TurbinePullService.java 20 Mar 2002 01:55:29 -0000 1.11
+++ TurbinePullService.java 16 Apr 2002 22:24:02 -0000 1.12
@@ -69,7 +69,7 @@
import org.apache.turbine.TemplateContext;
import org.apache.turbine.modules.DefaultTemplateContext;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
* <p>
@@ -143,7 +143,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbinePullService.java,v 1.11 2002/03/20 01:55:29 brekke Exp $
+ * @version $Id: TurbinePullService.java,v 1.12 2002/04/16 22:24:02 jvanzyl Exp $
*/
public class TurbinePullService
extends BaseService
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
