From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 3 Sep 2008 15:52:26 +0000 (+0000)
Subject: Working on the new dojo toolkit to get it to work properly
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1e3fbf961e992cf20349b656958220fdb0d894a8;p=tomcat7.0

Working on the new dojo toolkit to get it to work properly


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@691641 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/extras.xml b/extras.xml
index 13962f106..adf30e0bf 100644
--- a/extras.xml
+++ b/extras.xml
@@ -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"/>
diff --git a/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java b/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
index 2835d1252..bdbb2832d 100644
--- a/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
+++ b/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
@@ -93,6 +93,11 @@ public class MetaHandshakeRequest extends RequestBase implements BayeuxRequest {
             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());
diff --git a/webapps/cometd/examples/simplechat/cometdchat.htm b/webapps/cometd/examples/simplechat/cometdchat.htm
index d7da25f03..88a05a0be 100644
--- a/webapps/cometd/examples/simplechat/cometdchat.htm
+++ b/webapps/cometd/examples/simplechat/cometdchat.htm
@@ -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">
 
diff --git a/webapps/cometd/index.html b/webapps/cometd/index.html
index 29e461686..86f29cdfa 100644
--- a/webapps/cometd/index.html
+++ b/webapps/cometd/index.html
@@ -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>