Author: apetrelli
Date: Sat Jul 28 08:47:10 2007
New Revision: 560558
URL: http://svn.apache.org/viewvc?view=rev&rev=560558
Log:
WW-2049
Merge from trunk to STRUTS_2_0_X branch.
Added license to core/pom.xml.
Added configuration of RAT plugin in core/pom.xml to exclude some testing and
generated files.
Third bunch of added licenses.
The STRUTS_2_0_X branch has special files that need to be license-fixed.
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/theme.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest.xsl
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest2.xsl
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest3.xsl
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest4.xsl
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/log4j.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/TestAction-validation.xml
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/TestAction.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/dummy.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughClassPath.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughFileSystem.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/tempo.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/othertest.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/struts.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/struts.xml
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/template/test/Component.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/template/test/checkbox.jsp
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/test.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/testmessages.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/testmessages2.properties
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/validators.xml
Modified: struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/pom.xml?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/pom.xml Sat Jul 28 08:47:10 2007
@@ -1,4 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -105,6 +127,23 @@
<link>http://jakarta.apache.org/commons/logging/apidocs/</link>
<link>http://logging.apache.org/log4j/docs/api/</link>
</links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <configuration>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ <excludes>
+
<exclude>src/test/resources/org/apache/struts2/views/jsp/ui/*</exclude>
+
<exclude>src/main/resources/org/apache/struts2/static/domTT.js</exclude>
+
<exclude>src/test/resources/org/apache/struts2/interceptor/validation/*</exclude>
+ <exclude>src/site/resources/tags/**</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/theme.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/theme.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/theme.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/theme.properties
Sat Jul 28 08:47:10 2007
@@ -1 +1,20 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
parent = xhtml
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/SomeEnum.java
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,23 @@
+/*
+ * $Id: RequestUtils.java 471717 2006-11-06 12:50:18Z husted $
+ *
+ * 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;
public enum SomeEnum {
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest.xsl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest.xsl?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest.xsl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest.xsl
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,25 @@
+<!--
+/*
+ * $Id: RequestUtils.java 471717 2006-11-06 12:50:18Z husted $
+ *
+ * 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.
+ */
+-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns="http://www.w3.org/TR/xhtml1/strict";>
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest2.xsl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest2.xsl?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest2.xsl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest2.xsl
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,25 @@
+<!--
+/*
+ * $Id: RequestUtils.java 471717 2006-11-06 12:50:18Z husted $
+ *
+ * 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.
+ */
+-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns="http://www.w3.org/TR/xhtml1/strict";>
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest3.xsl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest3.xsl?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest3.xsl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest3.xsl
Sat Jul 28 08:47:10 2007
@@ -1,4 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * $Id: RequestUtils.java 471717 2006-11-06 12:50:18Z husted $
+ *
+ * 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.
+ */
+-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns="http://www.w3.org/TR/xhtml1/strict";>
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest4.xsl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest4.xsl?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest4.xsl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/XSLTResultTest4.xsl
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,25 @@
+<!--
+/*
+ * $Id: RequestUtils.java 471717 2006-11-06 12:50:18Z husted $
+ *
+ * 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.
+ */
+-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns="http://www.w3.org/TR/xhtml1/strict";>
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/log4j.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/log4j.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/log4j.properties
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,22 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
log4j.rootLogger = WARN, stdout
log4j.appender.stdout = org.apache.log4j.ConsoleAppender
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/TestAction-validation.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/TestAction-validation.xml?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/TestAction-validation.xml
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/TestAction-validation.xml
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,26 @@
+<!--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+-->
<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd";>
<validators>
<field name="foo">
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/TestAction.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/TestAction.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/TestAction.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/TestAction.properties
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,22 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
simpleKey=Simple Message
expressionKey=Foo is ${foo}
messageFormatKey=Params are {0} {1} {2}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/dummy.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/dummy.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/dummy.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/dummy.properties
Sat Jul 28 08:47:10 2007
@@ -0,0 +1,19 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughClassPath.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughClassPath.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughClassPath.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughClassPath.properties
Sat Jul 28 08:47:10 2007
@@ -1 +1,20 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
parent=xhtml
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughFileSystem.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughFileSystem.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughFileSystem.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughFileSystem.properties
Sat Jul 28 08:47:10 2007
@@ -1 +1,20 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
parent=xhtml
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/tempo.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/tempo.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/tempo.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/components/tempo.properties
Sat Jul 28 08:47:10 2007
@@ -0,0 +1,19 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp
Sat Jul 28 08:47:10 2007
@@ -1,5 +1,28 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
+<%--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+--%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,22 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
### Unit test of FileUploadInterceptor
struts.messages.error.file.too.large=The file is to large to be uploaded {0}
{1} {2} {3}
struts.messages.error.uploading=Error uploading: {0}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/othertest.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/othertest.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/othertest.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/othertest.properties
Sat Jul 28 08:47:10 2007
@@ -1 +1,20 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
othertestkey=othertestvalue
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/struts.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/struts.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/struts.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/struts.properties
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,22 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
struts.i18n.encoding=ISO-8859-1
struts.locale=de_DE
struts.multipart.saveDir=\temp
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/struts.xml?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/struts.xml
(original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/struts.xml Sat
Jul 28 08:47:10 2007
@@ -1,3 +1,25 @@
+<!--
+/*
+ * $Id: RequestUtils.java 471717 2006-11-06 12:50:18Z husted $
+ *
+ * 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.
+ */
+-->
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd";>
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/template/test/Component.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/template/test/Component.ftl?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/template/test/Component.ftl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/template/test/Component.ftl
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,26 @@
+<#--
+/*
+ * $Id: layout.jsp 503802 2007-02-05 18:36:44Z germuska $
+ *
+ * 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.
+ *
+ */
+-->
param hello = ${parameters.hello}
param argle = ${parameters.argle}
param glip = ${parameters.glip}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/template/test/checkbox.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/template/test/checkbox.jsp?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/template/test/checkbox.jsp
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/template/test/checkbox.jsp
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,26 @@
+<%--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+--%>
<%@ taglib prefix="s" uri="/struts-tags" %>
<input type="checkbox" <s:if
test="parameters['nameValue']">checked="checked"</s:if>
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/test.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/test.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/test.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/test.properties
Sat Jul 28 08:47:10 2007
@@ -1 +1,20 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
testkey=testvalue
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/testmessages.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/testmessages.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/testmessages.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/testmessages.properties
Sat Jul 28 08:47:10 2007
@@ -1,2 +1,21 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
default.testmessage=This is a test message
struts.messages.invalid.token=Replaced message for token tag
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/testmessages2.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/testmessages2.properties?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/testmessages2.properties
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/testmessages2.properties
Sat Jul 28 08:47:10 2007
@@ -1 +1,20 @@
+# $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+#
+# 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.
+
default.testmessage2=This is another test message
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/validators.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/validators.xml?view=diff&rev=560558&r1=560557&r2=560558
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/validators.xml
(original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/validators.xml
Sat Jul 28 08:47:10 2007
@@ -1,3 +1,25 @@
+<!--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
<!DOCTYPE validators PUBLIC
"-//OpenSymphony Group//XWork Validator Config 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd";>
