rleland 2002/12/07 23:53:32
Modified:
contrib/service-manager/services/factory/src/org/apache/struts/service/factory
FactoryService.java
contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc
DataBean.java JDBCArrayFactory.java
JDBCFactory.java JDBCFactoryMapping.java
JDBCSingleFactory.java JDBCSlideFactory.java
contrib/service-manager/services/factory/src/org/apache/struts/service/factory/rowset
RowSetFactory.java RowSetFactoryMapping.java
RowSetSlideFactory.java
contrib/service-manager/src/core/org/apache/struts/service
ServiceManager.java
contrib/service-manager/src/struts/org/apache/struts/action
ServicesServlet.java
Log:
ServiceManager needs to be updated in light
of the current PlugIn framework.
The JDBC services would still be useful.
Remove unused import statements &
refer to Globals instead of Action
Revision Changes Path
1.2 +7 -9
jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/FactoryService.java
Index: FactoryService.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/services/factory/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 25 Jul 2001 20:42:22 -0000 1.1
+++ FactoryService.java 8 Dec 2002 07:53:31 -0000 1.2
@@ -73,12 +73,10 @@
import javax.servlet.http.HttpSession;
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.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.action.ActionMapping;
+import org.apache.struts.util.MessageResources;
import org.apache.struts.service.Service;
import org.apache.struts.service.ServiceManager;
import org.apache.struts.service.ServletServiceManager;
@@ -467,7 +465,7 @@
* </p>
*
* @param parameterMapping Mapping for parameter
- * @param beanRegistration Bean registration
+ * @param registration Bean registration
* @param request The servlet request we are processing
*
* @return Parameter
@@ -543,7 +541,7 @@
* find it in map of early created factories. It returns one if finds
* any. Otherwise new factory will be instantiated, stored in
* in cash and method returns it.
- * @param beanFactoryMapping - factory mapping with factory definitions
+ * @param factoryMapping - factory mapping with factory definitions
* @param request - http request link
*/
protected Factory processFactoryCreate( FactoryMapping factoryMapping,
1.2 +3 -4
jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/DataBean.java
Index: DataBean.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/DataBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataBean.java 25 Jul 2001 20:42:22 -0000 1.1
+++ DataBean.java 8 Dec 2002 07:53:31 -0000 1.2
@@ -62,7 +62,6 @@
package org.apache.struts.service.factory.jdbc;
import java.sql.ResultSet;
-import java.sql.SQLException;
/**
* @author Oleg V Alexeev
1.2 +3 -6
jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/JDBCArrayFactory.java
Index: JDBCArrayFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/JDBCArrayFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCArrayFactory.java 25 Jul 2001 20:42:22 -0000 1.1
+++ JDBCArrayFactory.java 8 Dec 2002 07:53:31 -0000 1.2
@@ -63,15 +63,12 @@
import java.lang.Class;
import java.lang.Throwable;
-import javax.sql.DataSource;
-import java.sql.SQLException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import org.apache.struts.service.factory.Factory;
import org.apache.struts.service.factory.Parameter;
-import org.apache.struts.action.Action;
/**
* @author Oleg V Alexeev
1.2 +3 -6
jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/JDBCFactory.java
Index: JDBCFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/JDBCFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCFactory.java 25 Jul 2001 20:42:22 -0000 1.1
+++ JDBCFactory.java 8 Dec 2002 07:53:31 -0000 1.2
@@ -61,17 +61,14 @@
package org.apache.struts.service.factory.jdbc;
-import java.lang.Class;
import java.lang.Throwable;
import javax.sql.DataSource;
-import java.sql.SQLException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import javax.servlet.ServletException;
import org.apache.struts.service.factory.Factory;
import org.apache.struts.service.factory.Parameter;
-import org.apache.struts.action.Action;
import org.apache.struts.service.ServletServiceManager;
/**
1.2 +5 -5
jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/JDBCFactoryMapping.java
Index: JDBCFactoryMapping.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/JDBCFactoryMapping.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCFactoryMapping.java 25 Jul 2001 20:42:22 -0000 1.1
+++ JDBCFactoryMapping.java 8 Dec 2002 07:53:31 -0000 1.2
@@ -62,9 +62,9 @@
package org.apache.struts.service.factory.jdbc;
-import org.apache.struts.action.Action;
import org.apache.struts.service.factory.FactoryMapping;
import org.apache.struts.service.factory.Factory;
+import org.apache.struts.Globals;
/**
* @author Oleg V Alexeev
@@ -75,7 +75,7 @@
protected String dataSource = null;
public String getDataSource() {
- return ( (dataSource==null) ? Action.DATA_SOURCE_KEY : dataSource );
+ return ( (dataSource==null) ? Globals.DATA_SOURCE_KEY : dataSource
);
}
public void setDataSource( String dataSource ) {
1.2 +3 -7
jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/JDBCSingleFactory.java
Index: JDBCSingleFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/JDBCSingleFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCSingleFactory.java 25 Jul 2001 20:42:22 -0000 1.1
+++ JDBCSingleFactory.java 8 Dec 2002 07:53:31 -0000 1.2
@@ -63,13 +63,9 @@
import java.lang.Class;
import java.lang.Throwable;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.apache.struts.service.factory.Factory;
import org.apache.struts.service.factory.Parameter;
-import org.apache.struts.action.Action;
/**
* @author Oleg V Alexeev
1.2 +3 -8
jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/JDBCSlideFactory.java
Index: JDBCSlideFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/jdbc/JDBCSlideFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCSlideFactory.java 25 Jul 2001 20:42:22 -0000 1.1
+++ JDBCSlideFactory.java 8 Dec 2002 07:53:31 -0000 1.2
@@ -63,15 +63,10 @@
import java.lang.Class;
import java.lang.Throwable;
-import javax.sql.DataSource;
-import java.sql.SQLException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import org.apache.struts.service.factory.Factory;
import org.apache.struts.service.factory.Parameter;
-import org.apache.struts.action.Action;
import org.apache.struts.util.Slide;
/**
1.2 +3 -12
jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/rowset/RowSetFactory.java
Index: RowSetFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/rowset/RowSetFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RowSetFactory.java 25 Jul 2001 20:42:23 -0000 1.1
+++ RowSetFactory.java 8 Dec 2002 07:53:31 -0000 1.2
@@ -61,23 +61,14 @@
package org.apache.struts.service.factory.rowset;
-import java.lang.Class;
import java.lang.Throwable;
-import java.util.Iterator;
-import java.util.Hashtable;
import javax.sql.DataSource;
import java.sql.SQLException;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import javax.sql.RowSet;
-import javax.naming.Context;
-import javax.naming.InitialContext;
import sun.jdbc.rowset.CachedRowSet;
import javax.servlet.ServletException;
import org.apache.struts.service.factory.Factory;
import org.apache.struts.service.factory.Parameter;
-import org.apache.struts.action.Action;
import org.apache.struts.service.ServletServiceManager;
/**
1.2 +3 -4
jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/rowset/RowSetFactoryMapping.java
Index: RowSetFactoryMapping.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/rowset/RowSetFactoryMapping.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RowSetFactoryMapping.java 25 Jul 2001 20:42:23 -0000 1.1
+++ RowSetFactoryMapping.java 8 Dec 2002 07:53:31 -0000 1.2
@@ -61,7 +61,6 @@
package org.apache.struts.service.factory.rowset;
-import org.apache.struts.action.Action;
import org.apache.struts.service.factory.jdbc.JDBCFactoryMapping;
/**
1.2 +3 -7
jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/rowset/RowSetSlideFactory.java
Index: RowSetSlideFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/services/factory/src/org/apache/struts/service/factory/rowset/RowSetSlideFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RowSetSlideFactory.java 25 Jul 2001 20:42:23 -0000 1.1
+++ RowSetSlideFactory.java 8 Dec 2002 07:53:31 -0000 1.2
@@ -61,19 +61,15 @@
package org.apache.struts.service.factory.rowset;
-import java.lang.Class;
import java.lang.Throwable;
import javax.sql.DataSource;
-import java.sql.SQLException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import javax.sql.RowSet;
import sun.jdbc.rowset.CachedRowSet;
import javax.servlet.ServletException;
import org.apache.struts.service.factory.Factory;
import org.apache.struts.service.factory.Parameter;
-import org.apache.struts.action.Action;
import org.apache.struts.util.Slide;
import org.apache.struts.service.ServletServiceManager;
1.2 +4 -6
jakarta-struts/contrib/service-manager/src/core/org/apache/struts/service/ServiceManager.java
Index: ServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/src/core/org/apache/struts/service/ServiceManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServiceManager.java 25 Jul 2001 20:19:40 -0000 1.1
+++ ServiceManager.java 8 Dec 2002 07:53:32 -0000 1.2
@@ -63,7 +63,6 @@
import java.io.Serializable;
import java.io.InputStream;
-import java.io.IOException;
import java.io.FileInputStream;
import java.util.Iterator;
import java.util.HashMap;
@@ -373,7 +372,6 @@
*/
public Digester initDigester( int detail ) {
Digester digester = new Digester();
- digester.setDebug(detail);
digester.setNamespaceAware(true);
digester.setValidating(false);
return initDigester( digester, null );
1.2 +8 -21
jakarta-struts/contrib/service-manager/src/struts/org/apache/struts/action/ServicesServlet.java
Index: ServicesServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/service-manager/src/struts/org/apache/struts/action/ServicesServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServicesServlet.java 25 Jul 2001 20:19:41 -0000 1.1
+++ ServicesServlet.java 8 Dec 2002 07:53:32 -0000 1.2
@@ -61,29 +61,18 @@
package org.apache.struts.action;
-import java.lang.Class;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
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.Globals;
import org.apache.struts.service.ServiceManager;
import org.apache.struts.service.ServletServiceManager;
import org.apache.struts.upload.MultipartRequestWrapper;
-import org.xml.sax.AttributeList;
-import org.xml.sax.SAXException;
/**
* @author Oleg V Alexeev
@@ -195,7 +184,7 @@
request.setAttribute(Action.MULTIPART_KEY,
mapping.getMultipartClass());
//also pass the mapping through the request
- request.setAttribute(Action.MAPPING_KEY,
+ request.setAttribute(Globals.MAPPING_KEY,
mapping);
try {
@@ -218,8 +207,6 @@
HttpServletResponse response)
throws IOException, ServletException {
- Boolean result = null;
-
if (formInstance == null)
return (true);
@@ -250,7 +237,7 @@
// Call the validate() method of our ActionForm bean
errors = formInstance.validate(mapping, request);
- if ((errors == null) || errors.empty()) {
+ if ((errors == null) || errors.isEmpty()) {
if (debug >= 1)
log(" No errors detected by form
validate");
if( services.performBooleanCall( "validateAfter",
@@ -288,7 +275,7 @@
// Save our error messages and return to the input form if possible
if (debug >= 1)
log(" Validation error(s), redirecting to: " + uri);
- request.setAttribute(Action.ERROR_KEY, errors);
+ request.setAttribute(Globals.ERROR_KEY, errors);
//unwrap the multipart request if there is one
if (request instanceof MultipartRequestWrapper) {
request = ((MultipartRequestWrapper) request).getRequest();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
