geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r169154 [1/6] - in /geronimo/trunk: applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/ applications/jmxdebug/src/webapp/WEB-INF/ assemblies/j2ee-server/ etc/ modules/assembly/ modules/assembly/src/plan/ modules/axis-builder/ modules/axis/ modules/classloader-server/ modules/classloader-server/src/test/org/apache/geronimo/classloaderserver/http/ modules/client-builder/ modules/client-builder/src/java/org/apache/geronimo/client/builder/ modules/client-builder/src/test/org/apache/geronimo/client/builder/ modules/client/ modules/connector-builder/ modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ modules/connector/ modules/connector/src/java/org/apache/geronimo/connector/ modules/connector/src/java/org/apache/geronimo/connector/outbound/ modules/connector/src/test/org/apache/geronimo/connector/ modules/connector/src/test/org/apache/geronimo/connector/outbound/ modules/deploy-tool/src/java/org/apache/geronimo/deployment/ modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/ modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/ modules/deployment/ modules/deployment/src/java/org/apache/geronimo/deployment/ modules/deployment/src/java/org/apache/geronimo/deployment/util/ modules/interop/ modules/interop/src/test/org/apache/geronimo/interop/ modules/j2ee-builder/ modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/ modules/j2ee/ modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/ modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ modules/jetty-builder/ modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/ modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/ modules/jetty/ modules/jetty/src/test/org/apache/geronimo/jetty/ modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/ modules/kernel/ modules/kernel/src/java/org/apache/geronimo/gbean/jmx/ modules/kernel/src/java/org/apache/geronimo/gbean/runtime/ modules/kernel/src/java/org/apache/geronimo/kernel/ modules/kernel/src/java/org/apache/geronimo/kernel/basic/ modules/kernel/src/java/org/apache/geronimo/kernel/config/ modules/kernel/src/java/org/apache/geronimo/kernel/jmx/ modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/ modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ modules/kernel/src/java/org/apache/geronimo/kernel/registry/ modules/kernel/src/test/org/apache/geronimo/gbean/ modules/kernel/src/test/org/apache/geronimo/gbean/runtime/ modules/kernel/src/test/org/apache/geronimo/kernel/ modules/mail/ modules/mail/src/java/org/apache/geronimo/mail/ modules/mail/src/test/org/apache/geronimo/mail/ modules/naming/src/java/org/apache/geronimo/naming/reference/ modules/naming/src/test/org/apache/geronimo/naming/java/ modules/security/ modules/security/src/java/org/apache/geronimo/security/jaas/ modules/security/src/java/org/apache/geronimo/security/realm/ modules/security/src/java/org/apache/geronimo/security/realm/providers/ modules/security/src/test/org/apache/geronimo/security/ modules/security/src/test/org/apache/geronimo/security/jaas/ modules/security/src/test/org/apache/geronimo/security/remoting/jmx/ modules/service-builder/ modules/service-builder/src/java/org/apache/geronimo/deployment/service/ modules/spring-builder/ modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/ modules/spring/ modules/spring/src/java/org/apache/geronimo/spring/ modules/system/ modules/system/src/java/org/apache/geronimo/system/configuration/ modules/system/src/java/org/apache/geronimo/system/jmx/ modules/system/src/java/org/apache/geronimo/system/main/ modules/system/src/test/org/apache/geronimo/system/configuration/ modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/ modules/tomcat-builder/ modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/ modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/ modules/tomcat/ modules/tomcat/src/plan/ modules/tomcat/src/test/org/apache/geronimo/tomcat/ modules/webservices/ plugins/geronimo-packaging-plugin/ plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ plugins/maven-geronimo-plugin/ plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/
Date Sun, 08 May 2005 19:35:28 GMT
Author: dain
Date: Sun May  8 12:35:23 2005
New Revision: 169154

URL: http://svn.apache.org/viewcvs?rev=169154&view=rev
Log:
Added KernelFactory for pluggable kernel
Kernel is now an interface
Moved Kernel implementation  to basic kernel
Converted JMX registry and config manager to plain old gbeans (they do not require special access to the kernel)
Magic attributes such as state and enabled are now accessed via kernel methods
Use of getAttribute and invoke for magic attributes and state transition is now deprecated
Cleaned up cruft in GBean infos such as declaration of non existent attributes
Upgraded to newest CGLIB, asm, and commons-collections

Added:
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelFactory.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelFactoryError.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelRegistry.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicDependencyManager.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicKernel.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicKernelFactory.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicLifecycleMonitor.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/KernelGetAttributeInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/KernelOperationInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/KernelSetAttributeInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/LifecycleMonitorFlyweight.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/ProxyInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/ProxyMethodInterceptor.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/RawGetAttributeInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/RawOperationInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/RawSetAttributeInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationData.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXProxyManager.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXProxyMethodInterceptor.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/ExecutableConfigurationUtil.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/jmx/
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanServerNotFound.java
Removed:
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Version.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/GBeanMBean.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGBeanRegistry.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXLifecycleBroadcaster.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelMBean.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/BasicLifecycleMonitor.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitorFlyweight.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/KernelGetAttributeInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/KernelOperationInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/KernelSetAttributeInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyMethodInterceptor.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/RawGetAttributeInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/RawOperationInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/RawSetAttributeInvoker.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/AbstractGBeanRegistry.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/BasicGBeanRegistry.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/GBeanRegistry.java
Modified:
    geronimo/trunk/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/GBeanInfoHelper.java
    geronimo/trunk/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/KernelHelper.java
    geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml
    geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-tomcat.xml
    geronimo/trunk/assemblies/j2ee-server/project.xml
    geronimo/trunk/etc/project.properties
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
    geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
    geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-plan.xml
    geronimo/trunk/modules/axis-builder/project.xml
    geronimo/trunk/modules/axis/project.xml
    geronimo/trunk/modules/classloader-server/project.xml
    geronimo/trunk/modules/classloader-server/src/test/org/apache/geronimo/classloaderserver/http/HTTPClassLoaderServerTest.java
    geronimo/trunk/modules/client-builder/project.xml
    geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/AppClientBuilderTest.java
    geronimo/trunk/modules/client/project.xml
    geronimo/trunk/modules/connector-builder/project.xml
    geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/trunk/modules/connector/project.xml
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ConnectorMethodInterceptor.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterImpl.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/Bootstrap.java
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
    geronimo/trunk/modules/deployment/project.xml
    geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
    geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
    geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
    geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentUtil.java
    geronimo/trunk/modules/interop/project.xml
    geronimo/trunk/modules/interop/src/test/org/apache/geronimo/interop/InteropGBeanTest.java
    geronimo/trunk/modules/j2ee-builder/project.xml
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
    geronimo/trunk/modules/j2ee/project.xml
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEAppClientModuleImpl.java
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/Util.java
    geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java
    geronimo/trunk/modules/jetty-builder/project.xml
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/trunk/modules/jetty/project.xml
    geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
    geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ContainerTest.java
    geronimo/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
    geronimo/trunk/modules/kernel/project.xml
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanCollectionReference.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/ClassLoaderReference.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/ClassLoading.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/DependencyManager.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelGBean.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationStore.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelDelegate.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyFactory.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/BootstrapTest.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/ConfigTest.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/MockEndpoint.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/MockGBean.java
    geronimo/trunk/modules/mail/project.xml
    geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java
    geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java
    geronimo/trunk/modules/mail/src/test/org/apache/geronimo/mail/MailGBeanTest.java
    geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/reference/KernelReference.java
    geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/reference/SimpleAwareReference.java
    geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java
    geronimo/trunk/modules/security/project.xml
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginCoordinator.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
    geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
    geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
    geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
    geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
    geronimo/trunk/modules/service-builder/project.xml
    geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
    geronimo/trunk/modules/spring-builder/project.xml
    geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java
    geronimo/trunk/modules/spring/project.xml
    geronimo/trunk/modules/spring/src/java/org/apache/geronimo/spring/POJOGBean.java
    geronimo/trunk/modules/spring/src/java/org/apache/geronimo/spring/SpringApplicationImpl.java
    geronimo/trunk/modules/system/project.xml
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/CommandLine.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
    geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalConfigStoreTest.java
    geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/DDBeanImpl.java
    geronimo/trunk/modules/tomcat-builder/project.xml
    geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/trunk/modules/tomcat/project.xml
    geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml
    geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/trunk/modules/webservices/project.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
    geronimo/trunk/plugins/maven-geronimo-plugin/project.xml
    geronimo/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java
    geronimo/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StopRemoteServer.java
    geronimo/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StopServer.java
    geronimo/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/WaitForStarted.java

