You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by ps...@apache.org on 2011/10/28 16:46:58 UTC

svn commit: r1190373 - in /incubator/wookie/trunk: ant/ivy-java-common.xml ant/ivy-release-common.xml etc/release/maven/ etc/release/maven/DISCLAIMER etc/release/maven/LICENSE etc/release/maven/NOTICE etc/release/src-build-include.txt

Author: psharples
Date: Fri Oct 28 14:46:57 2011
New Revision: 1190373

URL: http://svn.apache.org/viewvc?rev=1190373&view=rev
Log:
Adding the changes made in the 0.9.1 branch made between RC1 and RC2.

Added:
    incubator/wookie/trunk/etc/release/maven/
    incubator/wookie/trunk/etc/release/maven/DISCLAIMER
    incubator/wookie/trunk/etc/release/maven/LICENSE
    incubator/wookie/trunk/etc/release/maven/NOTICE
Modified:
    incubator/wookie/trunk/ant/ivy-java-common.xml
    incubator/wookie/trunk/ant/ivy-release-common.xml
    incubator/wookie/trunk/etc/release/src-build-include.txt

Modified: incubator/wookie/trunk/ant/ivy-java-common.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/ant/ivy-java-common.xml?rev=1190373&r1=1190372&r2=1190373&view=diff
==============================================================================
--- incubator/wookie/trunk/ant/ivy-java-common.xml (original)
+++ incubator/wookie/trunk/ant/ivy-java-common.xml Fri Oct 28 14:46:57 2011
@@ -141,19 +141,19 @@
 	        <arg line="${run.args}"/>
             <syspropertyset refid="run.syspropertyset.id"/>
 	    </java>    	    	
-	</target>	
-
-	<!-- buildbot moans of this is not here -->
-	<target name="jar"/>
+	</target>
 	
-	<target name="jar-compiled" unless="not-subproject" depends="test-calling-project,clean-dist, compile-core">
+	<!-- buildbot moans if this is not here -->
+	<target name="jar"/>
+
+	<target name="jar-compiled" unless="not-subproject" depends="test-calling-project,clean-dist, compile-core, checkfirstrootivyrootpath, checksecondrootivyrootpath">
     	<mkdir dir="${dist.dir}"/>
     	<!-- Create compiled jar -->
         <jar destfile="${dist.dir}/${ant.project.name}.jar">
             <fileset dir="${project.build.classes.dir}">
             	<exclude name="**/*.java"/>
         	</fileset>
-        	<metainf dir="../../">
+        	<metainf dir="${calculated-generic-path}etc/release/maven/">
         		<include name="LICENSE"/>
         		<include name="NOTICE"/>
         		<include name="DISCLAIMER"/>
@@ -167,7 +167,7 @@
         </jar>
 	</target>
 	
-	<target name="jar-javadoc" depends="clean-dist, compile-core">
+	<target name="jar-javadoc" depends="clean-dist, compile-core, checkfirstrootivyrootpath, checksecondrootivyrootpath">
 		<!-- Create javadoc JAR -->    	
     	<mkdir dir="${dist.dir}/javadoc/"/>
     	<javadoc packagenames="*"
@@ -183,9 +183,9 @@
     	</javadoc>
     	<jar destfile="${dist.dir}/${ant.project.name}-javadoc.jar">
     		<fileset dir="${dist.dir}/javadoc"/>
-			<metainf dir="../../">
-			<include name="LICENSE"/>
-			<include name="NOTICE"/>
+    		<metainf dir="${calculated-generic-path}etc/release/maven/">
+				<include name="LICENSE"/>
+				<include name="NOTICE"/>
 				<include name="DISCLAIMER"/>
 			</metainf>    
         	<manifest>				
@@ -199,14 +199,14 @@
     	<delete dir="${dist.dir}/javadoc" />
 	</target>
     
-    <target name="jar-sources" depends="clean-dist, compile-core"  description="--> make a jar file for this project">
+    <target name="jar-sources" depends="clean-dist, compile-core, checkfirstrootivyrootpath, checksecondrootivyrootpath"  description="--> make a jar file for this project">
     	<mkdir dir="${dist.dir}"/>
     	<!-- Create source JAR -->
     	<jar destfile="${dist.dir}/${ant.project.name}-sources.jar">
     		<fileset dir="${project.core.src.dir}">
     			<include name="**/*"/>
     		</fileset>
-			<metainf dir="../../">
+			<metainf dir="${calculated-generic-path}etc/release/maven/">
 				<include name="LICENSE"/>
 				<include name="NOTICE"/>
 				<include name="DISCLAIMER"/>
