You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by nl...@apache.org on 2012/05/01 23:09:07 UTC
svn commit: r1332830 - in /tiles/framework/trunk: ./ tiles-autotag/
tiles-autotag/maven-autotag-plugin/src/test/resources/META-INF/
tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/
tiles-autotag/tiles-autot...
Author: nlebas
Date: Tue May 1 21:09:05 2012
New Revision: 1332830
URL: http://svn.apache.org/viewvc?rev=1332830&view=rev
Log:
add missing licence headers or autogenerated notices where needed
Modified:
tiles/framework/trunk/pom.xml
tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/test/resources/META-INF/template-suite.xml
tiles/framework/trunk/tiles-autotag/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/repository.vm
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/TldtestFMModelRepository.javat
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/tldtest-jsp.tld
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityProperties.vm
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/velocity.properties.test
tiles/framework/trunk/tiles-parent/pom.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java
tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-tiles-513.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-wildcard.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_en_US.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr_CA.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs2.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs3.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs_regression_TILES-352.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/invalid-defs.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/malformed-defs.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/temp-defs.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1_it.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs.xml
tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
tiles/framework/trunk/tiles-request/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java
tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/resources/test.html
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java
Modified: tiles/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Tue May 1 21:09:05 2012
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-master</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/test/resources/META-INF/template-suite.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/test/resources/META-INF/template-suite.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/test/resources/META-INF/template-suite.xml (original)
+++ tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/test/resources/META-INF/template-suite.xml Tue May 1 21:09:05 2012
@@ -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.
+ */
+ -->
<org.apache.tiles.autotag.model.TemplateSuite>
<name>test</name>
<templateClasses class="linked-hash-map">
Modified: tiles/framework/trunk/tiles-autotag/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/pom.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/pom.xml Tue May 1 21:09:05 2012
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>tiles-master</artifactId>
<groupId>org.apache.tiles</groupId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath/>
</parent>
<groupId>org.apache.tiles</groupId>
@@ -44,14 +44,6 @@ under the License.
<system>JIRA</system>
<url>https://issues.apache.org/jira/browse/AUTOTAG</url>
</issueManagement>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <url>https://repository.apache.org/snapshots</url>
- <releases><enabled>false</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </repository>
- </repositories>
<modules>
<module>tiles-autotag-core-runtime</module>
@@ -140,11 +132,18 @@ under the License.
<classNames>
<className>rat.analysis.license.ApacheSoftwareLicense20</className>
</classNames>
+ <classNames>
+ <className>rat.analysis.generation.GeneratedLicenseNotRequired</className>
+ </classNames>
</licenseMatchers>
<includes>
<include>pom.xml</include>
<include>src/**</include>
</includes>
+ <excludes>
+ <exclude>**/*LICENSE.txt</exclude>
+ <exclude>**/*MANIFEST.MF</exclude>
+ </excludes>
</configuration>
</execution>
</executions>
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm Tue May 1 21:09:05 2012
@@ -1,6 +1,5 @@
-package ${packageName};
#*
- * $Id: tiles-jsp.tld 836180 2009-11-14 14:00:02Z apetrelli $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,11 @@ package ${packageName};
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *#
+ *#/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
+package ${packageName};
+
import java.io.IOException;
import java.util.Map;
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/repository.vm
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/repository.vm?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/repository.vm (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/repository.vm Tue May 1 21:09:05 2012
@@ -1,4 +1,3 @@
-package ${packageName};
#*
* $Id: tiles-jsp.tld 836180 2009-11-14 14:00:02Z apetrelli $
*
@@ -18,7 +17,11 @@ package ${packageName};
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *#
+ *#/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
+package ${packageName};
+
/**
#foreach($line in $stringTool.splitOnNewlines(${suite.documentation}))
* $line
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat Tue May 1 21:09:05 2012
@@ -1,3 +1,6 @@
+/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
package org.apache.tiles.autotag.freemarker.test;
import java.io.IOException;
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat Tue May 1 21:09:05 2012
@@ -1,3 +1,6 @@
+/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
package org.apache.tiles.autotag.freemarker.test;
import java.io.IOException;
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/TldtestFMModelRepository.javat
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/TldtestFMModelRepository.javat?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/TldtestFMModelRepository.javat (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/TldtestFMModelRepository.javat Tue May 1 21:09:05 2012
@@ -1,3 +1,6 @@
+/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
package org.apache.tiles.autotag.freemarker.test;
/**
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm Tue May 1 21:09:05 2012
@@ -1,4 +1,3 @@
-package ${packageName};
#*
* $Id: tiles-jsp.tld 836180 2009-11-14 14:00:02Z apetrelli $
*
@@ -18,7 +17,11 @@ package ${packageName};
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *#
+ *#/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
+package ${packageName};
+
import java.io.IOException;
import javax.servlet.jsp.JspException;
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm Tue May 1 21:09:05 2012
@@ -19,6 +19,7 @@
* specific language governing permissions and limitations
* under the License.
*#
+<!-- This file was automatically generated by Apache Tiles Autotag. -->
<taglib
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java Tue May 1 21:09:05 2012
@@ -1,3 +1,6 @@
+/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
package org.apache.tiles.autotag.jsp.test;
import java.io.IOException;
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java Tue May 1 21:09:05 2012
@@ -1,3 +1,6 @@
+/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
package org.apache.tiles.autotag.jsp.test;
import java.io.IOException;
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/tldtest-jsp.tld
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/tldtest-jsp.tld?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/tldtest-jsp.tld (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/tldtest-jsp.tld Tue May 1 21:09:05 2012
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file was automatically generated by Apache Tiles Autotag. -->
<taglib
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm Tue May 1 21:09:05 2012
@@ -1,4 +1,3 @@
-package ${packageName};
#*
* $Id: tiles-jsp.tld 836180 2009-11-14 14:00:02Z apetrelli $
*
@@ -18,7 +17,11 @@ package ${packageName};
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *#
+ *#/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
+package ${packageName};
+
import java.io.IOException;
import java.io.Writer;
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityProperties.vm
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityProperties.vm?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityProperties.vm (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityProperties.vm Tue May 1 21:09:05 2012
@@ -17,6 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *#
+ *## This file was automatically generated by Apache Tiles Autotag.
userdirective=#foreach($clazz in ${suite.getTemplateClasses()})#if($velocityCount > 1),\
#{end}${packageName}.${clazz.tagClassPrefix}Directive#end
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat Tue May 1 21:09:05 2012
@@ -1,3 +1,6 @@
+/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
package org.apache.tiles.autotag.velocity.test;
import java.io.IOException;
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat Tue May 1 21:09:05 2012
@@ -1,3 +1,6 @@
+/*
+ * This file was automatically generated by Apache Tiles Autotag.
+ */
package org.apache.tiles.autotag.velocity.test;
import java.io.IOException;
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/velocity.properties.test
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/velocity.properties.test?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/velocity.properties.test (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/velocity.properties.test Tue May 1 21:09:05 2012
@@ -1,3 +1,3 @@
-
+# This file was automatically generated by Apache Tiles Autotag.
userdirective=org.apache.tiles.autotag.velocity.test.DoStuffDirective,\
org.apache.tiles.autotag.velocity.test.DoStuffNoBodyDirective
\ No newline at end of file
Modified: tiles/framework/trunk/tiles-parent/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/pom.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/pom.xml Tue May 1 21:09:05 2012
@@ -26,7 +26,7 @@
<parent>
<artifactId>tiles-master</artifactId>
<groupId>org.apache.tiles</groupId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath/>
</parent>
@@ -46,15 +46,6 @@
<ciManagement />
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <url>https://repository.apache.org/snapshots</url>
- <releases><enabled>false</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </repository>
- </repositories>
-
<modules>
<module>tiles-api</module>
<module>tiles-core</module>
@@ -359,6 +350,10 @@
<include>pom.xml</include>
<include>src/**</include>
</includes>
+ <excludes>
+ <exclude>**/*LICENSE.txt</exclude>
+ <exclude>**/*MANIFEST.MF</exclude>
+ </excludes>
</configuration>
</execution>
</executions>
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java Tue May 1 21:09:05 2012
@@ -1,5 +1,22 @@
-/**
+/*
+ * $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.
*/
package org.apache.tiles.definition.dao;
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java Tue May 1 21:09:05 2012
@@ -1,5 +1,22 @@
-/**
+/*
+ * $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.
*/
package org.apache.tiles.util;
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-tiles-513.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-tiles-513.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-tiles-513.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-tiles-513.xml Tue May 1 21:09:05 2012
@@ -1,16 +1,26 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- /* * $Id:tiles-defs-2.1.xml 628334 2008-02-16 16:01:46Z apetrelli $
- * * 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. */ -->
+<!--
+/*
+ * $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 tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-wildcard.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-wildcard.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-wildcard.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-wildcard.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_en_US.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_en_US.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_en_US.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_en_US.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr_CA.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr_CA.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr_CA.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr_CA.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs2.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs2.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs2.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs2.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs3.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs3.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs3.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs3.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs_regression_TILES-352.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs_regression_TILES-352.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs_regression_TILES-352.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs_regression_TILES-352.xml Tue May 1 21:09:05 2012
@@ -1,18 +1,25 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
- /* * $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
- 3.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-3.0 * * Unless required by
- applicable law or agreed to in writing, * software distributed under
- the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY * KIND, either express or implied. See the
- License for the * specific language governing permissions and
- limitations * under the License. */
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
-->
<!DOCTYPE tiles-definitions PUBLIC
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/invalid-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/invalid-defs.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/invalid-defs.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/invalid-defs.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/malformed-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/malformed-defs.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/malformed-defs.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/malformed-defs.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/temp-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/temp-defs.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/temp-defs.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/temp-defs.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml Tue May 1 21:09:05 2012
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
/*
- * $Id:tiles-defs-3.0.xml 628334 2008-02-16 16:01:46Z apetrelli $
+ * $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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1_it.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1_it.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1_it.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1_it.xml Tue May 1 21:09:05 2012
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
/*
- * $Id:tiles-defs-3.0.xml 628334 2008-02-16 16:01:46Z apetrelli $
+ * $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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs.xml Tue May 1 21:09:05 2012
@@ -7,11 +7,11 @@
* 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 3.0 (the
+ * 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-3.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
Modified: tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java Tue May 1 21:09:05 2012
@@ -1,3 +1,23 @@
+/*
+ * $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.
+ */
package org.apache.tiles.extras.renderer;
import java.io.FileNotFoundException;
Modified: tiles/framework/trunk/tiles-request/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/pom.xml?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/pom.xml Tue May 1 21:09:05 2012
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>tiles-master</artifactId>
<groupId>org.apache.tiles</groupId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath/>
</parent>
<groupId>org.apache.tiles</groupId>
@@ -44,14 +44,6 @@ under the License.
<system>JIRA</system>
<url>https://issues.apache.org/jira/browse/TREQ</url>
</issueManagement>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <url>https://repository.apache.org/snapshots</url>
- <releases><enabled>false</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </repository>
- </repositories>
<modules>
<module>tiles-request-api</module>
@@ -349,6 +341,10 @@ under the License.
<include>pom.xml</include>
<include>src/**</include>
</includes>
+ <excludes>
+ <exclude>**/*LICENSE.txt</exclude>
+ <exclude>**/*MANIFEST.MF</exclude>
+ </excludes>
</configuration>
</execution>
</executions>
Modified: tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java Tue May 1 21:09:05 2012
@@ -1,3 +1,23 @@
+/*
+ * $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.
+ */
package org.apache.tiles.request.jsp.autotag;
import static org.easymock.EasyMock.*;
Modified: tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/resources/test.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/resources/test.html?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/resources/test.html (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/resources/test.html Tue May 1 21:09:05 2012
@@ -1 +1,20 @@
-test template with {{testKey}}
\ No newline at end of file
+{{!
+ ! $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.
+}}test template with {{testKey}}
\ No newline at end of file
Modified: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java?rev=1332830&r1=1332829&r2=1332830&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java Tue May 1 21:09:05 2012
@@ -1,3 +1,23 @@
+/*
+ * $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.
+ */
package org.apache.tiles.request.velocity.autotag;
import static org.easymock.EasyMock.*;