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 16:02:22 UTC
svn commit: r471756 [6/31] - in /struts/struts2/trunk: apps/blank/
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/mailreader/src/main/java/mailreader2/
apps/portlet/src/main/java/org/apache/struts2/portlet/example/ apps/portle...
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.tag.nonui.iteratortag;
@@ -25,54 +28,54 @@
*/
public class MergeIteratorTagDemo extends ActionSupport implements Validateable {
- private static final long serialVersionUID = 4401107963952961695L;
-
- private String iteratorValue1;
- private String iteratorValue2;
-
-
- public void validate() {
- if (iteratorValue1 == null || iteratorValue1.trim().length() <= 0 ) {
- addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
- }
- else if (iteratorValue1.trim().indexOf(",") <= 0) {
- addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
- }
- if (iteratorValue2 == null || iteratorValue2.trim().length() <= 0) {
- addFieldError("iteratorValue2", "iterator value 2 cannot be empty");
- }
- else if (iteratorValue2.trim().indexOf(",") <= 0) {
- addFieldError("iteratorValue2", "iterator value 2 needs to be comma separated");
- }
- }
-
-
-
- public String getIteratorValue1() {
- return this.iteratorValue1;
- }
- public void setIteratorValue1(String iteratorValue1) {
- this.iteratorValue1 = iteratorValue1;
- }
-
-
-
- public String getIteratorValue2() {
- return this.iteratorValue2;
- }
- public void setIteratorValue2(String iteratorValue2) {
- this.iteratorValue2 = iteratorValue2;
- }
-
-
-
-
-
- public String input() throws Exception {
- return SUCCESS;
- }
-
- public String submit() throws Exception {
- return SUCCESS;
- }
+ private static final long serialVersionUID = 4401107963952961695L;
+
+ private String iteratorValue1;
+ private String iteratorValue2;
+
+
+ public void validate() {
+ if (iteratorValue1 == null || iteratorValue1.trim().length() <= 0 ) {
+ addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
+ }
+ else if (iteratorValue1.trim().indexOf(",") <= 0) {
+ addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
+ }
+ if (iteratorValue2 == null || iteratorValue2.trim().length() <= 0) {
+ addFieldError("iteratorValue2", "iterator value 2 cannot be empty");
+ }
+ else if (iteratorValue2.trim().indexOf(",") <= 0) {
+ addFieldError("iteratorValue2", "iterator value 2 needs to be comma separated");
+ }
+ }
+
+
+
+ public String getIteratorValue1() {
+ return this.iteratorValue1;
+ }
+ public void setIteratorValue1(String iteratorValue1) {
+ this.iteratorValue1 = iteratorValue1;
+ }
+
+
+
+ public String getIteratorValue2() {
+ return this.iteratorValue2;
+ }
+ public void setIteratorValue2(String iteratorValue2) {
+ this.iteratorValue2 = iteratorValue2;
+ }
+
+
+
+
+
+ public String input() throws Exception {
+ return SUCCESS;
+ }
+
+ public String submit() throws Exception {
+ return SUCCESS;
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.tag.nonui.iteratortag;
@@ -21,65 +24,65 @@
import com.opensymphony.xwork2.Validateable;
/**
- *
+ *
*/
public class SubsetIteratorTagDemo extends ActionSupport implements Validateable {
- private static final long serialVersionUID = -8151855954644052650L;
-
- private String iteratorValue;
- private Integer count;
- private Integer start;
-
-
- public void validate() {
- if (iteratorValue == null || iteratorValue.trim().length() <= 0 ) {
- addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
- }
- else if (iteratorValue.trim().indexOf(",") <= 0) {
- addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
- }
- }
-
-
-
- public String getIteratorValue() {
- return this.iteratorValue;
- }
- public void setIteratorValue(String iteratorValue) {
- this.iteratorValue = iteratorValue;
- }
-
-
-
- public Integer getCount() {
- return this.count;
- }
- public void setCount(Integer count) {
- this.count = count;
- }
-
-
-
- public Integer getStart() {
- return this.start;
- }
- public void setStart(Integer start) {
- this.start = start;
- }
-
-
-
-
-
- public String input() throws Exception {
- return SUCCESS;
- }
-
- public String submit() throws Exception {
- return SUCCESS;
- }
-
-
-
+ private static final long serialVersionUID = -8151855954644052650L;
+
+ private String iteratorValue;
+ private Integer count;
+ private Integer start;
+
+
+ public void validate() {
+ if (iteratorValue == null || iteratorValue.trim().length() <= 0 ) {
+ addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
+ }
+ else if (iteratorValue.trim().indexOf(",") <= 0) {
+ addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
+ }
+ }
+
+
+
+ public String getIteratorValue() {
+ return this.iteratorValue;
+ }
+ public void setIteratorValue(String iteratorValue) {
+ this.iteratorValue = iteratorValue;
+ }
+
+
+
+ public Integer getCount() {
+ return this.count;
+ }
+ public void setCount(Integer count) {
+ this.count = count;
+ }
+
+
+
+ public Integer getStart() {
+ return this.start;
+ }
+ public void setStart(Integer start) {
+ this.start = start;
+ }
+
+
+
+
+
+ public String input() throws Exception {
+ return SUCCESS;
+ }
+
+ public String submit() throws Exception {
+ return SUCCESS;
+ }
+
+
+
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.token;
@@ -28,9 +31,9 @@
*/
public class TokenAction extends ActionSupport {
- private static final long serialVersionUID = 616150375751184884L;
-
- private int amount;
+ private static final long serialVersionUID = 616150375751184884L;
+
+ private int amount;
public String execute() throws Exception {
// transfer from source to destination
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.validation;
@@ -22,12 +25,12 @@
/**
*/
public abstract class AbstractValidationActionSupport extends ActionSupport {
-
- public String submit() throws Exception {
- return "success";
- }
-
- public String input() throws Exception {
- return "input";
- }
+
+ public String submit() throws Exception {
+ return "success";
+ }
+
+ public String input() throws Exception {
+ return "input";
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.validation;
@@ -25,70 +28,70 @@
// START SNIPPET: fieldValidatorsExample
public class FieldValidatorsExampleAction extends AbstractValidationActionSupport {
-
- private static final long serialVersionUID = -4829381083003175423L;
-
- private String requiredValidatorField = null;
- private String requiredStringValidatorField = null;
- private Integer integerValidatorField = null;
- private Date dateValidatorField = null;
- private String emailValidatorField = null;
- private String urlValidatorField = null;
- private String stringLengthValidatorField = null;
- private String regexValidatorField = null;
- private String fieldExpressionValidatorField = null;
-
-
-
- public Date getDateValidatorField() {
- return dateValidatorField;
- }
- public void setDateValidatorField(Date dateValidatorField) {
- this.dateValidatorField = dateValidatorField;
- }
- public String getEmailValidatorField() {
- return emailValidatorField;
- }
- public void setEmailValidatorField(String emailValidatorField) {
- this.emailValidatorField = emailValidatorField;
- }
- public Integer getIntegerValidatorField() {
- return integerValidatorField;
- }
- public void setIntegerValidatorField(Integer integerValidatorField) {
- this.integerValidatorField = integerValidatorField;
- }
- public String getRegexValidatorField() {
- return regexValidatorField;
- }
- public void setRegexValidatorField(String regexValidatorField) {
- this.regexValidatorField = regexValidatorField;
- }
- public String getRequiredStringValidatorField() {
- return requiredStringValidatorField;
- }
- public void setRequiredStringValidatorField(String requiredStringValidatorField) {
- this.requiredStringValidatorField = requiredStringValidatorField;
- }
- public String getRequiredValidatorField() {
- return requiredValidatorField;
- }
- public void setRequiredValidatorField(String requiredValidatorField) {
- this.requiredValidatorField = requiredValidatorField;
- }
- public String getStringLengthValidatorField() {
- return stringLengthValidatorField;
- }
- public void setStringLengthValidatorField(String stringLengthValidatorField) {
- this.stringLengthValidatorField = stringLengthValidatorField;
- }
- public String getFieldExpressionValidatorField() {
- return fieldExpressionValidatorField;
- }
- public void setFieldExpressionValidatorField(
- String fieldExpressionValidatorField) {
- this.fieldExpressionValidatorField = fieldExpressionValidatorField;
- }
+
+ private static final long serialVersionUID = -4829381083003175423L;
+
+ private String requiredValidatorField = null;
+ private String requiredStringValidatorField = null;
+ private Integer integerValidatorField = null;
+ private Date dateValidatorField = null;
+ private String emailValidatorField = null;
+ private String urlValidatorField = null;
+ private String stringLengthValidatorField = null;
+ private String regexValidatorField = null;
+ private String fieldExpressionValidatorField = null;
+
+
+
+ public Date getDateValidatorField() {
+ return dateValidatorField;
+ }
+ public void setDateValidatorField(Date dateValidatorField) {
+ this.dateValidatorField = dateValidatorField;
+ }
+ public String getEmailValidatorField() {
+ return emailValidatorField;
+ }
+ public void setEmailValidatorField(String emailValidatorField) {
+ this.emailValidatorField = emailValidatorField;
+ }
+ public Integer getIntegerValidatorField() {
+ return integerValidatorField;
+ }
+ public void setIntegerValidatorField(Integer integerValidatorField) {
+ this.integerValidatorField = integerValidatorField;
+ }
+ public String getRegexValidatorField() {
+ return regexValidatorField;
+ }
+ public void setRegexValidatorField(String regexValidatorField) {
+ this.regexValidatorField = regexValidatorField;
+ }
+ public String getRequiredStringValidatorField() {
+ return requiredStringValidatorField;
+ }
+ public void setRequiredStringValidatorField(String requiredStringValidatorField) {
+ this.requiredStringValidatorField = requiredStringValidatorField;
+ }
+ public String getRequiredValidatorField() {
+ return requiredValidatorField;
+ }
+ public void setRequiredValidatorField(String requiredValidatorField) {
+ this.requiredValidatorField = requiredValidatorField;
+ }
+ public String getStringLengthValidatorField() {
+ return stringLengthValidatorField;
+ }
+ public void setStringLengthValidatorField(String stringLengthValidatorField) {
+ this.stringLengthValidatorField = stringLengthValidatorField;
+ }
+ public String getFieldExpressionValidatorField() {
+ return fieldExpressionValidatorField;
+ }
+ public void setFieldExpressionValidatorField(
+ String fieldExpressionValidatorField) {
+ this.fieldExpressionValidatorField = fieldExpressionValidatorField;
+ }
public String getUrlValidatorField() {
return urlValidatorField;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.validation;
@@ -23,31 +26,31 @@
// START SNIPPET: nonFieldValidatorsExample
public class NonFieldValidatorsExampleAction extends AbstractValidationActionSupport {
-
- private static final long serialVersionUID = -524460368233581186L;
-
- private String someText;
- private String someTextRetype;
- private String someTextRetypeAgain;
-
- public String getSomeText() {
- return someText;
- }
- public void setSomeText(String someText) {
- this.someText = someText;
- }
- public String getSomeTextRetype() {
- return someTextRetype;
- }
- public void setSomeTextRetype(String someTextRetype) {
- this.someTextRetype = someTextRetype;
- }
- public String getSomeTextRetypeAgain() {
- return someTextRetypeAgain;
- }
- public void setSomeTextRetypeAgain(String someTextRetypeAgain) {
- this.someTextRetypeAgain = someTextRetypeAgain;
- }
+
+ private static final long serialVersionUID = -524460368233581186L;
+
+ private String someText;
+ private String someTextRetype;
+ private String someTextRetypeAgain;
+
+ public String getSomeText() {
+ return someText;
+ }
+ public void setSomeText(String someText) {
+ this.someText = someText;
+ }
+ public String getSomeTextRetype() {
+ return someTextRetype;
+ }
+ public void setSomeTextRetype(String someTextRetype) {
+ this.someTextRetype = someTextRetype;
+ }
+ public String getSomeTextRetypeAgain() {
+ return someTextRetypeAgain;
+ }
+ public void setSomeTextRetypeAgain(String someTextRetypeAgain) {
+ this.someTextRetypeAgain = someTextRetypeAgain;
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.validation;
@@ -22,13 +25,13 @@
/**
*/
-// START SNIPPET: quizAction
+// START SNIPPET: quizAction
public class QuizAction extends ActionSupport {
-
- private static final long serialVersionUID = -7505437345373234225L;
-
- String name;
+
+ private static final long serialVersionUID = -7505437345373234225L;
+
+ String name;
int age;
String answer;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java Mon Nov 6 07:01:43 2006
@@ -1,57 +1,60 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.validation;
import com.opensymphony.xwork2.ActionSupport;
/**
- *
+ *
* @version $Date$ $Id$
*/
public class SubmitApplication extends ActionSupport {
-
- private String name;
- private Integer age;
-
- public void setName(String name) {
- this.name = name;
- }
- public String getName() {
- return this.name;
- }
-
- public void setAge(Integer age) {
- this.age = age;
- }
- public Integer getAge() {
- return age;
- }
-
- public String submitApplication() throws Exception {
- return SUCCESS;
- }
-
- public String applicationOk() throws Exception {
- addActionMessage("Your application looks ok.");
- return SUCCESS;
- }
- public String cancelApplication() throws Exception {
- addActionMessage("So you have decided to cancel the application");
- return SUCCESS;
- }
+
+ private String name;
+ private Integer age;
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getName() {
+ return this.name;
+ }
+
+ public void setAge(Integer age) {
+ this.age = age;
+ }
+ public Integer getAge() {
+ return age;
+ }
+
+ public String submitApplication() throws Exception {
+ return SUCCESS;
+ }
+
+ public String applicationOk() throws Exception {
+ addActionMessage("Your application looks ok.");
+ return SUCCESS;
+ }
+ public String cancelApplication() throws Exception {
+ addActionMessage("So you have decided to cancel the application");
+ return SUCCESS;
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.validation;
@@ -22,29 +25,29 @@
/**
*/
public class User {
-
- private String name;
- private Integer age;
- private Date birthday;
-
-
- public Integer getAge() {
- return age;
- }
- public void setAge(Integer age) {
- this.age = age;
- }
- public Date getBirthday() {
- return birthday;
- }
- public void setBirthday(Date birthday) {
- this.birthday = birthday;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
+
+ private String name;
+ private Integer age;
+ private Date birthday;
+
+
+ public Integer getAge() {
+ return age;
+ }
+ public void setAge(Integer age) {
+ this.age = age;
+ }
+ public Date getBirthday() {
+ return birthday;
+ }
+ public void setBirthday(Date birthday) {
+ this.birthday = birthday;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.validation;
@@ -22,17 +25,17 @@
public class VisitorValidatorsExampleAction extends AbstractValidationActionSupport {
- private static final long serialVersionUID = 4375454086939598216L;
-
- private User user;
-
- public User getUser() {
- return user;
- }
-
- public void setUser(User user) {
- this.user = user;
- }
+ private static final long serialVersionUID = 4375454086939598216L;
+
+ private User user;
+
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.showcase.wait;
@@ -25,9 +28,9 @@
*/
public class LongProcessAction extends ActionSupport {
- private static final long serialVersionUID = 2471910747833998708L;
-
- private int time;
+ private static final long serialVersionUID = 2471910747833998708L;
+
+ private int time;
public int getTime() {
return time;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/ServletActionContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/ServletActionContext.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/ServletActionContext.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/ServletActionContext.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2;
@@ -36,10 +39,10 @@
* web objects like servlet parameters, request attributes and things like the HTTP session.
*/
public class ServletActionContext extends ActionContext implements StrutsStatics {
-
- private static final long serialVersionUID = -666854718275106687L;
-
- public static final String STRUTS_VALUESTACK_KEY = "struts.valueStack";
+
+ private static final long serialVersionUID = -666854718275106687L;
+
+ public static final String STRUTS_VALUESTACK_KEY = "struts.valueStack";
public static final String ACTION_MAPPING = "struts.actionMapping";
@SuppressWarnings("unused")
@@ -49,7 +52,7 @@
/**
* Gets the current action context
- *
+ *
* @param req The request
* @return The current action context
*/
@@ -71,10 +74,10 @@
public static ValueStack getValueStack(HttpServletRequest req) {
return (ValueStack) req.getAttribute(STRUTS_VALUESTACK_KEY);
}
-
+
/**
* Gets the action mapping for this context
- *
+ *
* @return The action mapping
*/
public static ActionMapping getActionMapping() {
@@ -137,7 +140,7 @@
/**
* Sets the current servlet context object
- *
+ *
* @param servletContext The servlet context to use
*/
public static void setServletContext(ServletContext servletContext) {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2;
@@ -30,7 +33,7 @@
/** Whether the localization messages should automatically be reloaded */
public static final String STRUTS_I18N_RELOAD = "struts.i18n.reload";
-
+
/** The encoding to use for localization messages */
public static final String STRUTS_I18N_ENCODING = "struts.i18n.encoding";
@@ -45,7 +48,7 @@
/** The HTTP port used by Struts URLs */
public static final String STRUTS_URL_HTTP_PORT = "struts.url.http.port";
-
+
/** The HTTPS port used by Struts URLs */
public static final String STRUTS_URL_HTTPS_PORT = "struts.url.https.port";
@@ -54,7 +57,7 @@
/** The com.opensymphony.xwork2.ObjectFactory implementation class */
public static final String STRUTS_OBJECTFACTORY = "struts.objectFactory";
-
+
/** The com.opensymphony.xwork2.util.ObjectTypeDeterminer implementation class */
public static final String STRUTS_OBJECTTYPEDETERMINER = "struts.objectTypeDeterminer";
@@ -75,37 +78,37 @@
/** org.apache.struts2.views.velocity.VelocityManager implementation class */
public static final String STRUTS_VELOCITY_MANAGER_CLASSNAME = "struts.velocity.manager.classname";
-
+
/** The Velocity configuration file path */
public static final String STRUTS_VELOCITY_CONFIGFILE = "struts.velocity.configfile";
-
+
/** The location of the Velocity toolbox */
public static final String STRUTS_VELOCITY_TOOLBOXLOCATION = "struts.velocity.toolboxlocation";
-
+
/** List of Velocity context names */
public static final String STRUTS_VELOCITY_CONTEXTS = "struts.velocity.contexts";
/** The directory containing UI templates */
public static final String STRUTS_UI_TEMPLATEDIR = "struts.ui.templateDir";
-
+
/** The default UI template theme */
public static final String STRUTS_UI_THEME = "struts.ui.theme";
/** The maximize size of a multipart request (file upload) */
public static final String STRUTS_MULTIPART_MAXSIZE = "struts.multipart.maxSize";
-
+
/** The directory to use for storing uploaded files */
public static final String STRUTS_MULTIPART_SAVEDIR = "struts.multipart.saveDir";
-
- /**
- * The org.apache.struts2.dispatcher.multipart.MultiPartRequest parser implementation
- * for a multipart request (file upload)
+
+ /**
+ * The org.apache.struts2.dispatcher.multipart.MultiPartRequest parser implementation
+ * for a multipart request (file upload)
*/
public static final String STRUTS_MULTIPART_PARSER = "struts.multipart.parser";
/** Whether Spring should autoWire or not */
public static final String STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE = "struts.objectFactory.spring.autoWire";
-
+
/** Whether Spring should use its class cache or not */
public static final String STRUTS_OBJECTFACTORY_SPRING_USE_CLASS_CACHE = "struts.objectFactory.spring.useClassCache";
@@ -114,16 +117,16 @@
/** Location of additional configuration properties files to load */
public static final String STRUTS_CUSTOM_PROPERTIES = "struts.custom.properties";
-
+
/** Location of additional localization properties files to load */
public static final String STRUTS_CUSTOM_I18N_RESOURCES = "struts.custom.i18n.resources";
-
+
/** The org.apache.struts2.dispatcher.mapper.ActionMapper implementation class */
public static final String STRUTS_MAPPER_CLASS = "struts.mapper.class";
/** Whether the Struts filter should serve static content or not */
public static final String STRUTS_SERVE_STATIC_CONTENT = "struts.serve.static";
-
+
/** If static content served by the Struts filter should set browser caching header properties or not */
public static final String STRUTS_SERVE_STATIC_BROWSER_CACHE = "struts.serve.static.browserCache";
@@ -132,10 +135,10 @@
/** A list of configuration files automatically loaded by Struts */
public static final String STRUTS_CONFIGURATION_FILES = "struts.configuration.files";
-
- /** Whether slashes in action names are allowed or not */
+
+ /** Whether slashes in action names are allowed or not */
public static final String STRUTS_ENABLE_SLASHES_IN_ACTION_NAMES = "struts.enable.SlashesInActionNames";
-
+
/** Prefix used by {@link CompositeActionMapper} to identified its containing {@link ActionMapper} class. */
public static final String STRUTS_MAPPER_COMPOSITE = "struts.mapper.composite.";
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsException.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsException.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsException.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsException.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2;
@@ -22,7 +25,7 @@
/**
- * A generic runtime exception that optionally contains Location information
+ * A generic runtime exception that optionally contains Location information
*/
public class StrutsException extends XWorkException implements Locatable {
@@ -44,7 +47,7 @@
public StrutsException(String s) {
this(s, null, null);
}
-
+
/**
* Constructs a <code>StrutsException</code> with the specified
* detail message and target.
@@ -64,7 +67,7 @@
public StrutsException(Throwable cause) {
this(null, cause, null);
}
-
+
/**
* Constructs a <code>StrutsException</code> with the root cause and target
*
@@ -85,8 +88,8 @@
public StrutsException(String s, Throwable cause) {
this(s, cause, null);
}
-
-
+
+
/**
* Constructs a <code>StrutsException</code> with the specified
* detail message, cause, and target
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsStatics.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsStatics.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsStatics.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsStatics.java Mon Nov 6 07:01:43 2006
@@ -1,29 +1,32 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2;
/**
- * Constants used by Struts. The constants can be used to get or set objects
+ * Constants used by Struts. The constants can be used to get or set objects
* out of the action context or other collections.
- *
+ *
* <p/>
- *
+ *
* Example:
* <ul><code>ActionContext.getContext().put(HTTP_REQUEST, request);</code></ul>
* <p/>
@@ -59,7 +62,7 @@
* Constant for the JSP {@link javax.servlet.jsp.PageContext page context}.
*/
public static final String PAGE_CONTEXT = "com.opensymphony.xwork2.dispatcher.PageContext";
-
+
/** Constant for the PortletContext object */
public static final String STRUTS_PORTLET_CONTEXT = "struts.portlet.context";
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2;
@@ -50,7 +53,7 @@
configurationManager.addConfigurationProvider(
new StrutsXmlConfigurationProvider("struts.xml", false));
du.setConfigurationManager(configurationManager);
-
+
}
protected void tearDown() throws Exception {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.components;
@@ -52,8 +55,8 @@
* <!-- START SNIPPET: params -->
* <ul>
* <li>id (String) - the id (if specified) to put the action under stack's context.
- * <li>name* (String) - name of the action to be executed (without the extension suffix eg. .action)</li>
- * <li>namespace (String) - default to the namespace where this action tag is invoked</li>
+ * <li>name* (String) - name of the action to be executed (without the extension suffix eg. .action)</li>
+ * <li>namespace (String) - default to the namespace where this action tag is invoked</li>
* <li>executeResult (Boolean) - default is false. Decides wheather the result of this action is to be executed or not</li>
* <li>ignoreContextParams (Boolean) - default to false. Decides wheather the request parameters are to be included when the action is invoked</li>
* </ul>
@@ -63,14 +66,14 @@
* <!-- START SNIPPET: javacode -->
* public class ActionTagAction extends ActionSupport {
*
- * public String execute() throws Exception {
- * return "done";
- * }
+ * public String execute() throws Exception {
+ * return "done";
+ * }
*
- * public String doDefault() throws Exception {
- * ServletActionContext.getRequest().setAttribute("stringByAction", "This is a String put in by the action's doDefault()");
- * return "done";
- * }
+ * public String doDefault() throws Exception {
+ * ServletActionContext.getRequest().setAttribute("stringByAction", "This is a String put in by the action's doDefault()");
+ * return "done";
+ * }
* }
* <!-- END SNIPPET: javacode -->
* </pre>
@@ -93,12 +96,12 @@
* <pre>
* <!-- START SNIPPET: example -->
* <div>The following action tag will execute result and include it in this page</div>
- * <br />
- * <s:action name="actionTagAction" executeResult="true" />
+ * <br />
+ * <s:action name="actionTagAction" executeResult="true" />
* <br />
* <div>The following action tag will do the same as above, but invokes method specialMethod in action</div>
- * <br />
- * <s:action name="actionTagAction!specialMethod" executeResult="true" />
+ * <br />
+ * <s:action name="actionTagAction!specialMethod" executeResult="true" />
* <br />
* <div>The following action tag will not execute result, but put a String in request scope
* under an id "stringByAction" which will be retrieved using property tag</div>
@@ -130,24 +133,24 @@
}
public boolean end(Writer writer, String body) {
- boolean end = super.end(writer, "", false);
- try {
- if (flush) {
- try {
- writer.flush();
- } catch (IOException e) {
- LOG.warn("error while trying to flush writer ", e);
- }
- }
- executeAction();
-
- if ((getId() != null) && (proxy != null)) {
- getStack().setValue("#attr['" + getId() + "']",
- proxy.getAction());
- }
- } finally {
- popComponentStack();
- }
+ boolean end = super.end(writer, "", false);
+ try {
+ if (flush) {
+ try {
+ writer.flush();
+ } catch (IOException e) {
+ LOG.warn("error while trying to flush writer ", e);
+ }
+ }
+ executeAction();
+
+ if ((getId() != null) && (proxy != null)) {
+ getStack().setValue("#attr['" + getId() + "']",
+ proxy.getAction());
+ }
+ } finally {
+ popComponentStack();
+ }
return end;
}
@@ -294,12 +297,12 @@
public void setIgnoreContextParams(boolean ignoreContextParams) {
this.ignoreContextParams = ignoreContextParams;
}
-
+
/**
* whether the writer should be flush upon end of action component tag, default to true.
* @s.tagattribute required="false" type="Boolean" default="true"
*/
public void setFlush(boolean flush) {
- this.flush = flush;
+ this.flush = flush;
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.components;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionMessage.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionMessage.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionMessage.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionMessage.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.components;
@@ -25,7 +28,7 @@
/**
* <!-- START SNIPPET: javadoc -->
*
- * Render action messages if they exists, specific rendering layout depends on the
+ * Render action messages if they exists, specific rendering layout depends on the
* theme itself.
*
* <!-- END SNIPPET: javadoc -->
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 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.
+ * 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.
*/
package org.apache.struts2.components;
@@ -72,14 +75,14 @@
* <pre>
* <!-- START SNIPPET: example3 -->
* <s:a id="test" theme="ajax" href="/simpeResult.action" preInvokeJS="confirm(\'You sure\')">
- * A
+ * A
* </s:a>
* <!-- END SNIPPET: example3 -->
* </pre>
*
* @s.tag name="a" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.AnchorTag"
* description="Render a HTML href element that when clicked calls a URL via remote XMLHttpRequest"
- *
+ *
*/
public class Anchor extends RemoteCallUIBean {
final public static String OPEN_TEMPLATE = "a";
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 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.
+ * 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.
*/
package org.apache.struts2.components;
@@ -40,9 +43,9 @@
* the following will be how the appended iterator entries will be arranged:</p>
*
* <ol>
- * <li>First Entry of the First Iterator</li>
- * <li>Second Entry of the First Iterator</li>
- * <li>Third Entry of the First Iterator</li>
+ * <li>First Entry of the First Iterator</li>
+ * <li>Second Entry of the First Iterator</li>
+ * <li>Third Entry of the First Iterator</li>
* <li>First Entry of the Second Iterator</li>
* <li>Second Entry of the Second Iterator</li>
* <li>Third Entry of the Second Iterator</li>
@@ -54,7 +57,7 @@
*
* <!-- START SNIPPET: params -->
* <ul>
- * <li>id (String) - the id of which if supplied will have the resultant
+ * <li>id (String) - the id of which if supplied will have the resultant
* appended iterator stored under in the stack's context</li>
* </ul>
* <!-- END SNIPPET: params -->
@@ -63,45 +66,45 @@
* <!-- START SNIPPET: code -->
* public class AppendIteratorTagAction extends ActionSupport {
*
- * private List myList1;
- * private List myList2;
- * private List myList3;
- *
- *
- * public String execute() throws Exception {
- *
- * myList1 = new ArrayList();
- * myList1.add("1");
- * myList1.add("2");
- * myList1.add("3");
- *
- * myList2 = new ArrayList();
- * myList2.add("a");
- * myList2.add("b");
- * myList2.add("c");
- *
- * myList3 = new ArrayList();
- * myList3.add("A");
- * myList3.add("B");
- * myList3.add("C");
- *
- * return "done";
- * }
- *
- * public List getMyList1() { return myList1; }
- * public List getMyList2() { return myList2; }
- * public List getMyList3() { return myList3; }
+ * private List myList1;
+ * private List myList2;
+ * private List myList3;
+ *
+ *
+ * public String execute() throws Exception {
+ *
+ * myList1 = new ArrayList();
+ * myList1.add("1");
+ * myList1.add("2");
+ * myList1.add("3");
+ *
+ * myList2 = new ArrayList();
+ * myList2.add("a");
+ * myList2.add("b");
+ * myList2.add("c");
+ *
+ * myList3 = new ArrayList();
+ * myList3.add("A");
+ * myList3.add("B");
+ * myList3.add("C");
+ *
+ * return "done";
+ * }
+ *
+ * public List getMyList1() { return myList1; }
+ * public List getMyList2() { return myList2; }
+ * public List getMyList3() { return myList3; }
*}
* <!-- END SNIPPET: code -->
*
* <!-- START SNIPPET: example -->
* <s:append id="myAppendIterator">
- * <s:param value="%{myList1}" />
- * <s:param value="%{myList2}" />
- * <s:param value="%{myList3}" />
+ * <s:param value="%{myList1}" />
+ * <s:param value="%{myList2}" />
+ * <s:param value="%{myList3}" />
* </s:append>
* <s:iterator value="%{#myAppendIterator}">
- * <s:property />
+ * <s:property />
* </s:iterator>
* <!-- END SNIPPET: example -->
*
@@ -114,49 +117,49 @@
*/
public class AppendIterator extends Component implements UnnamedParametric {
- private static final Log _log = LogFactory.getLog(AppendIterator.class);
-
- private AppendIteratorFilter appendIteratorFilter= null;
- private List _parameters;
-
- public AppendIterator(ValueStack stack) {
- super(stack);
- }
-
- public boolean start(Writer writer) {
- _parameters = new ArrayList();
- appendIteratorFilter = new AppendIteratorFilter();
+ private static final Log _log = LogFactory.getLog(AppendIterator.class);
+
+ private AppendIteratorFilter appendIteratorFilter= null;
+ private List _parameters;
+
+ public AppendIterator(ValueStack stack) {
+ super(stack);
+ }
+
+ public boolean start(Writer writer) {
+ _parameters = new ArrayList();
+ appendIteratorFilter = new AppendIteratorFilter();
return super.start(writer);
}
-
- public boolean end(Writer writer, String body) {
-
- for (Iterator paramEntries = _parameters.iterator(); paramEntries.hasNext(); ) {
-
- Object iteratorEntryObj = paramEntries.next();
- if (! MakeIterator.isIterable(iteratorEntryObj)) {
- _log.warn("param with value resolved as "+iteratorEntryObj+" cannot be make as iterator, it will be ignored and hence will not appear in the merged iterator");
- continue;
- }
- appendIteratorFilter.setSource(MakeIterator.convert(iteratorEntryObj));
- }
-
- appendIteratorFilter.execute();
-
- if (getId() != null && getId().length() > 0) {
- getStack().getContext().put(getId(), appendIteratorFilter);
- }
-
- appendIteratorFilter = null;
+
+ public boolean end(Writer writer, String body) {
+
+ for (Iterator paramEntries = _parameters.iterator(); paramEntries.hasNext(); ) {
+
+ Object iteratorEntryObj = paramEntries.next();
+ if (! MakeIterator.isIterable(iteratorEntryObj)) {
+ _log.warn("param with value resolved as "+iteratorEntryObj+" cannot be make as iterator, it will be ignored and hence will not appear in the merged iterator");
+ continue;
+ }
+ appendIteratorFilter.setSource(MakeIterator.convert(iteratorEntryObj));
+ }
+
+ appendIteratorFilter.execute();
+
+ if (getId() != null && getId().length() > 0) {
+ getStack().getContext().put(getId(), appendIteratorFilter);
+ }
+
+ appendIteratorFilter = null;
return super.end(writer, body);
}
- // UnnamedParametric implementation --------------------------------------
- public void addParameter(Object value) {
- _parameters.add(value);
- }
+ // UnnamedParametric implementation --------------------------------------
+ public void addParameter(Object value) {
+ _parameters.add(value);
+ }
/**
* the id of which if supplied will have the resultant appended iterator stored under in the stack's context
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 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.
+ * 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.
*/
package org.apache.struts2.components;
@@ -40,8 +43,8 @@
*
* <!-- START SNIPPET: params -->
* <ul>
- * <li>id - the stack's context id (if supplied) that the created bean will be store under</li>
- * <li>name* - the class name of the bean to be instantiated (must respect JavaBean specification)</li>
+ * <li>id - the stack's context id (if supplied) that the created bean will be store under</li>
+ * <li>name* - the class name of the bean to be instantiated (must respect JavaBean specification)</li>
* </ul>
* <!-- END SNIPPET: params -->
*
@@ -58,7 +61,7 @@
*
* <-- in jsp form -->
* <s:bean name="org.apache.struts2.example.counter.SimpleCounter" id="counter">
- * <s:param name="foo" value="BAR" />
+ * <s:param name="foo" value="BAR" />
* The value of foot is : <s:property value="foo"/>, when inside the bean tag <br />
* </s:bean>
* <!-- END SNIPPET: examples -->
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.components;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.components;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
package org.apache.struts2.components;