@@ -278,12 +278,11 @@
 				<exclude name="WEB-INF/lib/" />
 			</fileset>
 			<metainf dir=".">
-				<include name="NOTICE"/>
 				<include name="DISCLAIMER"/>
-				<include name="UPGRADING"/>
 			</metainf>
 			<metainf dir="etc/release/war/">
 				<include name="LICENSE"/>
+				<include name="NOTICE"/>
 			</metainf>
 		</war>
 
@@ -320,10 +319,12 @@
 	<target name="checkfirstrootivyrootpath" depends="check-first-location-for-settings" if="firstivysettings.present">
 		<property name="calculated-ivy-path" value="../../ant/ivysettings.xml"/>
 		<property name="calculated-this-path" value="../../ant/ivy-java-common.xml"/>
+		<property name="calculated-generic-path" value="../../"/>
 	</target>		
 	<target name="checksecondrootivyrootpath" depends="check-second-location-for-settings" if="secondivysettings.present">
 		<property name="calculated-ivy-path" value="ant/ivysettings.xml"/>
 		<property name="calculated-this-path" value="ant/ivy-java-common.xml"/>
+		<property name="calculated-generic-path" value="./"/>
 	</target>
 		
     <target name="publish" depends="clean-build, jar-compiled" description="--> publish this project in the ivy repository">

Modified: incubator/wookie/trunk/ant/ivy-release-common.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/ant/ivy-release-common.xml?rev=1190373&r1=1190372&r2=1190373&view=diff
==============================================================================
--- incubator/wookie/trunk/ant/ivy-release-common.xml (original)
+++ incubator/wookie/trunk/ant/ivy-release-common.xml Fri Oct 28 14:46:57 2011
@@ -25,17 +25,10 @@
 
 	<tstamp />
 	<property name="project.general.name" value="apache-wookie-${version}" />
-	
-	<property name="wookie.source.folder.name" value="wookie-source" />
-	<property name="wookie.war.folder.name" value="wookie-war" />
-	<property name="wookie.standalone.folder.name" value="Apache-Wookie" />
-	<property name="wookie.source.zip.name"
-		value="apache-wookie-${version}-src" />	
-	<property name="wookie.standalone.zip.name"
-		value="apache-wookie-${version}-standalone" />
-	<property name="wookie.war.name"
-		value="apache-wookie-${version}-war" />
-	
+	<property name="wookie.source.folder.name" value="${project.general.name}-src" />
+	<property name="wookie.war.folder.name" value="${project.general.name}-war" />
+	<property name="wookie.standalone.folder.name" value="${project.general.name}-standalone" />
+		
 	<property name="rat.install.version" value="0.7" />	
 	<property name="rat.home" value="${user.home}/.ant" />
 	<property name="rat.jar.dir" value="${rat.home}/lib" />
@@ -68,33 +61,53 @@
 	
 	<target name="build-release-src" depends="init-rat">
 		<echo>Building source release</echo>
-		<mkdir dir="${wookie.release.dir}/${version}/source" />
+		<mkdir dir="${wookie.release.dir}/${version}/source/${wookie.source.folder.name}" />
+						
+		<copy todir="${wookie.release.dir}/${version}/source/${wookie.source.folder.name}">
+			<fileset dir="."/>
+		</copy>
 		
-		<!-- run RAT report -->
-		<rat:report reportFile="${wookie.release.dir}/${version}/source/rat-report.txt">
-		        <fileset dir=".">
-		        	<includesFile name="./etc/release/src-build-include.txt" />
-                    <excludesfile name="./licenses/rat-ignore.txt"/> 
-	            </fileset>
-		</rat:report>
+		<copy file="./etc/release/src-build-include.txt" toFile="${wookie.release.dir}/${version}/source/src-build-include.txt">
+		  <filterset>
+		  	<filter token="FOLDERNAME" value="${wookie.source.folder.name}/"/>
+		  </filterset>
+		</copy>
+		
+		<copy file="./etc/release/src-build-include.txt" toFile="${wookie.release.dir}/${version}/source/src-build-include-rat-test.txt">
+		  <filterset>
+		  	<filter token="FOLDERNAME" value=""/>
+		  </filterset>
+		</copy>
 		
-		<zip destfile="${wookie.release.dir}/${version}/source/${wookie.source.zip.name}.zip"
-		       basedir="."
-			includesFile="./etc/release/src-build-include.txt"   
+		<zip destfile="${wookie.release.dir}/${version}/source/${wookie.source.folder.name}.zip"
+		       basedir="${wookie.release.dir}/${version}/source/"
+			includesFile="${wookie.release.dir}/${version}/source/src-build-include.txt"   
 		  />
 		
 		<!-- tar -->
