From 3c5c60abdb426e3a43bc4000b7c6e3be5a1e9940 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Thu, 18 Aug 2011 09:38:36 +0000
Subject: [PATCH] #7381 Include licensing related files and release notes in
 JARs, removed an obsolete readme.txt

svn changeset:20464/svn branch:6.7
---
 build/build.xml          | 90 ++++++++++++++++++----------------------
 build/package/readme.txt | 79 -----------------------------------
 build/readme.txt         |  1 -
 3 files changed, 41 insertions(+), 129 deletions(-)
 delete mode 100644 build/package/readme.txt

diff --git a/build/build.xml b/build/build.xml
index 8bcbf228f9..9ee295c2df 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -218,7 +218,6 @@
         <echo>##teamcity[publishArtifacts '${result-path}/${base-name}-liferay.zip']</echo>
     </target>
 
-	<!-- TODO some files should go to the JAR instead of test WAR -->
     <target name="add-test-war-files">
         <echo>Adding test class files and launcher configuration.</echo>
         <copy todir="${output-dir}/WebContent/WEB-INF/classes">
@@ -243,54 +242,6 @@
         		<exclude name="**/*.xml" />
             </fileset>
         </copy>
-
-    	<delete includeemptydirs="true" defaultexcludes="false">
-            <fileset dir="${output-dir}">
-                <include name="*.txt" />
-                <include name="build-widgetset.xml" />
-            </fileset>
-        </delete>
-        <copy todir="${output-dir}">
-            <filterchain>
-                <expandproperties />
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="version" value="${version.full}" />
-                </replacetokens>
-            </filterchain>
-            <fileset dir="WebContent/license">
-                <include name="COPYING" />
-            </fileset>
-        </copy>
-        <copy todir="${output-dir}/WebContent">
-            <filterchain>
-                <expandproperties />
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="version" value="${version.full}" />
-                </replacetokens>
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="builddate" value="${build.date}" />
-                </replacetokens>
-            </filterchain>
-            <fileset dir="WebContent">
-                <exclude name="**/.svn" />
-                <include name="release-notes.html" />
-                <include name="*.html" />
-                <include name="license/*.html" />
-                <include name="license/*.txt" />
-            </fileset>
-        </copy>
-        <copy todir="${output-dir}">
-            <filterchain>
-                <expandproperties />
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="version" value="${version.full}" />
-                </replacetokens>
-            </filterchain>
-            <fileset dir="build/package">
-                <include name="readme.txt" />
-                <include name="build-widgetset.xml" />
-            </fileset>
-        </copy>
     </target>
 
     <!-- Build server-side, client-side, libraries, and tests.                   -->
@@ -420,6 +371,29 @@
                 <include name="web.xml" />
             </fileset>
         </copy>
+    	
+        <!-- These should go to various JARs -->
+        <copy todir="${output-dir}/WebContent">
+            <filterchain>
+                <expandproperties />
+                <replacetokens begintoken="@" endtoken="@">
+                    <token key="version" value="${version.full}" />
+                </replacetokens>
+                <replacetokens begintoken="@" endtoken="@">
+                    <token key="builddate" value="${build.date}" />
+                </replacetokens>
+            </filterchain>
+            <fileset dir="WebContent">
+                <exclude name="**/.svn" />
+                <include name="release-notes.html" />
+                <include name="*.html" />
+                <include name="license/*.html" />
+                <include name="license/*.txt" />
+            </fileset>
+            <fileset dir="WebContent/license">
+                <include name="COPYING" />
+            </fileset>
+        </copy>
     </target>
 
     <target name="compile-java" depends="init, check-servlet-version, webcontent">
@@ -605,6 +579,10 @@
                     <include name="VAADIN/themes/liferay/**/*" />
                     <include name="VAADIN/themes/runo/**/*" />
                     <include name="VAADIN/themes/reindeer/**/*" />
