Author: jmitchell
Date: Sat Apr 8 18:40:03 2006
New Revision: 392655
URL: http://svn.apache.org/viewcvs?rev=392655&view=rev
Log:
* remove old (stale?) ant builds from long, long ago
* remove old maven 1 builds which were severly broken anyway
* cleanup unused private and/or local variables
* remove unused imports
Removed:
struts/action/trunk/apps/build-tests.xml
struts/action/trunk/apps/build-webapp.xml
struts/action/trunk/apps/build-webapps.xml
struts/action/trunk/apps/project.properties
struts/action/trunk/apps/project.xml
Modified:
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/EditTypeAction.java
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/ShowFileAction.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditRegistrationAction.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditSubscriptionAction.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogoffAction.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonAction.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonForm.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationForm.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveRegistrationAction.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SubscriptionForm.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/EditRegistrationAction.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/EditSubscriptionAction.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogoffAction.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonAction.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveSubscriptionAction.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/memory/MemoryDatabasePlugIn.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/memory/MemoryUserDatabase.java
Modified:
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
(original)
+++
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
Sat Apr 8 18:40:03 2006
@@ -17,8 +17,6 @@
*/
package org.apache.struts.webapp.dispatch;
-import java.util.Map;
-import java.util.HashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts.actions.ActionDispatcher;
Modified:
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/DispatchExampleAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
(original)
+++
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
Sat Apr 8 18:40:03 2006
@@ -17,8 +17,6 @@
*/
package org.apache.struts.webapp.dispatch;
-import java.util.Map;
-import java.util.HashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts.actions.DispatchAction;
@@ -35,7 +33,6 @@
*/
public class DispatchExampleAction extends DispatchAction {
- private Map keyMethodMap = new HashMap();
private int fooCount;
private int barCount;
Modified:
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
(original)
+++
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
Sat Apr 8 18:40:03 2006
@@ -19,9 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.actions.ActionDispatcher;
import org.apache.struts.actions.EventDispatchAction;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
Modified:
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
(original)
+++
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
Sat Apr 8 18:40:03 2006
@@ -17,8 +17,6 @@
*/
package org.apache.struts.webapp.dispatch;
-import java.util.Map;
-import java.util.HashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts.actions.MappingDispatchAction;
@@ -35,7 +33,6 @@
*/
public class MappingDispatchExampleAction extends MappingDispatchAction {
- private Map keyMethodMap = new HashMap();
private int fooCount;
private int barCount;
Modified:
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/EditTypeAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/EditTypeAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/EditTypeAction.java
(original)
+++
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/EditTypeAction.java
Sat Apr 8 18:40:03 2006
@@ -79,6 +79,8 @@
ActionMapping mapping, ActionForm form,
HttpServletRequest request) {
+ log.debug("initFromBeans");
+
// Initialize
ArrayList satisfactionList = new ArrayList();
satisfactionList.add(new LabelValueBean("Very Satisfied", "4"));
Modified:
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/ShowFileAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/ShowFileAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/ShowFileAction.java
(original)
+++
struts/action/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/ShowFileAction.java
Sat Apr 8 18:40:03 2006
@@ -53,7 +53,6 @@
if(fileName != null) {
- byte[] bytes = new byte[1000];
InputStream input =
servlet.getServletContext().getResourceAsStream(fileName);
if (input == null) {
log.warn("File Not Found: "+fileName);
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditRegistrationAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditRegistrationAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditRegistrationAction.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditRegistrationAction.java
Sat Apr 8 18:40:03 2006
@@ -19,7 +19,6 @@
import java.lang.reflect.InvocationTargetException;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditSubscriptionAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditSubscriptionAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditSubscriptionAction.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditSubscriptionAction.java
Sat Apr 8 18:40:03 2006
@@ -19,7 +19,6 @@
import java.lang.reflect.InvocationTargetException;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -79,7 +78,6 @@
throws Exception {
// Extract attributes we will need
- Locale locale = getLocale(request);
HttpSession session = request.getSession();
String action = request.getParameter("action");
if (action == null) {
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogoffAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogoffAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogoffAction.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogoffAction.java
Sat Apr 8 18:40:03 2006
@@ -18,7 +18,6 @@
package org.apache.struts.webapp.example;
-import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
@@ -75,7 +74,6 @@
throws Exception {
// Extract attributes we will need
- Locale locale = getLocale(request);
HttpSession session = request.getSession();
User user = (User) session.getAttribute(Constants.USER_KEY);
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonAction.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonAction.java
Sat Apr 8 18:40:03 2006
@@ -18,7 +18,6 @@
package org.apache.struts.webapp.example;
-import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
@@ -79,7 +78,6 @@
throws Exception {
// Extract attributes we will need
- Locale locale = getLocale(request);
User user = null;
// Validate the request parameters specified by the user
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonForm.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonForm.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonForm.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonForm.java
Sat Apr 8 18:40:03 2006
@@ -21,7 +21,6 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationForm.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationForm.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationForm.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationForm.java
Sat Apr 8 18:40:03 2006
@@ -22,7 +22,6 @@
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.validator.ValidatorForm;
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveRegistrationAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveRegistrationAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveRegistrationAction.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveRegistrationAction.java
Sat Apr 8 18:40:03 2006
@@ -19,7 +19,6 @@
import java.lang.reflect.InvocationTargetException;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -84,7 +83,6 @@
throws Exception {
// Extract attributes and parameters we will need
- Locale locale = getLocale(request);
HttpSession session = request.getSession();
RegistrationForm regform = (RegistrationForm) form;
String action = regform.getAction();
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java
Sat Apr 8 18:40:03 2006
@@ -19,7 +19,6 @@
import java.lang.reflect.InvocationTargetException;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -82,7 +81,6 @@
throws Exception {
// Extract attributes and parameters we will need
- Locale locale = getLocale(request);
MessageResources messages = getResources(request);
HttpSession session = request.getSession();
SubscriptionForm subform = (SubscriptionForm) form;
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SubscriptionForm.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SubscriptionForm.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SubscriptionForm.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SubscriptionForm.java
Sat Apr 8 18:40:03 2006
@@ -21,7 +21,6 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
Sat Apr 8 18:40:03 2006
@@ -58,12 +58,6 @@
/**
- * The application configuration for our owning module.
- */
- private ModuleConfig config = null;
-
-
- /**
* The [EMAIL PROTECTED] MemoryUserDatabase} object we construct and make
available.
*/
private MemoryUserDatabase database = null;
@@ -122,7 +116,6 @@
database = null;
servlet = null;
database = null;
- config = null;
}
@@ -142,7 +135,6 @@
pathname + "'");
// Remember our associated configuration and servlet
- this.config = config;
this.servlet = servlet;
// Construct a new database and make it available
Modified:
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java
Sat Apr 8 18:40:03 2006
@@ -340,10 +340,7 @@
class MemorySubscriptionCreationFactory implements ObjectCreationFactory {
public MemorySubscriptionCreationFactory(MemoryUserDatabase database) {
- this.database = database;
}
-
- private MemoryUserDatabase database = null;
private Digester digester = null;
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/EditRegistrationAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/EditRegistrationAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/EditRegistrationAction.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/EditRegistrationAction.java
Sat Apr 8 18:40:03 2006
@@ -19,7 +19,6 @@
import java.lang.reflect.InvocationTargetException;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -80,7 +79,6 @@
throws Exception {
// Extract attributes we will need
- Locale locale = getLocale(request);
HttpSession session = request.getSession();
String action = request.getParameter("action");
if (action == null)
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/EditSubscriptionAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/EditSubscriptionAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/EditSubscriptionAction.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/EditSubscriptionAction.java
Sat Apr 8 18:40:03 2006
@@ -19,7 +19,6 @@
import java.lang.reflect.InvocationTargetException;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -79,7 +78,6 @@
throws Exception {
// Extract attributes we will need
- Locale locale = getLocale(request);
HttpSession session = request.getSession();
String action = request.getParameter("action");
if (action == null) {
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogoffAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogoffAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogoffAction.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogoffAction.java
Sat Apr 8 18:40:03 2006
@@ -18,7 +18,6 @@
package org.apache.struts.webapp.example2;
-import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -75,7 +74,6 @@
throws Exception {
// Extract attributes we will need
- Locale locale = getLocale(request);
HttpSession session = request.getSession();
User user = (User) session.getAttribute(Constants.USER_KEY);
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonAction.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonAction.java
Sat Apr 8 18:40:03 2006
@@ -18,7 +18,6 @@
package org.apache.struts.webapp.example2;
-import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -78,7 +77,6 @@
throws Exception {
// Extract attributes we will need
- Locale locale = getLocale(request);
User user = null;
// Validate the request parameters specified by the user
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
Sat Apr 8 18:40:03 2006
@@ -19,7 +19,6 @@
import java.lang.reflect.InvocationTargetException;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -33,7 +32,6 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.MessageResources;
/**
@@ -83,8 +81,6 @@
throws Exception {
// Extract attributes and parameters we will need
- Locale locale = getLocale(request);
- MessageResources messages = getResources(request);
HttpSession session = request.getSession();
RegistrationForm regform = (RegistrationForm) form;
String action = regform.getAction();
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveSubscriptionAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveSubscriptionAction.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveSubscriptionAction.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveSubscriptionAction.java
Sat Apr 8 18:40:03 2006
@@ -19,7 +19,6 @@
import java.lang.reflect.InvocationTargetException;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -80,7 +79,6 @@
throws Exception {
// Extract attributes and parameters we will need
- Locale locale = getLocale(request);
MessageResources messages = getResources(request);
HttpSession session = request.getSession();
SubscriptionForm subform = (SubscriptionForm) form;
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/memory/MemoryDatabasePlugIn.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/memory/MemoryDatabasePlugIn.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/memory/MemoryDatabasePlugIn.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/memory/MemoryDatabasePlugIn.java
Sat Apr 8 18:40:03 2006
@@ -58,12 +58,6 @@
/**
- * The application configuration for our owning module.
- */
- private ModuleConfig config = null;
-
-
- /**
* The [EMAIL PROTECTED] MemoryUserDatabase} object we construct and make
available.
*/
private MemoryUserDatabase database = null;
@@ -122,7 +116,6 @@
database = null;
servlet = null;
database = null;
- config = null;
}
@@ -142,7 +135,6 @@
pathname + "'");
// Remember our associated configuration and servlet
- this.config = config;
this.servlet = servlet;
// Construct a new database and make it available
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/memory/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/memory/MemoryUserDatabase.java?rev=392655&r1=392654&r2=392655&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/memory/MemoryUserDatabase.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/memory/MemoryUserDatabase.java
Sat Apr 8 18:40:03 2006
@@ -340,10 +340,8 @@
class MemorySubscriptionCreationFactory implements ObjectCreationFactory {
public MemorySubscriptionCreationFactory(MemoryUserDatabase database) {
- this.database = database;
}
- private MemoryUserDatabase database = null;
private Digester digester = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
