Changed build result path from /result to build/result.

svn changeset:4374/svn branch:trunk

diff --git a/build/VERSION.properties b/build/VERSION.properties
index 7d2fad61fe28d3761259e025665082918f3fa537..1318d3008d7e2664bec2fbbf82d24a60eaffad00 100644 (file)
--- a/build/VERSION.properties
+++ b/build/VERSION.properties
@@ -1 +1 @@
-version=5.2.0rc1
+version=5.2.0rc2

diff --git a/build/build.properties b/build/build.properties
index 24892fae27580f56500b91307dc38d6f1c0e6787..3580fe286dbd4997bbd8f9540cb2b24bc31bfcee 100644 (file)
--- a/build/build.properties
+++ b/build/build.properties
@@ -1,4 +1,4 @@
-result-path=/result
+result-path=build/result
 product-file=itmill-toolkit
 product-name=IT Mill Toolkit
 toolkit-package=com/itmill/toolkit

diff --git a/build/build.xml b/build/build.xml
index 4784e42286e0057f6cceeacdd120496ba344ad71..ec06775cadf41abc186bdbedc5a2d7006e5246f3 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -537,6 +537,11 @@
                                <include name="jetty/**/*" />
                        </fileset>
                </copy>
+        <copy todir="${output-dir}/WebContent/demo/lib">
+            <fileset dir="lib">
+                <include name="portlet/**/*" />
+            </fileset>
+        </copy>
 
                <!-- Add demo sources -->
                <echo>Adding demo sources to WebContent/WEB-INF/src</echo>
@@ -573,7 +578,12 @@
                                <include name="**/*" />
                        </fileset>
                </copy>
-
+               <java classname="com.itmill.toolkit.buildhelpers.PortletConfigurationGenerator" failonerror="yes" fork="yes" maxmemory="512m">
+                   <arg value="${output-dir}/WebContent/WEB-INF" />
+                   <classpath>
+                       <pathelement location="build/buildhelpers/" />
+                   </classpath>
+               </java>
        </target>
 
        <target name="compile-fileupload">

diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index 686e74ddd9407d9fd891f7e66ecdac92cced1ffa..2cada40fb47e59e953d360602b8160bb6f7bcfd2 100644 (file)
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -66,6 +66,15 @@
     </init-param>
   </servlet>
   
+   <servlet>
+    <servlet-name>PortletDemo</servlet-name>
+    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+    <init-param>
+      <param-name>application</param-name>
+      <param-value>com.itmill.toolkit.demo.PortletDemo</param-value>
+    </init-param>
+  </servlet>
+
   <servlet>
     <servlet-name>BrowserDemo</servlet-name>
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
@@ -106,6 +115,19 @@
     </init-param>
   </servlet>
   
+  <servlet>
+    <servlet-name>SimpleReserver</servlet-name>
+    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+    <init-param>
+      <param-name>application</param-name>
+      <param-value>com.itmill.toolkit.demo.reservation.simple.SimpleReserver</param-value>
+    </init-param>
+    <init-param>
+      <param-name>widgetset</param-name>
+      <param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+    </init-param>
+  </servlet>
+  
   <servlet>
     <servlet-name>SelectDemo</servlet-name>
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
@@ -307,7 +329,13 @@
     <servlet-class>com.itmill.toolkit.automatedtests.util.StatusServlet</servlet-class>
   </servlet>
   <!-- Section ends: Automated tests used by Testing Tools plug-in client -->
-  
+
+  <servlet-mapping>
+    <servlet-name>PortletDemo</servlet-name>
+    <url-pattern>/PortletDemo/*</url-pattern>
+    <!-- portlet -->
+  </servlet-mapping> 
+
   <servlet-mapping>
     <servlet-name>ITMillToolkitApplicationRunner</servlet-name>
     <url-pattern>/run/*</url-pattern>
@@ -349,6 +377,12 @@
     <url-pattern>/Reservr/*</url-pattern>
   </servlet-mapping>
   
+  <servlet-mapping>
+    <servlet-name>SimpleReserver</servlet-name>
+    <url-pattern>/SimpleReserver/*</url-pattern>
+    <!-- portlet style=height:400px -->
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>SelectDemo</servlet-name>
     <url-pattern>/SelectDemo/*</url-pattern>

diff --git a/build/package/eclipse-classpath b/build/package/eclipse-classpath
index c1871f60424c8ae98732197e14b87c993e615217..3f110ea199cad9fe80eeffc667e35f7370e52faa 100644 (file)
--- a/build/package/eclipse-classpath
+++ b/build/package/eclipse-classpath
@@ -9,6 +9,9 @@
        <classpathentry kind="lib" path="WebContent/demo/lib/jetty/jetty-6.1.7.jar"/>
        <classpathentry kind="lib" path="WebContent/demo/lib/jetty/jetty-util-6.1.7.jar"/>
        <classpathentry kind="lib" path="WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar"/>
+    <classpathentry kind="lib" path="WebContent/demo/lib/portlet/portal-kernel.jar"/>
+    <classpathentry kind="lib" path="WebContent/demo/lib/portlet/portal-service.jar"/>
+    <classpathentry kind="lib" path="WebContent/demo/lib/portlet/portlet.jar"/>
        <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
        <platform-specific-entries></platform-specific-entries>
 </classpath>