-		<tar destfile="${wookie.release.dir}/${version}/source/${wookie.source.zip.name}.tar.gz"
+		<tar destfile="${wookie.release.dir}/${version}/source/${wookie.source.folder.name}.tar.gz"
 			compression="gzip">
-			<zipfileset src="${wookie.release.dir}/${version}/source/${wookie.source.zip.name}.zip" />
+			<zipfileset src="${wookie.release.dir}/${version}/source/${wookie.source.folder.name}.zip" />
 		</tar>
 		
+		<!-- run RAT report -->
+		<rat:report reportFile="${wookie.release.dir}/${version}/source/rat-report.txt">
+			<fileset dir=".">
+		      	<includesFile name="${wookie.release.dir}/${version}/source/src-build-include-rat-test.txt" />
+		        <excludesfile name="./licenses/rat-ignore.txt"/> 
+		    </fileset>
+		</rat:report>	
+		
+		<!-- clean up -->
+		<delete dir="${wookie.release.dir}/${version}/source/${wookie.source.folder.name}"/>
+		<delete file="${wookie.release.dir}/${version}/source/src-build-include.txt"/>
+		<delete file="${wookie.release.dir}/${version}/source/src-build-include-rat-test.txt"/>
 	</target>
 
 	<target name="build-release-war" depends="init-rat,clean-build, compile-core, deploy-webapp, post-deploy-webapp">
 		<echo>Building war release</echo>
 		<delete dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}" />
-		<mkdir dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/scripts/" />
+		<mkdir dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/scripts/" />
 		
 		<!-- back the widgetserver.properties file up -->
 		<copy file="${build.dir}/webapp/wookie/WEB-INF/classes/widgetserver.properties"
@@ -114,17 +127,10 @@
 		        <filter token="REPOSITORY_WORKSPACE" value=""/>
 		    </filterset>
 		</copy>
-
-		<!--
-		<copy file="DISCLAIMER" tofile="${build.dir}/webapp/wookie/DISCLAIMER" overwrite="yes" />		
-		<copy file="NEW_AND_NOTEWORTHY" tofile="${build.dir}/webapp/wookie/NEW_AND_NOTEWORTHY" overwrite="yes" />
-        <copy file="UPGRADING" tofile="${build.dir}/webapp/wookie/UPGRADING" overwrite="yes" />
-		<copy file="etc/release/war/LICENSE" tofile="${build.dir}/webapp/wookie/LICENSE" overwrite="yes" />
-		-->
 		
 		<!-- build war file -->
 		<war
-			destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/wookie.war"
+			destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/wookie.war"
 			webxml="${build.dir}/webapp/wookie/WEB-INF/web.xml">	
 			<lib dir="${build.dir}/webapp/wookie/WEB-INF/lib">
 				<exclude name="derby-10.2.1.6.jar"/>
@@ -134,13 +140,13 @@
 				<exclude name="WEB-INF/classes/" />
 				<exclude name="WEB-INF/lib/" />
 			</fileset>
-			<metainf dir=".">				
-				<include name="NOTICE"/>
+			<metainf dir=".">
 				<include name="DISCLAIMER"/>
 				<include name="UPGRADING"/>				
 			</metainf> 
 			<metainf dir="etc/release/war/">
 				<include name="LICENSE"/>
+				<include name="NOTICE"/>
 			</metainf> 				
 		</war>
 			
@@ -156,26 +162,27 @@
 		-->
 
 		<!-- copy sql scripts across -->
-		<copy todir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/scripts/">
+		<copy todir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/scripts/">
 			<fileset dir="${build.dir}/classes/org/apache/wookie/beans/jpa/">
 				<include name="*.sql" />
 			</fileset>
 		</copy>
 
 		<!-- copy over project readme files-->
-		<copy file="DISCLAIMER" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/DISCLAIMER" overwrite="yes" />
-		<copy file="etc/release/war/LICENSE" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/LICENSE" overwrite="yes" />		
-		<copy file="README" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/README" overwrite="yes" />
-		<copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/RELEASE_NOTES" overwrite="yes" />
-		<copy file="NEW_AND_NOTEWORTHY" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/NEW_AND_NOTEWORTHY" overwrite="yes" />
-		<copy file="UPGRADING" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/UPGRADING" overwrite="yes" />
+		<copy file="DISCLAIMER" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/DISCLAIMER" overwrite="yes" />
+		<copy file="README" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/README" overwrite="yes" />
+		<copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/RELEASE_NOTES" overwrite="yes" />
+		<copy file="NEW_AND_NOTEWORTHY" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/NEW_AND_NOTEWORTHY" overwrite="yes" />
+		<copy file="UPGRADING" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/UPGRADING" overwrite="yes" />
+		<copy file="etc/release/war/NOTICE" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/NOTICE" overwrite="yes" />
+		<copy file="etc/release/war/LICENSE" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/LICENSE" overwrite="yes" />
 		<!-- copy WAR readme-->
 		<copy file="etc/release/war/WAR_BUILD_NOTES"
