Return-Path: 
 <dev-return-91051-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 80819 invoked from network); 3 Sep 2008 15:53:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 3 Sep 2008 15:53:22 -0000
Received: (qmail 39026 invoked by uid 500); 3 Sep 2008 15:53:17 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 39000 invoked by uid 500); 3 Sep 2008 15:53:17 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 38989 invoked by uid 99); 3 Sep 2008 15:53:17 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 08:53:16 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 15:52:27 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2D9F22388892; Wed,  3 Sep 2008 08:52:28 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: dev@tomcat.apache.org
From: fhanik@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080903155228.2D9F22388892@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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