attached are the patches in both the grizzly and glassfish trees.
Index: ../contribs/config/src/test/resources/grizzly-config.xml
===================================================================
--- ../contribs/config/src/test/resources/grizzly-config.xml (revision 3022)
+++ ../contribs/config/src/test/resources/grizzly-config.xml Wed Apr 22 18:13:17 EDT 2009
@@ -4,7 +4,7 @@
</transports>
<protocols>
<protocol name="http">
- <http/>
+ <http enable-comet-support="true"/>
</protocol>
</protocols>
<network-listeners>
Index: ../contribs/config/src/main/java/com/sun/grizzly/config/GrizzlyEmbeddedHttp.java
===================================================================
--- ../contribs/config/src/main/java/com/sun/grizzly/config/GrizzlyEmbeddedHttp.java (revision 3022)
+++ ../contribs/config/src/main/java/com/sun/grizzly/config/GrizzlyEmbeddedHttp.java Wed Apr 22 18:35:06 EDT 2009
@@ -280,7 +280,7 @@
Integer.toString(getMaxThreads())
});
}
- final Boolean enableComet = Boolean.valueOf(System.getProperty("v3.grizzly.cometSupport", "false"));
+ final Boolean enableComet = toBoolean(http.getEnableCometSupport());
if (enableComet && !"admin-listener".equalsIgnoreCase(networkListener.getName())) {
configureComet(habitat);
}
Index: ../contribs/config/pom.xml
===================================================================
--- ../contribs/config/pom.xml (revision 3034)
+++ ../contribs/config/pom.xml Wed Apr 22 18:35:18 EDT 2009
@@ -5,7 +5,7 @@
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-config</artifactId>
<packaging>hk2-jar</packaging>
- <version>1.0.0</version>
+ <version>1.0.1</version>
<name>grizzly-config</name>
<url>
https://grizzly.dev.java.net</url>
<repositories>
Index: ../pom.xml
===================================================================
--- ../pom.xml (revision 26559)
+++ ../pom.xml Wed Apr 22 18:35:32 EDT 2009
@@ -110,7 +110,7 @@
<deployment-api.version>1.2-rev-1</deployment-api.version>
<jaxrpc-api.version>1.1</jaxrpc-api.version>
<grizzly.version>1.9.14</grizzly.version>
- <grizzly-config.version>1.0.0</grizzly-config.version>
+ <grizzly-config.version>1.0.1</grizzly-config.version>
<jaxb-api.version>2.1</jaxb-api.version>
<jaxws-api.version>2.1</jaxws-api.version>
<jsr250-api.version>1.0</jsr250-api.version>
Index: ../core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyProxy.java
===================================================================
--- ../core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyProxy.java (revision 26557)
+++ ../core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyProxy.java Wed Apr 22 18:18:22 EDT 2009
@@ -119,7 +119,7 @@
*/
private void configureGrizzly() {
grizzlyListener = new GrizzlyServiceListener(new Controller());
- grizzlyListener.configure(networkListener, isWebProfile, null);
+ grizzlyListener.configure(networkListener, isWebProfile, grizzlyService.habitat);
final V3Mapper mapper = new V3Mapper(logger);
mapper.setPort(portNumber);