+                	
+                    <include name="release-notes.html" />
+                    <include name="license/**/*" />
+                    <include name="COPYING" />
                 </patternset>
             </fileset>
         </jar>
@@ -628,6 +606,13 @@
 		    		<include name="**/*.java" />
 				</patternset>
 		    </fileset>
+            <fileset dir="${output-dir}/WebContent">
+                <patternset>
+                    <include name="release-notes.html" />
+                    <include name="license/**/*" />
+                    <include name="COPYING" />
+                </patternset>
+            </fileset>
         </jar>
 	</target>
 	
@@ -673,6 +658,13 @@
 		    		<include name="**" />
 				</patternset>
 		    </fileset>
+            <fileset dir="${output-dir}/WebContent">
+                <patternset>
+                    <include name="release-notes.html" />
+                    <include name="license/**/*" />
+                    <include name="COPYING" />
+                </patternset>
+            </fileset>
         </jar>
 
         <!-- Append local style definitions. -->
diff --git a/build/package/readme.txt b/build/package/readme.txt
deleted file mode 100644
index 8b887ebb0d..0000000000
--- a/build/package/readme.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-==============================================================================
-Vaadin @version@ Readme
-==============================================================================
-
--------------
-How to Start?
--------------
-
-In Windows:
-  Just double-click start.bat icon. It will start a web application at
-  port 8888 on the local host and opens a web browser window to display
-  the start page of Vaadin Content Browser.
-
-In Linux:
-  Open a shell window, change to the installation directory, and execute
-  "sh start.sh". It will start a web application at port 8888 on the local
-  host and opens a web browser window to display the start page of Vaadin
-  Content Browser.
-
-In Mac:
-  Start Terminal.app and run the start.sh script in the installation
-  directory. It will start a web application at port 8888 on the local
-  host and opens a web browser window to display the start page of Vaadin
-  Content Browser.
-
-The installation directory is a web application as itself and can be directly
-imported to the Eclipse IDE by selecting
-"File / Import / Existing Projects into Workspace" from Eclipse main menu.
-See the manual for detailed instructions.
-
----------------------------------
-What's Inside the Vaadin Package?
----------------------------------
-
-You should start exploring Vaadin through the provided Content Browser web
-application within this package; see 'How to Start?' above.
-
-The WebContent directory contains the content available through the Content
-Browser: the Vaadin Library, demos, documentation, and other useful
-information to get started with Vaadin.
-
-Below is a list of most important locations and files:
-
-Start Vaadin
-- start exploring Vaadin by double-clicking this icon
-
-COPYING
-- license file
-
-WebContent/vaadin-@version@.jar
-- Vaadin Library containing Java source and compiled files
-
-WebContent/docs/book-of-vaadin.pdf
-- Book of Vaadin in PDF format
-
-WebContent/docs/api/index.html
-- Vaadin API Documentation as JavaDoc reference
-
-WebContent/WEB-INF/src
-- Content Browser source code, compiled into WebContent/WEB-INF/classes
- 
-WebContent/docs/example-source
-- example source code in HTML format
-
-WebContent/demo
-- files required by the demos
-
-Vaadin Development Server.launch
-GWT Development Mode.launch
-- launch configurations for Eclipse workspace
-
-WebContent/docs/example-source/build-widgetset.xml
-- example on how to build GWT widget sets for Vaadin application
-
-WebContent/VAADIN
-- widget sets and themes
-
-gwt
-- Google Web Toolkit is required for building new widget sets
diff --git a/build/readme.txt b/build/readme.txt
index 2e54326e44..64f1d91862 100644
--- a/build/readme.txt
+++ b/build/readme.txt
@@ -7,7 +7,6 @@ with Java 1.5, you can force build with 1.6 by adding the option
 -Dignoreversion=1
 
 Some of the most common targets to build:
-- Distribution ZIP-file will be built with target package-zip
 - Distribution JAR-file will be built with target package-jar
 - Test WAR will be built with target package-war
 
-- 
2.39.5