-			tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/WAR_BUILD_NOTES"
+			tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/WAR_BUILD_NOTES"
 			overwrite="yes" />
 
 		<!-- update context for mysql -->
-		<copy file="${etc.dir}/tomcat/conf/jpa-context.xml" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/${ant.project.name}.xml" overwrite="true">
+		<copy file="${etc.dir}/tomcat/conf/jpa-context.xml" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/${ant.project.name}.xml" overwrite="true">
 			<filterset>
 				<filter token="DATABASE_USER" value="java" />
 				<filter token="DATABASE_PASSWORD" value="java" />
@@ -185,17 +192,17 @@
 		</copy>
 
 		<!-- zip -->
-		<zip destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.name}.zip" basedir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/" update="true" />
+		<zip destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}.zip" basedir="${wookie.release.dir}/${version}/binary/war/" update="true" />
 
 		<!-- tar -->
-		<tar destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.name}.tar.gz"
+		<tar destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}.tar.gz"
 			compression="gzip">
-			<zipfileset src="${wookie.release.dir}/${version}/binary/war/${wookie.war.name}.zip" />
+			<zipfileset src="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}.zip" />
 		</tar>
 		
 		<!-- run RAT report -->
 		<rat:report reportFile="${wookie.release.dir}/${version}/binary/war/rat-report.txt">
-		        <fileset dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/">
+		        <fileset dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/">
                     <excludesfile name="./licenses/rat-ignore.txt"/> 
 	            </fileset>
 		</rat:report>
@@ -227,13 +234,13 @@
 
 		<copy file="./etc/jetty-realm.properties" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/etc/jetty-realm.properties" />
 		<copy file="DISCLAIMER" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/DISCLAIMER" overwrite="yes" />
-		<!--<copy file="KEYS" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/KEYS" overwrite="yes" />-->
 		<copy file="README" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/README" overwrite="yes" />
 		<copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/RELEASE_NOTES" overwrite="yes" />
 		<copy file="NEW_AND_NOTEWORTHY" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/NEW_AND_NOTEWORTHY" overwrite="yes" />
 		<copy file="UPGRADING" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/UPGRADING" overwrite="yes" />
 		<copy file="etc/release/standalone/LICENSE" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/LICENSE" overwrite="yes" />		
-
+		<copy file="etc/release/standalone/NOTICE" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/NOTICE" overwrite="yes" />
+		
 		<ivy:retrieve conf="runtime"
 			pattern="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/lib/[artifact]-[revision].[ext]" />
 
@@ -247,13 +254,13 @@
 			    </fileset>
 		</rat:report>
 		
-		<zip destfile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.zip.name}.zip"
+		<zip destfile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}.zip"
 			basedir="${wookie.release.dir}/${version}/binary/standalone/" includes="${wookie.standalone.folder.name}/"
 			update="true" />
 
-		<tar destfile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.zip.name}.tar.gz"
+		<tar destfile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}.tar.gz"
 			compression="gzip">
-			<zipfileset src="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.zip.name}.zip" />
+			<zipfileset src="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}.zip" />
 		</tar>
 
 		<delete dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}" />

Added: incubator/wookie/trunk/etc/release/maven/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/release/maven/DISCLAIMER?rev=1190373&view=auto
==============================================================================
--- incubator/wookie/trunk/etc/release/maven/DISCLAIMER (added)
+++ incubator/wookie/trunk/etc/release/maven/DISCLAIMER Fri Oct 28 14:46:57 2011
@@ -0,0 +1,6 @@
+Apache Wookie is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Incubator PMC. Incubation is required of all newly accepted projects 
+until a further review indicates that the infrastructure, communications, and decision
+making process have stabilized in a manner consistent with other successful ASF projects.
+While incubation status is not necessarily a reflection of the completeness or stability
+of the code, it does indicate that the project has yet to be fully endorsed by the ASF.

Added: incubator/wookie/trunk/etc/release/maven/LICENSE
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/release/maven/LICENSE?rev=1190373&view=auto
==============================================================================
--- incubator/wookie/trunk/etc/release/maven/LICENSE (added)
+++ incubator/wookie/trunk/etc/release/maven/LICENSE Fri Oct 28 14:46:57 2011
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
\ No newline at end of file

