Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 27812 invoked from network); 6 Nov 2006 15:08:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Nov 2006 15:08:12 -0000 Received: (qmail 35991 invoked by uid 500); 6 Nov 2006 15:04:48 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 35950 invoked by uid 500); 6 Nov 2006 15:04:47 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 35933 invoked by uid 99); 6 Nov 2006 15:04:47 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Nov 2006 07:04:47 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Nov 2006 07:04:31 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 28C521A985B; Mon, 6 Nov 2006 07:03:20 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r471756 [19/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/portl... Date: Mon, 06 Nov 2006 15:02:22 -0000 To: commits@struts.apache.org From: husted@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061106150320.28C521A985B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.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.views.jsp.ui; @@ -29,10 +32,10 @@ * @see TextField */ public class TextFieldTag extends AbstractUITag { - - private static final long serialVersionUID = 5811285953670562288L; - protected String maxlength; + private static final long serialVersionUID = 5811285953670562288L; + + protected String maxlength; protected String readonly; protected String size; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.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.views.jsp.ui; @@ -30,10 +33,10 @@ * @see TextArea */ public class TextareaTag extends AbstractUITag { - - private static final long serialVersionUID = -4107122506712927927L; - - protected String cols; + + private static final long serialVersionUID = -4107122506712927927L; + + protected String cols; protected String readonly; protected String rows; protected String wrap; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TimePickerTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TimePickerTag.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TimePickerTag.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TimePickerTag.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.views.jsp.ui; @@ -30,40 +33,40 @@ */ public class TimePickerTag extends TextFieldTag { - private static final long serialVersionUID = 3527737048468381376L; - - protected String format; - protected String timeIconPath; - protected String templatePath; - protected String templateCssPath; - - public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { - return new TimePicker(stack, req, res); - } - - protected void populateParams() { - super.populateParams(); - - final TimePicker timePicker = (TimePicker) component; - timePicker.setFormat(format); - timePicker.setTimeIconPath(timeIconPath); - timePicker.setTemplatePath(templatePath); - timePicker.setTemplateCssPath(templateCssPath); - } - - public void setFormat(String format) { + private static final long serialVersionUID = 3527737048468381376L; + + protected String format; + protected String timeIconPath; + protected String templatePath; + protected String templateCssPath; + + public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { + return new TimePicker(stack, req, res); + } + + protected void populateParams() { + super.populateParams(); + + final TimePicker timePicker = (TimePicker) component; + timePicker.setFormat(format); + timePicker.setTimeIconPath(timeIconPath); + timePicker.setTemplatePath(templatePath); + timePicker.setTemplateCssPath(templateCssPath); + } + + public void setFormat(String format) { this.format = format; } - + public void setTimeIconPath(String timeIconPath) { - this.timeIconPath = timeIconPath; + this.timeIconPath = timeIconPath; } - + public void setTemplatePath(String templatePath) { - this.templatePath = templatePath; + this.templatePath = templatePath; } - + public void setTemplateCssPath(String templateCssPath) { - this.templateCssPath = templateCssPath; + this.templateCssPath = templateCssPath; } } Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.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.views.jsp.ui; @@ -30,10 +33,10 @@ * @see Token */ public class TokenTag extends AbstractUITag { - - private static final long serialVersionUID = 722480798151703457L; - public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { + private static final long serialVersionUID = 722480798151703457L; + + public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new Token(stack, req, res); } } Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.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.views.jsp.ui; @@ -29,9 +32,9 @@ * @see TreeNode */ public class TreeNodeTag extends AbstractClosingTag { - - private static final long serialVersionUID = 7340746943017900803L; - + + private static final long serialVersionUID = 7340746943017900803L; + public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new TreeNode(stack,req,res); @@ -41,7 +44,7 @@ this.label = label; } - // NOTE: not necessary, label property is inherited, will be populated + // NOTE: not necessary, label property is inherited, will be populated // by super-class /*protected void populateParams() { if (label != null) { Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.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.views.jsp.ui; @@ -29,36 +32,36 @@ * @see Tree */ public class TreeTag extends AbstractClosingTag { - - private static final long serialVersionUID = 2735218501058548013L; - - private String toggle; + + private static final long serialVersionUID = 2735218501058548013L; + + private String toggle; private String treeSelectedTopic; private String treeExpandedTopic; - private String treeCollapsedTopic; + private String treeCollapsedTopic; private String rootNode; private String childCollectionProperty; private String nodeTitleProperty; private String nodeIdProperty; private String showRootGrid; - + private String showGrid; - private String blankIconSrc; - private String gridIconSrcL; - private String gridIconSrcV; - private String gridIconSrcP; - private String gridIconSrcC; - private String gridIconSrcX; - private String gridIconSrcY; - private String expandIconSrcPlus; - private String expandIconSrcMinus; - private String iconWidth; - private String iconHeight; - private String toggleDuration; + private String blankIconSrc; + private String gridIconSrcL; + private String gridIconSrcV; + private String gridIconSrcP; + private String gridIconSrcC; + private String gridIconSrcX; + private String gridIconSrcY; + private String expandIconSrcPlus; + private String expandIconSrcMinus; + private String iconWidth; + private String iconHeight; + private String toggleDuration; private String templateCssPath; - - public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { + + public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new Tree(stack,req,res); } @@ -67,52 +70,52 @@ Tree tree = (Tree) component; if (childCollectionProperty != null) - tree.setChildCollectionProperty(childCollectionProperty); + tree.setChildCollectionProperty(childCollectionProperty); if (nodeIdProperty != null) - tree.setNodeIdProperty(nodeIdProperty); + tree.setNodeIdProperty(nodeIdProperty); if (nodeTitleProperty != null) - tree.setNodeTitleProperty(nodeTitleProperty); + tree.setNodeTitleProperty(nodeTitleProperty); if (rootNode != null) - tree.setRootNode(rootNode); + tree.setRootNode(rootNode); if (toggle != null) - tree.setToggle(toggle); + tree.setToggle(toggle); if (treeCollapsedTopic != null) - tree.setTreeCollapsedTopic(treeCollapsedTopic); + tree.setTreeCollapsedTopic(treeCollapsedTopic); if (treeExpandedTopic != null) - tree.setTreeExpandedTopic(treeExpandedTopic); + tree.setTreeExpandedTopic(treeExpandedTopic); if (treeSelectedTopic != null) - tree.setTreeSelectedTopic(treeSelectedTopic); + tree.setTreeSelectedTopic(treeSelectedTopic); if (showRootGrid != null) - tree.setShowRootGrid(showRootGrid); - + tree.setShowRootGrid(showRootGrid); + if (showGrid != null) - tree.setShowGrid(showGrid); + tree.setShowGrid(showGrid); if (blankIconSrc != null) - tree.setBlankIconSrc(blankIconSrc); + tree.setBlankIconSrc(blankIconSrc); if (gridIconSrcL != null) - tree.setGridIconSrcL(gridIconSrcC); - if (gridIconSrcV != null) - tree.setGridIconSrcV(gridIconSrcV); + tree.setGridIconSrcL(gridIconSrcC); + if (gridIconSrcV != null) + tree.setGridIconSrcV(gridIconSrcV); if (gridIconSrcP != null) - tree.setGridIconSrcP(gridIconSrcP); + tree.setGridIconSrcP(gridIconSrcP); if (gridIconSrcC != null) - tree.setGridIconSrcC(gridIconSrcC); + tree.setGridIconSrcC(gridIconSrcC); if (gridIconSrcX != null) - tree.setGridIconSrcX(gridIconSrcX); + tree.setGridIconSrcX(gridIconSrcX); if (gridIconSrcY != null) - tree.setGridIconSrcY(gridIconSrcY); - if (expandIconSrcPlus != null) - tree.setExpandIconSrcPlus(expandIconSrcPlus); - if (expandIconSrcMinus != null) - tree.setExpandIconSrcMinus(expandIconSrcMinus); - if (iconWidth != null) - tree.setIconWidth(iconWidth); - if (iconHeight != null) - tree.setIconHeight(iconHeight); - if (toggleDuration != null) - tree.setToggleDuration(toggleDuration); - if (templateCssPath != null) - tree.setTemplateCssPath(templateCssPath); + tree.setGridIconSrcY(gridIconSrcY); + if (expandIconSrcPlus != null) + tree.setExpandIconSrcPlus(expandIconSrcPlus); + if (expandIconSrcMinus != null) + tree.setExpandIconSrcMinus(expandIconSrcMinus); + if (iconWidth != null) + tree.setIconWidth(iconWidth); + if (iconHeight != null) + tree.setIconHeight(iconHeight); + if (toggleDuration != null) + tree.setToggleDuration(toggleDuration); + if (templateCssPath != null) + tree.setTemplateCssPath(templateCssPath); } public String getToggle() { @@ -178,125 +181,125 @@ public void setNodeIdProperty(String nodeIdProperty) { this.nodeIdProperty = nodeIdProperty; } - + public String getShowRootGrid() { - return showRootGrid; + return showRootGrid; } - + public void setShowRootGrid(String showRootGrid) { - this.showRootGrid = showRootGrid; + this.showRootGrid = showRootGrid; } - + public String getBlankIconSrc() { - return blankIconSrc; - } + return blankIconSrc; + } + + public void setBlankIconSrc(String blankIconSrc) { + this.blankIconSrc = blankIconSrc; + } + + public String getExpandIconSrcMinus() { + return expandIconSrcMinus; + } + + public void setExpandIconSrcMinus(String expandIconSrcMinus) { + this.expandIconSrcMinus = expandIconSrcMinus; + } + + public String getExpandIconSrcPlus() { + return expandIconSrcPlus; + } + + public void setExpandIconSrcPlus(String expandIconSrcPlus) { + this.expandIconSrcPlus = expandIconSrcPlus; + } + + public String getGridIconSrcC() { + return gridIconSrcC; + } + + public void setGridIconSrcC(String gridIconSrcC) { + this.gridIconSrcC = gridIconSrcC; + } + + public String getGridIconSrcL() { + return gridIconSrcL; + } + + public void setGridIconSrcL(String gridIconSrcL) { + this.gridIconSrcL = gridIconSrcL; + } + + public String getGridIconSrcP() { + return gridIconSrcP; + } + + public void setGridIconSrcP(String gridIconSrcP) { + this.gridIconSrcP = gridIconSrcP; + } - public void setBlankIconSrc(String blankIconSrc) { - this.blankIconSrc = blankIconSrc; - } - - public String getExpandIconSrcMinus() { - return expandIconSrcMinus; - } - - public void setExpandIconSrcMinus(String expandIconSrcMinus) { - this.expandIconSrcMinus = expandIconSrcMinus; - } - - public String getExpandIconSrcPlus() { - return expandIconSrcPlus; - } - - public void setExpandIconSrcPlus(String expandIconSrcPlus) { - this.expandIconSrcPlus = expandIconSrcPlus; - } - - public String getGridIconSrcC() { - return gridIconSrcC; - } - - public void setGridIconSrcC(String gridIconSrcC) { - this.gridIconSrcC = gridIconSrcC; - } - - public String getGridIconSrcL() { - return gridIconSrcL; - } - - public void setGridIconSrcL(String gridIconSrcL) { - this.gridIconSrcL = gridIconSrcL; - } - - public String getGridIconSrcP() { - return gridIconSrcP; - } - - public void setGridIconSrcP(String gridIconSrcP) { - this.gridIconSrcP = gridIconSrcP; - } - - public String getGridIconSrcV() { - return gridIconSrcV; - } - - public void setGridIconSrcV(String gridIconSrcV) { - this.gridIconSrcV = gridIconSrcV; - } - - public String getGridIconSrcX() { - return gridIconSrcX; - } - - public void setGridIconSrcX(String gridIconSrcX) { - this.gridIconSrcX = gridIconSrcX; - } - - public String getGridIconSrcY() { - return gridIconSrcY; - } - - public void setGridIconSrcY(String gridIconSrcY) { - this.gridIconSrcY = gridIconSrcY; - } - - public String getIconHeight() { - return iconHeight; - } - - public void setIconHeight(String iconHeight) { - this.iconHeight = iconHeight; - } - - public String getIconWidth() { - return iconWidth; - } - - public void setIconWidth(String iconWidth) { - this.iconWidth = iconWidth; - } - - public String getTemplateCssPath() { - return templateCssPath; - } - - public void setTemplateCssPath(String templateCssPath) { - this.templateCssPath = templateCssPath; - } - - public String getToggleDuration() { - return toggleDuration; - } - - public void setToggleDuration(String toggleDuration) { - this.toggleDuration = toggleDuration; - } - - public String getShowGrid() { - return showGrid; - } - - public void setShowGrid(String showGrid) { - this.showGrid = showGrid; - } + public String getGridIconSrcV() { + return gridIconSrcV; + } + + public void setGridIconSrcV(String gridIconSrcV) { + this.gridIconSrcV = gridIconSrcV; + } + + public String getGridIconSrcX() { + return gridIconSrcX; + } + + public void setGridIconSrcX(String gridIconSrcX) { + this.gridIconSrcX = gridIconSrcX; + } + + public String getGridIconSrcY() { + return gridIconSrcY; + } + + public void setGridIconSrcY(String gridIconSrcY) { + this.gridIconSrcY = gridIconSrcY; + } + + public String getIconHeight() { + return iconHeight; + } + + public void setIconHeight(String iconHeight) { + this.iconHeight = iconHeight; + } + + public String getIconWidth() { + return iconWidth; + } + + public void setIconWidth(String iconWidth) { + this.iconWidth = iconWidth; + } + + public String getTemplateCssPath() { + return templateCssPath; + } + + public void setTemplateCssPath(String templateCssPath) { + this.templateCssPath = templateCssPath; + } + + public String getToggleDuration() { + return toggleDuration; + } + + public void setToggleDuration(String toggleDuration) { + this.toggleDuration = toggleDuration; + } + + public String getShowGrid() { + return showGrid; + } + + public void setShowGrid(String showGrid) { + this.showGrid = showGrid; + } } Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.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.views.jsp.ui; @@ -30,91 +33,91 @@ */ public class UpDownSelectTag extends SelectTag { - private static final long serialVersionUID = -8136573053799541353L; - - protected String allowMoveUp; - protected String allowMoveDown; - protected String allowSelectAll; - - protected String moveUpLabel; - protected String moveDownLabel; - protected String selectAllLabel; - - - public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { - return new UpDownSelect(stack, req, res); - } - - protected void populateParams() { - super.populateParams(); - - UpDownSelect c = (UpDownSelect) component; - - c.setAllowMoveUp(allowMoveUp); - c.setAllowMoveDown(allowMoveDown); - c.setAllowSelectAll(allowSelectAll); - - c.setMoveUpLabel(moveUpLabel); - c.setMoveDownLabel(moveDownLabel); - c.setSelectAllLabel(selectAllLabel); - - } - - - public String getAllowMoveUp() { - return allowMoveUp; - } - - public void setAllowMoveUp(String allowMoveUp) { - this.allowMoveUp = allowMoveUp; - } - - - - public String getAllowMoveDown() { - return allowMoveDown; - } - - public void setAllowMoveDown(String allowMoveDown) { - this.allowMoveDown = allowMoveDown; - } - - - - public String getAllowSelectAll() { - return allowSelectAll; - } - - public void setAllowSelectAll(String allowSelectAll) { - this.allowSelectAll = allowSelectAll; - } - - - public String getMoveUpLabel() { - return moveUpLabel; - } - - public void setMoveUpLabel(String moveUpLabel) { - this.moveUpLabel = moveUpLabel; - } - - - - public String getMoveDownLabel() { - return moveDownLabel; - } - - public void setMoveDownLabel(String moveDownLabel) { - this.moveDownLabel = moveDownLabel; - } - - - - public String getSelectAllLabel() { - return selectAllLabel; - } - - public void setSelectAllLabel(String selectAllLabel) { - this.selectAllLabel = selectAllLabel; - } + private static final long serialVersionUID = -8136573053799541353L; + + protected String allowMoveUp; + protected String allowMoveDown; + protected String allowSelectAll; + + protected String moveUpLabel; + protected String moveDownLabel; + protected String selectAllLabel; + + + public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { + return new UpDownSelect(stack, req, res); + } + + protected void populateParams() { + super.populateParams(); + + UpDownSelect c = (UpDownSelect) component; + + c.setAllowMoveUp(allowMoveUp); + c.setAllowMoveDown(allowMoveDown); + c.setAllowSelectAll(allowSelectAll); + + c.setMoveUpLabel(moveUpLabel); + c.setMoveDownLabel(moveDownLabel); + c.setSelectAllLabel(selectAllLabel); + + } + + + public String getAllowMoveUp() { + return allowMoveUp; + } + + public void setAllowMoveUp(String allowMoveUp) { + this.allowMoveUp = allowMoveUp; + } + + + + public String getAllowMoveDown() { + return allowMoveDown; + } + + public void setAllowMoveDown(String allowMoveDown) { + this.allowMoveDown = allowMoveDown; + } + + + + public String getAllowSelectAll() { + return allowSelectAll; + } + + public void setAllowSelectAll(String allowSelectAll) { + this.allowSelectAll = allowSelectAll; + } + + + public String getMoveUpLabel() { + return moveUpLabel; + } + + public void setMoveUpLabel(String moveUpLabel) { + this.moveUpLabel = moveUpLabel; + } + + + + public String getMoveDownLabel() { + return moveDownLabel; + } + + public void setMoveDownLabel(String moveDownLabel) { + this.moveDownLabel = moveDownLabel; + } + + + + public String getSelectAllLabel() { + return selectAllLabel; + } + + public void setSelectAllLabel(String selectAllLabel) { + this.selectAllLabel = selectAllLabel; + } } Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.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.views.jsp.ui.table; @@ -32,9 +35,9 @@ */ public class WebTableTag extends ComponentTag { - private static final long serialVersionUID = 2978932111492397942L; - - protected String sortOrder; + private static final long serialVersionUID = 2978932111492397942L; + + protected String sortOrder; protected String modelName; protected boolean sortable; protected int sortColumn; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.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.views.util; @@ -34,7 +37,7 @@ /** * Value Stack's Context related Utilities. - * + * */ public class ContextUtil { public static final String REQUEST = "request"; @@ -66,7 +69,7 @@ } return map; } - + /** * Return true if either Configuration's altSyntax is on or the stack context's useAltSyntax is on * @param context stack's context Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java Mon Nov 6 07:01:43 2006 @@ -1,27 +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. - */ -package org.apache.struts2.views.util; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.struts2.RequestUtils; - -/** + * 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. */ public class ResourceUtil { public static String getResourceBase(HttpServletRequest req) { Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java Mon Nov 6 07:01:43 2006 @@ -1,20 +1,24 @@ /* * $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.views.util; import java.io.UnsupportedEncodingException; @@ -62,9 +66,9 @@ public static String buildUrl(String action, HttpServletRequest request, HttpServletResponse response, Map params) { return buildUrl(action, request, response, params, null, true, true); } - + public static String buildUrl(String action, HttpServletRequest request, HttpServletResponse response, Map params, String scheme, boolean includeContext, boolean encodeResult) { - return buildUrl(action, request, response, params, scheme, includeContext, encodeResult, false); + return buildUrl(action, request, response, params, scheme, includeContext, encodeResult, false); } public static String buildUrl(String action, HttpServletRequest request, HttpServletResponse response, Map params, String scheme, boolean includeContext, boolean encodeResult, boolean forceAddSchemeHostAndPort) { @@ -89,19 +93,19 @@ // only append scheme if it is different to the current scheme *OR* // if we explicity want it to be appended by having forceAddSchemeHostAndPort = true if (forceAddSchemeHostAndPort) { - String reqScheme = request.getScheme(); - changedScheme = true; - link.append(scheme != null ? scheme : reqScheme); - link.append("://"); - link.append(request.getServerName()); - - if ((scheme.equals("http") && (httpPort != DEFAULT_HTTP_PORT)) || (scheme.equals("https") && httpsPort != DEFAULT_HTTPS_PORT)) + String reqScheme = request.getScheme(); + changedScheme = true; + link.append(scheme != null ? scheme : reqScheme); + link.append("://"); + link.append(request.getServerName()); + + if ((scheme.equals("http") && (httpPort != DEFAULT_HTTP_PORT)) || (scheme.equals("https") && httpsPort != DEFAULT_HTTPS_PORT)) { link.append(":"); link.append(scheme.equals("http") ? httpPort : httpsPort); } } - else if ( + else if ( (scheme != null) && !scheme.equals(request.getScheme())) { changedScheme = true; link.append(scheme); @@ -124,16 +128,16 @@ link.append(contextPath); } } else if (changedScheme) { - + // (Applicable to Servlet 2.4 containers) // If the request was forwarded, the attribute below will be set with the original URL String uri = (String) request.getAttribute("javax.servlet.forward.request_uri"); - + // If the attribute wasn't found, default to the value in the request object if (uri == null) { uri = request.getRequestURI(); } - + link.append(uri.substring(0, uri.lastIndexOf('/') + 1)); } @@ -148,7 +152,7 @@ if (requestURI == null) { requestURI = (String) request.getAttribute("javax.servlet.forward.request_uri"); } - + // If neither request attributes were found, default to the value in the request object if (requestURI == null) { requestURI = request.getRequestURI(); @@ -184,9 +188,9 @@ } public static void buildParametersString(Map params, StringBuffer link) { - buildParametersString(params, link, AMP); + buildParametersString(params, link, AMP); } - + public static void buildParametersString(Map params, StringBuffer link, String paramSeparator) { if ((params != null) && (params.size() > 0)) { if (link.toString().indexOf("?") == -1) { @@ -251,10 +255,10 @@ return translatedInput; } } - + public static String translateAndDecode(String input) { - String translatedInput = translateVariable(input); - String encoding = getEncodingFromConfiguration(); + String translatedInput = translateVariable(input); + String encoding = getEncodingFromConfiguration(); try { return URLDecoder.decode(translatedInput, encoding); @@ -263,15 +267,15 @@ return translatedInput; } } - + private static String translateVariable(String input) { - ValueStack valueStack = ServletActionContext.getContext().getValueStack(); + ValueStack valueStack = ServletActionContext.getContext().getValueStack(); String output = TextParseUtil.translateVariables(input, valueStack); return output; } - + private static String getEncodingFromConfiguration() { - final String encoding; + final String encoding; if (Settings.isSet(StrutsConstants.STRUTS_I18N_ENCODING)) { encoding = Settings.get(StrutsConstants.STRUTS_I18N_ENCODING); } else { @@ -279,29 +283,29 @@ } return encoding; } - + public static Map parseQueryString(String queryString) { - Map queryParams = new LinkedHashMap(); - if (queryString != null) { - String[] params = queryString.split("&"); - for (int a=0; a< params.length; a++) { - if (params[a].trim().length() > 0) { - String[] tmpParams = params[a].split("="); - String paramName = null; - String paramValue = ""; - if (tmpParams.length > 0) { - paramName = tmpParams[0]; - } - if (tmpParams.length > 1) { - paramValue = tmpParams[1]; - } - if (paramName != null) { - String translatedParamValue = translateAndDecode(paramValue); - queryParams.put(paramName, translatedParamValue); - } - } - } - } - return queryParams; + Map queryParams = new LinkedHashMap(); + if (queryString != null) { + String[] params = queryString.split("&"); + for (int a=0; a< params.length; a++) { + if (params[a].trim().length() > 0) { + String[] tmpParams = params[a].split("="); + String paramName = null; + String paramValue = ""; + if (tmpParams.length > 0) { + paramName = tmpParams[0]; + } + if (tmpParams.length > 1) { + paramValue = tmpParams[1]; + } + if (paramName != null) { + String translatedParamValue = translateAndDecode(paramValue); + queryParams.put(paramName, translatedParamValue); + } + } + } + } + return queryParams; } } Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.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.views.velocity; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.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.views.velocity; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityServlet.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityServlet.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityServlet.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityServlet.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.views.velocity; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.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.views.velocity; @@ -127,7 +130,7 @@ * Names of contexts that will be chained on every request */ private String[] chainedContextNames; - + private Properties velocityProperties; protected VelocityManager() { @@ -282,7 +285,7 @@ // now apply our systemic defaults, then allow user to override applyDefaultConfiguration(context, properties); - + String defaultUserDirective = properties.getProperty("userdirective"); @@ -355,14 +358,14 @@ } } } - + // overide with programmatically set properties if (this.velocityProperties != null) { - Iterator keys = this.velocityProperties.keySet().iterator(); - while (keys.hasNext()) { - String key = (String) keys.next(); - properties.setProperty(key, this.velocityProperties.getProperty(key)); - } + Iterator keys = this.velocityProperties.keySet().iterator(); + while (keys.hasNext()) { + String key = (String) keys.next(); + properties.setProperty(key, this.velocityProperties.getProperty(key)); + } } String userdirective = properties.getProperty("userdirective"); @@ -375,7 +378,7 @@ properties.setProperty("userdirective", userdirective); - + // for debugging purposes, allows users to dump out the properties that have been configured if (log.isDebugEnabled()) { log.debug("Initializing Velocity with the following properties ..."); @@ -488,8 +491,8 @@ Properties p = loadConfiguration(context); VelocityEngine velocityEngine = new VelocityEngine(); - - // Set the velocity attribute for the servlet context + + // Set the velocity attribute for the servlet context // if this is not set the webapp loader WILL NOT WORK velocityEngine.setApplicationAttribute(ServletContext.class.getName(), context); @@ -656,17 +659,17 @@ return string; } - /** - * @return the velocityProperties - */ - public Properties getVelocityProperties() { - return velocityProperties; - } - - /** - * @param velocityProperties the velocityProperties to set - */ - public void setVelocityProperties(Properties velocityProperties) { - this.velocityProperties = velocityProperties; - } + /** + * @return the velocityProperties + */ + public Properties getVelocityProperties() { + return velocityProperties; + } + + /** + * @param velocityProperties the velocityProperties to set + */ + public void setVelocityProperties(Properties velocityProperties) { + this.velocityProperties = velocityProperties; + } } Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.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.views.velocity.components; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java?view=diff&rev=471756&r1=471755&r2=471756 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.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.views.velocity.components;