oalexeev 01/07/17 21:22:20
Modified: contrib/service-manager build.properties.sample build.xml
contrib/service-manager/src/org/apache/struts/action
ServicesServlet.java
contrib/service-manager/src/org/apache/struts/service
InitServiceConfigRule.java
InitServiceManagerRule.java InitServiceRule.java
Service.java ServiceManager.java
contrib/service-manager/src/org/apache/struts/service/factory
FactoryService.java
Log:
Migrate to the digester, collections and beanutils from commons
projects.
Revision Changes Path
1.2 +3 -0 jakarta-struts/contrib/service-manager/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/service-manager/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 2001/07/14 22:41:56 1.1
+++ build.properties.sample 2001/07/18 04:22:19 1.2
@@ -1,3 +1,6 @@
struts.lib=../../dist/lib/struts.jar
jdbc20ext.jar=../jdbc2_0-stdext.jar
servlet.jar=../jakarta-servletapi/lib/servlet.jar
+commons-beanutils.jar=../../../jakarta-commons/beanutils/dist/commons-beanutils.jar
+commons-collections.jar=../../../jakarta-commons/collections/dist/commons-collections.jar
+commons-digester.jar=../../../jakarta-commons/digester/dist/commons-digester.jar
1.2 +6 -0 jakarta-struts/contrib/service-manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/service-manager/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/07/14 22:41:56 1.1
+++ build.xml 2001/07/18 04:22:19 1.2
@@ -9,6 +9,9 @@
<property name="struts.lib" value="../../dist/lib/struts.jar"/>
<property name="jdbc20ext.jar" value="../jdbc2_0-stdext.jar"/>
<property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
+ <property name="collections.jar"
value="../../../jakarta-commons/collections/dist/commons-collections.jar"/>
+ <property name="beanutils.jar"
value="../../../jakarta-commons/beanutils/dist/commons-beanutils.jar"/>
+ <property name="digester.jar"
value="../../../jakarta-commons/digester/dist/commons-digester.jar"/>
<!-- Output directory name for all files generated by the build process -->
@@ -52,6 +55,9 @@
<pathelement location="${struts.lib}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
+ <pathelement location="${collections.jar}"/>
+ <pathelement location="${beanutils.jar}"/>
+ <pathelement location="${digester.jar}"/>
</path>
1.2 +10 -10
jakarta-struts/contrib/service-manager/src/org/apache/struts/action/ServicesServlet.java
Index: ServicesServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/action/ServicesServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServicesServlet.java 2001/07/14 22:41:56 1.1
+++ ServicesServlet.java 2001/07/18 04:22:19 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/action/ServicesServlet.java,v
1.1 2001/07/14 22:41:56 oalexeev Exp $
- * $Revision: 1.1 $
- * $Date: 2001/07/14 22:41:56 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/action/ServicesServlet.java,v
1.2 2001/07/18 04:22:19 oalexeev Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/07/18 04:22:19 $
*
* ====================================================================
*
@@ -71,12 +71,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.struts.digester.Digester;
-import org.apache.struts.digester.Rule;
-import org.apache.struts.util.BeanUtils;
-import org.apache.struts.util.ConvertUtils;
-import org.apache.struts.util.PropertyUtils;
-import org.apache.struts.util.FastHashMap;
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.Rule;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.collections.FastHashMap;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.taglib.html.Constants;
import org.apache.struts.service.ServiceManager;
@@ -87,7 +87,7 @@
/**
* @author Oleg V Alexeev
- * @version $Revision: 1.1 $ $Date: 2001/07/14 22:41:56 $
+ * @version $Revision: 1.2 $ $Date: 2001/07/18 04:22:19 $
*/
public class ServicesServlet
extends ActionServlet {
1.2 +6 -6
jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceConfigRule.java
Index: InitServiceConfigRule.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceConfigRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InitServiceConfigRule.java 2001/07/14 22:41:57 1.1
+++ InitServiceConfigRule.java 2001/07/18 04:22:19 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceConfigRule.java,v
1.1 2001/07/14 22:41:57 oalexeev Exp $
- * $Revision: 1.1 $
- * $Date: 2001/07/14 22:41:57 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceConfigRule.java,v
1.2 2001/07/18 04:22:19 oalexeev Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/07/18 04:22:19 $
*
* ====================================================================
*
@@ -61,13 +61,13 @@
package org.apache.struts.service;
-import org.apache.struts.digester.Digester;
-import org.apache.struts.digester.Rule;
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.Rule;
import org.xml.sax.AttributeList;
/**
* @author Oleg V Alexeev
- * @version $Revision: 1.1 $ $Date: 2001/07/14 22:41:57 $
+ * @version $Revision: 1.2 $ $Date: 2001/07/18 04:22:19 $
*/
public class InitServiceConfigRule extends Rule {
1.2 +6 -6
jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceManagerRule.java
Index: InitServiceManagerRule.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceManagerRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InitServiceManagerRule.java 2001/07/14 22:41:57 1.1
+++ InitServiceManagerRule.java 2001/07/18 04:22:19 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceManagerRule.java,v
1.1 2001/07/14 22:41:57 oalexeev Exp $
- * $Revision: 1.1 $
- * $Date: 2001/07/14 22:41:57 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceManagerRule.java,v
1.2 2001/07/18 04:22:19 oalexeev Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/07/18 04:22:19 $
*
* ====================================================================
*
@@ -63,13 +63,13 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.struts.digester.Digester;
-import org.apache.struts.digester.Rule;
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.Rule;
import org.xml.sax.AttributeList;
/**
* @author Oleg V Alexeev
- * @version $Revision: 1.1 $ $Date: 2001/07/14 22:41:57 $
+ * @version $Revision: 1.2 $ $Date: 2001/07/18 04:22:19 $
*/
public class InitServiceManagerRule extends Rule {
1.2 +6 -6
jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceRule.java
Index: InitServiceRule.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InitServiceRule.java 2001/07/14 22:41:57 1.1
+++ InitServiceRule.java 2001/07/18 04:22:19 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceRule.java,v
1.1 2001/07/14 22:41:57 oalexeev Exp $
- * $Revision: 1.1 $
- * $Date: 2001/07/14 22:41:57 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/InitServiceRule.java,v
1.2 2001/07/18 04:22:19 oalexeev Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/07/18 04:22:19 $
*
* ====================================================================
*
@@ -61,13 +61,13 @@
package org.apache.struts.service;
-import org.apache.struts.digester.Digester;
-import org.apache.struts.digester.Rule;
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.Rule;
import org.xml.sax.AttributeList;
/**
* @author Oleg V Alexeev
- * @version $Revision: 1.1 $ $Date: 2001/07/14 22:41:57 $
+ * @version $Revision: 1.2 $ $Date: 2001/07/18 04:22:19 $
*/
public class InitServiceRule extends Rule {
1.2 +5 -5
jakarta-struts/contrib/service-manager/src/org/apache/struts/service/Service.java
Index: Service.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/Service.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Service.java 2001/07/14 22:41:57 1.1
+++ Service.java 2001/07/18 04:22:19 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/Service.java,v
1.1 2001/07/14 22:41:57 oalexeev Exp $
- * $Revision: 1.1 $
- * $Date: 2001/07/14 22:41:57 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/Service.java,v
1.2 2001/07/18 04:22:19 oalexeev Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/07/18 04:22:19 $
*
* ====================================================================
*
@@ -62,11 +62,11 @@
package org.apache.struts.service;
import java.io.Serializable;
-import org.apache.struts.digester.Digester;
+import org.apache.commons.digester.Digester;
/**
* @author Oleg V Alexeev
- * @version $Revision: 1.1 $ $Date: 2001/07/14 22:41:57 $
+ * @version $Revision: 1.2 $ $Date: 2001/07/18 04:22:19 $
*/
public class Service implements Serializable {
1.2 +5 -5
jakarta-struts/contrib/service-manager/src/org/apache/struts/service/ServiceManager.java
Index: ServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/ServiceManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServiceManager.java 2001/07/14 22:41:57 1.1
+++ ServiceManager.java 2001/07/18 04:22:19 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/ServiceManager.java,v
1.1 2001/07/14 22:41:57 oalexeev Exp $
- * $Revision: 1.1 $
- * $Date: 2001/07/14 22:41:57 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/ServiceManager.java,v
1.2 2001/07/18 04:22:19 oalexeev Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/07/18 04:22:19 $
*
* ====================================================================
*
@@ -67,11 +67,11 @@
import java.util.ArrayList;
import java.lang.NoSuchMethodException;
import java.lang.reflect.Method;
-import org.apache.struts.digester.Digester;
+import org.apache.commons.digester.Digester;
/**
* @author Oleg V Alexeev
- * @version $Revision: 1.1 $ $Date: 2001/07/14 22:41:57 $
+ * @version $Revision: 1.2 $ $Date: 2001/07/18 04:22:19 $
*/
public class ServiceManager implements Serializable {
1.2 +9 -9
jakarta-struts/contrib/service-manager/src/org/apache/struts/service/factory/FactoryService.java
Index: FactoryService.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/factory/FactoryService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FactoryService.java 2001/07/14 22:41:57 1.1
+++ FactoryService.java 2001/07/18 04:22:20 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/factory/FactoryService.java,v
1.1 2001/07/14 22:41:57 oalexeev Exp $
- * $Revision: 1.1 $
- * $Date: 2001/07/14 22:41:57 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/service-manager/src/org/apache/struts/service/factory/FactoryService.java,v
1.2 2001/07/18 04:22:20 oalexeev Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/07/18 04:22:20 $
*
* ====================================================================
*
@@ -71,14 +71,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.struts.digester.Digester;
-import org.apache.struts.digester.Rule;
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.Rule;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.BeanUtils;
-import org.apache.struts.util.ConvertUtils;
-import org.apache.struts.util.PropertyUtils;
-import org.apache.struts.util.FastHashMap;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.collections.FastHashMap;
import org.apache.struts.service.Service;
import org.apache.struts.service.ServiceManager;
import org.apache.struts.service.ServletServiceManager;
