jvanzyl 02/04/16 15:23:36
Modified: . project.xml
src/core/org/apache/fulcrum BaseService.java
BaseServiceBroker.java
BaseUnicastRemoteService.java Fulcrum.java
Service.java ServiceBroker.java ServiceManager.java
src/services/org/apache/fulcrum/velocity
TurbineVelocityService.java
src/services/org/apache/fulcrum/xmlrpc
TurbineXmlRpcService.java
src/test/org/apache/fulcrum/localization
LocalizationTest.java
src/test/org/apache/fulcrum/xmlrpc XmlRpcTest.java
Log:
Updating to commons-configuration
Revision Changes Path
1.24 +23 -80 jakarta-turbine-fulcrum/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- project.xml 28 Mar 2002 18:49:43 -0000 1.23
+++ project.xml 16 Apr 2002 22:23:35 -0000 1.24
@@ -1,35 +1,27 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <version>2</version>
<name>jakarta-turbine-fulcrum</name>
<id>fulcrum</id>
<currentVersion>3.0-b2-dev</currentVersion>
<organization>Apache Software Foundation</organization>
<inceptionYear>2000</inceptionYear>
<package>org.apache.fulcrum</package>
-
- <!-- Gump integration -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
-
<shortDescription>Services Framework</shortDescription>
-
- <description>
- Fulcrum is a services framework.
- </description>
-
+ <description>Fulcrum is a services framework.</description>
<url>http://jakarta.apache.org/turbine/fulcrum/</url>
<cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-fulcrum/</cvsWebUrl>
<issueTrackingUrl>http://nagoya.apache.org:8080/scarab/servlet/scarab/</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/turbine/fulcrum/</siteDirectory>
-
<releases>
<release>
<version>3.0-b1</version>
<tag>FULCRUM_3_0_B1</tag>
</release>
</releases>
-
<mailingLists>
<mailingList>
<name>Turbine User List</name>
@@ -44,263 +36,214 @@
<archive>http://nagoya.apache.org:8080/eyebrowse/SummarizeList?[EMAIL PROTECTED]</archive>
</mailingList>
</mailingLists>
-
<developers>
-
<developer>
<name>Geir Magnusson Jr.</name>
<id>geirm</id>
<email>[EMAIL PROTECTED]</email>
<organization>Independent (DVSL Maven)</organization>
</developer>
-
<developer>
<name>John McNally</name>
<id>jmcnally</id>
<email>[EMAIL PROTECTED]</email>
<organization>CollabNet</organization>
</developer>
-
<developer>
<name>Martin Poeschl</name>
<id>mpoeschl</id>
<email>[EMAIL PROTECTED]</email>
<organization>Zenplex</organization>
</developer>
-
<developer>
<name>Daniel Rall</name>
<id>dlr</id>
<email>[EMAIL PROTECTED]</email>
<organization>CollabNet, Inc.</organization>
</developer>
-
<developer>
<name>Jon Scott Stevens</name>
<id>jon</id>
<email>[EMAIL PROTECTED]</email>
<organization>CollabNet, Inc.</organization>
</developer>
-
<developer>
<name>Jason van Zyl</name>
<id>jvanzyl</id>
<email>[EMAIL PROTECTED]</email>
<organization>Zenplex</organization>
</developer>
-
</developers>
-
-
- <!-- Need to mark these as compile-time/run-time -->
-
<dependencies>
-
<dependency>
<name>bsf</name>
<type>required</type>
<version>2.2</version>
<jar>bsf.jar</jar>
</dependency>
-
<dependency>
<name>commons-collections</name>
<type>required</type>
<version>1.0</version>
<jar>commons-collections.jar</jar>
</dependency>
-
<dependency>
<name>commons-codec</name>
<type>required</type>
<version>1.0</version>
<jar>commons-codec.jar</jar>
</dependency>
-
<dependency>
<name>commons-email</name>
<type>required</type>
<version>0.1</version>
<jar>commons-email-0.1-dev.jar</jar>
</dependency>
-
+ <dependency>
+ <name>commons-email</name>
+ <type>required</type>
+ <version>0.1</version>
+ <jar>commons-email-0.1-dev.jar</jar>
+ </dependency>
<dependency>
<name>commons-lang</name>
<type>required</type>
<version>0.1</version>
<jar>commons-lang-0.1-dev.jar</jar>
</dependency>
-
<dependency>
<name>commons-pool</name>
<type>required</type>
<version>0.1</version>
<jar>commons-pool.jar</jar>
</dependency>
-
<dependency>
<name>commons-fileupload</name>
<type>required</type>
<version>1.0</version>
<jar>commons-fileupload-1.0-dev.jar</jar>
</dependency>
-
<dependency>
<name>dom4j</name>
<type>required</type>
<version>1.3</version>
<jar>dom4j-1.3.jar</jar>
</dependency>
-
<dependency>
<name>jaf</name>
<type>required</type>
<version>1.0.1</version>
<jar>activation-1.0.1.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-regexp</name>
<type>required</type>
<version>1.3-dev</version>
<jar>jakarta-regexp-1.3-dev.jar</jar>
</dependency>
-
<dependency>
<name>javamail</name>
<type>required</type>
<version>1.2</version>
<jar>mail-1.2.jar</jar>
</dependency>
-
<dependency>
<name>jdbc</name>
<type>required</type>
<version>2.0</version>
<jar>jdbc2_0-stdext.jar</jar>
</dependency>
-
<dependency>
<name>jndi</name>
<type>required</type>
<version>1.2.1</version>
<jar>jndi-1.2.1.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-log4j</name>
<type>required</type>
<version>1.1.3</version>
<jar>log4j-1.1.3.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-servletapi</name>
<type>required</type>
<version>2.2</version>
<jar>servlet-2.2.jar</jar>
</dependency>
-
+ <dependency>
+ <name>commons-configuration</name>
+ <type>required</type>
+ <version>1.0-dev</version>
+ <jar>commons-configuration-1.0-dev</jar>
+ </dependency>
<dependency>
<name>jakarta-turbine-stratum</name>
<type>required</type>
<version>1.0-b2-dev</version>
<jar>stratum-1.0-b2-dev.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-turbine-torque</name>
<type>required</type>
<version>3.0-b2-dev</version>
<jar>torque-3.0-b2-dev.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-velocity</name>
<type>required</type>
<version>1.3-dev</version>
<jar>velocity-1.3-dev.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-velocity-dvsl</name>
<type>documentation</type>
<version>0.43</version>
<jar>velocity-dvsl-0.43.jar</jar>
</dependency>
-
<dependency>
<name>village</name>
<type>required</type>
<version>1.5.3-dev.jar</version>
<jar>village-1.5.3-dev.jar</jar>
</dependency>
-
<dependency>
<name>xml-xerces</name>
<type>required</type>
<version>2.0.0</version>
<jar>xercesImpl-2.0.0.jar</jar>
</dependency>
-
<dependency>
<name>xml-apis</name>
<type>required</type>
<version>2.0.0</version>
<jar>xmlParserAPIs-2.0.0.jar</jar>
</dependency>
-
<dependency>
<name>xml-rpc</name>
<type>required</type>
<version>1.1</version>
<jar>xmlrpc.jar</jar>
</dependency>
-
<dependency>
<name>xml-xalan2</name>
<type>required</type>
<version>2.1.0</version>
<jar>xalan-2.1.0.jar</jar>
</dependency>
-
</dependencies>
-
<build>
-
<sourceDirectories>
<sourceDirectory>src/core</sourceDirectory>
<sourceDirectory>src/services</sourceDirectory>
<sourceDirectory>src/util</sourceDirectory>
</sourceDirectories>
-
- <testSourceDirectories>
- <testSourceDirectory>src/core</testSourceDirectory>
- <testSourceDirectory>src/services</testSourceDirectory>
- <testSourceDirectory>src/util</testSourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- </testSourceDirectories>
-
- <aspectSourceDirectories>
- </aspectSourceDirectories>
-
- <!-- Unit test classes -->
- <unitTestClassEntries>
- <unitTestClassEntry>include = **/*Test*.class</unitTestClassEntry>
- </unitTestClassEntries>
-
- <!-- Runtime unit test classes -->
- <runtimeTestClassEntries>
- </runtimeTestClassEntries>
-
- <!-- J A R R E S O U R C E S -->
- <!-- Resources that are packaged up inside the JAR file -->
-
- <jarResources>
- </jarResources>
-
- <jars>
- </jars>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <aspectSourceDirectories></aspectSourceDirectories>
+ <unitTestPatterns>
+ <unitTestPattern>include = **/*Test*.java</unitTestPattern>
+ </unitTestPatterns>
+ <jarResources></jarResources>
+ <jars></jars>
</build>
</project>
-
1.11 +2 -2
jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/BaseService.java
Index: BaseService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/BaseService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BaseService.java 6 Feb 2002 16:20:15 -0000 1.10
+++ BaseService.java 16 Apr 2002 22:23:36 -0000 1.11
@@ -56,7 +56,7 @@
import java.util.List;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.log4j.Category;
/**
@@ -68,7 +68,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leonard Richardson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: BaseService.java,v 1.10 2002/02/06 16:20:15 mpoeschl Exp $
+ * @version $Id: BaseService.java,v 1.11 2002/04/16 22:23:36 jvanzyl Exp $
*/
public abstract class BaseService implements Service
{
1.15 +3 -3
jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/BaseServiceBroker.java
Index: BaseServiceBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/BaseServiceBroker.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BaseServiceBroker.java 6 Feb 2002 16:20:15 -0000 1.14
+++ BaseServiceBroker.java 16 Apr 2002 22:23:36 -0000 1.15
@@ -67,8 +67,8 @@
import java.util.Stack;
import org.apache.fulcrum.ServiceException;
-import org.apache.stratum.configuration.BaseConfiguration;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
import org.apache.log4j.Category;
import org.apache.log4j.helpers.NullEnumeration;
@@ -88,7 +88,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: BaseServiceBroker.java,v 1.14 2002/02/06 16:20:15 mpoeschl Exp $
+ * @version $Id: BaseServiceBroker.java,v 1.15 2002/04/16 22:23:36 jvanzyl Exp $
*/
public abstract class BaseServiceBroker implements ServiceBroker
{
1.7 +1 -1
jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/BaseUnicastRemoteService.java
Index: BaseUnicastRemoteService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/BaseUnicastRemoteService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseUnicastRemoteService.java 6 Feb 2002 16:20:15 -0000 1.6
+++ BaseUnicastRemoteService.java 16 Apr 2002 22:23:36 -0000 1.7
@@ -56,7 +56,7 @@
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.log4j.Category;
/**
1.4 +2 -2 jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/Fulcrum.java
Index: Fulcrum.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/Fulcrum.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Fulcrum.java 29 Mar 2002 03:52:22 -0000 1.3
+++ Fulcrum.java 16 Apr 2002 22:23:36 -0000 1.4
@@ -56,7 +56,7 @@
import org.apache.stratum.lifecycle.Configurable;
import org.apache.stratum.lifecycle.Initializable;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
* A implementation of a <code>ServiceBroker</code> which implements the
@@ -64,7 +64,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
* @author <a href="mailto:ericATdobbse.net";>Eric Dobbs</a>
- * @version $Id: Fulcrum.java,v 1.3 2002/03/29 03:52:22 dobbs Exp $
+ * @version $Id: Fulcrum.java,v 1.4 2002/04/16 22:23:36 jvanzyl Exp $
*/
public class Fulcrum
implements Configurable, Initializable
1.12 +2 -2 jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/Service.java
Index: Service.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/Service.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Service.java 6 Feb 2002 16:20:15 -0000 1.11
+++ Service.java 16 Apr 2002 22:23:36 -0000 1.12
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.log4j.Category;
/**
@@ -69,7 +69,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Leonard Richardson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: Service.java,v 1.11 2002/02/06 16:20:15 mpoeschl Exp $
+ * @version $Id: Service.java,v 1.12 2002/04/16 22:23:36 jvanzyl Exp $
*/
public interface Service
{
1.7 +2 -2
jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/ServiceBroker.java
Index: ServiceBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/ServiceBroker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServiceBroker.java 6 Feb 2002 16:20:15 -0000 1.6
+++ ServiceBroker.java 16 Apr 2002 22:23:36 -0000 1.7
@@ -57,7 +57,7 @@
import java.util.List;
import java.util.Hashtable;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.log4j.Category;
/**
@@ -82,7 +82,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: ServiceBroker.java,v 1.6 2002/02/06 16:20:15 mpoeschl Exp $
+ * @version $Id: ServiceBroker.java,v 1.7 2002/04/16 22:23:36 jvanzyl Exp $
*/
public interface ServiceBroker
{
1.7 +2 -2
jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/ServiceManager.java
Index: ServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/core/org/apache/fulcrum/ServiceManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServiceManager.java 6 Feb 2002 16:20:15 -0000 1.6
+++ ServiceManager.java 16 Apr 2002 22:23:36 -0000 1.7
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.log4j.Category;
/**
@@ -67,7 +67,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: ServiceManager.java,v 1.6 2002/02/06 16:20:15 mpoeschl Exp $
+ * @version $Id: ServiceManager.java,v 1.7 2002/04/16 22:23:36 jvanzyl Exp $
*/
public interface ServiceManager extends ServiceBroker
{
1.16 +2 -2
jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/velocity/TurbineVelocityService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineVelocityService.java 4 Apr 2002 00:57:24 -0000 1.15
+++ TurbineVelocityService.java 16 Apr 2002 22:23:36 -0000 1.16
@@ -76,7 +76,7 @@
import org.apache.fulcrum.template.TurbineTemplate;
import org.apache.fulcrum.template.TemplateContext;
import org.apache.fulcrum.template.BaseTemplateEngineService;
-import org.apache.stratum.configuration.ConfigurationConverter;
+import org.apache.commons.configuration.ConfigurationConverter;
/**
* This is a Service that can process Velocity templates from within a
@@ -100,7 +100,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbineVelocityService.java,v 1.15 2002/04/04 00:57:24 jon Exp $
+ * @version $Id: TurbineVelocityService.java,v 1.16 2002/04/16 22:23:36 jvanzyl Exp
$
*/
public class TurbineVelocityService
extends BaseTemplateEngineService
1.7 +2 -2
jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/xmlrpc/TurbineXmlRpcService.java
Index: TurbineXmlRpcService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/xmlrpc/TurbineXmlRpcService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineXmlRpcService.java 6 Feb 2002 16:20:15 -0000 1.6
+++ TurbineXmlRpcService.java 16 Apr 2002 22:23:36 -0000 1.7
@@ -75,7 +75,7 @@
import org.apache.xmlrpc.secure.SecureWebServer;
import org.apache.xmlrpc.secure.SecurityTool;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
* This is a service which will make an xml-rpc call to a remote server.
@@ -99,7 +99,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: TurbineXmlRpcService.java,v 1.6 2002/02/06 16:20:15 mpoeschl Exp $
+ * @version $Id: TurbineXmlRpcService.java,v 1.7 2002/04/16 22:23:36 jvanzyl Exp $
*/
public class TurbineXmlRpcService
extends BaseService
1.6 +2 -2
jakarta-turbine-fulcrum/src/test/org/apache/fulcrum/localization/LocalizationTest.java
Index: LocalizationTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/test/org/apache/fulcrum/localization/LocalizationTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocalizationTest.java 28 Mar 2002 19:10:16 -0000 1.5
+++ LocalizationTest.java 16 Apr 2002 22:23:36 -0000 1.6
@@ -61,8 +61,8 @@
import org.apache.fulcrum.ServiceManager;
import org.apache.fulcrum.TurbineServices;
-import org.apache.stratum.configuration.BaseConfiguration;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
import junit.framework.Test;
import junit.framework.TestCase;
1.3 +1 -1
jakarta-turbine-fulcrum/src/test/org/apache/fulcrum/xmlrpc/XmlRpcTest.java
Index: XmlRpcTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/test/org/apache/fulcrum/xmlrpc/XmlRpcTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlRpcTest.java 29 Mar 2002 03:00:14 -0000 1.2
+++ XmlRpcTest.java 16 Apr 2002 22:23:36 -0000 1.3
@@ -58,7 +58,7 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.stratum.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.fulcrum.Fulcrum;
import org.apache.fulcrum.ServiceManager;
import org.apache.fulcrum.TurbineServices;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