Added: incubator/wookie/trunk/etc/release/maven/NOTICE
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/release/maven/NOTICE?rev=1190373&view=auto
==============================================================================
--- incubator/wookie/trunk/etc/release/maven/NOTICE (added)
+++ incubator/wookie/trunk/etc/release/maven/NOTICE Fri Oct 28 14:46:57 2011
@@ -0,0 +1,5 @@
+Apache Wookie
+Copyright 2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/)
\ No newline at end of file

Modified: incubator/wookie/trunk/etc/release/src-build-include.txt
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/release/src-build-include.txt?rev=1190373&r1=1190372&r2=1190373&view=diff
==============================================================================
--- incubator/wookie/trunk/etc/release/src-build-include.txt (original)
+++ incubator/wookie/trunk/etc/release/src-build-include.txt Fri Oct 28 14:46:57 2011
@@ -1,54 +1,54 @@
-.settings/
-ant/
-connector/CSharp/
-connector/flash_flex/
-connector/java/src/
-connector/java/src-test/
-connector/java/build.properties
-connector/java/build.xml
-connector/java/ivy.xml
-connector/java/README.txt
-connector/java/pom-template.xml
-connector/java/version.properties
-connector/php/
-connector/python/
-connector/ruby/
-connector/README.txt
-docs/
-etc/
-features/
-licenses/
-modules/
-parser/java/src/
-parser/java/src-test/
-parser/java/ant/
-parser/java/build.properties
-parser/java/build.xml
-parser/java/ivy.xml
-parser/java/README.txt
-parser/java/pom-template.xml
-parser/java/test.wgt
-project_admin/
-schemas/
-scratchpad/
-scripts/
-shindig/
-src/
-src-tests/
-tutorials/
-WebContent/
-widgets/
-.classpath
-.project
-build.properties
-build.xml
-BUILDING
-DISCLAIMER
-ivy.xml
-LICENSE
-NEW_AND_NOTEWORTHY
-UPGRADING
-NOTICE
-README
-RELEASE_NOTES
-pom-template.xml
\ No newline at end of file
+@FOLDERNAME@.settings/
+@FOLDERNAME@ant/
+@FOLDERNAME@connector/CSharp/
+@FOLDERNAME@connector/flash_flex/
+@FOLDERNAME@connector/java/src/
+@FOLDERNAME@connector/java/src-test/
+@FOLDERNAME@connector/java/build.properties
+@FOLDERNAME@connector/java/build.xml
+@FOLDERNAME@connector/java/ivy.xml
+@FOLDERNAME@connector/java/README.txt
+@FOLDERNAME@connector/java/pom-template.xml
+@FOLDERNAME@connector/java/version.properties
+@FOLDERNAME@connector/php/
+@FOLDERNAME@connector/python/
+@FOLDERNAME@connector/ruby/
+@FOLDERNAME@connector/README.txt
+@FOLDERNAME@docs/
+@FOLDERNAME@etc/
+@FOLDERNAME@features/
+@FOLDERNAME@licenses/
+@FOLDERNAME@modules/
+@FOLDERNAME@parser/java/src/
+@FOLDERNAME@parser/java/src-test/
+@FOLDERNAME@parser/java/ant/
+@FOLDERNAME@parser/java/build.properties
+@FOLDERNAME@parser/java/build.xml
+@FOLDERNAME@parser/java/ivy.xml
+@FOLDERNAME@parser/java/README.txt
+@FOLDERNAME@parser/java/pom-template.xml
+@FOLDERNAME@parser/java/test.wgt
+@FOLDERNAME@project_admin/
+@FOLDERNAME@schemas/
+@FOLDERNAME@scratchpad/
+@FOLDERNAME@scripts/
+@FOLDERNAME@shindig/
+@FOLDERNAME@src/
+@FOLDERNAME@src-tests/
+@FOLDERNAME@tutorials/
+@FOLDERNAME@WebContent/
+@FOLDERNAME@widgets/
+@FOLDERNAME@.classpath
+@FOLDERNAME@.project
+@FOLDERNAME@build.properties
+@FOLDERNAME@build.xml
+@FOLDERNAME@BUILDING
+@FOLDERNAME@DISCLAIMER
+@FOLDERNAME@ivy.xml
+@FOLDERNAME@LICENSE
+@FOLDERNAME@NEW_AND_NOTEWORTHY
+@FOLDERNAME@UPGRADING
+@FOLDERNAME@NOTICE
+@FOLDERNAME@README
+@FOLDERNAME@RELEASE_NOTES
+@FOLDERNAME@pom-template.xml
\ No newline at end of file