Modified: struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Factory.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Factory.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Factory.java (original) +++ struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Factory.java Sun Apr 27 06:41:38 2008 @@ -1,20 +1,24 @@ /* * $Id$ - * Copyright 2004 The Apache Software Foundation. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import com.opensymphony.xwork2.*;
Modified: struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionForward.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionForward.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionForward.java (original) +++ struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionForward.java Sun Apr 27 06:41:38 2008 @@ -1,20 +1,24 @@ /* - * Copyright 2004 The Apache Software Foundation. + * $Id$ * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * $Header:$ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import org.apache.struts.action.ActionForward; Modified: struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java (original) +++ struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java Sun Apr 27 06:41:38 2008 @@ -1,20 +1,24 @@ /* - * Copyright 2004 The Apache Software Foundation. + * $Id$ * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * $Header:$ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import org.apache.struts.action.ActionMapping; Modified: struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java (original) +++ struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java Sun Apr 27 06:41:38 2008 @@ -1,20 +1,24 @@ /* - * Copyright 2004 The Apache Software Foundation. + * $Id$ * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * $Header:$ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig; Modified: struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperMessageResources.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperMessageResources.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperMessageResources.java (original) +++ struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperMessageResources.java Sun Apr 27 06:41:38 2008 @@ -1,20 +1,24 @@ /* * $Id$ - * Copyright 2004 The Apache Software Foundation. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import java.util.Locale; Modified: struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java (original) +++ struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java Sun Apr 27 06:41:38 2008 @@ -1,20 +1,24 @@ /* - * Copyright 2004 The Apache Software Foundation. + * $Id$ * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * $Header:$ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import java.util.HashMap; Modified: struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml (original) +++ struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml Sun Apr 27 06:41:38 2008 @@ -21,7 +21,6 @@ * under the License. */ --> - <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd";> Modified: struts/struts2/trunk/plugins/struts1/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java (original) +++ struts/struts2/trunk/plugins/struts1/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java Sun Apr 27 06:41:38 2008 @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.s1; import junit.framework.*; Modified: struts/struts2/trunk/plugins/struts1/src/test/java/org/apache/struts2/s1/Struts1FactoryTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/test/java/org/apache/struts2/s1/Struts1FactoryTest.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/src/test/java/org/apache/struts2/s1/Struts1FactoryTest.java (original) +++ struts/struts2/trunk/plugins/struts1/src/test/java/org/apache/struts2/s1/Struts1FactoryTest.java Sun Apr 27 06:41:38 2008 @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.s1; import java.lang.reflect.InvocationTargetException; Modified: struts/struts2/trunk/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml (original) +++ struts/struts2/trunk/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml Sun Apr 27 06:41:38 2008 @@ -21,7 +21,6 @@ * under the License. */ --> - <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd";> Modified: struts/struts2/trunk/plugins/testng/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/testng/pom.xml?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/testng/pom.xml (original) +++ struts/struts2/trunk/plugins/testng/pom.xml Sun Apr 27 06:41:38 2008 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- /* - * $Id: pom.xml 612481 2008-01-16 15:24:54Z husted $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Modified: struts/struts2/trunk/plugins/testng/src/main/java/org/apache/struts2/StrutsTestCase.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/testng/src/main/java/org/apache/struts2/StrutsTestCase.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/testng/src/main/java/org/apache/struts2/StrutsTestCase.java (original) +++ struts/struts2/trunk/plugins/testng/src/main/java/org/apache/struts2/StrutsTestCase.java Sun Apr 27 06:41:38 2008 @@ -1,5 +1,5 @@ /* - * $Id: TestNGStrutsTestCase.java 502294 2007-02-01 17:28:00Z niallp $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2; import java.util.Map; Modified: struts/struts2/trunk/plugins/testng/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/testng/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/testng/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java (original) +++ struts/struts2/trunk/plugins/testng/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java Sun Apr 27 06:41:38 2008 @@ -1,5 +1,5 @@ /* - * $Id: TestNGStrutsTestCase.java 502294 2007-02-01 17:28:00Z niallp $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2; /** Modified: struts/struts2/trunk/plugins/testng/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/testng/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/testng/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java (original) +++ struts/struts2/trunk/plugins/testng/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java Sun Apr 27 06:41:38 2008 @@ -1,5 +1,5 @@ /* - * $Id: TestNGStrutsTestCaseTest.java 502294 2007-02-01 17:28:00Z niallp $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2; import junit.framework.TestCase; Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/ConfiguredServletContext.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/ConfiguredServletContext.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/ConfiguredServletContext.java (original) +++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/ConfiguredServletContext.java Sun Apr 27 06:41:38 2008 @@ -1,4 +1,6 @@ /* + * $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 @@ -7,7 +9,7 @@ * "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 @@ -15,8 +17,8 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * */ + package org.apache.struts2.tiles; Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java (original) +++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java Sun Apr 27 06:41:38 2008 @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.tiles; import org.apache.tiles.TilesApplicationContext; Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java (original) +++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java Sun Apr 27 06:41:38 2008 @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.tiles; import java.util.HashMap; Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java (original) +++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java Sun Apr 27 06:41:38 2008 @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.tiles; import java.io.IOException; Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java (original) +++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java Sun Apr 27 06:41:38 2008 @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.tiles; import javax.servlet.ServletContext; Modified: struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml (original) +++ struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml Sun Apr 27 06:41:38 2008 @@ -21,7 +21,6 @@ * under the License. */ --> - <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd";> Modified: struts/struts2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Sun Apr 27 06:41:38 2008 @@ -199,7 +199,6 @@ </execution> </executions> </plugin> - <!-- Commenting it out until it stops breaking the release <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>rat-maven-plugin</artifactId> @@ -225,7 +224,6 @@ </execution> </executions> </plugin> - --> </plugins> </build> </profile> @@ -311,6 +309,39 @@ </execution> </executions> </plugin> + <!-- Commenting out the license plugin, until it works like we want. + To use the "license:format" goal, remove the "core" module before running, + otherwise it will ignore the file exclusions. + + <plugin> + <groupId>com.google.code.maven-license-plugin</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>1.2.7-SNAPSHOT</version> + <configuration> + <header>src/etc/header.txt</header> + <includes> + <include>pom.xml</include> + <include>src/**</include> + <include>core/pom.xml</include> + <include>core/src/**</include> + <include>plugins/**/pom.xml</include> + <include>plugins/**/src/**</include> + <include>apps/**/pom.xml</include> + </includes> + <excludes> + <exclude>**/*.txt</exclude> + <exclude>core/src/test/resources/org/apache/struts2/views/jsp/ui/*</exclude> + <exclude>core/src/main/resources/org/apache/struts2/static/domTT.js</exclude> + <exclude>core/src/test/resources/org/apache/struts2/interceptor/validation/*</exclude> + <exclude>core/src/site/resources/tags/**</exclude> + <exclude>plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/nls/**</exclude> + <exclude>plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/**</exclude> + <exclude>plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/*</exclude> + <exclude>plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/**</exclude> + <exclude>apps/**/src/**</exclude> + </excludes> + </configuration> + </plugin> --> </plugins> <defaultGoal>install</defaultGoal> Added: struts/struts2/trunk/src/etc/header.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/etc/header.txt?rev=651946&view=auto ============================================================================== --- struts/struts2/trunk/src/etc/header.txt (added) +++ struts/struts2/trunk/src/etc/header.txt Sun Apr 27 06:41:38 2008 @@ -0,0 +1,18 @@ +$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. \ No newline at end of file Propchange: struts/struts2/trunk/src/etc/header.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: struts/struts2/trunk/src/etc/header.txt ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Modified: struts/struts2/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/index.xml?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/src/site/xdoc/index.xml (original) +++ struts/struts2/trunk/src/site/xdoc/index.xml Sun Apr 27 06:41:38 2008 @@ -1,5 +1,27 @@ <?xml version="1.0"?> <!-- +/* + * $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. + */ +--> +<!-- // ======================================================================== 78 --> <document> Modified: struts/struts2/trunk/src/site/xdoc/jxr.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/jxr.xml?rev=651946&r1=651945&r2=651946&view=diff ============================================================================== --- struts/struts2/trunk/src/site/xdoc/jxr.xml (original) +++ struts/struts2/trunk/src/site/xdoc/jxr.xml Sun Apr 27 06:41:38 2008 @@ -1,17 +1,25 @@ <?xml version="1.0"?> <!-- -Copyright 2006 The Apache Software Foundation -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +/* + * $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. + */ --> <!-- // ======================================================================== 78
