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 13962f1..adf30e0 100644 (file)
--- 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 2835d12..bdbb283 100644 (file)
--- 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();\r
             client.setSupportedConnTypes(suppConnTypesFlag);\r
             client.setUseJsonFiltered(getExt().get(Bayeux.JSON_COMMENT_FILTERED_FIELD) != null);\r
+            if (client.useJsonFiltered()) {\r
+               event.getHttpServletResponse().setContentType("text/json-comment-filtered");\r
+            }else {\r
+               event.getHttpServletResponse().setContentType("text/json");\r
+            }\r
             response.put(Bayeux.CLIENT_FIELD, client.getId());\r
             ((HashMap) response.get(Bayeux.ADVICE_FIELD)).put(Bayeux.RECONNECT_FIELD, Bayeux.RETRY_RESPONSE);\r
             ((HashMap) response.get(Bayeux.ADVICE_FIELD)).put(Bayeux.INTERVAL_FIELD, getReconnectInterval());\r

diff --git a/webapps/cometd/examples/simplechat/cometdchat.htm b/webapps/cometd/examples/simplechat/cometdchat.htm
index d7da25f..88a05a0 100644 (file)
--- a/webapps/cometd/examples/simplechat/cometdchat.htm
+++ b/webapps/cometd/examples/simplechat/cometdchat.htm
@@ -3,6 +3,7 @@
 \r
 <script type="text/javascript" src="../../dojo/dojo.js.uncompressed.js"></script>\r
 <script type="text/javascript" src="../../dojox/cometd.js"></script>\r
+<script type="text/javascript" src="../../dojox/cometd/_base.js"></script>\r
 \r
 <script type="text/javascript">\r
 \r

diff --git a/webapps/cometd/index.html b/webapps/cometd/index.html
index 29e4616..86f29cd 100644 (file)
--- a/webapps/cometd/index.html
+++ b/webapps/cometd/index.html
@@ -3,5 +3,4 @@
 \r
 <p>\r
 Try the <a href="examples/simplechat/cometdchat.htm">Simple Chat Demo</a>.</br>\r
-Try the <a href="examples/tictactoe/ttt1.htm">Tic-Tac-Toe Demo</a>.</br>\r
 </p>\r