Can someone who has the authority review the changes please ? I am
really waiting for this. Guess i am more eager than Justin :)
And I would like this to go to the J1 Preview branch as well.
thanks very much.
Anissa
Jane Young wrote:
> The pom.xml update is fine.
> You need to get someone else to review domain.xml, quicklook's
> WebtierTests.java and ThreadPoolConfig.java.
>
> I know it's frustrating waiting for approval, but I think your changes
> requires someone who knows this area. Jerome?
>
> Thanks,
> Jane
>
>
> Justin Lee wrote:
>> So I guess no objections to this?
>>
>> Anissa Lam wrote:
>>>
>>> Appreciate if one of you can review and give a go-ahead on this
>>> changes. I have been waiting for this changes from Justin to
>>> continue my work.
>>>
>>> thanks
>>> Anissa.
>>> ------------------------------------------------------------------------
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
>>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>
attached mail follows:
This integration addresses the following bugs:
https://glassfish.dev.java.net/issues/show_bug.cgi?id=8033
https://glassfish.dev.java.net/issues/show_bug.cgi?id=8042
https://glassfish.dev.java.net/issues/show_bug.cgi?id=8059
Per Anissa's request some method names have been modified in the
grizzly-config interfaces to align with AMX practices. Defaults were
also audited and updated to better reflect the common uses. As such,
the templates have been modified to remove explicit attributes whose
values match the defaults (hk2 will do this anyway the first time it
updates the document).
The bulk of the changes are in the grizzly-config code but this
integration touches a few minor points in glassfish.
Index: ../packager/nucleus-base/domains/domain1/config/domain.xml
===================================================================
--- ../packager/nucleus-base/domains/domain1/config/domain.xml (revision 26728)
+++ ../packager/nucleus-base/domains/domain1/config/domain.xml Thu Apr 30 11:09:11 EDT 2009
@@ -27,16 +27,8 @@
<config name="server-config">
<http-service>
<access-log rotation-suffix="yyyy-MM-dd" rotation-interval-in-minutes="15"></access-log>
- <virtual-server id="server" network-listeners="http-listener-1,http-listener-2">
- <property value="${com.sun.aas.instanceRoot}/docroot" name="docroot" />
- <property value="${com.sun.aas.instanceRoot}/logs/access" name="accesslog" />
- <property value="false" name="sso-enabled" />
- </virtual-server>
- <virtual-server id="__asadmin" network-listeners="admin-listener">
- <property value="${com.sun.aas.instanceRoot}/docroot" name="docroot" />
- <property value="${com.sun.aas.instanceRoot}/logs/access" name="accesslog" />
- <property value="false" name="sso-enabled" />
- </virtual-server>
+ <virtual-server id="server" network-listeners="http-listener-1,http-listener-2"></virtual-server>
+ <virtual-server id="__asadmin" network-listeners="admin-listener"></virtual-server>
<property value="false" name="accessLoggingEnabled" />
</http-service>
<iiop-service>
@@ -151,18 +143,18 @@
<network-config>
<protocols>
<protocol name="http-listener-1">
- <http header-buffer-length="8192" forced-response-type="text/plain; charset=iso-8859-1" default-virtual-server="server" max-connections="250" server-name="" default-response-type="text/plain; charset=iso-8859-1">
+ <http default-virtual-server="server" max-connections="250" server-name="">
<file-cache enabled="false"></file-cache>
</http>
</protocol>
<protocol security-enabled="true" name="http-listener-2">
- <http header-buffer-length="8192" forced-response-type="text/plain; charset=iso-8859-1" default-virtual-server="server" max-connections="250" server-name="" default-response-type="text/plain; charset=iso-8859-1">
+ <http default-virtual-server="server" max-connections="250" server-name="">
<file-cache enabled="false"></file-cache>
</http>
<ssl ssl3-enabled="false" cert-nickname="s1as"></ssl>
</protocol>
<protocol name="admin-listener">
- <http header-buffer-length="8192" forced-response-type="text/plain; charset=iso-8859-1" default-virtual-server="__asadmin" max-connections="250" server-name="" default-response-type="text/plain; charset=iso-8859-1">
+ <http default-virtual-server="__asadmin" max-connections="250" server-name="">
<file-cache enabled="false"></file-cache>
</http>
</protocol>
@@ -179,7 +171,7 @@
</transports>
</network-config>
<thread-pools>
- <thread-pool min-thread-pool-size="2" thread-pool-id="http-thread-pool" max-queue-size="4096"></thread-pool>
+ <thread-pool thread-pool-id="http-thread-pool" max-queue-size="4096"></thread-pool>
<thread-pool thread-pool-id="thread-pool-1"/>
</thread-pools>
</config>
Index: ../packager/nucleus-base/lib/templates/domain.xml
===================================================================
--- ../packager/nucleus-base/lib/templates/domain.xml (revision 26728)
+++ ../packager/nucleus-base/lib/templates/domain.xml Thu Apr 30 11:09:11 EDT 2009
@@ -27,16 +27,8 @@
<config name="%%%CONFIG_MODEL_NAME%%%">
<http-service>
<access-log rotation-interval-in-minutes="15" rotation-suffix="yyyy-MM-dd" />
- <virtual-server id="server" network-listeners="http-listener-1,http-listener-2">
- <property value="${com.sun.aas.instanceRoot}/docroot" name="docroot" />
- <property value="${com.sun.aas.instanceRoot}/logs/access" name="accesslog" />
- <property value="false" name="sso-enabled" />
- </virtual-server>
- <virtual-server id="__asadmin" network-listeners="admin-listener">
- <property value="${com.sun.aas.instanceRoot}/docroot" name="docroot" />
- <property value="${com.sun.aas.instanceRoot}/logs/access" name="accesslog" />
- <property value="false" name="sso-enabled" />
- </virtual-server>
+ <virtual-server id="server" network-listeners="http-listener-1,http-listener-2"></virtual-server>
+ <virtual-server id="__asadmin" network-listeners="admin-listener"></virtual-server>
<property value="false" name="accessLoggingEnabled" />
</http-service>
<iiop-service>
@@ -153,18 +145,18 @@
<network-config>
<protocols>
<protocol name="http-listener-1">
- <http header-buffer-length="8192" forced-response-type="text/plain; charset=iso-8859-1" default-virtual-server="server" max-connections="250" server-name="" default-response-type="text/plain; charset=iso-8859-1">
+ <http default-virtual-server="server" max-connections="250" server-name="">
<file-cache enabled="false"></file-cache>
</http>
</protocol>
<protocol security-enabled="true" name="http-listener-2">
- <http header-buffer-length="8192" forced-response-type="text/plain; charset=iso-8859-1" default-virtual-server="server" max-connections="250" server-name="" default-response-type="text/plain; charset=iso-8859-1">
+ <http default-virtual-server="server" max-connections="250" server-name="">
<file-cache enabled="false"></file-cache>
</http>
<ssl ssl3-enabled="false" cert-nickname="s1as"></ssl>
</protocol>
<protocol name="admin-listener">
- <http header-buffer-length="8192" forced-response-type="text/plain; charset=iso-8859-1" default-virtual-server="__asadmin" max-connections="250" server-name="" default-response-type="text/plain; charset=iso-8859-1">
+ <http default-virtual-server="__asadmin" max-connections="250" server-name="">
<file-cache enabled="false"></file-cache>
</http>
</protocol>
@@ -179,7 +171,7 @@
</transports>
</network-config>
<thread-pools>
- <thread-pool min-thread-pool-size="2" thread-pool-id="http-thread-pool" max-queue-size="4096"></thread-pool>
+ <thread-pool thread-pool-id="http-thread-pool" max-queue-size="4096"></thread-pool>
<thread-pool thread-pool-id="thread-pool-1"/>
</thread-pools>
</config>
Index: ../tests/quicklook/admin/src/test/admin/WebtierTests.java
===================================================================
--- ../tests/quicklook/admin/src/test/admin/WebtierTests.java (revision 26728)
+++ ../tests/quicklook/admin/src/test/admin/WebtierTests.java Thu Apr 30 13:05:06 EDT 2009
@@ -38,7 +38,7 @@
* @since GlassFish v3 Prelude
*/
public class WebtierTests extends BaseAsadminTest {
- private final String LISTENER_NAME = "ls123456"; //sufficiently unique, I believe
+ private final String LISTENER_NAME = "ls" + System.currentTimeMillis(); //sufficiently unique, I believe
@BeforeClass
private void setup() {
Index: ../pom.xml
===================================================================
--- ../pom.xml (revision 26728)
+++ ../pom.xml Wed Apr 29 17:38:15 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.2</grizzly-config.version>
+ <grizzly-config.version>1.0.3</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: ../common/amx-config/src/main/java/org/glassfish/admin/amx/intf/config/ThreadPoolConfig.java
===================================================================
--- ../common/amx-config/src/main/java/org/glassfish/admin/amx/intf/config/ThreadPoolConfig.java (revision 26728)
+++ ../common/amx-config/src/main/java/org/glassfish/admin/amx/intf/config/ThreadPoolConfig.java Thu Apr 30 10:57:20 EDT 2009
@@ -60,7 +60,7 @@
/**
Key for use with {_at_link ConfigConfig#createThreadPoolConfig}.
*/
- public static final String IDLE_THREAD_TIMEOUT_IN_SECONDS_KEY = "IdleThreadTimeoutInSeconds";
+ public static final String IDLE_THREAD_TIMEOUT_IN_SECONDS_KEY = "IdleThreadTimeoutSeconds";
/**
Key for use with {_at_link ConfigConfig#createThreadPoolConfig}.
*/
@@ -68,8 +68,8 @@
@ResolveTo(Integer.class)
- public String getIdleThreadTimeoutInSeconds();
- public void setIdleThreadTimeoutInSeconds( String value );
+ public String getIdleThreadTimeoutSeconds();
+ public void setIdleThreadTimeoutSeconds( String value );
@ResolveTo(Integer.class)
public String getMinThreadPoolSize();
@@ -80,12 +80,12 @@
public void setMaxThreadPoolSize( String value );
@ResolveTo(Integer.class)
- public String getThreadIncrement();
- public void setThreadIncrement( String value );
+ public String getThreadIncrement(); // unused. delete?
+ public void setThreadIncrement( String value ); // unused. delete?
@ResolveTo(Integer.class)
- public String getNumWorkQueues();
- public void setNumWorkQueues( String value );
+ public String getNumWorkQueues(); // unused. delete?
+ public void setNumWorkQueues( String value ); // unused. delete?
public String getThreadPoolId();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
For additional commands, e-mail: dev-help_at_glassfish.dev.java.net