tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r691634 - in /tomcat/trunk: ./ webapps/cometd/WEB-INF/ webapps/cometd/examples/chat/ webapps/cometd/examples/dojo/ webapps/cometd/examples/simplechat/ webapps/cometd/examples/tictactoe/ webapps/cometd/examples/timesync/
Date Wed, 03 Sep 2008 15:25:04 GMT
Author: fhanik
Date: Wed Sep  3 08:25:03 2008
New Revision: 691634

URL: http://svn.apache.org/viewvc?rev=691634&view=rev
Log:
Dojo toolkit should be downloaded and not included in SVN

Removed:
    tomcat/trunk/webapps/cometd/WEB-INF/filters.json
    tomcat/trunk/webapps/cometd/examples/chat/
    tomcat/trunk/webapps/cometd/examples/dojo/
    tomcat/trunk/webapps/cometd/examples/tictactoe/
    tomcat/trunk/webapps/cometd/examples/timesync/
Modified:
    tomcat/trunk/build.properties.default
    tomcat/trunk/extras.xml
    tomcat/trunk/webapps/cometd/examples/simplechat/cometdchat.htm

Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=691634&r1=691633&r2=691634&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Sep  3 08:25:03 2008
@@ -103,3 +103,9 @@
 json-lib.home=${base.path}/json-20070829
 json-lib.lib=http://repo1.maven.org/maven2/org/json/json/20070829/json-20070829.jar
 json-lib.jar=json.jar
+
+# ----- Dojo Toolkit 
+dojo-js.home=${base.path}/dojo-release-1.1.1
+dojo-js.loc=http://download.dojotoolkit.org/release-1.1.1/dojo-release-1.1.1.tar.gz
+dojo-js.jar=${dojo-js.home}/dojo/dojo.js
+

Modified: tomcat/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=691634&r1=691633&r2=691634&view=diff
==============================================================================
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Wed Sep  3 08:25:03 2008
@@ -229,6 +229,11 @@
   <target name="bayeux">
     <mkdir dir="${tomcat.extras}"/>
 
+    <antcall target="downloadgz">
+      <param name="sourcefile" value="${dojo-js.loc}"/>
+      <param name="destfile" value="${dojo-js.jar}"/>
+    </antcall>
+  	
     <copy todir="${tomcat.extras}" file="${json-lib.home}/${json-lib.jar}"/>
     <!-- Classpath -->
     <path id="tomcat.bayeux.classpath">
@@ -285,19 +290,43 @@
       </fileset>
     </jar>
     
+    <!-- build samples webapplication /cometd -->
+  	<property name="cometd-app" value="${base.path}/cometd"/>
+  	<mkdir dir="${cometd-app}"/>
+  	
+  	<copy todir="${cometd-app}">
+  	  <fileset dir="${basedir}/webapps/cometd">
+  		<include name="**/**"/>
+  	  </fileset>
+      <fileset dir="${dojo-js.home}">
+      	<include name="dojo/dojo.js.uncompressed.js"/>
+        <include name="dojo/_base.js"/>
+        <include name="dojo/_base/json.js"/>
+      	<include name="dojox/cometd.js"/>
+      	<include name="dojox/cometd/*.*"/>
+      </fileset>	
+  	</copy>
+    <mkdir dir="${cometd-app}/WEB-INF/lib"/>
+    <copy todir="${cometd-app}/WEB-INF/lib" file="${tomcat-bayeux-samples.jar}"/>
+  	
     <zip zipfile="${cometd.war}">
-      <fileset dir="${basedir}/webapps/cometd">
+      <fileset dir="${cometd-app}">
         <include name="**/**"/>
       </fileset>
     </zip>
+  	
+  	<delete dir="${cometd-app}"/>
+  	
+  	<!-- create checksums -->
     <checksum file="${cometd-api.jar}" forceOverwrite="yes" fileext=".md5" />
     <checksum file="${tomcat-bayeux.jar}" forceOverwrite="yes" fileext=".md5" />
-    <checksum file="${tomcat-bayeux-samples.jar}" forceOverwrite="yes" fileext=".md5"
/>
+    <checksum file="${cometd.war}" forceOverwrite="yes" fileext=".md5" />
     <checksum file="${tomcat.extras}/${json-lib.jar}" forceOverwrite="yes" fileext=".md5"
/>
+  	
+  	<!-- print out how to --> 
     <echo>You've built the Tomcat Bayeux libraries, simply add the following libraries
to your CATALINA_HOME/lib directory:
           ${cometd-api.jar}
           ${tomcat-bayeux.jar} 
-          ${tomcat-bayeux-samples.jar} 
           ${tomcat.extras}/${json-lib.jar}
 To run the sample application, copy the following applications into your CATALINA_BASE/webapps
directory
           ${cometd.war}
@@ -333,5 +362,15 @@
     <mkdir dir="${destdir}" />
     <get src="${sourcefile}" dest="${destfile}" />
   </target>
+	
+  <target name="downloadgz" unless="exist" depends="setproxy,testexist">
+    <!-- Download and extract the package -->
+    <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
+    <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
+    <untar src="${base.path}/file.tar" dest="${base.path}"/>
+    <delete file="${base.path}/file.tar"/>
+    <delete file="${base.path}/file.tar.gz"/>
+  </target>
+
 
 </project>

Modified: tomcat/trunk/webapps/cometd/examples/simplechat/cometdchat.htm
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/cometd/examples/simplechat/cometdchat.htm?rev=691634&r1=691633&r2=691634&view=diff
==============================================================================
--- tomcat/trunk/webapps/cometd/examples/simplechat/cometdchat.htm (original)
+++ tomcat/trunk/webapps/cometd/examples/simplechat/cometdchat.htm Wed Sep  3 08:25:03 2008
@@ -1,8 +1,8 @@
 <html>
 <header><title>Comet Simple Chat Application</title>
 
-<script type="text/javascript" src="../dojo/dojo/dojo.js"></script>
-<script type="text/javascript" src="../dojo/dojox/cometd.js.uncompressed.js"></script>
+<script type="text/javascript" src="../../dojo/dojo.js.uncompressed.js"></script>
+<script type="text/javascript" src="../../dojox/cometd.js"></script>
 
 <script type="text/javascript">
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message