Modified: geronimo/trunk/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/GBeanInfoHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/GBeanInfoHelper.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/GBeanInfoHelper.java (original)
+++ geronimo/trunk/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/GBeanInfoHelper.java Sun May  8 12:35:23 2005
@@ -67,7 +67,7 @@
 
     public String getState() {
         try {
-            return State.toString(((Integer)kernel.getAttribute(objectName, "state")).intValue());
+            return State.toString(kernel.getGBeanState(objectName));
         } catch (Exception e) {
             return ("Could not get state: " + e.getMessage());
         }

Modified: geronimo/trunk/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/KernelHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/KernelHelper.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/KernelHelper.java (original)
+++ geronimo/trunk/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/beanlib/KernelHelper.java Sun May  8 12:35:23 2005
@@ -26,6 +26,7 @@
 import javax.management.ObjectName;
 
 import org.apache.geronimo.jmxdebug.util.ObjectNameComparator;
+import org.apache.geronimo.kernel.KernelRegistry;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.management.State;
 
@@ -38,7 +39,7 @@
     private final Kernel kernel;
 
     public KernelHelper() {
-        kernel = Kernel.getSingleKernel();
+        kernel = KernelRegistry.getSingleKernel();
     }
 
     public Kernel getKernel() {
@@ -87,8 +88,7 @@
 
     public String getState(ObjectName name) {
         try {
-            int state = ((Integer) kernel.getAttribute(name, "state")).intValue();
-            return State.toString(state);
+            return State.toString(kernel.getGBeanState(name));
         } catch (Exception e) {
             return null;
         }

Modified: geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml (original)
+++ geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml Sun May  8 12:35:23 2005
@@ -6,9 +6,9 @@
     >
 
     <dependency>
-        <uri>commons-collections/jars/commons-collections-2.1.jar</uri>
+        <uri>commons-collections/jars/commons-collections-3.1.jar</uri>
     </dependency>
-    
+
     <context-root>/debug-tool</context-root>
     <context-priority-classloader>false</context-priority-classloader>
 </web-app>

Modified: geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-tomcat.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-tomcat.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-tomcat.xml (original)
+++ geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-tomcat.xml Sun May  8 12:35:23 2005
@@ -6,7 +6,7 @@
     >
 
     <dependency>
-        <uri>commons-collections/jars/commons-collections-2.1.jar</uri>
+        <uri>commons-collections/jars/commons-collections-3.1.jar</uri>
     </dependency>
     
     <context-root>/debug-tool</context-root>

Modified: geronimo/trunk/assemblies/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/project.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/project.xml Sun May  8 12:35:23 2005
@@ -699,7 +699,7 @@
         </dependency>
         <dependency>
             <groupId>springframework</groupId>
-            <artifactId>${spring_artifact}</artifactId>
+            <artifactId>spring</artifactId>
             <version>${spring_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Sun May  8 12:35:23 2005
@@ -98,17 +98,17 @@
 activemq_jetty_version=4.2.20RC0
 ant_version=1.5
 antlr_version=2.7.2
+asm_version=1.4.3
 axion_version=1.0-M3-dev
 axis_version=1.2.1-SNAPSHOT
 avalon_framework_version=4.1.4
 avalon_logkit_version=1.2.2
 bouncycastle_version=jdk14-124
-cglib_version=2.0.2
-cglib_full_version=2.0 <!-- ActiveMQ -->
+cglib_version=2.1
 castor_version=0.9.5.3
 commons_beanutils_version=1.6.1
 commons_cli_version=1.0
-commons_collections_version=2.1
+commons_collections_version=3.1
 commons_dbcp_version=1.2
 commons_digester_version=1.6
 commons_discovery_version=SNAPSHOT
@@ -152,7 +152,6 @@
 p2psockets_version=1.1.2
 regexp_version=1.3
 scout_version=1.0-SNAPSHOT
-spring_artifact=spring
 spring_version=1.1.3
 stax_version=1.1.1-dev
 stax_api_version=1.0

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Sun May  8 12:35:23 2005
@@ -456,6 +456,15 @@
         </dependency>
 
         <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
             <version>${ant_version}</version>
@@ -562,7 +571,7 @@
 
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
+            <artifactId>cglib-nodep</artifactId>
             <version>${cglib_version}</version>
             <url>http://cglib.sf.net/</url>
             <properties>
@@ -1180,7 +1189,7 @@
         </dependency>
         <dependency>
             <groupId>springframework</groupId>
-            <artifactId>${spring_artifact}</artifactId>
+            <artifactId>spring</artifactId>
             <version>${spring_version}</version>
             <properties>
                 <repository>true</repository>

Modified: geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml Sun May  8 12:35:23 2005
@@ -45,6 +45,11 @@
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
     </gbean>
 
+    <!-- Configuration Manager service -->
+    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl">
+        <reference name="Stores"><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></reference>
+    </gbean>
+
     <!-- Repository -->
     <gbean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">
         <attribute name="root">repository/</attribute>

Modified: geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml Sun May  8 12:35:23 2005
@@ -38,6 +38,10 @@
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
     </gbean>
 
+    <!-- Configuration Manager service -->
+    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl">
+        <reference name="Stores"><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></reference>
+    </gbean>
 
     <!-- Repository -->
     <gbean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml Sun May  8 12:35:23 2005
@@ -73,6 +73,10 @@
 
     <!--client side web services-->
     <dependency>
+        <uri>asm/jars/asm-${asm_version}.jar</uri>
+    </dependency>
+
+    <dependency>
         <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
     </dependency>
 

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Sun May  8 12:35:23 2005
@@ -119,6 +119,9 @@
          <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
+        <uri>asm/jars/asm-${asm_version}.jar</uri>
+    </dependency>
+    <dependency>
          <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Sun May  8 12:35:23 2005
@@ -61,6 +61,9 @@
         <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
     </dependency>
     <dependency>
+        <uri>asm/jars/asm-${asm_version}.jar</uri>
+    </dependency>
+    <dependency>
         <uri>geronimo/jars/geronimo-axis-builder-${geronimo_version}.jar</uri>
     </dependency>
 

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Sun May  8 12:35:23 2005
@@ -108,6 +108,10 @@
     </dependency>
 
     <dependency>
+        <uri>asm/jars/asm-${asm_version}.jar</uri>
+    </dependency>
+
+    <dependency>
          <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
     </dependency>
 
@@ -284,7 +288,7 @@
 
     <!-- JMX Remoting -->
     <gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
-        <attribute name="URL">service:jmx:rmi://localhost/jndi/rmi:/JMXConnector</attribute>
+        <attribute name="url">service:jmx:rmi://localhost/jndi/rmi:/JMXConnector</attribute>
         <attribute name="applicationConfigName">JMX</attribute>
     </gbean>
 

Modified: geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml Sun May  8 12:35:23 2005
@@ -25,7 +25,7 @@
   >
 
   <dependency>
-    <uri>springframework/jars/${spring_artifact}-${spring_version}.jar</uri><!-- lose later -->
+    <uri>springframework/jars/spring-${spring_version}.jar</uri><!-- lose later -->
   </dependency>
   <dependency>
     <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>

Modified: geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml Sun May  8 12:35:23 2005
@@ -25,7 +25,7 @@
   >
 
   <dependency>
-    <uri>springframework/jars/${spring_artifact}-${spring_version}.jar</uri>
+    <uri>springframework/jars/spring-${spring_version}.jar</uri>
   </dependency>
   <dependency>
     <uri>geronimo/jars/geronimo-spring-${geronimo_version}.jar</uri>

Modified: geronimo/trunk/modules/assembly/src/plan/system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-plan.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-plan.xml Sun May  8 12:35:23 2005
@@ -45,6 +45,11 @@
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
     </gbean>
 
+    <!-- Configuration Manager service -->
+    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl">
+        <reference name="Stores"><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></reference>
+    </gbean>
+
     <!-- Persistent List of running Configurations service -->
     <gbean name="Default" class="org.apache.geronimo.system.configuration.FileConfigurationList">
         <reference name="ServerInfo"><name>ServerInfo</name></reference>

Modified: geronimo/trunk/modules/axis-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/project.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/project.xml (original)
+++ geronimo/trunk/modules/axis-builder/project.xml Sun May  8 12:35:23 2005
@@ -193,7 +193,7 @@
 
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
+            <artifactId>cglib-nodep</artifactId>
             <version>${cglib_version}</version>
             <url>http://cglib.sf.net/</url>
         </dependency>
@@ -216,6 +216,12 @@
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
             <version>${mx4j_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm_version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/axis/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/project.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/project.xml (original)
+++ geronimo/trunk/modules/axis/project.xml Sun May  8 12:35:23 2005
@@ -80,6 +80,12 @@
         </dependency>
 
         <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm_version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>axis</groupId>
             <artifactId>axis</artifactId>
             <version>${axis_version}</version>
@@ -93,7 +99,7 @@
 
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
+            <artifactId>cglib-nodep</artifactId>
             <version>${cglib_version}</version>
             <url>http://cglib.sf.net/</url>
         </dependency>

Modified: geronimo/trunk/modules/classloader-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/classloader-server/project.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/classloader-server/project.xml (original)
+++ geronimo/trunk/modules/classloader-server/project.xml Sun May  8 12:35:23 2005
@@ -93,7 +93,7 @@
 
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
+            <artifactId>cglib-nodep</artifactId>
             <version>${cglib_version}</version>
             <url>http://cglib.sf.net/</url>
         </dependency>

Modified: geronimo/trunk/modules/classloader-server/src/test/org/apache/geronimo/classloaderserver/http/HTTPClassLoaderServerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/classloader-server/src/test/org/apache/geronimo/classloaderserver/http/HTTPClassLoaderServerTest.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/classloader-server/src/test/org/apache/geronimo/classloaderserver/http/HTTPClassLoaderServerTest.java (original)
+++ geronimo/trunk/modules/classloader-server/src/test/org/apache/geronimo/classloaderserver/http/HTTPClassLoaderServerTest.java Sun May  8 12:35:23 2005
@@ -32,8 +32,8 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.jetty.JettyContainerImpl;
 import org.apache.geronimo.jetty.connector.HTTPConnector;
+import org.apache.geronimo.kernel.KernelFactory;
 import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.registry.BasicGBeanRegistry;
 
 
 /**
@@ -85,7 +85,7 @@
         connectorName = new ObjectName("geronimo.jetty:role=Connector");
         Set connectorPatterns = new HashSet();
         connectorPatterns.add(connectorName);
-        kernel = new Kernel("test.kernel", new BasicGBeanRegistry());
+        kernel = KernelFactory.newInstance().createKernel("test.kernel");
         kernel.boot();
         GBeanData container = new GBeanData(containerName, JettyContainerImpl.GBEAN_INFO);
         start(container);

Modified: geronimo/trunk/modules/client-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/project.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/project.xml (original)
+++ geronimo/trunk/modules/client-builder/project.xml Sun May  8 12:35:23 2005
@@ -177,7 +177,7 @@
 
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
+            <artifactId>cglib-nodep</artifactId>
             <version>${cglib_version}</version>
             <url>http://cglib.sf.net/</url>
         </dependency>

Modified: geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Sun May  8 12:35:23 2005
@@ -61,6 +61,7 @@
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
 import org.apache.geronimo.schema.SchemaConversionUtils;
@@ -272,7 +273,7 @@
         // application clients do not add anything to the shared context
     }
 
-    public String addGBeans(EARContext earContext, Module module, ClassLoader earClassLoader) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module module, ClassLoader earClassLoader) throws DeploymentException {
         J2eeContext earJ2eeContext = earContext.getJ2eeContext();
 
         AppClientModule appClientModule = (AppClientModule) module;
@@ -327,10 +328,11 @@
 
         // create another child configuration within the config store for the client application
         EARContext appClientDeploymentContext = null;
-        File appClientConfiguration = null;
+        File appClientDir = null;
+        ConfigurationData appClientConfigurationData = null;
         try {
             try {
-                appClientConfiguration = store.createNewConfigurationDir();
+                appClientDir = store.createNewConfigurationDir();
 
                 // construct the app client deployment context... this is the same class used by the ear context
                 try {
@@ -342,7 +344,7 @@
                     } else {
                         clientParentId = defaultClientParentId;
                     }
-                    appClientDeploymentContext = new EARContext(appClientConfiguration,
+                    appClientDeploymentContext = new EARContext(appClientDir,
                             clientConfigId,
                             ConfigurationModuleType.APP_CLIENT,
                             clientParentId,
@@ -476,6 +478,9 @@
                     throw new DeploymentException("Unable to initialize AppClientModule GBean", e);
                 }
                 appClientDeploymentContext.addGBean(appClientContainerGBeanData);
+
+                // get the configuration data
+                appClientConfigurationData = appClientDeploymentContext.getConfigurationData();
             } finally {
                 if (appClientDeploymentContext != null) {
                     try {
@@ -486,12 +491,14 @@
             }
 
             try {
-                return store.install(appClientConfiguration).toString();
+                // todo this should be handled in the Deployer class
+                store.install(appClientDeploymentContext.getConfigurationData(), appClientDir);
             } catch (Exception e) {
                 throw new DeploymentException(e);
             }
+            earContext.addChildConfiguration(appClientConfigurationData);
         } catch (Throwable e) {
-            DeploymentUtil.recursiveDelete(appClientConfiguration);
+            DeploymentUtil.recursiveDelete(appClientDir);
             if (e instanceof Error) {
                 throw (Error) e;
             } else if (e instanceof DeploymentException) {

Modified: geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/AppClientBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/AppClientBuilderTest.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/AppClientBuilderTest.java (original)
+++ geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/AppClientBuilderTest.java Sun May  8 12:35:23 2005
@@ -3,18 +3,19 @@
 import javax.management.ObjectName;
 
 import junit.framework.TestCase;
+import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.kernel.KernelFactory;
 
 /**
  */
 public class AppClientBuilderTest extends TestCase {
 
     public void testAppClientGBean() throws Exception {
-        Kernel kernel = new Kernel("testDomain");
+        Kernel kernel = KernelFactory.newInstance().createKernel("testDomain");
         kernel.boot();
-        GBeanMBean gbean = new GBeanMBean(AppClientModuleBuilder.class.getName(), AppClientModuleBuilder.class.getClassLoader());
-        kernel.loadGBean(new ObjectName("testDomain:test=test"), gbean);
 
+        GBeanData gbeanData = new GBeanData(new ObjectName("testDomain:test=test"), AppClientModuleBuilder.GBEAN_INFO);
+        kernel.loadGBean(gbeanData, AppClientModuleBuilder.class.getClassLoader());
     }
 }

Modified: geronimo/trunk/modules/client/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client/project.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/client/project.xml (original)
+++ geronimo/trunk/modules/client/project.xml Sun May  8 12:35:23 2005
@@ -100,7 +100,7 @@
 
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
+            <artifactId>cglib-nodep</artifactId>
             <version>${cglib_version}</version>
             <url>http://cglib.sf.net/</url>
         </dependency>

Modified: geronimo/trunk/modules/connector-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/project.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/project.xml (original)
+++ geronimo/trunk/modules/connector-builder/project.xml Sun May  8 12:35:23 2005
@@ -179,7 +179,7 @@
 
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
+            <artifactId>cglib-nodep</artifactId>
             <version>${cglib_version}</version>
             <url>http://cglib.sf.net/</url>
         </dependency>

Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Sun May  8 12:35:23 2005
@@ -362,7 +362,7 @@
 
     }
 
-    public String addGBeans(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
         J2eeContext earJ2eeContext = earContext.getJ2eeContext();
         J2eeContext moduleJ2eeContext = J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext, NameFactory.RESOURCE_ADAPTER_MODULE, module.getName());
         J2eeContext resourceJ2eeContext = J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext, NameFactory.JCA_RESOURCE, module.getName());
@@ -409,8 +409,6 @@
         ServiceConfigBuilder.addGBeans(gbeans, cl, moduleJ2eeContext, earContext);
 
         addConnectorGBeans(earContext, resourceJ2eeContext, resourceAdapterModuleName, (ConnectorType) specDD, geronimoConnector, cl);
-
-        return null;
     }
 
     private void addConnectorGBeans(EARContext earContext, J2eeContext moduleJ2eeContext, ObjectName resourceAdapterModuleObjectName, ConnectorType connector, GerConnectorType geronimoConnector, ClassLoader cl) throws DeploymentException {
@@ -720,7 +718,7 @@
             throw new DeploymentException("Unexpected pooling support element");
         }
         try {
-            connectionManagerGBean.setAttribute("name", connectionfactoryInstance.getName());
+//            connectionManagerGBean.setAttribute("name", connectionfactoryInstance.getName());
             connectionManagerGBean.setAttribute("transactionSupport", transactionSupport);
             connectionManagerGBean.setAttribute("pooling", pooling);
             connectionManagerGBean.setReferencePattern("ConnectionTracker", earContext.getConnectionTrackerObjectName());

Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Sun May  8 12:35:23 2005
@@ -17,13 +17,9 @@
 
 package org.apache.geronimo.connector.deployment;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -39,9 +35,9 @@
 import java.util.jar.JarFile;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
+import javax.naming.Reference;
 import javax.sql.DataSource;
 import javax.xml.namespace.QName;
-import javax.naming.Reference;
 
 import junit.framework.TestCase;
 import org.apache.geronimo.common.DeploymentException;
@@ -53,25 +49,29 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.EJBReferenceBuilder;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
 import org.apache.geronimo.j2ee.deployment.RefContext;
-import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
-import org.apache.geronimo.j2ee.deployment.EJBReferenceBuilder;
 import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
+import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelFactory;
+import org.apache.geronimo.kernel.config.ConfigurationManagerImpl;
 import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.kernel.registry.BasicGBeanRegistry;
 import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.tranql.sql.jdbc.JDBCUtil;
 
@@ -153,12 +153,13 @@
                                             return null;
                                         }
                                     };
+    private ObjectName configurationManagerName;
 
 
     public void testBuildEar() throws Exception {
         ObjectName connectionTrackerName = new ObjectName("geronimo.connector:service=ConnectionTracker");
         JarFile rarFile = null;
-        Kernel kernel = new Kernel("foo", new BasicGBeanRegistry());
+        Kernel kernel = KernelFactory.newInstance().createKernel("foo");
         try {
             kernel.boot();
 
@@ -166,6 +167,11 @@
             kernel.loadGBean(store, this.getClass().getClassLoader());
             kernel.startGBean(store.getName());
 
+            GBeanData configurationManagerData = new GBeanData(configurationManagerName, ConfigurationManagerImpl.GBEAN_INFO);
+            configurationManagerData.setReferencePatterns("Stores", Collections.singleton(store.getName()));
+            kernel.loadGBean(configurationManagerData, getClass().getClassLoader());
+            kernel.startGBean(configurationManagerName);
+
             rarFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear-noger.ear"));
             EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId, null, connectionTrackerName, null, null, null, null, null, ejbReferenceBuilder, null, new ConnectorModuleBuilder(defaultParentId, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, repository, kernel), resourceReferenceBuilder, null, serviceReferenceBuilder, kernel);
             File tempDir = null;
@@ -296,13 +302,19 @@
         ObjectName connectionTrackerName = NameFactory.getComponentName(null, null, null, null, "ConnectionTracker", ConnectionTrackingCoordinator.GBEAN_INFO.getJ2eeType(), j2eeContext);
                 //new ObjectName("test:J2EEServer=bar,J2EEModule=org/apache/geronimo/j2ee/deployment/test,service=ConnectionTracker");
 
-        Kernel kernel = new Kernel("foo", new BasicGBeanRegistry());
+        Kernel kernel = KernelFactory.newInstance().createKernel("foo");
         try {
             kernel.boot();
 
             GBeanData store = new GBeanData(JMXUtil.getObjectName("foo:j2eeType=ConfigurationStore,name=mock"), MockConfigStore.GBEAN_INFO);
             kernel.loadGBean(store, this.getClass().getClassLoader());
             kernel.startGBean(store.getName());
+
+            GBeanData configurationManagerData = new GBeanData(configurationManagerName, ConfigurationManagerImpl.GBEAN_INFO);
+            configurationManagerData.setReferencePatterns("Stores", Collections.singleton(store.getName()));
+            kernel.loadGBean(configurationManagerData, getClass().getClassLoader());
+            kernel.startGBean(configurationManagerName);
+
             ConnectorModuleBuilder moduleBuilder = new ConnectorModuleBuilder(defaultParentId, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, repository, kernel);
             File rarFile = action.getRARFile();
 
@@ -341,7 +353,7 @@
                 moduleBuilder.addGBeans(earContext, module, cl);
                 earContext.close();
 
-                verifyDeployment(tempDir, oldCl, j2eeContext, resourceAdapterName, is15);
+                verifyDeployment(earContext.getConfigurationData(), tempDir, oldCl, j2eeContext, resourceAdapterName, is15);
             } finally {
                 module.close();
                 DeploymentUtil.recursiveDelete(tempDir);
@@ -351,23 +363,29 @@
         }
     }
 
-    private void verifyDeployment(File unpackedDir, ClassLoader cl, J2eeContext j2eeContext, String resourceAdapterName, boolean is15) throws Exception {
+    private void verifyDeployment(ConfigurationData configurationData, File unpackedDir, ClassLoader cl, J2eeContext j2eeContext, String resourceAdapterName, boolean is15) throws Exception {
         DataSource ds = null;
         Kernel kernel = null;
         try {
-            GBeanData config = loadConfig(unpackedDir);
+            GBeanData config = ExecutableConfigurationUtil.getConfigurationGBeanData(configurationData);
             ObjectName objectName = ObjectName.getInstance("test:configuration=test-ejb-jar");
             config.setName(objectName);
 
-            kernel = new Kernel("bar", new BasicGBeanRegistry());
+            kernel = KernelFactory.newInstance().createKernel("bar");
             kernel.boot();
+
             GBeanData store = new GBeanData(JMXUtil.getObjectName("foo:j2eeType=ConfigurationStore,name=mock"), MockConfigStore.GBEAN_INFO);
             kernel.loadGBean(store, this.getClass().getClassLoader());
             kernel.startGBean(store.getName());
 
-            GBeanData baseConfig = (GBeanData) kernel.invoke(store.getName(), "getConfiguration", new Object[]{defaultParentId}, new String[]{URI.class.getName()});
-            kernel.loadGBean(baseConfig, this.getClass().getClassLoader());
-            kernel.startGBean(baseConfig.getName());
+            GBeanData configurationManagerData = new GBeanData(configurationManagerName, ConfigurationManagerImpl.GBEAN_INFO);
+            configurationManagerData.setReferencePatterns("Stores", Collections.singleton(store.getName()));
+            kernel.loadGBean(configurationManagerData, getClass().getClassLoader());
+            kernel.startGBean(configurationManagerName);
+            ConfigurationManager configurationManager = (ConfigurationManager) kernel.getProxyManager().createProxy(configurationManagerName, ConfigurationManager.class);
+
+            ObjectName baseConfigName = configurationManager.load(defaultParentId);
+            kernel.startGBean(baseConfigName);
 
             ObjectName serverInfoObjectName = ObjectName.getInstance(j2eeContext.getJ2eeDomainName() + ":name=ServerInfo");
             GBeanData serverInfoGBean = new GBeanData(serverInfoObjectName, ServerInfo.GBEAN_INFO);
@@ -392,7 +410,7 @@
             Set gb = kernel.listGBeans(JMXUtil.getObjectName("test:*"));
             for (Iterator iterator = gb.iterator(); iterator.hasNext();) {
                 ObjectName name = (ObjectName) iterator.next();
-                if (State.RUNNING_INDEX != ((Integer) kernel.getAttribute(name, "state")).intValue()) {
+                if (State.RUNNING_INDEX != kernel.getGBeanState(name)) {
                     System.out.println("Not running: " + name);
                 }
             }
@@ -524,23 +542,11 @@
     }
 
     private void assertRunning(Kernel kernel, ObjectName objectName) throws Exception {
-        int state = ((Integer) kernel.getAttribute(objectName, "state")).intValue();
-        assertEquals(State.RUNNING_INDEX, state);
-    }
-
-    private GBeanData loadConfig(File unpackedCar) throws Exception {
-        InputStream in = new FileInputStream(new File(unpackedCar, "META-INF/config.ser"));
-        try {
-            ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(in));
-            GBeanData config = new GBeanData();
-            config.readExternal(ois);
-            return config;
-        } finally {
-            in.close();
-        }
+        assertEquals(State.RUNNING_INDEX, kernel.getGBeanState(objectName));
     }
 
     protected void setUp() throws Exception {
+        configurationManagerName = new ObjectName(":j2eeType=ConfigurationManager,name=Basic");
         defaultParentId = new URI("org/apache/geronimo/Server");
     }
 
@@ -561,42 +567,50 @@
     }
 
     public static class MockConfigStore implements ConfigurationStore {
-        public URI install(URL source) throws IOException, InvalidConfigException {
-            return null;
+        private final Kernel kernel;
+
+        public MockConfigStore(Kernel kernel) {
+            this.kernel = kernel;
         }
 
-        public URI install(File source) throws IOException, InvalidConfigException {
+        public URI install(URL source) throws IOException, InvalidConfigException {
             return null;
         }
 
-        public void uninstall(URI configID) throws NoSuchConfigException, IOException {
-
+        public void install(ConfigurationData configurationData, File source) throws IOException, InvalidConfigException {
         }
 
-        public boolean containsConfiguration(URI configID) {
-            return true;
+        public void uninstall(URI configID) throws NoSuchConfigException, IOException {
         }
 
-        public GBeanData getConfiguration(URI id) throws NoSuchConfigException, IOException, InvalidConfigException {
-            GBeanData configData = null;
+        public ObjectName loadConfiguration(URI configId) throws NoSuchConfigException, IOException, InvalidConfigException {
+            ObjectName configurationObjectName = null;
             try {
-                configData = new GBeanData(Configuration.getConfigurationObjectName(id), Configuration.GBEAN_INFO);
+                configurationObjectName = Configuration.getConfigurationObjectName(configId);
             } catch (MalformedObjectNameException e) {
                 throw new InvalidConfigException(e);
             }
-            configData.setAttribute("ID", id);
+            GBeanData configData = new GBeanData(configurationObjectName, Configuration.GBEAN_INFO);
+            configData.setAttribute("id", configId);
             configData.setAttribute("domain", "test");
             configData.setAttribute("server", "bar");
             configData.setAttribute("gBeanState", NO_OBJECTS_OS);
-            return configData;
-        }
 
-        public void updateConfiguration(Configuration configuration) throws NoSuchConfigException, Exception {
+            try {
+                kernel.loadGBean(configData, Configuration.class.getClassLoader());
+            } catch (Exception e) {
+                throw new InvalidConfigException("Unable to register configuration", e);
+            }
+
+            return configurationObjectName;
+        }
 
+        public boolean containsConfiguration(URI configID) {
+            return true;
         }
 
-        public URL getBaseURL(URI id) throws NoSuchConfigException {
-            return null;
+        public void updateConfiguration(ConfigurationData configurationData) throws NoSuchConfigException, Exception {
+
         }
 
         public String getObjectName() {
@@ -618,6 +632,8 @@
         static {
             GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder(MockConfigStore.class, NameFactory.CONFIGURATION_STORE);
             infoBuilder.addInterface(ConfigurationStore.class);
+            infoBuilder.addAttribute("kernel", Kernel.class, false);
+            infoBuilder.setConstructor(new String[] {"kernel"});
             GBEAN_INFO = infoBuilder.getBeanInfo();
 
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -629,6 +645,5 @@
                 throw new RuntimeException(e);
             }
         }
-    };
-
+    }
 }

Modified: geronimo/trunk/modules/connector/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/project.xml?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/project.xml (original)
+++ geronimo/trunk/modules/connector/project.xml Sun May  8 12:35:23 2005
@@ -105,7 +105,7 @@
 
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
+            <artifactId>cglib-nodep</artifactId>
             <version>${cglib_version}</version>
             <url>http://cglib.sf.net/</url>
         </dependency>

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ConnectorMethodInterceptor.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ConnectorMethodInterceptor.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ConnectorMethodInterceptor.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ConnectorMethodInterceptor.java Sun May  8 12:35:23 2005
@@ -23,9 +23,9 @@
 
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;
+import org.apache.geronimo.kernel.KernelRegistry;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.proxy.DeadProxyException;
-import org.apache.geronimo.kernel.proxy.DeadProxyException;
 
 /**
  * MethodInterceptor used by various Proxies.  The important part of this class is the
@@ -62,7 +62,7 @@
     }
 
     private void connectInternalProxy() throws Throwable {
-        Kernel kernel = Kernel.getKernel(kernelName);
+        Kernel kernel = KernelRegistry.getKernel(kernelName);
         try {
             internalProxy = kernel.invoke(targetName, "$getConnectionFactory");
         } catch (Exception e) {

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterImpl.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterImpl.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterImpl.java Sun May  8 12:35:23 2005
@@ -16,20 +16,11 @@
  */
 package org.apache.geronimo.connector;
 
-import java.util.Map;
-import javax.management.ObjectName;
 import javax.management.MalformedObjectNameException;
 
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
-import org.apache.geronimo.j2ee.management.J2EEServer;
-import org.apache.geronimo.j2ee.management.J2EEApplication;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
  * @version $Rev:  $ $Date:  $

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java Sun May  8 12:35:23 2005
@@ -21,17 +21,13 @@
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
+import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.J2EEApplication;
 import org.apache.geronimo.j2ee.management.J2EEServer;
 import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
-import org.apache.geronimo.j2ee.management.impl.Util;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
-import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 
 /**

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java Sun May  8 12:35:23 2005
@@ -134,7 +134,6 @@
     static {
         GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder(GenericConnectionManager.class, AbstractConnectionManager.GBEAN_INFO);
 
-        infoBuilder.addAttribute("name", String.class, true);
         infoBuilder.addAttribute("transactionSupport", TransactionSupport.class, true);
         infoBuilder.addAttribute("pooling", PoolingSupport.class, true);
 

Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java (original)
+++ geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java Sun May  8 12:35:23 2005
@@ -30,8 +30,8 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.KernelFactory;
 import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.registry.BasicGBeanRegistry;
 
 /**
  * @version $Rev$ $Date$
@@ -103,7 +103,7 @@
 
     protected void setUp() throws Exception {
         J2eeContext j2eeContext = new J2eeContextImpl("test.domain", "geronimo.server", "testapp", NameFactory.RESOURCE_ADAPTER_MODULE, "testmodule", TARGET_NAME, NameFactory.JMS_RESOURCE);
-        kernel = new Kernel(j2eeContext.getJ2eeDomainName(), new BasicGBeanRegistry());
+        kernel = KernelFactory.newInstance().createKernel(j2eeContext.getJ2eeDomainName());
         kernel.boot();
         selfName = NameFactory.getComponentName(null, null, null, NameFactory.JCA_RESOURCE, null, null, null, j2eeContext);
 

Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java (original)
+++ geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java Sun May  8 12:35:23 2005
@@ -45,6 +45,7 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.KernelFactory;
 import org.apache.geronimo.kernel.Kernel;
 
 /**
@@ -142,7 +143,7 @@
 //    }
 
     protected void setUp() throws Exception {
-        kernel = new Kernel(KERNEL_NAME);
+        kernel = KernelFactory.newInstance().createKernel(KERNEL_NAME);
         kernel.boot();
         ClassLoader cl = MockConnectionTrackingCoordinator.class.getClassLoader();
         ctcName = ObjectName.getInstance("test:role=ConnectionTrackingCoordinator");
@@ -153,7 +154,6 @@
         GBeanData cmf = new GBeanData(cmfName, GenericConnectionManager.getGBeanInfo());
         cmf.setAttribute("transactionSupport", NoTransactions.INSTANCE);
         cmf.setAttribute("pooling", new NoPool());
-        cmf.setAttribute("name", "TestCF");
         cmf.setReferencePatterns("ConnectionTracker", Collections.singleton(ctcName));
         kernel.loadGBean(cmf, cl);
 

Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/Bootstrap.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/Bootstrap.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/Bootstrap.java (original)
+++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/Bootstrap.java Sun May  8 12:35:23 2005
@@ -18,7 +18,6 @@
 package org.apache.geronimo.deployment;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
@@ -26,6 +25,8 @@
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
 import org.apache.geronimo.deployment.xbeans.ConfigurationType;
+import org.apache.geronimo.kernel.config.ConfigurationData;
+import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil;
 import org.apache.geronimo.system.configuration.LocalConfigStore;
 import org.apache.geronimo.system.main.CommandLineManifest;
 import org.apache.geronimo.system.repository.ReadOnlyRepository;
@@ -155,31 +156,12 @@
                 configurationDir = configStore.createNewConfigurationDir();
 
                 // build the deployer-system configuration into the configurationDir
-                builder.buildConfiguration(deployerSystemConfig, null, configurationDir);
+                ConfigurationData configurationData = builder.buildConfiguration(deployerSystemConfig, null, configurationDir);
 
-                // Write the manifest
-                File metaInf = new File(configurationDir, "META-INF");
-                metaInf.mkdirs();
-                FileOutputStream out = null;
-                try {
-                    out = new FileOutputStream(new File(metaInf, "MANIFEST.MF"));
-                    manifest.write(out);
-                } finally {
-                    DeploymentUtil.close(out);
-                }
-
-                // add the startup file which allows us to locate the startup directory
-                File startupJarTag = new File(metaInf, "startup-jar");
-                startupJarTag.createNewFile();
-
-                // jar up the directory
-                DeploymentUtil.jarDirectory(configurationDir, new File(deployerJar));
-
-                // delete the startup file before moving this to the config store
-                startupJarTag.delete();
+                ExecutableConfigurationUtil.createExecutableConfiguration(configurationData, manifest, configurationDir, new File(deployerJar));
 
                 // install the configuration
-                configStore.install(configurationDir);
+                configStore.install(configurationData, configurationDir);
             } catch (Throwable e) {
                 DeploymentUtil.recursiveDelete(configurationDir);
                 if (e instanceof Error) {
@@ -199,10 +181,10 @@
                 configurationDir = configStore.createNewConfigurationDir();
 
                 // build the j2ee-deployer configuration into the configurationDir
-                builder.buildConfiguration(j2eeDeployerConfig, domain, server, configurationDir);
+                ConfigurationData configurationData = builder.buildConfiguration(j2eeDeployerConfig, domain, server, configurationDir);
 
                 // install the configuration
-                configStore.install(configurationDir);
+                configStore.install(configurationData, configurationDir);
             } catch (Throwable e) {
                 DeploymentUtil.recursiveDelete(configurationDir);
                 if (e instanceof Error) {

Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java (original)
+++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java Sun May  8 12:35:23 2005
@@ -47,9 +47,11 @@
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.NoSuchStoreException;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.jmx.KernelDelegate;
-import org.apache.geronimo.kernel.jmx.KernelMBean;
 import org.apache.geronimo.kernel.management.State;
+import org.apache.geronimo.kernel.Kernel;
 
 
 /**
@@ -58,13 +60,15 @@
 public class JMXDeploymentManager implements DeploymentManager {
     private JMXConnector jmxConnector;
     private MBeanServerConnection mbServerConnection;
-    private KernelMBean kernel;
+    private Kernel kernel;
+    private ConfigurationManager configurationManager;
     private CommandContext commandContext;
 
     public JMXDeploymentManager(JMXConnector jmxConnector) throws IOException {
         this.jmxConnector = jmxConnector;
         mbServerConnection = jmxConnector.getMBeanServerConnection();
         kernel = new KernelDelegate(mbServerConnection);
+        configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
         commandContext = new CommandContext();
         commandContext.setLogErrors(true);
         commandContext.setVerbose(true);
@@ -77,6 +81,7 @@
             throw (IllegalStateException) new IllegalStateException("Unable to close connection").initCause(e);
         } finally {
             mbServerConnection = null;
+            configurationManager = null;
             kernel = null;
         }
     }
@@ -85,7 +90,7 @@
         if (kernel == null) {
             throw new IllegalStateException("Disconnected");
         }
-        List stores = kernel.listConfigurationStores();
+        List stores = configurationManager.listStores();
         if (stores.size() == 0) {
             return null;
         }
@@ -139,7 +144,7 @@
             for (int i = 0; i < targetList.length; i++) {
                 TargetImpl target = (TargetImpl) targetList[i];
                 ObjectName storeName = target.getObjectName();
-                List infos = kernel.listConfigurations(storeName);
+                List infos = configurationManager.listConfigurations(storeName);
                 for (int j = 0; j < infos.size(); j++) {
                     ConfigurationInfo info = (ConfigurationInfo) infos.get(j);
                     if (filter.accept(info)) {

Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java (original)
+++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java Sun May  8 12:35:23 2005
@@ -30,7 +30,7 @@
 import javax.management.ObjectName;
 
 import org.apache.geronimo.kernel.jmx.JMXUtil;
-import org.apache.geronimo.kernel.jmx.KernelMBean;
+import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
 
@@ -40,7 +40,7 @@
 public abstract class AbstractDeployCommand extends CommandSupport {
     private final static String DEPLOYER_NAME = "*:name=Deployer,j2eeType=Deployer,*";
 
-    protected final KernelMBean kernel;
+    protected final Kernel kernel;
     private static final String[] DEPLOY_SIG = {File.class.getName(), File.class.getName()};
     protected final boolean spool;
     protected File moduleArchive;
@@ -48,7 +48,7 @@
     protected InputStream moduleStream;
     protected InputStream deploymentStream;
 
-    public AbstractDeployCommand(CommandType command, KernelMBean kernel, File moduleArchive, File deploymentPlan, InputStream moduleStream, InputStream deploymentStream, boolean spool) {
+    public AbstractDeployCommand(CommandType command, Kernel kernel, File moduleArchive, File deploymentPlan, InputStream moduleStream, InputStream deploymentStream, boolean spool) {
         super(command);
         this.kernel = kernel;
         this.moduleArchive = moduleArchive;

Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java (original)
+++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java Sun May  8 12:35:23 2005
@@ -25,7 +25,7 @@
 import javax.management.ObjectName;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.kernel.jmx.KernelMBean;
+import org.apache.geronimo.kernel.Kernel;
 
 /**
  * @version $Rev$ $Date$
@@ -33,12 +33,12 @@
 public class DistributeCommand extends AbstractDeployCommand {
     protected final Target[] targetList;
 
-    public DistributeCommand(KernelMBean kernel, Target[] targetList, File moduleArchive, File deploymentPlan) {
+    public DistributeCommand(Kernel kernel, Target[] targetList, File moduleArchive, File deploymentPlan) {
         super(CommandType.DISTRIBUTE, kernel, moduleArchive, deploymentPlan, null, null, false);
         this.targetList = targetList;
     }
 
-    public DistributeCommand(KernelMBean kernel, Target[] targetList, InputStream moduleStream, InputStream deploymentStream) {
+    public DistributeCommand(Kernel kernel, Target[] targetList, InputStream moduleStream, InputStream deploymentStream) {
         super(CommandType.DISTRIBUTE, kernel, null, null, moduleStream, deploymentStream, true);
         this.targetList = targetList;
     }

Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java (original)
+++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java Sun May  8 12:35:23 2005
@@ -19,7 +19,6 @@
 import java.io.File;
 import java.io.InputStream;
 import java.net.URI;
-
 import javax.enterprise.deploy.shared.CommandType;
 import javax.enterprise.deploy.spi.TargetModuleID;
 import javax.management.ObjectName;
@@ -27,7 +26,10 @@
 import org.apache.geronimo.deployment.plugin.TargetImpl;
 import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.kernel.jmx.KernelMBean;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
 
 /**
  * @version $Rev$ $Date$
@@ -36,12 +38,12 @@
     private static final String[] UNINSTALL_SIG = {URI.class.getName()};
     private final TargetModuleID[] modules;
 
-    public RedeployCommand(KernelMBean kernel, TargetModuleID[] moduleIDList, File moduleArchive, File deploymentPlan) {
+    public RedeployCommand(Kernel kernel, TargetModuleID[] moduleIDList, File moduleArchive, File deploymentPlan) {
         super(CommandType.DISTRIBUTE, kernel, moduleArchive, deploymentPlan, null, null, false);
         this.modules = moduleIDList;
     }
 
-    public RedeployCommand(KernelMBean kernel, TargetModuleID[] moduleIDList, InputStream moduleArchive, InputStream deploymentPlan) {
+    public RedeployCommand(Kernel kernel, TargetModuleID[] moduleIDList, InputStream moduleArchive, InputStream deploymentPlan) {
         super(CommandType.START, kernel, null, null, moduleArchive, deploymentPlan, true);
         this.modules = moduleIDList;
     }
@@ -63,11 +65,15 @@
                     copyTo(deploymentPlan, deploymentStream);
                 }
             }
+
+            ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
             for (int i = 0; i < modules.length; i++) {
                 TargetModuleIDImpl module = (TargetModuleIDImpl) modules[i];
 
                 URI configID = URI.create(module.getModuleID());
-                kernel.stopConfiguration(configID);
+                ObjectName configName = Configuration.getConfigurationObjectName(configID);
+                kernel.stopGBean(configName);
+                configurationManager.unload(configID);
 
                 TargetImpl target = (TargetImpl) module.getTarget();
                 ObjectName storeName = target.getObjectName();

Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java?rev=169154&r1=169153&r2=169154&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java (original)
+++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java Sun May  8 12:35:23 2005
@@ -18,11 +18,13 @@
 package org.apache.geronimo.deployment.plugin.local;
 
 import java.net.URI;
-
 import javax.enterprise.deploy.shared.CommandType;
 import javax.enterprise.deploy.spi.TargetModuleID;
+import javax.management.ObjectName;
 
-import org.apache.geronimo.kernel.jmx.KernelMBean;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
 
 /**
  *
@@ -30,10 +32,10 @@
  * @version $Rev$ $Date$
  */
 public class StartCommand extends CommandSupport {
-    private final KernelMBean kernel;
+    private final Kernel kernel;
     private final TargetModuleID[] modules;
 
-    public StartCommand(KernelMBean kernel, TargetModuleID modules[]) {
+    public StartCommand(Kernel kernel, TargetModuleID modules[]) {
         super(CommandType.START);
         this.kernel = kernel;
         this.modules = modules;
@@ -41,11 +43,14 @@
 
     public void run() {
         try {
+            ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
             for (int i = 0; i < modules.length; i++) {
                 TargetModuleID module = modules[i];
 
                 URI moduleID = URI.create(module.getModuleID());
-                kernel.startConfiguration(moduleID);
+                ObjectName configName = configurationManager.load(moduleID);
+                kernel.startRecursiveGBean(configName);
+
                 addModule(module);
             }
             complete("Completed");



Mime
View raw message