dev@glassfish.java.net

Re: upcoming grizzly-config merge -- Build Broken

From: Jane Young <Jane.Young_at_Sun.COM>
Date: Mon, 13 Apr 2009 14:06:50 -0700

Thank you, Justin.

Justin Lee wrote:
> I think I have that test fixed. It looks like it was an ordering
> issue and depending on how junit decided it was going to run the
> tests, things would work or not. I've reenabled HttpServiceTest and
> have committed the update.
>
> Jane Young wrote:
>> Hi Justin,
>>
>> I can reproduce the failure on Solaris Sparc 10. On the Mac, the
>> HttpServiceTest passed.
>> Let me know if you want access to a Solaris Sparc machine.
>>
>> Jane
>>
>>
>> Terena Chinn-Fujii wrote:
>>> Hi Justin,
>>>
>>> It is failing on RE Hudson and the following platforms:
>>>
>>> - Solaris Sparc 9 (v880 with 8 CPUs)
>>> - Solaris Sparc 10 Zone (4 CPUs)
>>> And Hong's machine which is a dual core X86 with Ubuntu.
>>>
>>>
>>> Terena
>>>
>>>
>>>
>>> Justin Lee wrote:
>>>> I ran the test just fine, actually... Is it failing on hudson?
>>>>
>>>> Jane Young wrote:
>>>>> Hi Justin,
>>>>>
>>>>> In the meantime, I'm going to disable HttpServiceTest so we can
>>>>> get a nightly build out.
>>>>> Thanks,
>>>>> Jane
>>>>>
>>>>>
>>>>> Justin Lee wrote:
>>>>>> That test should work. I'm getting everything up to date in
>>>>>> another workspace and i'll see if I get the same error.
>>>>>>
>>>>>> Hong Zhang wrote:
>>>>>>> Hi, Jane
>>>>>>>
>>>>>>>> Are you still seeing the same error?
>>>>>>>
>>>>>>> Yes, I am still seeing this. I worked around it in my local
>>>>>>> workspace by turning off the HttpServiceTest. My box is a
>>>>>>> dual-core X86 with Ubuntu installed on top of it.
>>>>>>>
>>>>>>> - Hong
>>>>>>>
>>>>>>>> Jerome fixed the issue by turning off the surefire tests:
>>>>>>>> TransactionCallBackTest
>>>>>>>> But the failure you're seeing is in HttpServiceTest. The
>>>>>>>> nightly gf-hudson (RE Hudson) is also failing in the same
>>>>>>>> area. I know Terena usually build with a clean maven
>>>>>>>> repository. I cannot reproduce it either on the Mac.
>>>>>>>> Please let me know if you're able to resolve this issue.
>>>>>>>> Jane
>>>>>>>>
>>>>>>>>
>>>>>>>> Hong Zhang wrote:
>>>>>>>>
>>>>>>>>> Hi, Anissa
>>>>>>>>>
>>>>>>>>>> I updated the 2 files that Jerome checked in, and it now
>>>>>>>>>> builds for me. GUI was broken due to AMX loading error and
>>>>>>>>>> i am looking to see why.
>>>>>>>>>> I didn't run QL after the update, but I am able to use CLI to
>>>>>>>>>> deploy hello.war
>>>>>>>>>>
>>>>>>>>>> The 2 files Jerome fixed:
>>>>>>>>>>
>>>>>>>>>> trunk/v3/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TransactionCallBackTest.java
>>>>>>>>>>
>>>>>>>>>> trunk/v3/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>> yes, I have those changes:
>>>>>>>>>
>>>>>>>>> hzhang_at_nmr:~/files/workspaces/v3$ svn info
>>>>>>>>> Path: .
>>>>>>>>> URL: https://svn.dev.java.net/svn/glassfish-svn/trunk/v3
>>>>>>>>> Repository Root: https://svn.dev.java.net/svn/glassfish-svn
>>>>>>>>> Repository UUID: 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5
>>>>>>>>> Revision: 26103
>>>>>>>>> Node Kind: directory
>>>>>>>>> Schedule: normal
>>>>>>>>> Last Changed Author: dochez
>>>>>>>>> Last Changed Rev: 26103
>>>>>>>>> Last Changed Date: 2009-04-12 12:23:18 -0400 (Sun, 12 Apr 2009)
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> But it still failed for me. I even tried to clean the local
>>>>>>>>> .m2 repository, same thing..
>>>>>>>>>
>>>>>>>>> - Hong
>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> Hong Zhang wrote:
>>>>>>>>>>
>>>>>>>>>>> I updated my workspace just now (with no local changes) and
>>>>>>>>>>> my build still failed, any one has any idea?
>>>>>>>>>>>
>>>>>>>>>>> ...
>>>>>>>>>>> Note: Recompile with -Xlint:unchecked for details.
>>>>>>>>>>> [INFO] [surefire:test]
>>>>>>>>>>> [INFO] Surefire report directory:
>>>>>>>>>>> /home/hzhang/files/workspaces/v3/admin/config-api/target/surefire-reports
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> -------------------------------------------------------
>>>>>>>>>>> T E S T S
>>>>>>>>>>> -------------------------------------------------------
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.ModulesTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.209 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.TranslatedViewCreationTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.115 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.DirectCreationTest
>>>>>>>>>>> Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.301 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.model.AllModelsImplementingTest
>>>>>>>>>>>
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.097 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.UnprocessedEventsTest
>>>>>>>>>>> Apr 12, 2009 4:40:06 PM
>>>>>>>>>>> org.jvnet.hk2.config.Transactions$ConfigListenerNotifier$1 call
>>>>>>>>>>> WARNING: Unprocessed event :
>>>>>>>>>>> UnprocessedChangeEvent{PropertyName=port, OldValue = 8080,
>>>>>>>>>>> NewValue = 8908, Source =
>>>>>>>>>>> GlassFishConfigBean.com.sun.grizzly.config.dom.NetworkListener},
>>>>>>>>>>> reason = Java NIO port listener cannot reconfigure its port
>>>>>>>>>>> dynamically, when = 1239568806046
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.089 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.TraversalTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.009 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.DirectRemovalTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.036 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.UpgradeTest
>>>>>>>>>>> Apr 12, 2009 4:40:06 PM
>>>>>>>>>>> com.sun.enterprise.configapi.tests.UpgradeTest setup
>>>>>>>>>>> INFO: running upgrade class
>>>>>>>>>>> org.glassfish.config.support.GrizzlyConfigSchemaMigrator
>>>>>>>>>>> Apr 12, 2009 4:40:06 PM
>>>>>>>>>>> com.sun.enterprise.configapi.tests.UpgradeTest setup
>>>>>>>>>>> INFO: running upgrade class
>>>>>>>>>>> org.glassfish.config.support.UpgradeService
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.371 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.validation.JdbcConnectionPoolValidationTest
>>>>>>>>>>>
>>>>>>>>>>> Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.031 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.ApplicationsTest
>>>>>>>>>>> Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.001 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.Ssl2EnabledTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.004 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.extensibility.ContainerExtensionTest
>>>>>>>>>>>
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.016 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.ConcurrentModificationsTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.006 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.TransactionListenerTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.004 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.HttpListenerTest
>>>>>>>>>>> Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.003 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.AddPropertyTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.009 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.ParentTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.001 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.DomainTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.001 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.EnabledTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.002 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.CollectionsAccessTest
>>>>>>>>>>> Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.008 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.ConfigListenerTest
>>>>>>>>>>> Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.042 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.dvt.AccessLogAllDefaultsTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.013 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.PersistenceTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.014 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.DirectAccessTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.038 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.ParentConfigListenerTest
>>>>>>>>>>> Apr 12, 2009 4:40:06 PM
>>>>>>>>>>> org.jvnet.hk2.config.Transactions$ConfigListenerNotifier$1 call
>>>>>>>>>>> WARNING: Unprocessed event :
>>>>>>>>>>> UnprocessedChangeEvent{PropertyName=network-listener,
>>>>>>>>>>> OldValue = null, NewValue =
>>>>>>>>>>> GlassFishConfigBean.com.sun.grizzly.config.dom.NetworkListener,
>>>>>>>>>>> Source =
>>>>>>>>>>> GlassFishConfigBean.com.sun.grizzly.config.dom.NetworkListeners},
>>>>>>>>>>> reason = unimplemented by NetworkListenersContainer, when =
>>>>>>>>>>> 1239568806735
>>>>>>>>>>> Apr 12, 2009 4:40:06 PM
>>>>>>>>>>> org.jvnet.hk2.config.Transactions$ConfigListenerNotifier$1 call
>>>>>>>>>>> WARNING: Unprocessed event :
>>>>>>>>>>> UnprocessedChangeEvent{PropertyName=network-listener,
>>>>>>>>>>> OldValue = null, NewValue =
>>>>>>>>>>> GlassFishConfigBean.com.sun.grizzly.config.dom.NetworkListener,
>>>>>>>>>>> Source =
>>>>>>>>>>> GlassFishConfigBean.com.sun.grizzly.config.dom.NetworkListeners},
>>>>>>>>>>> reason = unimplemented by NetworkListenersContainer, when =
>>>>>>>>>>> 1239568806735
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.021 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.TranslatedValuesTest
>>>>>>>>>>> Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.002 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.dvt.JdbcConnectionPoolDefaultsTest
>>>>>>>>>>>
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.014 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.TransactionCallBackTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time
>>>>>>>>>>> elapsed: 0.001 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.DuplicateKeyedElementTest
>>>>>>>>>>> Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.004 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.JavaConfigSubTypesTest
>>>>>>>>>>> Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.057 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.dvt.SecurityServiceDefaultsTest
>>>>>>>>>>>
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.014 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.RawValueTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.001 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.PropertyChangeListenerTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.018 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.DefaultValueTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.001 sec
>>>>>>>>>>> Running
>>>>>>>>>>> com.sun.enterprise.configapi.tests.GetElementTypeByNameTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.001 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.SubTypesTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.001 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.AttributeRemovalTest
>>>>>>>>>>> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.017 sec
>>>>>>>>>>> Running com.sun.enterprise.configapi.tests.HttpServiceTest
>>>>>>>>>>> Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time
>>>>>>>>>>> elapsed: 0.01 sec <<< FAILURE!
>>>>>>>>>>>
>>>>>>>>>>> Results :
>>>>>>>>>>>
>>>>>>>>>>> Failed tests:
>>>>>>>>>>> connectionTest(com.sun.enterprise.configapi.tests.HttpServiceTest)
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> Tests run: 53, Failures: 1, Errors: 0, Skipped: 1
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> Terena Chinn-Fujii wrote:
>>>>>>>>>>>
>>>>>>>>>>>> Thanks Jerome!!
>>>>>>>>>>>>
>>>>>>>>>>>> Terena
>>>>>>>>>>>>
>>>>>>>>>>>> Jerome Dochez wrote:
>>>>>>>>>>>>
>>>>>>>>>>>>> I have fixed the problems with the build, the QL is also
>>>>>>>>>>>>> passing on my machine.
>>>>>>>>>>>>>
>>>>>>>>>>>>> jerome
>>>>>>>>>>>>>
>>>>>>>>>>>>> On Apr 12, 2009, at 12:31 AM, Anissa Lam wrote:
>>>>>>>>>>>>>
>>>>>>>>>>>>>>
>>>>>>>>>>>>>> Hi,
>>>>>>>>>>>>>> I checked out a new workspace with the changes, and its
>>>>>>>>>>>>>> at revision 26101. The build failed.
>>>>>>>>>>>>>> I checked Hudson, it is red as well,
>>>>>>>>>>>>>> http://hudson.glassfish.org/job/gf-trunk-build-continuous/721/
>>>>>>>>>>>>>> showing the same error i am getting.
>>>>>>>>>>>>>>
>>>>>>>>>>>>>> Anissa.
>>>>>>>>>>>>>>
>>>>>>>>>>>>>>
>>>>>>>>>>>>>> Justin Lee wrote:
>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> The grizzly config changes are officially in svn now. I
>>>>>>>>>>>>>>> made some changes as requested by Jerome and those
>>>>>>>>>>>>>>> changes were approved by Dhiru, Abhijit, and Jan for the
>>>>>>>>>>>>>>> milestone 2 release. Again, with this commit, the admin
>>>>>>>>>>>>>>> GUI is broken until Anissa, et. al, can get it caught up
>>>>>>>>>>>>>>> with the rest of the system so until then, you'll need
>>>>>>>>>>>>>>> to use the CLI instead.
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> The commit log is below:
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> grizzly-config merge. grizzly 1.9.13 integration.
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> tests run: QL
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> File summary : 230 files affected in 1 modules.
>>>>>>>>>>>>>>> Modules affected : v3
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> Module [v3]:
>>>>>>>>>>>>>>> 20 Deleted files:
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/NetworkConfig.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyListenerConfigurator.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyServiceListener.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpServiceContainer.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ThreadPool.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/PortUnification.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Protocol.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Transport.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ProtocolFilter.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/NetworkListeners.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyEmbeddedHttp.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyEmbeddedHttps.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/NetworkListener.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ProtocolFinder.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Transports.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ProtocolChainInstanceHandler.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SelectionKeyHandler.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ProtocolChain.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Ssl.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Protocols.java
>>>>>>>>>>>>>>> 26098 deleted
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> 207 Modified files:
>>>>>>>>>>>>>>> common/common-util/src/test/resources/wrongorder.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCConnectionPoolManager.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JmxConnector.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admingui/core/src/main/java/org/glassfish/admingui/handlers/VirtualServerHandlers.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LoadBalancer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpListener.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/FilterConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AdminObjectResource.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConnectionPool.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/GroupManagementService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/J2eeApplication.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/org/glassfish/config/support/UpgradeService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ListenerConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalStrings.properties
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> jms/src/main/java/com/sun/enterprise/connectors/jms/system/ActiveJmsResourceAdapter.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/internal-api/src/main/java/org/glassfish/internal/data/ModuleInfo.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/StoreProperties.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> tests/quicklook/testng.xml 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GlassfishProtocolChain.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/RequestProcessing.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpListenerContainer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateProfiler.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConnectorModule.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/src/main/java/org/glassfish/web/admin/cli/LocalStrings.properties
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/realm/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DasConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/realm/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/realm/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/Ssl2EnabledTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/src/main/java/org/glassfish/web/admin/monitor/telemetry/ThreadPoolTelemetry.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DiagnosticService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-glue/src/main/java/com/sun/enterprise/web/PEAccessLogValve.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/CustomResource.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/resources/com/sun/enterprise/v3/admin/delete-ssl.1
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectCreationTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/server-mgmt/src/main/resources/lib/templates/domain.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/test/resources/DomainTest.xml 26098=>26101
>>>>>>>>>>>>>>> common/amx-api/src/main/java/com/sun/appserv/management/config/HTTPListenerConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Module.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/pom.xml 26098=>26101
>>>>>>>>>>>>>>> connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorConnectionPoolAdminServiceImpl.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateSsl.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/common-util/src/test/resources/adminport.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AccessLog.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/realm/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdminConsoleAdapter.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/pom.xml 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/MapperUpdateListener.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/IiopListener.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/realm/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Event.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/HttpService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/amx-api/src/main/java/com/sun/appserv/management/config/VirtualServerConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AvailabilityService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TransactionListenerTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SystemPropertyBag.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/realm/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Application.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ParentConfigListenerTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/MailResource.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> tests/quicklook/testng_gd.xml 26098=>26101
>>>>>>>>>>>>>>> connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/JdbcRecoveryResourceHandler.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IIOPSSLSocketFactory.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRuntime.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ParentTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConnectorResource.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectRemovalTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Mbean.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LbConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConnectorConnectionPool.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/EnabledTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/src/main/java/org/glassfish/web/admin/cli/CreateVirtualServer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TranslatedViewCreationTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-glue/src/main/java/com/sun/enterprise/web/BasePersistenceStrategyBuilder.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateAdminObject.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/common-util/src/main/java/com/sun/enterprise/universal/xml/MiniXmlParser.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JmsAvailability.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/common-util/src/test/resources/hasprofiler.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/EjbContainerAvailability.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/launcher/src/test/resources/domains/domain3/config/domain.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/AddPropertyTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorResource.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/EjbModule.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ExtensionModule.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/WebContainerAvailability.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IIOPUtils.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-glue/src/main/java/com/sun/enterprise/web/reconfig/HttpServiceConfigListener.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdminEndpointDecider.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/DynamicConfigListener.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> jms/src/main/java/com/sun/enterprise/connectors/jms/util/JmsRaUtil.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/CustomResourceDeployer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyProxy.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/MdbContainer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ModuleLogLevels.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/UnprocessedEventsTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SessionProperties.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JdbcConnectionPool.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Configs.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/PersistenceTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Engine.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AlertService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AuditModule.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ContainerMapper.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ConnectorsRecoveryResourceHandler.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AuthRealm.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/common-util/src/test/resources/rightorder.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/common-util/src/test/resources/noconfig.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/realm/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DuplicateKeyedElementTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SslClientConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/src/main/java/org/glassfish/web/admin/monitor/telemetry/HttpServiceTelemetryBootstrap.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Server.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ModulesTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Cluster.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> embedded/api/src/main/resources/org/glassfish/embed/domain.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateMessageSecurityProvider.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ProviderConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/realm/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/common-util/src/test/resources/adminport2.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-glue/src/main/java/com/sun/enterprise/web/TomcatDeploymentConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectAccessTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpListener.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JaccProvider.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecurityService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourceAdapterConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/VirtualServer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourceRef.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/common-util/pom.xml 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/WebModule.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpListenerTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/common-util/src/test/resources/nodomainname.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteSsl.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> tests/quicklook/testng_debug.xml 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/resources/DomainTest.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JdbcConnectionPoolDeployer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/src/main/java/org/glassfish/web/admin/cli/ListHttpListeners.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LifecycleModule.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/pom.xml 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/HttpListener.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/src/main/java/org/glassfish/web/admin/monitor/telemetry/WebTelemetryBootstrap.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCResourceManager.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/HttpFileCache.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AppclientModule.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/org/glassfish/config/support/GlassFishConfigBean.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/common-util/src/test/java/com/sun/enterprise/universal/xml/MiniXmlParserTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DefaultValueTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/KeepAlive.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Domain.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> distributions/nucleus-base/domains/domain1/config/domain.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/HttpProtocol.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-ajp/src/main/java/org/apache/jk/common/res/LocalStrings.properties
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/EjbTimerService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Profiler.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TransactionCallBackTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/launcher/src/test/resources/domains/baddomain/config/domain.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/GetElementTypeByNameTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteVirtualServer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/launcher/src/test/resources/domains/domain1/config/domain.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ExternalJndiResource.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java
>>>>>>>>>>>>>>> 26100=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/WebContainer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpServiceTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/resources/com/sun/enterprise/v3/admin/create-ssl.1
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-ajp/src/main/java/org/apache/jk/server/JkMain.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Config.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/DeploymentEventListenerImpl.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> common/internal-api/src/main/java/org/glassfish/internal/grizzly/V3Mapper.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> core/kernel/src/test/java/com/sun/enterprise/v3/admin/ConfigAttributeSetTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/PersistenceManagerFactoryResource.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/core/src/main/java/com/sun/enterprise/security/jmac/config/ConfigDomainParser.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> jdbc/admin/src/test/resources/DomainTest.xml 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/TransactionService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-glue/src/main/java/com/sun/enterprise/web/ServerConfigLookup.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JdbcResource.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/war-util/src/main/java/org/glassfish/web/loader/ServletContainerInitializerUtil.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/launcher/src/test/resources/domains/domain2/config/domain.xml
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> null/pom.xml 26100=>26101
>>>>>>>>>>>>>>> core/kernel/src/main/java/com/sun/enterprise/v3/server/AppServerStartup.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/NodeAgent.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ConfigListenerTest.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/web-core/src/main/java/com/sun/enterprise/web/connector/grizzly/GrizzlyConnectorLauncher.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JavaConfig.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> security/realm/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AdminService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/MonitoringService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ThreadPools.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> web/admin/src/main/resources/org/glassfish/web/admin/cli/create-virtual-server.1
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/util/S1ASThreadPoolManager.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JmsHost.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JmsService.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ModuleMonitoringLevels.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Orb.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ManagerProperties.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/EjbContainer.java
>>>>>>>>>>>>>>> 26098=>26101
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> 3 Added files:
>>>>>>>>>>>>>>> common/common-util/src/test/resources/olddomain.xml 26101
>>>>>>>>>>>>>>> admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/NetworkListenersContainer.java
>>>>>>>>>>>>>>> 26101
>>>>>>>>>>>>>>> admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java
>>>>>>>>>>>>>>> 26101
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> Committed at Apr 11, 2009 9:32:01 PM
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> Justin Lee wrote:
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> The merge is done but the commit is pending review
>>>>>>>>>>>>>>>> before I push it. The interfaces in question currently
>>>>>>>>>>>>>>>> live in the grizzly-config module in the grizzly tree
>>>>>>>>>>>>>>>> and lack any AMX reference.
>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Lloyd Chambers wrote:
>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>> Justin,
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>> That's the good news.
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>> The bad news is that I've been diverted to get JSR 77
>>>>>>>>>>>>>>>>> MEJB working.
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>> But it might already work as-is, or maybe with a
>>>>>>>>>>>>>>>>> minor effort—I’ll see. Has your new code gone in, and
>>>>>>>>>>>>>>>>> will the domain.xml structure reflect it?
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>> I'd suggest committing your @Configured interfaces
>>>>>>>>>>>>>>>>> without any AMX annotations. Then I can test it out.
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>> Lloyd
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>> On Apr 6, 2009, at 9:27 AM, Justin Lee wrote:
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>> Oh, that's fantastic news. It was causing me some
>>>>>>>>>>>>>>>>>> heartburn because if the grizzly-config needed AMX
>>>>>>>>>>>>>>>>>> beans, it'd have to live in the glassfish tree and
>>>>>>>>>>>>>>>>>> everyone seems to prefer that it live in grizzly.
>>>>>>>>>>>>>>>>>> Any ETA on that? I might get 100% green with that.
>>>>>>>>>>>>>>>>>> That would make my day.
>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>> Lloyd Chambers wrote:
>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>> Justin,
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>> The new version of AMX (not yet committed), won't
>>>>>>>>>>>>>>>>>>> require anything for AMX support, beyond the plain
>>>>>>>>>>>>>>>>>>> vanilla @Configured, so don't worry about it.
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>> Lloyd
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>> On Apr 5, 2009, at 7:16 PM, Justin Lee wrote:
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>> As promised here is diff/patch for the merge. All
>>>>>>>>>>>>>>>>>>>> the maven tests pass except for the admin GUI tests
>>>>>>>>>>>>>>>>>>>> which are expected and approved failures. The
>>>>>>>>>>>>>>>>>>>> admin GUI is busted with this merge until that team
>>>>>>>>>>>>>>>>>>>> can sync up with these changes (grizzly-config has
>>>>>>>>>>>>>>>>>>>> no AMX support). That's a known issue and has been
>>>>>>>>>>>>>>>>>>>> approved for the short term. This changes 220+
>>>>>>>>>>>>>>>>>>>> files so I'd encourage all the module owners to at
>>>>>>>>>>>>>>>>>>>> least scan through the changelist. Most of the
>>>>>>>>>>>>>>>>>>>> changes outside of config-api and the web tier
>>>>>>>>>>>>>>>>>>>> stuff is cosmetic and mostly are just package name
>>>>>>>>>>>>>>>>>>>> changes though some are tweaks to support the new
>>>>>>>>>>>>>>>>>>>> API. The drastic changes are in config-api and the
>>>>>>>>>>>>>>>>>>>> web code. Please look over this as soon as you can
>>>>>>>>>>>>>>>>>>>> as we'd like to get this merge in and thoroughly
>>>>>>>>>>>>>>>>>>>> validated before the build on the 20th.
>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>> If you have any questions, please don't hesitate to
>>>>>>>>>>>>>>>>>>>> ask. I'll
>>>>>>>>>>>>>>>>>>>> literally be waiting around for them.
>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>> Justin Lee wrote:
>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>> In the next day or two, I'll hopefully begin the
>>>>>>>>>>>>>>>>>>>>> merge process for the grizzly-config related
>>>>>>>>>>>>>>>>>>>>> changes (branches/v3-grizzly-config) as described
>>>>>>>>>>>>>>>>>>>>> here:
>>>>>>>>>>>>>>>>>>>>> http://wiki.glassfish.java.net/Wiki.jsp?page=GrizzlyConfigOnePager
>>>>>>>>>>>>>>>>>>>>> . The quick description is that the schema for
>>>>>>>>>>>>>>>>>>>>> domain.xml is changing a bit. The changes are
>>>>>>>>>>>>>>>>>>>>> almost completely webtier related. The new
>>>>>>>>>>>>>>>>>>>>> default domain.xml is attached for you to look
>>>>>>>>>>>>>>>>>>>>> over. For new installations, this update should
>>>>>>>>>>>>>>>>>>>>> be all but transparent. If, however, you have
>>>>>>>>>>>>>>>>>>>>> existing xml files that you'd like to continue
>>>>>>>>>>>>>>>>>>>>> using, I have written a migration utility that
>>>>>>>>>>>>>>>>>>>>> will update the file for you. This migrator uses
>>>>>>>>>>>>>>>>>>>>> the same mechanism to read/write as is used at
>>>>>>>>>>>>>>>>>>>>> runtime by the admin tools. By using this tool,
>>>>>>>>>>>>>>>>>>>>> any comments you have in the file will be lost as
>>>>>>>>>>>>>>>>>>>>> comments are not stored as part of the DOM in
>>>>>>>>>>>>>>>>>>>>> memory. So if those comments are important to
>>>>>>>>>>>>>>>>>>>>> you, you'll want to consider doing the migration
>>>>>>>>>>>>>>>>>>>>> manually. You can run the migrator with the
>>>>>>>>>>>>>>>>>>>>> following command in the v3/admin/config-api
>>>>>>>>>>>>>>>>>>>>> directory:
>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>> mvn exec:java -Dmaven.test.skip=true -Dfile=<path
>>>>>>>>>>>>>>>>>>>>> to your file>
>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>> This will migrate your file automatically. Make
>>>>>>>>>>>>>>>>>>>>> sure you back up this file before migrating just
>>>>>>>>>>>>>>>>>>>>> in case.
>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>> If you use the config-api interfaces, you'll
>>>>>>>>>>>>>>>>>>>>> notice that "old" interfaces are still there but
>>>>>>>>>>>>>>>>>>>>> deprecated. Interfaces like HttpListener are
>>>>>>>>>>>>>>>>>>>>> there for ease of migration but should not be used
>>>>>>>>>>>>>>>>>>>>> as they are no longer considered by the
>>>>>>>>>>>>>>>>>>>>> configuration subsystem.
>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>> At this moment, all the quicklook tests are green
>>>>>>>>>>>>>>>>>>>>> except for the GUI tests which return a series of
>>>>>>>>>>>>>>>>>>>>> 500 errors. The admin GUI will be likely broken
>>>>>>>>>>>>>>>>>>>>> by this merge until Anissa has time to get the GUI
>>>>>>>>>>>>>>>>>>>>> caught up with the schema changes. Existing admin
>>>>>>>>>>>>>>>>>>>>> CLI commands, however, will work with the existing
>>>>>>>>>>>>>>>>>>>>> schema. New commands will be coming online in the
>>>>>>>>>>>>>>>>>>>>> next short while, as well, for more targeted
>>>>>>>>>>>>>>>>>>>>> support for the new schema. So for now, any admin
>>>>>>>>>>>>>>>>>>>>> work will need to be done using the CLI or direct
>>>>>>>>>>>>>>>>>>>>> xml edits. Hopefully the GUI breakage won't last
>>>>>>>>>>>>>>>>>>>>> for long but conflicting work by the GUI team
>>>>>>>>>>>>>>>>>>>>> precluded making updates on the branch as best as
>>>>>>>>>>>>>>>>>>>>> I can tell.
>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>> I'll have diffs shortly for those interested in
>>>>>>>>>>>>>>>>>>>>> looking them over. I'm not sure who all needs to
>>>>>>>>>>>>>>>>>>>>> sign off on this merge so some guidance would be
>>>>>>>>>>>>>>>>>>>>> helpful. I'll do my best to answer any questions
>>>>>>>>>>>>>>>>>>>>> anyone might have.
>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>> ------------------------------------------------------------------------
>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>> ---------------------------------------------------------------------
>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>> To unsubscribe, e-mail:
>>>>>>>>>>>>>>>>>>>>> dev-unsubscribe_at_glassfish.dev.java.net
>>>>>>>>>>>>>>>>>>>>> For additional commands, e-mail:
>>>>>>>>>>>>>>>>>>>>> dev-help_at_glassfish.dev.java.net
>>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>> <grizzly_config_merge.patch.zip>---------------------------------------------------------------------
>>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>> To unsubscribe, e-mail:
>>>>>>>>>>>>>>>>>>>> dev-unsubscribe_at_glassfish.dev.java.net
>>>>>>>>>>>>>>>>>>>> For additional commands, e-mail:
>>>>>>>>>>>>>>>>>>>> dev-help_at_glassfish.dev.java.net
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>> Lloyd Chambers
>>>>>>>>>>>>>>>>>>> lloyd.chambers_at_sun.com
>>>>>>>>>>>>>>>>>>> GlassFish Team
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>> ---------------------------------------------------------------------
>>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>> 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
>>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>> Lloyd Chambers
>>>>>>>>>>>>>>>>> lloyd.chambers_at_sun.com
>>>>>>>>>>>>>>>>> GlassFish Team
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>> ---------------------------------------------------------------------
>>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>> 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
>>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> ---------------------------------------------------------------------
>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>> 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
>>>>>>>>>>>>>>
>>>>>>>>>>>>>
>>>>>>>>>>>>>
>>>>>>>>>>>>> ---------------------------------------------------------------------
>>>>>>>>>>>>>
>>>>>>>>>>>>> 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
>>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> ---------------------------------------------------------------------
>>>>>>>>>>>
>>>>>>>>>>> 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
>>>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> ---------------------------------------------------------------------
>>>>>>>>>
>>>>>>>>> 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
>>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> ---------------------------------------------------------------------
>>>>>>>
>>>>>>> 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
>>>>>>
>>>>>
>>>>>
>>>>> ---------------------------------------------------------------------
>>>>> 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
>>>>
>>>
>>>
>>> ---------------------------------------------------------------------
>>> 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
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>