From: Jani Laakso <jani.laakso@itmill.com>
Date: Tue, 4 Dec 2007 19:52:39 +0000 (+0000)
Subject: License parametrized
X-Git-Tag: 6.7.0.beta1~5288
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e9e52bf23b4bd475eb382bd2e7344427aecf7641;p=vaadin-framework.git

License parametrized

svn changeset:3163/svn branch:trunk
---

diff --git a/build/Apache2LicenseForJavaFiles.txt b/build/Apache2LicenseForJavaFiles.txt
new file mode 100644
index 0000000000..f32820a01d
--- /dev/null
+++ b/build/Apache2LicenseForJavaFiles.txt
@@ -0,0 +1,13 @@
+ * Copyright 2007 IT Mill Ltd.
+ * 
+ * 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
diff --git a/build/build.xml b/build/build.xml
index 82b6ffa318..e2c2ffd39b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -455,16 +455,17 @@
 	<target name="build" depends="demo" description="Build package required files, without packing them.">
 	</target>
 
-
 	<!-- Copy and preprocess sources for packaging 
 	NOTE: Replaces <version></version> tags with build version tag for some "textual" files
 	-->
 	<target name="preprocess-src">
+		<loadfile property="ITMillApache2LicenseForJavaFiles" srcFile="build/ITMillApache2LicenseForJavaFiles.txt" />
 		<mkdir dir="${result-path}/src" />
 		<echo>Copying src directory and processing copied files.</echo>
 		<echo>Replacing &lt;version&gt; tag with build version for java/html/css/xml files.</echo>
 		<copy todir="${result-path}/src">
 			<filterset>
+				<filter token="ITMillApache2LicenseForJavaFiles" value="${ITMillApache2LicenseForJavaFiles}" />
 				<filter token="VERSION" value="${version}" />
 			</filterset>
 			<fileset dir="src">
@@ -537,7 +538,7 @@
 				<include name="META-INF/**/*" />
 			</fileset>
 		</copy>
-		
+
 		<!-- Add package specific WebContent files from build/package/WebContent -->
 		<copy todir="${output-dir}/WebContent">
 			<fileset dir="build/package/WebContent">
@@ -664,7 +665,7 @@
 				<include name="${toolkit-package}/launcher/**" />
 			</fileset>
 		</copy>
-		
+
 		<!--
 		<echo>Building WAR</echo>
 		<war warfile="${output-dir}/${product-file}.war">