#7381 Include licensing related files and release notes in JARs, removed an obsolete...

svn changeset:20464/svn branch:6.7

diff --git a/build/build.xml b/build/build.xml
index 8bcbf228f9c97ce1c1705189a5428b9fd21da6a5..9ee295c2df2d4770a32b1236e7164dbefdc363ba 100644 (file)
--- 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 (file)
index 8b887eb..0000000
--- a/build/package/readme.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-==============================================================================\r
-Vaadin @version@ Readme\r
-==============================================================================\r
-\r
--------------\r
-How to Start?\r
--------------\r
-\r
-In Windows:\r
-  Just double-click start.bat icon. It will start a web application at\r
-  port 8888 on the local host and opens a web browser window to display\r
-  the start page of Vaadin Content Browser.\r
-\r
-In Linux:\r
-  Open a shell window, change to the installation directory, and execute\r
-  "sh start.sh". It will start a web application at port 8888 on the local\r
-  host and opens a web browser window to display the start page of Vaadin\r
-  Content Browser.\r
-\r
-In Mac:\r
-  Start Terminal.app and run the start.sh script in the installation\r
-  directory. It will start a web application at port 8888 on the local\r
-  host and opens a web browser window to display the start page of Vaadin\r
-  Content Browser.\r
-\r
-The installation directory is a web application as itself and can be directly\r
-imported to the Eclipse IDE by selecting\r
-"File / Import / Existing Projects into Workspace" from Eclipse main menu.\r
-See the manual for detailed instructions.\r
-\r
----------------------------------\r
-What's Inside the Vaadin Package?\r
----------------------------------\r
-\r
-You should start exploring Vaadin through the provided Content Browser web\r
-application within this package; see 'How to Start?' above.\r
-\r
-The WebContent directory contains the content available through the Content\r
-Browser: the Vaadin Library, demos, documentation, and other useful\r
-information to get started with Vaadin.\r
-\r
-Below is a list of most important locations and files:\r
-\r
-Start Vaadin\r
-- start exploring Vaadin by double-clicking this icon\r
-\r
-COPYING\r
-- license file\r
-\r
-WebContent/vaadin-@version@.jar\r
-- Vaadin Library containing Java source and compiled files\r
-\r
-WebContent/docs/book-of-vaadin.pdf\r
-- Book of Vaadin in PDF format\r
-\r
-WebContent/docs/api/index.html\r
-- Vaadin API Documentation as JavaDoc reference\r
-\r
-WebContent/WEB-INF/src\r
-- Content Browser source code, compiled into WebContent/WEB-INF/classes\r
- \r
-WebContent/docs/example-source\r
-- example source code in HTML format\r
-\r
-WebContent/demo\r
-- files required by the demos\r
-\r
-Vaadin Development Server.launch\r
-GWT Development Mode.launch\r
-- launch configurations for Eclipse workspace\r
-\r
-WebContent/docs/example-source/build-widgetset.xml\r
-- example on how to build GWT widget sets for Vaadin application\r
-\r
-WebContent/VAADIN\r
-- widget sets and themes\r
-\r
-gwt\r
-- Google Web Toolkit is required for building new widget sets\r

diff --git a/build/readme.txt b/build/readme.txt
index 2e54326e44d0e48e0c47079d734843ea626229be..64f1d918623751e31f5aa230eee1ce48a11a70db 100644 (file)
--- 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