packaging

svn changeset:3095/svn branch:trunk

3 files changed, 14 insertions, 55 deletions

diff --git a/WebContent/WEB-INF/itmill-toolkit-license.xml b/WebContent/WEB-INF/itmill-toolkit-license.xml
deleted file mode 100644
index e078083dd0..0000000000
--- a/WebContent/WEB-INF/itmill-toolkit-license.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--  License for IT Mill Toolkit 4.0
-	  License number is 1
-	  
-	  This license is for development and testing purposes only. It is
-	  not valid for any kind of production use. To obtain a license for
-	  production use, see http://www.itmill.com/
-	  
-	  The license file should either be placed in your applications
-	  WEB-INF directory as itmill-toolkit-license.xml or set in your
-	  Application class init -method using readLicenseFile -method in
-	  com.itmill.toolkit.service.License
-
-	  The legal text corresponding to this license can be found in
-	  http://www.itmill.com/
--->
-
-<license number="1">
-
-	<!-- This license is only valid for the product specified below -->
-	<product>
-		<name>IT Mill Toolkit</name>
-	</product>
-	
-	<!--  These limits define how you can use the product (defined above) -->
-	<limits print-limits-on-init="true">
-	
-		<!--  This license can only be used for the purpose defined below -->
-		<purpose>Development and testing only, production use is forbidden</purpose>
-		
-		<!-- Number of concurrent users per server -->
-		<concurrent-users-per-server limit="unlimited"/>
-		
-		<!-- Number of servers (Java Virtual Machines) this license can be concurrently used in -->
-		<concurrent-jvms limit="unlimited"/>
-
-		<!-- Only the version within these limits are covered by this license  
-	    -->
-		<version>
-			<major equals-to="4"/>
-		</version>
-
-	</limits>
-	
-	<signature>MCwCFEtw/xNqGCUEyLBdd4+OLtJqf2TiAhRrex2SEWk3FYE+4GZlLqoKxL9d4w==</signature>
-</license>
\ No newline at end of file
diff --git a/WebContent/index.html b/WebContent/index.html
index 90ee218729..c6394c50ea 100644
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -10,7 +10,7 @@
 		<script type="text/javascript">
 		
 		window.onload = function() {
-			itmill.init();
+			itm	ill.init();
 		}
 		
 		var itmill = function() {
@@ -155,8 +155,15 @@
 					
 					<div id="additional-demos-content"> <!-- For JavaScript hooking -->
 					<ul>
-						<li><a href="table-demo">Table Demo</a></li>
-						<li><a href="select-demo">Select Demo</a></li>
+						<li><a href="HelloWorld/">Hello world</a></li>
+						<li><a href="Calc/">Calculator</a></li>
+						<li><a href="colorpicker/">Color picker widget</a></li>
+						<li><a href="CachingDemo/">Widget caching demo</a></li>
+						<li><a href="KeyboardShortcut/">Keyboard shortcuts</a></li>
+						<li><a href="ModalWindow/">Modal window demo</a></li>
+						<li><a href="LayoutDemo/"></a>Basic layouts demo</li>
+						<li><a href="BufferedComponents/">Buffered components</a></li>
+						<li><a href="TestForNativeWindowing/">Native windows</a></li>
 					</ul>
 					</div>
 				
@@ -174,7 +181,7 @@
 				
 				<h4>Manual Deployment</h4>
 				<p>If you do not use Eclipse, you can manually deploy the Toolkit 
-				<a href="lib/itmill-toolkit.war">WAR-package</a> to your application server.
+				<a href="demo/itmill-toolkit.war">WAR-package</a> to your application server.
 				</p>
 				
 			</div> <!-- /getting-started -->
@@ -185,7 +192,7 @@
 				<h4>Documentation</h4>
 				<p>Need help using IT Mill Toolkit? Look no further. Everything you need to know is here.</p>
 				<ul class="links">
-					<li><a href="doc/manual/manual.html">Manual</a> <a href="doc/manual.pdf" class="more"><span>(</span>PDF<span>)</span></a></li>
+					<li><a href="doc/manual/index.html">Manual</a> <a href="doc/manual.pdf" class="more"><span>(</span>PDF<span>)</span></a></li>
 					<li><a href="doc/api/index.html" class="more">JavaDoc API</a></li>
 					<li><a href="http://forum.itmill.com" class="more">Support forum</a></li>
 				</ul>
@@ -214,7 +221,7 @@
 					<h5>Documentation</h5>
 					<ul>
 						<li><a href="release-notes.html">Release Notes</a></li>
-						<li><a href="doc/manual/manual.html">Manual</a> &nbsp; (<a href="manual.pdf">view as PDF</a>)</li>
+						<li><a href="doc/manual/manual.html">Manual</a> &nbsp; (<a href="doc/manual.pdf">view as PDF</a>)</li>
 						<li><a href="doc/api/index.html">JavaDoc API</a></li>
 					</ul>
 				</div>
diff --git a/build/build.xml b/build/build.xml
index 10cb8cd40b..7f0e3d7864 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -501,7 +501,6 @@
 			<fileset dir="WebContent">
 				<exclude name="**/.svn" />
 				<exclude name="openajax/**" />
-				<exclude name="index.html" />
 				<exclude name="WEB-INF/web.xml" />
 				<exclude name="ITMILL/widgetsets/**" />
 				<exclude name="WEB-INF/lib/commons-fileupload-custom.jar" />
@@ -638,7 +637,7 @@
 		-->
 		
 		<echo>Building WAR</echo>
-		<war warfile="${output-dir}/${product-file}.war" webxml="build/package/WebContent/WEB-INF/web.xml">
+		<war warfile="${output-dir}/WebContent/demo/${product-file}.war" webxml="build/package/WebContent/WEB-INF/web.xml">
 			<fileset dir="${output-dir}/WebContent">
 				<exclude name="WEB-INF/web.xml" />
 				<include name="**/*" />