Author: wsmoak
Date: Thu Jul 13 19:52:07 2006
New Revision: 421785
URL: http://svn.apache.org/viewvc?rev=421785&view=rev
Log:
Include LICENSE and NOTICE in the -src distribution. (Reported by Ted Husted)
Add license headers to the assembly descriptors.
STR-2911
Modified:
struts/struts1/trunk/assembly/src/main/assembly/all.xml
struts/struts1/trunk/assembly/src/main/assembly/apps.xml
struts/struts1/trunk/assembly/src/main/assembly/docs.xml
struts/struts1/trunk/assembly/src/main/assembly/lib.xml
struts/struts1/trunk/assembly/src/main/assembly/src.xml
Modified: struts/struts1/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/all.xml?rev=421785&r1=421784&r2=421785&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/all.xml Thu Jul 13 19:52:07
2006
@@ -1,3 +1,23 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
+
<assembly>
<id>all</id>
<formats>
Modified: struts/struts1/trunk/assembly/src/main/assembly/apps.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/apps.xml?rev=421785&r1=421784&r2=421785&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/apps.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/apps.xml Thu Jul 13
19:52:07 2006
@@ -1,3 +1,22 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
<assembly>
<id>apps</id>
<formats>
Modified: struts/struts1/trunk/assembly/src/main/assembly/docs.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/docs.xml?rev=421785&r1=421784&r2=421785&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/docs.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/docs.xml Thu Jul 13
19:52:07 2006
@@ -1,3 +1,23 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
+
<assembly>
<id>docs</id>
<formats>
Modified: struts/struts1/trunk/assembly/src/main/assembly/lib.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/lib.xml?rev=421785&r1=421784&r2=421785&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/lib.xml Thu Jul 13 19:52:07
2006
@@ -1,3 +1,23 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
+
<assembly>
<id>lib</id>
<formats>
Modified: struts/struts1/trunk/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/src.xml?rev=421785&r1=421784&r2=421785&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/src.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/src.xml Thu Jul 13 19:52:07
2006
@@ -1,3 +1,23 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
+
<assembly>
<id>src</id>
<formats>
@@ -5,7 +25,18 @@
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
- <!-- Include the source code in the assembly -->
+
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+
+ <!-- Include the source code in the assembly -->
<fileSet>
<directory>../</directory>
<outputDirectory>src/</outputDirectory>
