You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/11/06 15:55:31 UTC
svn commit: r471754 [3/19] - in /struts/struts1/trunk:
apps/cookbook/src/main/java/examples/
apps/cookbook/src/main/java/examples/bean/
apps/cookbook/src/main/java/examples/dyna/
apps/cookbook/src/main/java/examples/links/ apps/cookbook/src/main/java/e...
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditRegistrationAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditRegistrationAction.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditRegistrationAction.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditRegistrationAction.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -73,48 +78,48 @@
* an exception
*/
public ActionForward execute(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response)
- throws Exception {
-
- // Extract attributes we will need
- HttpSession session = request.getSession();
- String action = request.getParameter("action");
- if (action == null)
- action = "Create";
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
+
+ // Extract attributes we will need
+ HttpSession session = request.getSession();
+ String action = request.getParameter("action");
+ if (action == null)
+ action = "Create";
if (log.isDebugEnabled()) {
log.debug("EditRegistrationAction: Processing " + action +
" action");
}
- // Is there a currently logged on user?
- User user = null;
- if (!"Create".equals(action)) {
- user = (User) session.getAttribute(Constants.USER_KEY);
- if (user == null) {
+ // Is there a currently logged on user?
+ User user = null;
+ if (!"Create".equals(action)) {
+ user = (User) session.getAttribute(Constants.USER_KEY);
+ if (user == null) {
if (log.isDebugEnabled()) {
log.debug(" User is not logged on in session "
+ session.getId());
}
- return (mapping.findForward("logon"));
- }
- }
+ return (mapping.findForward("logon"));
+ }
+ }
- // Populate the user registration form
- if (form == null) {
+ // Populate the user registration form
+ if (form == null) {
if (log.isTraceEnabled()) {
log.trace(" Creating new RegistrationForm bean under key "
+ mapping.getAttribute());
}
- form = new RegistrationForm();
+ form = new RegistrationForm();
if ("request".equals(mapping.getScope()))
request.setAttribute(mapping.getAttribute(), form);
else
session.setAttribute(mapping.getAttribute(), form);
- }
- RegistrationForm regform = (RegistrationForm) form;
- if (user != null) {
+ }
+ RegistrationForm regform = (RegistrationForm) form;
+ if (user != null) {
if (log.isTraceEnabled()) {
log.trace(" Populating form from " + user);
}
@@ -133,7 +138,7 @@
log.error("RegistrationForm.populate", t);
throw new ServletException("RegistrationForm.populate", t);
}
- }
+ }
// Set a transactional control token to prevent double posting
if (log.isTraceEnabled()) {
@@ -141,11 +146,11 @@
}
saveToken(request);
- // Forward control to the edit user registration page
+ // Forward control to the edit user registration page
if (log.isTraceEnabled()) {
log.trace(" Forwarding to 'success' page");
}
- return (mapping.findForward("success"));
+ return (mapping.findForward("success"));
}
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditSubscriptionAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditSubscriptionAction.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditSubscriptionAction.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/EditSubscriptionAction.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -72,62 +77,62 @@
* an exception
*/
public ActionForward execute(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response)
- throws Exception {
-
- // Extract attributes we will need
- HttpSession session = request.getSession();
- String action = request.getParameter("action");
- if (action == null) {
- action = "Create";
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
+
+ // Extract attributes we will need
+ HttpSession session = request.getSession();
+ String action = request.getParameter("action");
+ if (action == null) {
+ action = "Create";
}
- String host = request.getParameter("host");
+ String host = request.getParameter("host");
if (log.isDebugEnabled()) {
log.debug("EditSubscriptionAction: Processing " + action +
" action");
}
- // Is there a currently logged on user?
- User user = (User) session.getAttribute(Constants.USER_KEY);
- if (user == null) {
+ // Is there a currently logged on user?
+ User user = (User) session.getAttribute(Constants.USER_KEY);
+ if (user == null) {
if (log.isTraceEnabled()) {
log.trace(" User is not logged on in session "
+ session.getId());
}
- return (mapping.findForward("logon"));
- }
+ return (mapping.findForward("logon"));
+ }
- // Identify the relevant subscription
- Subscription subscription =
+ // Identify the relevant subscription
+ Subscription subscription =
user.findSubscription(request.getParameter("host"));
- if ((subscription == null) && !action.equals("Create")) {
+ if ((subscription == null) && !action.equals("Create")) {
if (log.isTraceEnabled()) {
log.trace(" No subscription for user " +
user.getUsername() + " and host " + host);
}
- return (mapping.findForward("failure"));
- }
+ return (mapping.findForward("failure"));
+ }
if (subscription != null) {
session.setAttribute(Constants.SUBSCRIPTION_KEY, subscription);
}
- // Populate the subscription form
- if (form == null) {
+ // Populate the subscription form
+ if (form == null) {
if (log.isTraceEnabled()) {
log.trace(" Creating new SubscriptionForm bean under key "
+ mapping.getAttribute());
}
- form = new SubscriptionForm();
+ form = new SubscriptionForm();
if ("request".equals(mapping.getScope())) {
request.setAttribute(mapping.getAttribute(), form);
} else {
session.setAttribute(mapping.getAttribute(), form);
}
- }
- SubscriptionForm subform = (SubscriptionForm) form;
- subform.setAction(action);
+ }
+ SubscriptionForm subform = (SubscriptionForm) form;
+ subform.setAction(action);
if (!action.equals("Create")) {
if (log.isTraceEnabled()) {
log.trace(" Populating form from " + subscription);
@@ -147,11 +152,11 @@
}
}
- // Forward control to the edit subscription page
+ // Forward control to the edit subscription page
if (log.isTraceEnabled()) {
log.trace(" Forwarding to 'success' page");
}
- return (mapping.findForward("success"));
+ return (mapping.findForward("success"));
}
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/ExpiredPasswordException.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/ExpiredPasswordException.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/ExpiredPasswordException.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/ExpiredPasswordException.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/IndexBacking.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/IndexBacking.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/IndexBacking.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/IndexBacking.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -61,7 +66,7 @@
* @param actionEvent
*/
public void testListener(ActionEvent actionEvent){
-// System.out.println("================= it works!!");
+// System.out.println("================= it works!!");
}
/**
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LinkSubscriptionTag.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LinkSubscriptionTag.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LinkSubscriptionTag.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LinkSubscriptionTag.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LinkUserTag.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LinkUserTag.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LinkUserTag.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LinkUserTag.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -54,8 +59,8 @@
* The message resources for this package.
*/
protected static MessageResources messages =
- MessageResources.getMessageResources
- ("org.apache.struts.webapp.example.ApplicationResources");
+ MessageResources.getMessageResources
+ ("org.apache.struts.webapp.example.ApplicationResources");
/**
@@ -72,7 +77,7 @@
*/
public String getPage() {
- return (this.page);
+ return (this.page);
}
@@ -84,7 +89,7 @@
*/
public void setPage(String page) {
- this.page = page;
+ this.page = page;
}
@@ -94,7 +99,7 @@
*/
public String getName() {
- return (this.name);
+ return (this.name);
}
@@ -106,7 +111,7 @@
*/
public void setName(String name) {
- this.name = name;
+ this.name = name;
}
@@ -121,45 +126,45 @@
*/
public int doStartTag() throws JspException {
- // Generate the URL to be encoded
+ // Generate the URL to be encoded
HttpServletRequest request =
(HttpServletRequest) pageContext.getRequest();
StringBuffer url = new StringBuffer(request.getContextPath());
url.append(page);
- User user = null;
- try {
- user = (User) pageContext.findAttribute(name);
+ User user = null;
+ try {
+ user = (User) pageContext.findAttribute(name);
} catch (ClassCastException e) {
- user = null;
- }
- if (user == null)
- throw new JspException
- (messages.getMessage("linkUser.noUser", name));
- if (page.indexOf("?") < 0)
- url.append("?");
- else
- url.append("&");
- url.append("username=");
- url.append(ResponseUtils.filter(user.getUsername()));
-
- // Generate the hyperlink start element
- HttpServletResponse response =
- (HttpServletResponse) pageContext.getResponse();
- StringBuffer results = new StringBuffer("<a href=\"");
- results.append(response.encodeURL(url.toString()));
- results.append("\">");
-
- // Print this element to our output writer
- JspWriter writer = pageContext.getOut();
- try {
- writer.print(results.toString());
- } catch (IOException e) {
- throw new JspException
- (messages.getMessage("linkUser.io", e.toString()));
- }
+ user = null;
+ }
+ if (user == null)
+ throw new JspException
+ (messages.getMessage("linkUser.noUser", name));
+ if (page.indexOf("?") < 0)
+ url.append("?");
+ else
+ url.append("&");
+ url.append("username=");
+ url.append(ResponseUtils.filter(user.getUsername()));
+
+ // Generate the hyperlink start element
+ HttpServletResponse response =
+ (HttpServletResponse) pageContext.getResponse();
+ StringBuffer results = new StringBuffer("<a href=\"");
+ results.append(response.encodeURL(url.toString()));
+ results.append("\">");
+
+ // Print this element to our output writer
+ JspWriter writer = pageContext.getOut();
+ try {
+ writer.print(results.toString());
+ } catch (IOException e) {
+ throw new JspException
+ (messages.getMessage("linkUser.io", e.toString()));
+ }
- // Evaluate the body of this tag
- return (EVAL_BODY_INCLUDE);
+ // Evaluate the body of this tag
+ return (EVAL_BODY_INCLUDE);
}
@@ -173,16 +178,16 @@
public int doEndTag() throws JspException {
- // Print the ending element to our output writer
- JspWriter writer = pageContext.getOut();
- try {
- writer.print("</a>");
- } catch (IOException e) {
- throw new JspException
- (messages.getMessage("link.io", e.toString()));
- }
+ // Print the ending element to our output writer
+ JspWriter writer = pageContext.getOut();
+ try {
+ writer.print("</a>");
+ } catch (IOException e) {
+ throw new JspException
+ (messages.getMessage("link.io", e.toString()));
+ }
- return (EVAL_PAGE);
+ return (EVAL_PAGE);
}
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogoffAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogoffAction.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogoffAction.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogoffAction.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -68,33 +73,33 @@
* @exception Exception if business logic throws an exception
*/
public ActionForward execute(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response)
- throws Exception {
-
- // Extract attributes we will need
- HttpSession session = request.getSession();
- User user = (User) session.getAttribute(Constants.USER_KEY);
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
+
+ // Extract attributes we will need
+ HttpSession session = request.getSession();
+ User user = (User) session.getAttribute(Constants.USER_KEY);
- // Process this user logoff
- if (user != null) {
+ // Process this user logoff
+ if (user != null) {
if (log.isDebugEnabled()) {
log.debug("LogoffAction: User '" + user.getUsername() +
"' logged off in session " + session.getId());
}
- } else {
+ } else {
if (log.isDebugEnabled()) {
log.debug("LogoffActon: User logged off in session " +
session.getId());
}
- }
- session.removeAttribute(Constants.SUBSCRIPTION_KEY);
- session.removeAttribute(Constants.USER_KEY);
- session.invalidate();
+ }
+ session.removeAttribute(Constants.SUBSCRIPTION_KEY);
+ session.removeAttribute(Constants.USER_KEY);
+ session.invalidate();
- // Forward control to the specified success URI
- return (mapping.findForward("success"));
+ // Forward control to the specified success URI
+ return (mapping.findForward("success"));
}
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonAction.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonAction.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonAction.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -72,58 +77,58 @@
* @exception Exception if business logic throws an exception
*/
public ActionForward execute(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response)
- throws Exception {
-
- // Extract attributes we will need
- User user = null;
-
- // Validate the request parameters specified by the user
- ActionMessages errors = new ActionMessages();
- String username = (String)
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
+
+ // Extract attributes we will need
+ User user = null;
+
+ // Validate the request parameters specified by the user
+ ActionMessages errors = new ActionMessages();
+ String username = (String)
PropertyUtils.getSimpleProperty(form, "username");
String password = (String)
PropertyUtils.getSimpleProperty(form, "password");
- UserDatabase database = (UserDatabase)
- servlet.getServletContext().getAttribute(Constants.DATABASE_KEY);
- if (database == null)
+ UserDatabase database = (UserDatabase)
+ servlet.getServletContext().getAttribute(Constants.DATABASE_KEY);
+ if (database == null)
errors.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("error.database.missing"));
- else {
- user = getUser(database, username);
- if ((user != null) && !user.getPassword().equals(password))
- user = null;
- if (user == null)
+ else {
+ user = getUser(database, username);
+ if ((user != null) && !user.getPassword().equals(password))
+ user = null;
+ if (user == null)
errors.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("error.password.mismatch"));
- }
+ }
- // Report any errors we have discovered back to the original form
- if (!errors.isEmpty()) {
- saveErrors(request, errors);
+ // Report any errors we have discovered back to the original form
+ if (!errors.isEmpty()) {
+ saveErrors(request, errors);
return (mapping.getInputForward());
- }
+ }
- // Save our logged-in user in the session
- HttpSession session = request.getSession();
- session.setAttribute(Constants.USER_KEY, user);
+ // Save our logged-in user in the session
+ HttpSession session = request.getSession();
+ session.setAttribute(Constants.USER_KEY, user);
if (log.isDebugEnabled()) {
log.debug("LogonAction: User '" + user.getUsername() +
"' logged on in session " + session.getId());
}
// Remove the obsolete form bean
- if (mapping.getAttribute() != null) {
+ if (mapping.getAttribute() != null) {
if ("request".equals(mapping.getScope()))
request.removeAttribute(mapping.getAttribute());
else
session.removeAttribute(mapping.getAttribute());
}
- // Forward control to the specified success URI
- return (mapping.findForward("success"));
+ // Forward control to the specified success URI
+ return (mapping.findForward("success"));
}
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonForm.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonForm.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonForm.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/LogonForm.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -63,7 +68,7 @@
*/
public String getPassword() {
- return (this.password);
+ return (this.password);
}
@@ -85,7 +90,7 @@
*/
public String getUsername() {
- return (this.username);
+ return (this.username);
}
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/MainMenuBacking.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/MainMenuBacking.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/MainMenuBacking.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/MainMenuBacking.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationBacking.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationBacking.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationBacking.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationBacking.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationForm.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationForm.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationForm.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/RegistrationForm.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -106,7 +111,7 @@
*/
public String getAction() {
- return (this.action);
+ return (this.action);
}
@@ -128,7 +133,7 @@
*/
public String getFromAddress() {
- return (this.fromAddress);
+ return (this.fromAddress);
}
@@ -150,7 +155,7 @@
*/
public String getFullName() {
- return (this.fullName);
+ return (this.fullName);
}
@@ -172,7 +177,7 @@
*/
public String getPassword() {
- return (this.password);
+ return (this.password);
}
@@ -194,7 +199,7 @@
*/
public String getPassword2() {
- return (this.password2);
+ return (this.password2);
}
@@ -216,7 +221,7 @@
*/
public String getReplyToAddress() {
- return (this.replyToAddress);
+ return (this.replyToAddress);
}
@@ -238,7 +243,7 @@
*/
public String getUsername() {
- return (this.username);
+ return (this.username);
}
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveRegistrationAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveRegistrationAction.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveRegistrationAction.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveRegistrationAction.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -77,47 +82,47 @@
* an exception
*/
public ActionForward execute(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response)
- throws Exception {
-
- // Extract attributes and parameters we will need
- HttpSession session = request.getSession();
- RegistrationForm regform = (RegistrationForm) form;
- String action = regform.getAction();
- if (action == null) {
- action = "Create";
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
+
+ // Extract attributes and parameters we will need
+ HttpSession session = request.getSession();
+ RegistrationForm regform = (RegistrationForm) form;
+ String action = regform.getAction();
+ if (action == null) {
+ action = "Create";
}
UserDatabase database = (UserDatabase)
- servlet.getServletContext().getAttribute(Constants.DATABASE_KEY);
+ servlet.getServletContext().getAttribute(Constants.DATABASE_KEY);
if (log.isDebugEnabled()) {
log.debug("SaveRegistrationAction: Processing " + action +
" action");
}
- // Is there a currently logged on user (unless creating)?
- User user = (User) session.getAttribute(Constants.USER_KEY);
- if (!"Create".equals(action) && (user == null)) {
+ // Is there a currently logged on user (unless creating)?
+ User user = (User) session.getAttribute(Constants.USER_KEY);
+ if (!"Create".equals(action) && (user == null)) {
if (log.isTraceEnabled()) {
log.trace(" User is not logged on in session "
+ session.getId());
}
- return (mapping.findForward("logon"));
+ return (mapping.findForward("logon"));
}
- // Was this transaction cancelled?
- if (isCancelled(request)) {
+ // Was this transaction cancelled?
+ if (isCancelled(request)) {
if (log.isTraceEnabled()) {
log.trace(" Transaction '" + action +
"' was cancelled");
}
- session.removeAttribute(Constants.SUBSCRIPTION_KEY);
- return (mapping.findForward("failure"));
- }
+ session.removeAttribute(Constants.SUBSCRIPTION_KEY);
+ return (mapping.findForward("failure"));
+ }
// Validate the transactional control token
- ActionMessages errors = new ActionMessages();
+ ActionMessages errors = new ActionMessages();
if (log.isTraceEnabled()) {
log.trace(" Checking transactional control token");
}
@@ -127,39 +132,39 @@
}
resetToken(request);
- // Validate the request parameters specified by the user
+ // Validate the request parameters specified by the user
if (log.isTraceEnabled()) {
log.trace(" Performing extra validations");
}
- String value = null;
- value = regform.getUsername();
- if (("Create".equals(action)) &&
+ String value = null;
+ value = regform.getUsername();
+ if (("Create".equals(action)) &&
(database.findUser(value) != null)) {
errors.add("username",
new ActionMessage("error.username.unique",
regform.getUsername()));
}
- if ("Create".equals(action)) {
- value = regform.getPassword();
- if ((value == null) || (value.length() <1)) {
+ if ("Create".equals(action)) {
+ value = regform.getPassword();
+ if ((value == null) || (value.length() <1)) {
errors.add("password",
new ActionMessage("error.password.required"));
}
- value = regform.getPassword2();
- if ((value == null) || (value.length() < 1)) {
+ value = regform.getPassword2();
+ if ((value == null) || (value.length() < 1)) {
errors.add("password2",
new ActionMessage("error.password2.required"));
}
- }
+ }
- // Report any errors we have discovered back to the original form
- if (!errors.isEmpty()) {
- saveErrors(request, errors);
+ // Report any errors we have discovered back to the original form
+ if (!errors.isEmpty()) {
+ saveErrors(request, errors);
saveToken(request);
return (mapping.getInputForward());
- }
+ }
- // Update the user's persistent profile information
+ // Update the user's persistent profile information
try {
if ("Create".equals(action)) {
user = database.createUser(regform.getUsername());
@@ -189,27 +194,27 @@
}
// Log the user in if appropriate
- if ("Create".equals(action)) {
- session.setAttribute(Constants.USER_KEY, user);
+ if ("Create".equals(action)) {
+ session.setAttribute(Constants.USER_KEY, user);
if (log.isTraceEnabled()) {
log.trace(" User '" + user.getUsername() +
"' logged on in session " + session.getId());
}
- }
+ }
- // Remove the obsolete form bean
- if (mapping.getAttribute() != null) {
+ // Remove the obsolete form bean
+ if (mapping.getAttribute() != null) {
if ("request".equals(mapping.getScope()))
request.removeAttribute(mapping.getAttribute());
else
session.removeAttribute(mapping.getAttribute());
}
- // Forward control to the specified success URI
+ // Forward control to the specified success URI
if (log.isTraceEnabled()) {
log.trace(" Forwarding to success page");
}
- return (mapping.findForward("success"));
+ return (mapping.findForward("success"));
}
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -75,47 +80,47 @@
* an exception
*/
public ActionForward execute(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response)
- throws Exception {
-
- // Extract attributes and parameters we will need
- MessageResources messages = getResources(request);
- HttpSession session = request.getSession();
- SubscriptionForm subform = (SubscriptionForm) form;
- String action = subform.getAction();
- if (action == null) {
- action = "?";
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
+
+ // Extract attributes and parameters we will need
+ MessageResources messages = getResources(request);
+ HttpSession session = request.getSession();
+ SubscriptionForm subform = (SubscriptionForm) form;
+ String action = subform.getAction();
+ if (action == null) {
+ action = "?";
}
if (log.isDebugEnabled()) {
log.debug("SaveSubscriptionAction: Processing " + action +
" action");
}
- // Is there a currently logged on user?
- User user = (User) session.getAttribute(Constants.USER_KEY);
- if (user == null) {
+ // Is there a currently logged on user?
+ User user = (User) session.getAttribute(Constants.USER_KEY);
+ if (user == null) {
if (log.isTraceEnabled()) {
log.trace(" User is not logged on in session "
+ session.getId());
}
- return (mapping.findForward("logon"));
+ return (mapping.findForward("logon"));
}
- // Was this transaction cancelled?
- if (isCancelled(request)) {
+ // Was this transaction cancelled?
+ if (isCancelled(request)) {
if (log.isTraceEnabled()) {
log.trace(" Transaction '" + action +
"' was cancelled");
}
session.removeAttribute(Constants.SUBSCRIPTION_KEY);
- return (mapping.findForward("success"));
- }
+ return (mapping.findForward("success"));
+ }
- // Is there a related Subscription object?
- Subscription subscription =
- (Subscription) session.getAttribute(Constants.SUBSCRIPTION_KEY);
+ // Is there a related Subscription object?
+ Subscription subscription =
+ (Subscription) session.getAttribute(Constants.SUBSCRIPTION_KEY);
if ("Create".equals(action)) {
if (log.isTraceEnabled()) {
log.trace(" Creating subscription for mail server '" +
@@ -124,25 +129,25 @@
subscription =
user.createSubscription(subform.getHost());
}
- if (subscription == null) {
+ if (subscription == null) {
if (log.isTraceEnabled()) {
log.trace(" Missing subscription for user '" +
user.getUsername() + "'");
}
- response.sendError(HttpServletResponse.SC_BAD_REQUEST,
- messages.getMessage("error.noSubscription"));
- return (null);
- }
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST,
+ messages.getMessage("error.noSubscription"));
+ return (null);
+ }
- // Was this transaction a Delete?
- if (action.equals("Delete")) {
+ // Was this transaction a Delete?
+ if (action.equals("Delete")) {
if (log.isTraceEnabled()) {
log.trace(" Deleting mail server '" +
subscription.getHost() + "' for user '" +
user.getUsername() + "'");
}
user.removeSubscription(subscription);
- session.removeAttribute(Constants.SUBSCRIPTION_KEY);
+ session.removeAttribute(Constants.SUBSCRIPTION_KEY);
try {
UserDatabase database = (UserDatabase)
servlet.getServletContext().
@@ -151,12 +156,12 @@
} catch (Exception e) {
log.error("Database save", e);
}
- return (mapping.findForward("success"));
- }
+ return (mapping.findForward("success"));
+ }
- // All required validations were done by the form itself
+ // All required validations were done by the form itself
- // Update the persistent subscription information
+ // Update the persistent subscription information
if (log.isTraceEnabled()) {
log.trace(" Populating database from form bean");
}
@@ -182,20 +187,20 @@
log.error("Database save", e);
}
- // Remove the obsolete form bean and current subscription
- if (mapping.getAttribute() != null) {
+ // Remove the obsolete form bean and current subscription
+ if (mapping.getAttribute() != null) {
if ("request".equals(mapping.getScope()))
request.removeAttribute(mapping.getAttribute());
else
session.removeAttribute(mapping.getAttribute());
}
- session.removeAttribute(Constants.SUBSCRIPTION_KEY);
+ session.removeAttribute(Constants.SUBSCRIPTION_KEY);
- // Forward control to the specified success URI
+ // Forward control to the specified success URI
if (log.isTraceEnabled()) {
log.trace(" Forwarding to success page");
}
- return (mapping.findForward("success"));
+ return (mapping.findForward("success"));
}
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/Subscription.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/Subscription.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/Subscription.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/Subscription.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SubscriptionForm.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SubscriptionForm.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SubscriptionForm.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/SubscriptionForm.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -92,7 +97,7 @@
*/
public String getAction() {
- return (this.action);
+ return (this.action);
}
@@ -135,7 +140,7 @@
*/
public String getHost() {
- return (this.host);
+ return (this.host);
}
@@ -157,7 +162,7 @@
*/
public String getPassword() {
- return (this.password);
+ return (this.password);
}
@@ -179,7 +184,7 @@
*/
public String getType() {
- return (this.type);
+ return (this.type);
}
@@ -201,7 +206,7 @@
*/
public String getUsername() {
- return (this.username);
+ return (this.username);
}
@@ -254,23 +259,23 @@
ActionErrors errors = new ActionErrors();
- if ((host == null) || (host.length() < 1))
+ if ((host == null) || (host.length() < 1))
errors.add("host",
new ActionMessage("error.host.required"));
- if ((username == null) || (username.length() < 1))
+ if ((username == null) || (username.length() < 1))
errors.add("username",
new ActionMessage("error.username.required"));
- if ((password == null) || (password.length() < 1))
+ if ((password == null) || (password.length() < 1))
errors.add("password",
new ActionMessage("error.password.required"));
- if ((type == null) || (type.length() < 1))
+ if ((type == null) || (type.length() < 1))
errors.add("type",
new ActionMessage("error.type.required"));
- else if (!"imap".equals(type) && !"pop3".equals(type))
+ else if (!"imap".equals(type) && !"pop3".equals(type))
errors.add("type",
new ActionMessage("error.type.invalid", type));
- return (errors);
+ return (errors);
}
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/User.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/User.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/User.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/User.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/UserDatabase.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/UserDatabase.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/UserDatabase.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/UserDatabase.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -112,7 +117,7 @@
}
}
- servlet.getServletContext().removeAttribute(Constants.DATABASE_KEY);
+ servlet.getServletContext().removeAttribute(Constants.DATABASE_KEY);
database = null;
servlet = null;
database = null;
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemorySubscription.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemorySubscription.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemorySubscription.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemorySubscription.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUser.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUser.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUser.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUser.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java (original)
+++ struts/struts1/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/ApplicationMapping.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/ApplicationMapping.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/ApplicationMapping.java (original)
+++ struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/ApplicationMapping.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -63,7 +68,7 @@
*/
public String getFailure() {
- return (this.failure);
+ return (this.failure);
}
@@ -75,7 +80,7 @@
*/
public void setFailure(String failure) {
- this.failure = failure;
+ this.failure = failure;
}
@@ -85,7 +90,7 @@
*/
public String getSuccess() {
- return (this.success);
+ return (this.success);
}
@@ -97,7 +102,7 @@
*/
public void setSuccess(String success) {
- this.success = success;
+ this.success = success;
}
Modified: struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/CheckLogonTag.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/CheckLogonTag.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/CheckLogonTag.java (original)
+++ struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/CheckLogonTag.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -58,7 +63,7 @@
*/
public String getName() {
- return (this.name);
+ return (this.name);
}
@@ -70,7 +75,7 @@
*/
public void setName(String name) {
- this.name = name;
+ this.name = name;
}
@@ -80,7 +85,7 @@
*/
public String getPage() {
- return (this.page);
+ return (this.page);
}
@@ -92,7 +97,7 @@
*/
public void setPage(String page) {
- this.page = page;
+ this.page = page;
}
@@ -107,7 +112,7 @@
*/
public int doStartTag() throws JspException {
- return (SKIP_BODY);
+ return (SKIP_BODY);
}
@@ -121,23 +126,23 @@
*/
public int doEndTag() throws JspException {
- // Is there a valid user logged on?
- boolean valid = false;
- HttpSession session = pageContext.getSession();
- if ((session != null) && (session.getAttribute(name) != null))
- valid = true;
-
- // Forward control based on the results
- if (valid)
- return (EVAL_PAGE);
- else {
- try {
- pageContext.forward(page);
- } catch (Exception e) {
- throw new JspException(e.toString());
- }
- return (SKIP_PAGE);
- }
+ // Is there a valid user logged on?
+ boolean valid = false;
+ HttpSession session = pageContext.getSession();
+ if ((session != null) && (session.getAttribute(name) != null))
+ valid = true;
+
+ // Forward control based on the results
+ if (valid)
+ return (EVAL_PAGE);
+ else {
+ try {
+ pageContext.forward(page);
+ } catch (Exception e) {
+ throw new JspException(e.toString());
+ }
+ return (SKIP_PAGE);
+ }
}
Modified: struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/Constants.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/Constants.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/Constants.java (original)
+++ struts/struts1/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/Constants.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/