You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by he...@apache.org on 2006/10/12 18:10:50 UTC

svn commit: r463298 [9/11] - in /jakarta/velocity/engine/trunk: ./ build/ build/xsl/ convert/ examples/anakia/build/ examples/anakia/xdocs/ examples/anakia/xdocs/about/ examples/anakia/xdocs/stylesheets/ examples/app_example1/ examples/app_example2/ ex...

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestException.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestException.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestException.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestException.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.misc;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import org.apache.velocity.util.introspection.Info;

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestImpl.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestImpl.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestImpl.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectTestImpl.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.misc;
 
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import org.apache.velocity.util.introspection.Info;

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectorTestObject.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectorTestObject.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectorTestObject.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/UberspectorTestObject.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.misc;
 
 /*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 public class UberspectorTestObject

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/BoolObj.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/BoolObj.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/BoolObj.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/BoolObj.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.provider;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 /**

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/Child.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/Child.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/Child.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/Child.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.provider;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 /**

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/ForeachMethodCallHelper.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/ForeachMethodCallHelper.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/ForeachMethodCallHelper.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/ForeachMethodCallHelper.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.provider;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 /**

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NullToStringObject.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NullToStringObject.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NullToStringObject.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NullToStringObject.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.provider;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 /**

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NumberMethods.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NumberMethods.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NumberMethods.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/NumberMethods.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.provider;
 
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import java.math.BigDecimal;

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/Person.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/Person.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/Person.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/Person.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.provider;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 /**

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestNumber.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestNumber.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestNumber.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestNumber.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.provider;
 
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import org.apache.velocity.util.TemplateNumber;

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.provider;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import java.util.ArrayList;

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/BaseSQLTest.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/BaseSQLTest.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/BaseSQLTest.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/BaseSQLTest.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.sql;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import org.apache.velocity.test.BaseTestCase;

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.sql;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import java.io.BufferedWriter;

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/HsqlDB.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/HsqlDB.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/HsqlDB.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/HsqlDB.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.sql;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import org.apache.commons.lang.StringUtils;

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/HsqlDataSource.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/HsqlDataSource.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/HsqlDataSource.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/HsqlDataSource.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.sql;
 
 /*
- * Copyright 2000-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import java.io.PrintWriter;

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/view/TemplateNodeView.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/view/TemplateNodeView.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/view/TemplateNodeView.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/view/TemplateNodeView.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.test.view;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import java.io.BufferedReader;

Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/util/SimplePoolTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/util/SimplePoolTestCase.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/util/SimplePoolTestCase.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/util/SimplePoolTestCase.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.velocity.util;
 
 /*
- * Copyright 2003-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 import junit.framework.Test;

Modified: jakarta/velocity/engine/trunk/test/anakia/compare/index.html
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/compare/index.html?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/compare/index.html (original)
+++ jakarta/velocity/engine/trunk/test/anakia/compare/index.html Thu Oct 12 09:10:32 2006
@@ -1,3 +1,21 @@
+<!--
+ 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.    
+-->
 <!-- Content Stylesheet for Site -->
 
         

Modified: jakarta/velocity/engine/trunk/test/anakia/velocity.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/velocity.properties?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/velocity.properties (original)
+++ jakarta/velocity/engine/trunk/test/anakia/velocity.properties Thu Oct 12 09:10:32 2006
@@ -1,15 +1,16 @@
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# This is an empty velocity.properties file.
-# It is only used to trigger bug #21173 if present.
+# 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: jakarta/velocity/engine/trunk/test/anakia/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/xdocs/index.xml?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/xdocs/index.xml (original)
+++ jakarta/velocity/engine/trunk/test/anakia/xdocs/index.xml Thu Oct 12 09:10:32 2006
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.    
+-->
 <document>
     <properties>
         <author email="jon@latchkey.com">Jon S. Stevens</author>

Modified: jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/customContext.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/customContext.xml?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/customContext.xml (original)
+++ jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/customContext.xml Thu Oct 12 09:10:32 2006
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 name="Jakarta Site" href="http://jakarta.apache.org/">
     <body>
         <menu name="Other Context">

Modified: jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/project.xml?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/project.xml (original)
+++ jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/project.xml Thu Oct 12 09:10:32 2006
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 name="Jakarta Site"
         href="http://jakarta.apache.org/">
 

Modified: jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site.vsl?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site.vsl (original)
+++ jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site.vsl Thu Oct 12 09:10:32 2006
@@ -1,3 +1,19 @@
+## 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.    
 <!-- Content Stylesheet for Site -->
 
     ## Defined variables

Modified: jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl (original)
+++ jakarta/velocity/engine/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl Thu Oct 12 09:10:32 2006
@@ -1,3 +1,19 @@
+## 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.    
 <!-- Content Stylesheet for Site -->
 
     ## Defined variables

Modified: jakarta/velocity/engine/trunk/test/classloader/Foo.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/classloader/Foo.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/classloader/Foo.java (original)
+++ jakarta/velocity/engine/trunk/test/classloader/Foo.java Thu Oct 12 09:10:32 2006
@@ -1,17 +1,20 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 /**

Modified: jakarta/velocity/engine/trunk/test/configuration/include1.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/configuration/include1.properties?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/configuration/include1.properties (original)
+++ jakarta/velocity/engine/trunk/test/configuration/include1.properties Thu Oct 12 09:10:32 2006
@@ -1,14 +1,17 @@
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.    
 include1.property = somnambulance

Modified: jakarta/velocity/engine/trunk/test/configuration/include2.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/configuration/include2.properties?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/configuration/include2.properties (original)
+++ jakarta/velocity/engine/trunk/test/configuration/include2.properties Thu Oct 12 09:10:32 2006
@@ -1,14 +1,17 @@
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.    
 include2.property = insomnia

Modified: jakarta/velocity/engine/trunk/test/configuration/test-config.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/configuration/test-config.properties?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/configuration/test-config.properties (original)
+++ jakarta/velocity/engine/trunk/test/configuration/test-config.properties Thu Oct 12 09:10:32 2006
@@ -1,20 +1,19 @@
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------
-# Make sure that we get these back in the
-# order that they are listed here.
-# ---------------------------------------------------------
+# 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.    
 01 = 01
 02 = 02
 03 = 03

Modified: jakarta/velocity/engine/trunk/test/ds/create-db.sql
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/ds/create-db.sql?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/ds/create-db.sql (original)
+++ jakarta/velocity/engine/trunk/test/ds/create-db.sql Thu Oct 12 09:10:32 2006
@@ -1,16 +1,19 @@
--- Copyright 2001-2005 The Apache Software Foundation.
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
 --
--- Licensed under the Apache License, Version 2.0 (the "License")
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
+--   http://www.apache.org/licenses/LICENSE-2.0
 --
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.    
 
 drop table velocity_template if exists;
 

Modified: jakarta/velocity/engine/trunk/test/macroforwarddefine/velocity.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/macroforwarddefine/velocity.properties?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/macroforwarddefine/velocity.properties (original)
+++ jakarta/velocity/engine/trunk/test/macroforwarddefine/velocity.properties Thu Oct 12 09:10:32 2006
@@ -1,3 +1,19 @@
+# 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.    
 resource.loader= file
 
 file.resource.loader.class= org.apache.velocity.runtime.resource.loader.FileResourceLoader

Modified: jakarta/velocity/engine/trunk/test/misc/compile.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/misc/compile.sh?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/misc/compile.sh (original)
+++ jakarta/velocity/engine/trunk/test/misc/compile.sh Thu Oct 12 09:10:32 2006
@@ -1,18 +1,21 @@
-#!/bin/sh
+# !/bin/sh
 
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.    
 
 CLASSPATH=.:../../bin/classes
 

Modified: jakarta/velocity/engine/trunk/test/misc/dump.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/misc/dump.sh?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/misc/dump.sh (original)
+++ jakarta/velocity/engine/trunk/test/misc/dump.sh Thu Oct 12 09:10:32 2006
@@ -1,18 +1,21 @@
-#!/bin/sh
+# !/bin/sh
 
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.    
 
 CLASSPATH=.:../../bin/classes
 

Modified: jakarta/velocity/engine/trunk/test/misc/test.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/misc/test.sh?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/misc/test.sh (original)
+++ jakarta/velocity/engine/trunk/test/misc/test.sh Thu Oct 12 09:10:32 2006
@@ -1,18 +1,21 @@
-#!/bin/sh
+# !/bin/sh
 
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.    
 
 CLASSPATH=.:../../bin/classes
 

Modified: jakarta/velocity/engine/trunk/test/templates/templates.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/templates/templates.properties?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/templates/templates.properties (original)
+++ jakarta/velocity/engine/trunk/test/templates/templates.properties Thu Oct 12 09:10:32 2006
@@ -1,17 +1,19 @@
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Base names of templates to add to the VelocitytestSuite
+# 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.1  = arithmetic
 test.template.2  = array

Modified: jakarta/velocity/engine/trunk/test/texen-classpath/compare/TurbineWeather.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen-classpath/compare/TurbineWeather.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen-classpath/compare/TurbineWeather.java (original)
+++ jakarta/velocity/engine/trunk/test/texen-classpath/compare/TurbineWeather.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.turbine.services.weather;
 
 /*
- * Copyright 1997-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 

Modified: jakarta/velocity/engine/trunk/test/texen-classpath/compare/TurbineWeatherService.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen-classpath/compare/TurbineWeatherService.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen-classpath/compare/TurbineWeatherService.java (original)
+++ jakarta/velocity/engine/trunk/test/texen-classpath/compare/TurbineWeatherService.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.turbine.services.weather;
 
 /*
- * Copyright 1997-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 

Modified: jakarta/velocity/engine/trunk/test/texen-classpath/compare/WeatherService.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen-classpath/compare/WeatherService.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen-classpath/compare/WeatherService.java (original)
+++ jakarta/velocity/engine/trunk/test/texen-classpath/compare/WeatherService.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.turbine.services.weather;
 
 /*
- * Copyright 1997-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 

Modified: jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/license.txt
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/license.txt?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/license.txt (original)
+++ jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/license.txt Thu Oct 12 09:10:32 2006
@@ -1,55 +1,19 @@
 /*
- * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the Java Apache
- *    Project for use in the Apache JServ servlet engine project
- *    <http://java.apache.org/>."
- *
- * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
- *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
- *    "Java Apache Project" must not be used to endorse or promote products
- *    derived from this software without prior written permission.
- *
- * 5. Products derived from this software may not be called "Apache JServ"
- *    nor may "Apache" nor "Apache JServ" appear in their names without
- *    prior written permission of the Java Apache Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the Java Apache
- *    Project for use in the Apache JServ servlet engine project
- *    <http://java.apache.org/>."
- *
- * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Java Apache Group. For more information
- * on the Java Apache Project and the Apache JServ Servlet Engine project,
- * please see <http://java.apache.org/>.
- *
+ * 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: jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/service.props
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/service.props?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/service.props (original)
+++ jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/service.props Thu Oct 12 09:10:32 2006
@@ -3,9 +3,22 @@
 name=Jason van Zyl
 email=jvanzyl@apache.org
 
-# # The contents of the file license.txt
-# # will be available in the context
-# # as $license.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.    
 
 license.file.contents = test/texen/license.txt
 

Modified: jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/test.props
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/test.props?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/test.props (original)
+++ jakarta/velocity/engine/trunk/test/texen-classpath/jar-contents/test.props Thu Oct 12 09:10:32 2006
@@ -1,16 +1,19 @@
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.    
 author = Edward O. Wilson
 title = Consilience: The Unity of Knowledge
 publisher = Knopf

Modified: jakarta/velocity/engine/trunk/test/texen-classpath/mkjar.sh
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen-classpath/mkjar.sh?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen-classpath/mkjar.sh (original)
+++ jakarta/velocity/engine/trunk/test/texen-classpath/mkjar.sh Thu Oct 12 09:10:32 2006
@@ -1,22 +1,24 @@
-#!/bin/sh
+# !/bin/sh
 
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.    
 
 (
   cd jar-contents
   rm -f ../test.jar
-  rm *~
   jar cvf ../test.jar *
 )

Modified: jakarta/velocity/engine/trunk/test/texen-classpath/test.jar
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen-classpath/test.jar?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
Binary files - no diff available.

Modified: jakarta/velocity/engine/trunk/test/texen/additional.props
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen/additional.props?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen/additional.props (original)
+++ jakarta/velocity/engine/trunk/test/texen/additional.props Thu Oct 12 09:10:32 2006
@@ -1,14 +1,17 @@
-# Copyright 2000-2006 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.    
 occupation=somnambulist

Modified: jakarta/velocity/engine/trunk/test/texen/compare/TurbineWeather.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen/compare/TurbineWeather.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen/compare/TurbineWeather.java (original)
+++ jakarta/velocity/engine/trunk/test/texen/compare/TurbineWeather.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.turbine.services.weather;
 
 /*
- * Copyright 1997-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 

Modified: jakarta/velocity/engine/trunk/test/texen/compare/TurbineWeatherService.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen/compare/TurbineWeatherService.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen/compare/TurbineWeatherService.java (original)
+++ jakarta/velocity/engine/trunk/test/texen/compare/TurbineWeatherService.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.turbine.services.weather;
 
 /*
- * Copyright 1997-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 

Modified: jakarta/velocity/engine/trunk/test/texen/compare/WeatherService.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/test/texen/compare/WeatherService.java?view=diff&rev=463298&r1=463297&r2=463298
==============================================================================
--- jakarta/velocity/engine/trunk/test/texen/compare/WeatherService.java (original)
+++ jakarta/velocity/engine/trunk/test/texen/compare/WeatherService.java Thu Oct 12 09:10:32 2006
@@ -1,19 +1,22 @@
 package org.apache.turbine.services.weather;
 
 /*
- * Copyright 1997-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
  */
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org