tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r691641 - in /tomcat/trunk: extras.xml java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java webapps/cometd/examples/simplechat/cometdchat.htm webapps/cometd/index.html
Date Wed, 03 Sep 2008 15:52:27 GMT
Author: fhanik
Date: Wed Sep  3 08:52:26 2008
New Revision: 691641

URL: http://svn.apache.org/viewvc?rev=691641&view=rev
Log:
Working on the new dojo toolkit to get it to work properly

Modified:
    tomcat/trunk/extras.xml
    tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
    tomcat/trunk/webapps/cometd/examples/simplechat/cometdchat.htm
    tomcat/trunk/webapps/cometd/index.html

Modified: tomcat/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=691641&r1=691640&r2=691641&view=diff
==============================================================================
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Wed Sep  3 08:52:26 2008
@@ -299,11 +299,8 @@
   		<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/*.*"/>
+      	<include name="dojo/**"/>
+      	<include name="dojox/**"/>
       </fileset>	
   	</copy>
     <mkdir dir="${cometd-app}/WEB-INF/lib"/>

Modified: tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java?rev=691641&r1=691640&r2=691641&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java Wed Sep 
3 08:52:26 2008
@@ -93,6 +93,11 @@
             clientId = client.getId();
             client.setSupportedConnTypes(suppConnTypesFlag);
             client.setUseJsonFiltered(getExt().get(Bayeux.JSON_COMMENT_FILTERED_FIELD) !=
null);
+            if (client.useJsonFiltered()) {
+            	event.getHttpServletResponse().setContentType("text/json-comment-filtered");
+            }else {
+            	event.getHttpServletResponse().setContentType("text/json");
+            }
             response.put(Bayeux.CLIENT_FIELD, client.getId());
             ((HashMap) response.get(Bayeux.ADVICE_FIELD)).put(Bayeux.RECONNECT_FIELD, Bayeux.RETRY_RESPONSE);
             ((HashMap) response.get(Bayeux.ADVICE_FIELD)).put(Bayeux.INTERVAL_FIELD, getReconnectInterval());

Modified: tomcat/trunk/webapps/cometd/examples/simplechat/cometdchat.htm
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/cometd/examples/simplechat/cometdchat.htm?rev=691641&r1=691640&r2=691641&view=diff
==============================================================================
--- tomcat/trunk/webapps/cometd/examples/simplechat/cometdchat.htm (original)
+++ tomcat/trunk/webapps/cometd/examples/simplechat/cometdchat.htm Wed Sep  3 08:52:26 2008
@@ -3,6 +3,7 @@
 
 <script type="text/javascript" src="../../dojo/dojo.js.uncompressed.js"></script>
 <script type="text/javascript" src="../../dojox/cometd.js"></script>
+<script type="text/javascript" src="../../dojox/cometd/_base.js"></script>
 
 <script type="text/javascript">
 

Modified: tomcat/trunk/webapps/cometd/index.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/cometd/index.html?rev=691641&r1=691640&r2=691641&view=diff
==============================================================================
--- tomcat/trunk/webapps/cometd/index.html (original)
+++ tomcat/trunk/webapps/cometd/index.html Wed Sep  3 08:52:26 2008
@@ -3,5 +3,4 @@
 
 <p>
 Try the <a href="examples/simplechat/cometdchat.htm">Simple Chat Demo</a>.</br>
-Try the <a href="examples/tictactoe/ttt1.htm">Tic-Tac-Toe Demo</a>.</br>
 </p>



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


Mime
View raw message