You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ks...@apache.org on 2002/04/17 00:07:09 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc TurbineXmlRpcService.java
kschrader 02/04/16 15:07:09
Modified: . build.xml default.properties deps.list project.xml
src/java/org/apache/turbine Turbine.java
src/java/org/apache/turbine/services BaseService.java
BaseServiceBroker.java
BaseUnicastRemoteService.java Service.java
ServiceBroker.java TurbineServices.java
src/java/org/apache/turbine/services/cache
TurbineGlobalCacheService.java
src/java/org/apache/turbine/services/db
TurbineMapBrokerService.java
TurbinePoolBrokerService.java
src/java/org/apache/turbine/services/factory
TurbineFactoryService.java
src/java/org/apache/turbine/services/freemarker
TurbineFreeMarkerService.java
src/java/org/apache/turbine/services/jsp
TurbineJspService.java
src/java/org/apache/turbine/services/logging
PropertiesLoggingConfig.java
src/java/org/apache/turbine/services/mimetype
TurbineMimeTypeService.java
src/java/org/apache/turbine/services/pool
TurbinePoolService.java
src/java/org/apache/turbine/services/resources
ResourceService.java TurbineResourceService.java
TurbineResources.java
src/java/org/apache/turbine/services/rundata
TurbineRunDataService.java
src/java/org/apache/turbine/services/template
BaseTemplateEngineService.java
TurbineTemplateService.java
src/java/org/apache/turbine/services/velocity
TurbineVelocityService.java
src/java/org/apache/turbine/services/webmacro
TurbineTemplateProvider.java
TurbineWebMacroService.java
src/java/org/apache/turbine/services/xmlrpc
TurbineXmlRpcService.java
Log:
Switching to commons.configuration
Revision Changes Path
1.12 +1 -0 jakarta-turbine-2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 29 Mar 2002 02:00:02 -0000 1.11
+++ build.xml 16 Apr 2002 22:07:07 -0000 1.12
@@ -16,6 +16,7 @@
<path id="classpath">
<pathelement location="${activation.jar}"/>
<pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-configuration.jar}"/>
<pathelement location="${commons-lang.jar}"/>
<pathelement location="${ecs.jar}"/>
<pathelement location="${regexp.jar}"/>
1.9 +2 -1 jakarta-turbine-2/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/default.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.properties 19 Mar 2002 00:20:55 -0000 1.8
+++ default.properties 16 Apr 2002 22:07:07 -0000 1.9
@@ -41,6 +41,7 @@
activation.jar = ${lib.repo}/activation-1.0.1.jar
commons-collections.jar = ${lib.repo}/commons-collections.jar
+commons-configuration.jar = ${lib.repo}/commons-configuration-1.0-dev.jar
commons-lang.jar = ${lib.repo}/commons-lang-0.1-dev.jar
ecs.jar = ${lib.repo}/ecs-1.4.1.jar
regexp.jar = ${lib.repo}/jakarta-regexp-1.3-dev.jar
@@ -51,7 +52,7 @@
javamail.jar = ${lib.repo}/mail-1.2.jar
oro.jar = ${lib.repo}/oro.jar
servlet.jar = ${lib.repo}/servlet-2.2.jar
-stratum.jar = ${lib.repo}/stratum-0.1-dev.jar
+stratum.jar = ${lib.repo}/stratum-1.0-b2-dev.jar
torque.jar = ${lib.repo}/torque-3.0-dev.jar
velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
village.jar = ${lib.repo}/village-1.5.3-dev.jar
1.4 +2 -1 jakarta-turbine-2/deps.list
Index: deps.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/deps.list,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deps.list 11 Mar 2002 17:36:43 -0000 1.3
+++ deps.list 16 Apr 2002 22:07:07 -0000 1.4
@@ -1,6 +1,7 @@
<non-distributable>|activation.jar|http://java.sun.com/products/javabeans/glasgow/jaf.html
commons-collections.jar
commons-lang-0.1-dev.jar
+commons-configuration-1.0-dev.jar
ecs-1.4.1.jar
jakarta-regexp-1.3-dev.jar
jdbc2_0-stdext.jar
@@ -10,7 +11,7 @@
mail-1.2.jar
oro.jar
servlet-2.2.jar
-stratum-0.1-dev.jar
+stratum-1.0-b2-dev.jar
torque-3.0-dev.jar
velocity-1.3-dev.jar
village-1.5.3-dev.jar
1.29 +21 -15 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- project.xml 15 Apr 2002 02:24:09 -0000 1.28
+++ project.xml 16 Apr 2002 22:07:07 -0000 1.29
@@ -10,21 +10,21 @@
<package>org.apache.turbine</package>
<gumpRepositoryId>jakarta</gumpRepositoryId>
<shortDescription>A servlet based framework.</shortDescription>
-
+
<description>
- Turbine is a servlet based framework that allows experienced
- Java developers to quickly build secure web applications. Parts
- of Turbine can also be used independently of the web portion of
- Turbine as well. In other words, we strive to make portions of
+ Turbine is a servlet based framework that allows experienced
+ Java developers to quickly build secure web applications. Parts
+ of Turbine can also be used independently of the web portion of
+ Turbine as well. In other words, we strive to make portions of
Turbine easily available for use in other applications.
</description>
-
+
<url>http://jakarta.apache.org/turbine/turbine-2/</url>
<cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-2/</cvsWebUrl>
<issueTrackingUrl>http://nagoya.apache.org:8080/scarab/servlet/scarab/</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/turbine/turbine-2/</siteDirectory>
-
+
<mailingLists>
<mailingList>
<name>Turbine User List</name>
@@ -39,7 +39,7 @@
<archive>http://nagoya.apache.org:8080/eyebrowse/SummarizeList?listName=turbine-dev@jakarta.apache.org</archive>
</mailingList>
</mailingLists>
-
+
<developers>
<developer>
<name>Gary Bartlett</name>
@@ -239,7 +239,7 @@
<email>dlr@finemaltcoding.com</email>
<organization>CollabNet, Inc.</organization>
</developer>
-
+
<!--
<td>Cameron Riley</td>
<td><a href="mailto:criley@ekmail.com">criley@ekmail.com</a></td>
@@ -252,12 +252,12 @@
<td></td>
<td>Master</td>
-->
- <!--
- <td>Kurt Schrader</td>
- <td><a href="mailto:kschrade@engin.umich.edu">kschrade@engin.umich.edu</a></td>
- <td></td>
- <td>Journeyer</td>
- -->
+ <developer>
+ <name>Kurt Schrader</name>
+ <id>kschrader</id>
+ <email>kschrader@karmalab.org</email>
+ <organization>University of Michigan</organization>
+ </developer>
<!--
<td>Ingo Schuster</td>
<td><a href="mailto:ingo@raleigh.ibm.com">ingo@raleigh.ibm.com</a></td>
@@ -336,6 +336,12 @@
<type>required</type>
<version>1.0</version>
<jar>commons-collections.jar</jar>
+ </dependency>
+ <dependency>
+ <name>commons-configuration</name>
+ <type>required</type>
+ <version>1.0</version>
+ <jar>commons-configuration-1.0-dev.jar</jar>
</dependency>
<dependency>
<name>commons-lang</name>
1.14 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Turbine.java 29 Mar 2002 15:57:03 -0000 1.13
+++ Turbine.java 16 Apr 2002 22:07:07 -0000 1.14
@@ -65,8 +65,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.stratum.component.ComponentLoader;
-import org.apache.stratum.configuration.Configuration;
-import org.apache.stratum.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.stratum.lifecycle.Configurable;
import org.apache.stratum.lifecycle.Initializable;
import org.apache.turbine.modules.ActionLoader;
@@ -117,7 +117,7 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:sean@informage.net">Sean Legassick</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: Turbine.java,v 1.13 2002/03/29 15:57:03 dobbs Exp $
+ * @version $Id: Turbine.java,v 1.14 2002/04/16 22:07:07 kschrader Exp $
*/
public class Turbine
extends HttpServlet
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/BaseService.java
Index: BaseService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/BaseService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseService.java 13 Mar 2002 19:43:35 -0000 1.2
+++ BaseService.java 16 Apr 2002 22:07:07 -0000 1.3
@@ -55,14 +55,14 @@
*/
import java.util.Properties;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
* This class is a generic implementation of <code>Service</code>.
*
* @author <a href="mailto:burton@apache.org">Kevin Burton</a>
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: BaseService.java,v 1.2 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: BaseService.java,v 1.3 2002/04/16 22:07:07 kschrader Exp $
*/
public class BaseService
extends BaseInitable
1.3 +3 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseServiceBroker.java 13 Mar 2002 19:43:35 -0000 1.2
+++ BaseServiceBroker.java 16 Apr 2002 22:07:07 -0000 1.3
@@ -61,8 +61,8 @@
import java.util.Properties;
import org.apache.turbine.util.StringUtils;
-import org.apache.stratum.configuration.BaseConfiguration;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -84,7 +84,7 @@
* @author <a href="mailto:burton@apache.org">Kevin Burton</a>
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: BaseServiceBroker.java,v 1.2 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: BaseServiceBroker.java,v 1.3 2002/04/16 22:07:07 kschrader Exp $
*/
public abstract class BaseServiceBroker
extends BaseInitableBroker
1.3 +1 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
Index: BaseUnicastRemoteService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseUnicastRemoteService.java 13 Mar 2002 19:43:34 -0000 1.2
+++ BaseUnicastRemoteService.java 16 Apr 2002 22:07:07 -0000 1.3
@@ -1,6 +1,6 @@
package org.apache.turbine.services;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import java.util.Properties;
import java.rmi.RemoteException;
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/Service.java
Index: Service.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/Service.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Service.java 13 Mar 2002 19:43:34 -0000 1.2
+++ Service.java 16 Apr 2002 22:07:07 -0000 1.3
@@ -55,7 +55,7 @@
*/
import java.util.Properties;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -67,7 +67,7 @@
* @author <a href="mailto:burton@apache.org">Kevin Burton</a>
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: Service.java,v 1.2 2002/03/13 19:43:34 mpoeschl Exp $
+ * @version $Id: Service.java,v 1.3 2002/04/16 22:07:07 kschrader Exp $
*/
public interface Service
extends Initable
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/ServiceBroker.java
Index: ServiceBroker.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/ServiceBroker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServiceBroker.java 13 Mar 2002 19:43:34 -0000 1.2
+++ ServiceBroker.java 16 Apr 2002 22:07:07 -0000 1.3
@@ -55,7 +55,7 @@
*/
import java.util.Properties;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -78,7 +78,7 @@
* @author <a href="mailto:burton@apache.org">Kevin Burton</a>
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: ServiceBroker.java,v 1.2 2002/03/13 19:43:34 mpoeschl Exp $
+ * @version $Id: ServiceBroker.java,v 1.3 2002/04/16 22:07:07 kschrader Exp $
*/
public interface ServiceBroker
extends InitableBroker
1.4 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/TurbineServices.java
Index: TurbineServices.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/TurbineServices.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineServices.java 13 Mar 2002 19:43:34 -0000 1.3
+++ TurbineServices.java 16 Apr 2002 22:07:07 -0000 1.4
@@ -64,7 +64,7 @@
import org.apache.turbine.services.logging.LoggingService;
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -75,7 +75,7 @@
* @author <a href="mailto:burton@apache.org">Kevin Burton</a>
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: TurbineServices.java,v 1.3 2002/03/13 19:43:34 mpoeschl Exp $
+ * @version $Id: TurbineServices.java,v 1.4 2002/04/16 22:07:07 kschrader Exp $
*/
public class TurbineServices
extends BaseServiceBroker
1.4 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java
Index: TurbineGlobalCacheService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineGlobalCacheService.java 13 Mar 2002 19:43:34 -0000 1.3
+++ TurbineGlobalCacheService.java 16 Apr 2002 22:07:08 -0000 1.4
@@ -64,7 +64,7 @@
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -95,7 +95,7 @@
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
* @author <a href="mailto:john@zenplex.com">John Thorhauer</a>
- * @version $Id: TurbineGlobalCacheService.java,v 1.3 2002/03/13 19:43:34 mpoeschl Exp $
+ * @version $Id: TurbineGlobalCacheService.java,v 1.4 2002/04/16 22:07:08 kschrader Exp $
*/
public class TurbineGlobalCacheService
extends TurbineBaseService
1.5 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/db/TurbineMapBrokerService.java
Index: TurbineMapBrokerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/db/TurbineMapBrokerService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineMapBrokerService.java 13 Mar 2002 19:43:35 -0000 1.4
+++ TurbineMapBrokerService.java 16 Apr 2002 22:07:08 -0000 1.5
@@ -66,7 +66,7 @@
import org.apache.turbine.util.db.adapter.DBFactory;
import org.apache.turbine.util.db.map.DatabaseMap;
import org.apache.turbine.util.db.map.TableMap;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -79,7 +79,7 @@
* @author <a href="mailto:magnus@handtolvur.is">Magn�s ��r Torfason</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: TurbineMapBrokerService.java,v 1.4 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbineMapBrokerService.java,v 1.5 2002/04/16 22:07:08 kschrader Exp $
*/
public class TurbineMapBrokerService extends BaseService
implements MapBrokerService
1.4 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/db/TurbinePoolBrokerService.java
Index: TurbinePoolBrokerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/db/TurbinePoolBrokerService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbinePoolBrokerService.java 13 Mar 2002 19:43:35 -0000 1.3
+++ TurbinePoolBrokerService.java 16 Apr 2002 22:07:08 -0000 1.4
@@ -63,7 +63,7 @@
import org.apache.turbine.util.db.adapter.DB;
import org.apache.turbine.util.db.pool.ConnectionPool;
import org.apache.turbine.util.db.pool.DBConnection;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -76,7 +76,7 @@
* @author <a href="mailto:magnus@handtolvur.is">Magn�s ��r Torfason</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: TurbinePoolBrokerService.java,v 1.3 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbinePoolBrokerService.java,v 1.4 2002/04/16 22:07:08 kschrader Exp $
*/
public class TurbinePoolBrokerService extends BaseService
implements PoolBrokerService
1.3 +2 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineFactoryService.java 13 Mar 2002 19:43:34 -0000 1.2
+++ TurbineFactoryService.java 16 Apr 2002 22:07:08 -0000 1.3
@@ -63,7 +63,7 @@
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.pool.ObjectInputStreamForContext;
@@ -79,7 +79,7 @@
* will be used.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbineFactoryService.java,v 1.2 2002/03/13 19:43:34 mpoeschl Exp $
+ * @version $Id: TurbineFactoryService.java,v 1.3 2002/04/16 22:07:08 kschrader Exp $
*/
public class TurbineFactoryService
extends TurbineBaseService
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/TurbineFreeMarkerService.java
Index: TurbineFreeMarkerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/TurbineFreeMarkerService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineFreeMarkerService.java 13 Mar 2002 19:43:35 -0000 1.2
+++ TurbineFreeMarkerService.java 16 Apr 2002 22:07:08 -0000 1.3
@@ -69,7 +69,7 @@
import org.apache.turbine.services.resources.*;
import org.apache.turbine.services.servlet.TurbineServlet;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.ecs.StringElement;
@@ -93,7 +93,7 @@
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: TurbineFreeMarkerService.java,v 1.2 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbineFreeMarkerService.java,v 1.3 2002/04/16 22:07:08 kschrader Exp $
* @deprecated
*/
public class TurbineFreeMarkerService
1.3 +1 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
Index: TurbineJspService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJspService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineJspService.java 13 Mar 2002 19:43:35 -0000 1.2
+++ TurbineJspService.java 16 Apr 2002 22:07:08 -0000 1.3
@@ -76,7 +76,7 @@
import org.apache.turbine.services.template.BaseTemplateEngineService;
import org.apache.turbine.services.template.TurbineTemplate;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/logging/PropertiesLoggingConfig.java
Index: PropertiesLoggingConfig.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/logging/PropertiesLoggingConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertiesLoggingConfig.java 5 Apr 2002 07:04:55 -0000 1.2
+++ PropertiesLoggingConfig.java 16 Apr 2002 22:07:08 -0000 1.3
@@ -61,7 +61,7 @@
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.util.Log;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
* Small helper class that encapsulates the logging configuration
@@ -69,7 +69,7 @@
* file.
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: PropertiesLoggingConfig.java,v 1.2 2002/04/05 07:04:55 dobbs Exp $
+ * @version $Id: PropertiesLoggingConfig.java,v 1.3 2002/04/16 22:07:08 kschrader Exp $
*/
public class PropertiesLoggingConfig implements LoggingConfig
{
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/mimetype/TurbineMimeTypeService.java
Index: TurbineMimeTypeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/mimetype/TurbineMimeTypeService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineMimeTypeService.java 13 Mar 2002 19:43:35 -0000 1.2
+++ TurbineMimeTypeService.java 16 Apr 2002 22:07:08 -0000 1.3
@@ -64,7 +64,7 @@
import org.apache.turbine.services.mimetype.util.MimeType;
import org.apache.turbine.services.mimetype.util.MimeTypeMap;
import org.apache.turbine.services.mimetype.util.CharSetMap;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -85,7 +85,7 @@
* a set of most common mappings.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbineMimeTypeService.java,v 1.2 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbineMimeTypeService.java,v 1.3 2002/04/16 22:07:08 kschrader Exp $
*/
public class TurbineMimeTypeService
extends TurbineBaseService
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/pool/TurbinePoolService.java
Index: TurbinePoolService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pool/TurbinePoolService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbinePoolService.java 13 Mar 2002 19:43:35 -0000 1.2
+++ TurbinePoolService.java 16 Apr 2002 22:07:08 -0000 1.3
@@ -61,7 +61,7 @@
import javax.servlet.ServletConfig;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.pool.Recyclable;
@@ -86,7 +86,7 @@
* a dispose method, when they are returned to the pool.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbinePoolService.java,v 1.2 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbinePoolService.java,v 1.3 2002/04/16 22:07:08 kschrader Exp $
*/
public class TurbinePoolService
extends TurbineFactoryService
1.4 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/resources/ResourceService.java
Index: ResourceService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/resources/ResourceService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceService.java 13 Mar 2002 19:43:35 -0000 1.3
+++ ResourceService.java 16 Apr 2002 22:07:08 -0000 1.4
@@ -59,7 +59,7 @@
import java.util.Vector;
import javax.servlet.ServletConfig;
import org.apache.turbine.services.Service;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -84,7 +84,7 @@
* @author <a href="mailto:greg@shwoop.com">Greg Ritter</a>
* @author <a href="mailto:luta.raphael@networks.vivendi.net">Rapha�l Luta</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: ResourceService.java,v 1.3 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: ResourceService.java,v 1.4 2002/04/16 22:07:08 kschrader Exp $
*/
public interface ResourceService extends Service
{
1.7 +5 -5 jakarta-turbine-2/src/java/org/apache/turbine/services/resources/TurbineResourceService.java
Index: TurbineResourceService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/resources/TurbineResourceService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineResourceService.java 13 Mar 2002 19:43:35 -0000 1.6
+++ TurbineResourceService.java 16 Apr 2002 22:07:08 -0000 1.7
@@ -70,10 +70,10 @@
import org.apache.turbine.util.ServletUtils;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.TurbineException;
-import org.apache.stratum.configuration.BaseConfiguration;
-import org.apache.stratum.configuration.Configuration;
-import org.apache.stratum.configuration.ConfigurationConverter;
-import org.apache.stratum.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationConverter;
+import org.apache.commons.configuration.PropertiesConfiguration;
/**
@@ -97,7 +97,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:luta.raphael@networks.vivendi.net">Rapha�l Luta</a>
* @author <a href="mailto:jvanzyl@periapt.com@">Jason van Zyl</a>
- * @version $Id: TurbineResourceService.java,v 1.6 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbineResourceService.java,v 1.7 2002/04/16 22:07:08 kschrader Exp $
*/
public class TurbineResourceService
extends TurbineBaseService
1.4 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/resources/TurbineResources.java
Index: TurbineResources.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/resources/TurbineResources.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineResources.java 13 Mar 2002 19:43:35 -0000 1.3
+++ TurbineResources.java 16 Apr 2002 22:07:08 -0000 1.4
@@ -58,7 +58,7 @@
import java.util.Vector;
import javax.servlet.ServletConfig;
import org.apache.turbine.services.TurbineServices;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
* <p>This is a static class for defining the default Turbine configuration
@@ -71,7 +71,7 @@
* @author <a href="mailto:greg@shwoop.com">Greg Ritter</a>
* @author <a href="mailto:luta.raphael@networks.vivendi.net">Rapha�l Luta</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: TurbineResources.java,v 1.3 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbineResources.java,v 1.4 2002/04/16 22:07:08 kschrader Exp $
*/
public abstract class TurbineResources
{
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
Index: TurbineRunDataService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineRunDataService.java 13 Mar 2002 19:43:35 -0000 1.2
+++ TurbineRunDataService.java 16 Apr 2002 22:07:08 -0000 1.3
@@ -64,7 +64,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.CookieParser;
@@ -84,7 +84,7 @@
* the implementations should implement the Recyclable interface.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbineRunDataService.java,v 1.2 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbineRunDataService.java,v 1.3 2002/04/16 22:07:08 kschrader Exp $
*/
public class TurbineRunDataService
extends TurbineBaseService
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java
Index: BaseTemplateEngineService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseTemplateEngineService.java 13 Mar 2002 19:43:35 -0000 1.2
+++ BaseTemplateEngineService.java 16 Apr 2002 22:07:08 -0000 1.3
@@ -59,7 +59,7 @@
import org.apache.turbine.services.TurbineBaseService;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: BaseTemplateEngineService.java,v 1.2 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: BaseTemplateEngineService.java,v 1.3 2002/04/16 22:07:08 kschrader Exp $
*/
public abstract class BaseTemplateEngineService extends TurbineBaseService
implements TemplateEngineService
1.4 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
Index: TurbineTemplateService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/TurbineTemplateService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineTemplateService.java 13 Mar 2002 19:43:35 -0000 1.3
+++ TurbineTemplateService.java 16 Apr 2002 22:07:09 -0000 1.4
@@ -70,7 +70,7 @@
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.services.servlet.TurbineServlet;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -111,7 +111,7 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbineTemplateService.java,v 1.3 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbineTemplateService.java,v 1.4 2002/04/16 22:07:09 kschrader Exp $
*/
public class TurbineTemplateService extends TurbineBaseService
implements TemplateService
1.7 +3 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineVelocityService.java 13 Mar 2002 19:43:35 -0000 1.6
+++ TurbineVelocityService.java 16 Apr 2002 22:07:09 -0000 1.7
@@ -86,8 +86,8 @@
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.services.template.BaseTemplateEngineService;
-import org.apache.stratum.configuration.Configuration;
-import org.apache.stratum.configuration.ConfigurationConverter;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationConverter;
/**
@@ -107,7 +107,7 @@
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:sean@informage.ent">Sean Legassick</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: TurbineVelocityService.java,v 1.6 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbineVelocityService.java,v 1.7 2002/04/16 22:07:09 kschrader Exp $
*/
public class TurbineVelocityService extends BaseTemplateEngineService
implements VelocityService
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/webmacro/TurbineTemplateProvider.java
Index: TurbineTemplateProvider.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/webmacro/TurbineTemplateProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineTemplateProvider.java 13 Mar 2002 19:43:34 -0000 1.2
+++ TurbineTemplateProvider.java 16 Apr 2002 22:07:09 -0000 1.3
@@ -59,7 +59,7 @@
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.Log;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.webmacro.Broker;
import org.webmacro.NotFoundException;
import org.webmacro.Template;
@@ -82,7 +82,7 @@
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: TurbineTemplateProvider.java,v 1.2 2002/03/13 19:43:34 mpoeschl Exp $
+ * @version $Id: TurbineTemplateProvider.java,v 1.3 2002/04/16 22:07:09 kschrader Exp $
* @deprecated
*/
public class TurbineTemplateProvider
1.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/webmacro/TurbineWebMacroService.java
Index: TurbineWebMacroService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/webmacro/TurbineWebMacroService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineWebMacroService.java 13 Mar 2002 19:43:34 -0000 1.2
+++ TurbineWebMacroService.java 16 Apr 2002 22:07:09 -0000 1.3
@@ -72,7 +72,7 @@
import org.apache.turbine.util.template.TemplateLink;
import org.apache.turbine.util.template.TemplatePageAttributes;
import org.apache.turbine.util.webmacro.WebMacroFormatter;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.webmacro.Broker;
import org.webmacro.Context;
import org.webmacro.FastWriter;
@@ -113,7 +113,7 @@
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: TurbineWebMacroService.java,v 1.2 2002/03/13 19:43:34 mpoeschl Exp $
+ * @version $Id: TurbineWebMacroService.java,v 1.3 2002/04/16 22:07:09 kschrader Exp $
* @deprecated
*/
public class TurbineWebMacroService extends BaseTemplateEngineService
1.4 +2 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineXmlRpcService.java 13 Mar 2002 19:43:35 -0000 1.3
+++ TurbineXmlRpcService.java 16 Apr 2002 22:07:09 -0000 1.4
@@ -77,7 +77,7 @@
import org.apache.turbine.services.xmlrpc.util.FileTransfer;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.TurbineException;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -100,7 +100,7 @@
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: TurbineXmlRpcService.java,v 1.3 2002/03/13 19:43:35 mpoeschl Exp $
+ * @version $Id: TurbineXmlRpcService.java,v 1.4 2002/04/16 22:07:09 kschrader Exp $
*/
public class TurbineXmlRpcService
extends TurbineBaseService
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>