click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r831849 - in /incubator/click/trunk/click: build/ examples/build.xml examples/webapp/WEB-INF/web.xml lib/click-dev-tasks-1.1.jar
Date Mon, 02 Nov 2009 10:27:35 GMT
Author: sabob
Date: Mon Nov  2 10:27:34 2009
New Revision: 831849

URL: http://svn.apache.org/viewvc?rev=831849&view=rev
Log:
migrated click-examples to use build time deployment

Modified:
    incubator/click/trunk/click/build/   (props changed)
    incubator/click/trunk/click/examples/build.xml
    incubator/click/trunk/click/examples/webapp/WEB-INF/web.xml
    incubator/click/trunk/click/lib/click-dev-tasks-1.1.jar

Propchange: incubator/click/trunk/click/build/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov  2 10:27:34 2009
@@ -1,2 +1,3 @@
-tomcat.bat
-publish.bat
+publish.bat
+tomcat.bat
+deployed.html

Modified: incubator/click/trunk/click/examples/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/build.xml?rev=831849&r1=831848&r2=831849&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/build.xml (original)
+++ incubator/click/trunk/click/examples/build.xml Mon Nov  2 10:27:34 2009
@@ -87,6 +87,14 @@
          <fileset dir="${dir.webapp}/javadoc" includes="**/*"/>
       </delete>
       <delete dir="${dir.webapp}/click"/>
+      <delete dir="${dir.webapp}/images"/>
+
+      <!-- Delete all deployed.html reports -->
+      <delete>
+          <fileset dir="${basedir}" includes="deployed*.html"/>
+          <fileset dir="../build" includes="deployed*.html"/>
+      </delete>
+
       <javadoc sourcepath="src"
                destdir="${dir.webapp}/javadoc"
                author="true"
@@ -105,6 +113,22 @@
       	    tofile="${dir.webapp}/javadoc/stylesheet.css"/>
       <delete file="${dir.deploy}/${name}.war"/>
       <mkdir dir="${dir.deploy}"/>
+
+      <taskdef name="deploy"
+            classname="org.apache.click.tools.deploy.DeployTask"
+            classpath="../lib/click-dev-tasks-1.1.jar"/>
+
+      <deploy todir="${dir.webapp}">
+        <fileset dir="${dir.webapp}/WEB-INF">
+            <include name="**/classes"/>
+            <include name="**/*.jar"/>
+        </fileset>
+        <fileset dir="../dist">
+            <include name="${jar.click}"/>
+            <include name="${jar.click-extras}"/>
+        </fileset>
+      </deploy>
+
       <war destfile="${dir.deploy}/${name}.war"
            webxml="${dir.webapp}/WEB-INF/web.xml">
          <manifest>

Modified: incubator/click/trunk/click/examples/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/WEB-INF/web.xml?rev=831849&r1=831848&r2=831849&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/WEB-INF/web.xml (original)
+++ incubator/click/trunk/click/examples/webapp/WEB-INF/web.xml Mon Nov  2 10:27:34 2009
@@ -158,10 +158,11 @@
   Please note, you only need this mapping in restricted environments where Click
   cannot deploy resources to the file system.
   -->
+  <!--
 	<servlet-mapping>
 		<servlet-name>ClickServlet</servlet-name>
 		<url-pattern>/click/*</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping>-->
 	
 	<!-- Wecome Files -->
 

Modified: incubator/click/trunk/click/lib/click-dev-tasks-1.1.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/lib/click-dev-tasks-1.1.jar?rev=831849&r1=831848&r2=831849&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message