You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/12/07 16:55:39 UTC
svn commit: r110110 - in geronimo/branches/djencks/jetty-deployer1/trunk: etc modules/assembly modules/assembly/src/plan modules/axis/src/java/org/apache/geronimo/axis modules/client-builder/src/java/org/apache/geronimo/client/builder modules/common/src/java/org/apache/geronimo/common modules/common/src/java/org/apache/geronimo/common/propertyeditor modules/connector-builder/src/java/org/apache/geronimo/connector/deployment modules/connector-builder/src/test/org/apache/geronimo/connector/deployment modules/deploy-tool modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local modules/deployment/src/java/org/apache/geronimo/deployment modules/deployment/src/java/org/apache/geronimo/deployment/util modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment modules/j2ee/src/java/org/apache/geronimo/j2ee/mejb modules/j2ee/src/test/org/apache/geronimo/j2ee/management modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment modules/jetty/src/test/org/apache/geronimo/jetty modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting modules/kernel/src/java/org/apache/geronimo/gbean 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/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/kernel/src/test/org/apache/geronimo/kernel/config modules/naming-builder modules/naming-builder/src/java/org/apache/geronimo/naming/deployment modules/remoting/src/java/org/apache/geronimo/remoting/jmx modules/remoting/src/test/org/apache/geronimo/remoting modules/security/src/test/org/apache/geronimo/security/jaas modules/service-builder/src/java/org/apache/geronimo/deployment/service modules/system/src/java/org/apache/geronimo/system/main modules/tomcat modules/tomcat/src/java/org/apache/geronimo/tomcat modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment modules/tomcat/src/plan modules/tomcat/src/var plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin
Author: djencks
Date: Tue Dec 7 07:55:36 2004
New Revision: 110110
URL: http://svn.apache.org/viewcvs?view=rev&rev=110110
Log:
merge trunk changes to revision 109996
Added:
geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java (props changed)
- copied unchanged from r109996, geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java (props changed)
- copied unchanged from r109996, geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java (props changed)
- copied unchanged from r109996, geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java
- copied unchanged from r109996, geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelGBean.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelGBean.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/GBeanMBean.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/GBeanMBean.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGBeanRegistry.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGBeanRegistry.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXLifecycleBroadcaster.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXLifecycleBroadcaster.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelDelegate.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelDelegate.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelMBean.java (props changed)
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelMBean.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/
- copied from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/BasicLifecycleMonitor.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/BasicLifecycleMonitor.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleAdapter.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleAdapter.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleListener.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleListener.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitor.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitor.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitorFlyweight.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitorFlyweight.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/
- copied from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/BasicGBeanRegistry.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/BasicGBeanRegistry.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/GBeanRegistry.java
- copied unchanged from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/GBeanRegistry.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (props changed)
- copied unchanged from r109996, geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/
- copied from r109996, geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/
geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (props changed)
- copied unchanged from r109996, geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Removed:
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentException.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanJMXUtil.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/JMXLifecycleBroadcaster.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelMBean.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/LifecycleAdapter.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/LifecycleListener.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/LifecycleMonitor.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Run.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGetAttributeInvoker.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXInvocationHandler.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXInvoker.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXOperationInvoker.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXSetAttributeInvoker.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanProxyFactory.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/config/RunTest.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/var/server.xml
Modified:
geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent
geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml
geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/ClassEditor.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/project.xml
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/mejb/MEJB.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GOperationSignature.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanCollectionReference.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/ClassLoading.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/DependencyManager.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXUtil.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/ClassloadingTest.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/project.xml
geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/test/org/apache/geronimo/remoting/JMXRemotingTest.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml
geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml
geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/plan/tomcat-plan.xml
geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java
geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StopRemoteServer.java
geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/WaitForStarted.java
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent Tue Dec 7 07:55:36 2004
@@ -78,7 +78,7 @@
<!ENTITY maven-version "1.0">
<!ENTITY mockobjects-version "0.09">
<!ENTITY mx4j-version "2.0.1">
-<!ENTITY openorb-version "1.4.0-BETA2">
+<!ENTITY openorb-version "1.4.0-GERONIMO">
<!ENTITY oro-version "2.0.8">
<!ENTITY p2psockets-version "1.1.2">
<!ENTITY regexp-version "1.3">
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml Tue Dec 7 07:55:36 2004
@@ -180,7 +180,16 @@
<repository>true</repository>
</properties>
</dependency>
-
+<!-- Tomcat module still breaks a clean build
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-tomcat</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+-->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-jetty-builder</artifactId>
@@ -690,6 +699,17 @@
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
<version>&jetty-version;</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <!-- Don't want to break the other modules that rely on the libs -->
+ <!--version>&tomcat-version;</version-->
+ <version>5.5.4</version>
+ <url>http://jakarta.apache.org/tomcat/</url>
<properties>
<repository>true</repository>
</properties>
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Tue Dec 7 07:55:36 2004
@@ -83,6 +83,22 @@
<dependency>
<uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
</dependency>
+ <!--
+ - Uncomment it to run Apache Tomcat
+ -
+ <dependency>
+ <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/catalina-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/naming-resources-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/tomcat-util-5.5.4.jar</uri>
+ </dependency>
+ -->
<dependency>
<uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
</dependency>
@@ -171,6 +187,11 @@
<reference name="SecurityService">geronimo.deployer:type=SecurityService</reference>
<attribute name="defaultServlets">geronimo.deployer:role=DefaultServlet,config=org/apache/geronimo/J2EEDeployer,*</attribute>
</gbean>
+ <!--
+ - Uncomment it to run Apache Tomcat module builder
+ -
+ <gbean name="geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/J2EEDeployer" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder"/>
+ -->
<gbean name="geronimo.deployer:role=DefaultServlet,config=org/apache/geronimo/J2EEDeployer,name=StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
<attribute name="servletName">default</attribute>
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Tue Dec 7 07:55:36 2004
@@ -71,6 +71,61 @@
<dependency>
<uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
</dependency>
+ <!--
+ - Uncomment it to run Apache Tomcat as the web container
+ -
+ <dependency>
+ <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/catalina-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/jasper-compiler-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/jasper-runtime-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/tomcat-coyote-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/tomcat-http-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/tomcat-util-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/naming-resources-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/servlets-default-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/servlets-invoker-5.5.4.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>commons-beanutils/jars/commons-beanutils-1.6.1.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>commons-collections/jars/commons-collections-2.1.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>commons-digester/jars/commons-digester-1.6.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>commons-el/jars/commons-el-1.0.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>commons-modeler/jars/commons-modeler-1.1.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>regexp/jars/regexp-1.3.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>mx4j/jars/mx4j-2.0.1.jar</uri>
+ </dependency>
+ -->
<dependency>
<uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
</dependency>
@@ -214,6 +269,11 @@
<!-- default WAR container using Jetty -->
<gbean name="geronimo.server:type=WebContainer,container=Jetty" class="org.apache.geronimo.jetty.JettyContainerImpl"/>
+ <!--
+ - Uncomment it and comment the above Jetty GBean to run Apache Tomcat as the web container
+ -
+ <gbean name="geronimo.server:type=WebContainer,container=Tomcat" class="org.apache.geronimo.tomcat.TomcatContainer"/>
+ -->
<gbean name="geronimo.server:type=RequestLog,container=Jetty" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
<reference name="JettyContainer">geronimo.server:type=WebContainer,container=Jetty</reference>
<reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java Tue Dec 7 07:55:36 2004
@@ -49,7 +49,7 @@
import org.apache.axis.utils.NetworkUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.kernel.Kernel;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java Tue Dec 7 07:55:36 2004
@@ -27,7 +27,7 @@
import javax.management.ObjectName;
import org.apache.geronimo.deployment.ConfigurationBuilder;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Tue Dec 7 07:55:36 2004
@@ -34,7 +34,7 @@
import javax.management.ObjectName;
import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.GBeanHelper;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.deployment.util.NestedJarFile;
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java (from r109996, geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java?view=diff&rev=110110&p1=geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java (from r109996, geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java?view=diff&rev=110110&p1=geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java (from r109996, geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java?view=diff&rev=110110&p1=geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java (from r109996, geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java?view=diff&rev=110110&p1=geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java&r2=110110
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/ClassEditor.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/ClassEditor.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/ClassEditor.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/ClassEditor.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/ClassEditor.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/ClassEditor.java Tue Dec 7 07:55:36 2004
@@ -24,23 +24,18 @@
*
* @version $Rev$ $Date$
*/
-public class ClassEditor
- extends TextPropertyEditorSupport
-{
+public class ClassEditor extends TextPropertyEditorSupport {
/**
* Returns a Class for the input object converted to a string.
*
* @return a Class object
- *
- * @throws PropertyEditorException Failed to create Class instance.
+ * @throws PropertyEditorException Failed to create Class instance.
*/
- public Object getValue()
- {
+ public Object getValue() {
try {
String classname = getAsText();
- return ClassLoading.loadClass(classname);
- }
- catch (Exception e) {
+ return ClassLoading.loadClass(classname, Thread.currentThread().getContextClassLoader());
+ } catch (Exception e) {
throw new PropertyEditorException(e);
}
}
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java Tue Dec 7 07:55:36 2004
@@ -158,8 +158,9 @@
throw new NullArgumentException("editorTypeName");
}
- Class type = ClassLoading.loadClass(typeName);
- Class editorType = ClassLoading.loadClass(editorTypeName);
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ Class type = ClassLoading.loadClass(typeName, classLoader);
+ Class editorType = ClassLoading.loadClass(editorTypeName, classLoader);
registerEditor(type, editorType);
}
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Tue Dec 7 07:55:36 2004
@@ -52,7 +52,7 @@
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
import org.apache.geronimo.connector.outbound.security.PasswordCredentialRealm;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.GBeanHelper;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.DynamicGAttributeInfo;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java Tue Dec 7 07:55:36 2004
@@ -37,7 +37,7 @@
import javax.sql.DataSource;
import junit.framework.TestCase;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/project.xml?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/project.xml&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/project.xml&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/project.xml (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/project.xml Tue Dec 7 07:55:36 2004
@@ -75,6 +75,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java Tue Dec 7 07:55:36 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import javax.enterprise.deploy.spi.status.ProgressObject;
import javax.enterprise.deploy.spi.TargetModuleID;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java Tue Dec 7 07:55:36 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import javax.enterprise.deploy.spi.status.ProgressObject;
import javax.enterprise.deploy.spi.DeploymentManager;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java Tue Dec 7 07:55:36 2004
@@ -28,7 +28,7 @@
import javax.enterprise.deploy.spi.TargetModuleID;
import javax.enterprise.deploy.spi.status.ProgressObject;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* The CLI deployer logic to distribute.
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java Tue Dec 7 07:55:36 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import javax.enterprise.deploy.spi.TargetModuleID;
import javax.enterprise.deploy.spi.Target;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java Tue Dec 7 07:55:36 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.io.PrintWriter;
import javax.enterprise.deploy.spi.Target;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java Tue Dec 7 07:55:36 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.io.PrintWriter;
import java.io.File;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java Tue Dec 7 07:55:36 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.io.PrintWriter;
import java.io.File;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java Tue Dec 7 07:55:36 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.io.PrintWriter;
import java.util.ArrayList;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java Tue Dec 7 07:55:36 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.io.PrintWriter;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java Tue Dec 7 07:55:36 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.util.*;
import java.io.PrintWriter;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java Tue Dec 7 07:55:36 2004
@@ -19,7 +19,7 @@
import java.io.*;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
*
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java Tue Dec 7 07:55:36 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* Something was wrong with the user's syntax (as opposed to the command
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java Tue Dec 7 07:55:36 2004
@@ -31,7 +31,7 @@
import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import javax.management.ObjectName;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.plugin.factories.AuthenticationFailedException;
import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
import org.apache.geronimo.system.main.CommandLine;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java Tue Dec 7 07:55:36 2004
@@ -44,12 +44,11 @@
import org.apache.geronimo.deployment.plugin.local.StartCommand;
import org.apache.geronimo.deployment.plugin.local.StopCommand;
import org.apache.geronimo.deployment.plugin.local.UndeployCommand;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelMBean;
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.jmx.MBeanProxyFactory;
+import org.apache.geronimo.kernel.jmx.KernelDelegate;
+import org.apache.geronimo.kernel.jmx.KernelMBean;
import org.apache.geronimo.kernel.management.State;
/**
@@ -66,7 +65,7 @@
public JMXDeploymentManager(JMXConnector jmxConnector) throws IOException {
this.jmxConnector = jmxConnector;
mbServerConnection = jmxConnector.getMBeanServerConnection();
- kernel = (KernelMBean) MBeanProxyFactory.getProxy(KernelMBean.class, mbServerConnection, Kernel.KERNEL);
+ kernel = new KernelDelegate(mbServerConnection);
}
public void release() {
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java Tue Dec 7 07:55:36 2004
@@ -30,10 +30,10 @@
import javax.enterprise.deploy.spi.TargetModuleID;
import javax.management.ObjectName;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.kernel.KernelMBean;
+import org.apache.geronimo.kernel.jmx.KernelMBean;
/**
* @version $Rev$ $Date$
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java Tue Dec 7 07:55:36 2004
@@ -26,8 +26,9 @@
import org.apache.geronimo.deployment.plugin.TargetImpl;
import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
-import org.apache.geronimo.kernel.KernelMBean;
+import org.apache.geronimo.kernel.jmx.KernelMBean;
import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.kernel.jmx.KernelMBean;
/**
* @version $Rev$ $Date$
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java Tue Dec 7 07:55:36 2004
@@ -21,7 +21,8 @@
import javax.enterprise.deploy.shared.CommandType;
import javax.enterprise.deploy.spi.TargetModuleID;
-import org.apache.geronimo.kernel.KernelMBean;
+import org.apache.geronimo.kernel.jmx.KernelMBean;
+import org.apache.geronimo.kernel.jmx.KernelMBean;
/**
*
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java Tue Dec 7 07:55:36 2004
@@ -21,7 +21,7 @@
import javax.enterprise.deploy.shared.CommandType;
import javax.enterprise.deploy.spi.TargetModuleID;
-import org.apache.geronimo.kernel.KernelMBean;
+import org.apache.geronimo.kernel.jmx.KernelMBean;
/**
* @version $Rev$ $Date$
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java Tue Dec 7 07:55:36 2004
@@ -23,7 +23,7 @@
import org.apache.geronimo.deployment.plugin.TargetImpl;
import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
-import org.apache.geronimo.kernel.KernelMBean;
+import org.apache.geronimo.kernel.jmx.KernelMBean;
import org.apache.geronimo.kernel.config.NoSuchConfigException;
/**
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java Tue Dec 7 07:55:36 2004
@@ -21,18 +21,19 @@
import java.io.IOException;
import java.util.List;
import java.util.jar.JarFile;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
*/
public interface ConfigurationBuilder {
/**
- * Builds a the deployment plan specific to this builder from a planFile and/or
+ * Builds a deployment plan specific to this builder from a planFile and/or
* module if this builder can process it.
* @param planFile the deployment plan to examine; can be null
* @param module the URL of the module to examine; can be null
* @return the deployment plan, or null if this builder can not handle the module
- * @throws DeploymentException if there was a problem with the configuration
+ * @throws org.apache.geronimo.common.DeploymentException if there was a problem with the configuration
*/
Object getDeploymentPlan(File planFile, JarFile module) throws DeploymentException;
@@ -43,7 +44,7 @@
* @param module the module to build
* @param outfile the file to write the configuration to
* @throws IOException if there was a problem reading or writing the files
- * @throws DeploymentException if there was a problem with the configuration
+ * @throws org.apache.geronimo.common.DeploymentException if there was a problem with the configuration
*/
List buildConfiguration(Object plan, JarFile module, File outfile) throws IOException, DeploymentException;
}
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java Tue Dec 7 07:55:36 2004
@@ -40,6 +40,7 @@
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.config.InvalidConfigException;
+import org.apache.geronimo.common.DeploymentException;
/**
* Command line based deployment utility which combines multiple deployable modules
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java Tue Dec 7 07:55:36 2004
@@ -58,6 +58,7 @@
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentException.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentException.java?view=auto&rev=110109
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java Tue Dec 7 07:55:36 2004
@@ -23,7 +23,7 @@
import javax.xml.parsers.DocumentBuilder;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -43,7 +43,7 @@
* Create an helper related to the specified deployment URL with META-INF
* as the directory with the given files
*
- * @see #DeploymentHelper(URLInfo, String, String, String, String)
+ * @see #DeploymentHelper(URLInfo, String, String, String)
*/
public DeploymentHelper(URLInfo urlInfo, String j2eeDDName,
String geronimoDDName) throws DeploymentException {
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java?view=auto&rev=110109
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Tue Dec 7 07:55:36 2004
@@ -37,8 +37,8 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ConfigurationBuilder;
-import org.apache.geronimo.deployment.DeploymentException;
import org.apache.geronimo.deployment.service.GBeanHelper;
import org.apache.geronimo.deployment.util.NestedJarFile;
import org.apache.geronimo.deployment.util.DeploymentUtil;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java Tue Dec 7 07:55:36 2004
@@ -22,7 +22,7 @@
import javax.management.ObjectName;
import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java Tue Dec 7 07:55:36 2004
@@ -18,7 +18,7 @@
import javax.naming.Reference;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java Tue Dec 7 07:55:36 2004
@@ -39,6 +39,8 @@
private final String originalSpecDD;
protected Module(boolean standAlone, URI configId, URI parentId, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
+ assert targetPath != null: "targetPath is null";
+
this.standAlone = standAlone;
this.configId = configId;
this.parentId = parentId;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java Tue Dec 7 07:55:36 2004
@@ -21,7 +21,7 @@
import java.net.URI;
import java.util.jar.JarFile;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java Tue Dec 7 07:55:36 2004
@@ -25,7 +25,10 @@
import javax.management.ObjectName;
import javax.naming.Reference;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.common.AmbiguousEJBRefException;
+import org.apache.geronimo.common.UnknownEJBRefException;
+import org.apache.geronimo.common.UnresolvedEJBRefException;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.gbean.GBeanData;
@@ -330,7 +333,7 @@
// if we didn't find any ejbs that implement that interface... give up
if (references == null || references.isEmpty()) {
- throw new UnresolvedEJBRefException(refName, ejbRefInfo, false);
+ throw new UnresolvedEJBRefException(refName, ejbRefInfo.isLocal(), ejbRefInfo.isSession(), ejbRefInfo.getHomeIntf(), ejbRefInfo.getBeanIntf(), false);
}
// if there is only one matching ejb, use it
@@ -345,7 +348,7 @@
}
// there is more then one ejb that implements that interface... give up
- throw new UnresolvedEJBRefException(refName, ejbRefInfo, true);
+ throw new UnresolvedEJBRefException(refName, ejbRefInfo.isLocal(), ejbRefInfo.isSession(), ejbRefInfo.getHomeIntf(), ejbRefInfo.getBeanIntf(), true);
}
//Resource adapter/activationspec support
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java Tue Dec 7 07:55:36 2004
@@ -18,7 +18,7 @@
import javax.naming.Reference;
import javax.management.ObjectName;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
/**
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java?view=auto&rev=110109
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java?view=auto&rev=110109
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java Tue Dec 7 07:55:36 2004
@@ -26,7 +26,7 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.kernel.jmx.JMXUtil;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java Tue Dec 7 07:55:36 2004
@@ -21,7 +21,10 @@
import javax.management.ObjectName;
import junit.framework.TestCase;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.common.AmbiguousEJBRefException;
+import org.apache.geronimo.common.UnknownEJBRefException;
+import org.apache.geronimo.common.UnresolvedEJBRefException;
import org.apache.geronimo.gbean.GBeanData;
/**
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java Tue Dec 7 07:55:36 2004
@@ -22,7 +22,7 @@
import java.util.jar.JarFile;
import junit.framework.Assert;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java Tue Dec 7 07:55:36 2004
@@ -22,7 +22,7 @@
import java.util.jar.JarFile;
import junit.framework.Assert;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java Tue Dec 7 07:55:36 2004
@@ -24,7 +24,7 @@
import javax.management.ObjectName;
import junit.framework.Assert;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/mejb/MEJB.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/mejb/MEJB.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/mejb/MEJB.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/mejb/MEJB.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/mejb/MEJB.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/mejb/MEJB.java Tue Dec 7 07:55:36 2004
@@ -16,8 +16,6 @@
*/
package org.apache.geronimo.j2ee.mejb;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import javax.ejb.EJBHome;
import javax.ejb.EJBObject;
@@ -27,8 +25,11 @@
import javax.management.AttributeList;
import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
+import javax.management.IntrospectionException;
+import javax.management.InvalidAttributeValueException;
import javax.management.MBeanException;
import javax.management.MBeanInfo;
+import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.QueryExp;
import javax.management.ReflectionException;
@@ -37,13 +38,8 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.jmx.GBeanJMXUtil;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.InternalKernelException;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelMBean;
-import org.apache.geronimo.kernel.NoSuchAttributeException;
-import org.apache.geronimo.kernel.NoSuchOperationException;
+import org.apache.geronimo.kernel.jmx.MBeanServerDelegate;
/**
* GBean implementing Management interface and supplying proxies to act as the MEJB container.
@@ -51,150 +47,50 @@
* @version $Rev: $ $Date: $
*/
public class MEJB implements Management {
- private final Kernel kernel;
+ private final MBeanServer mbeanServer;
public MEJB(Kernel kernel) {
- this.kernel = kernel;
+ mbeanServer = new MBeanServerDelegate(kernel);
}
- public Object getAttribute(ObjectName name, String attribute) throws MBeanException, AttributeNotFoundException, InstanceNotFoundException, ReflectionException {
- try {
- return kernel.getAttribute(name, attribute);
- } catch (NoSuchAttributeException e) {
- throw new AttributeNotFoundException(attribute);
- } catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.getCanonicalName());
- } catch (InternalKernelException e) {
- throw new MBeanException(unwrapInternalKernelException(e));
- } catch (Exception e) {
- throw new MBeanException(e);
- }
- }
-
- public AttributeList getAttributes(ObjectName name, String[] attributes) throws InstanceNotFoundException, ReflectionException {
- AttributeList attributeList = new AttributeList(attributes.length);
- for (int i = 0; i < attributes.length; i++) {
- String attribute = attributes[i];
- try {
- Object value = kernel.getAttribute(name, attribute);
- attributeList.add(i, new Attribute(attribute, value));
- } catch (NoSuchAttributeException e) {
- // ignored - caller will simply find no value
- } catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.getCanonicalName());
- } catch (InternalKernelException e) {
- throw new ReflectionException(unwrapInternalKernelException(e));
- } catch (Exception e) {
- // ignored - caller will simply find no value
- }
- }
- return attributeList;
+ public MBeanInfo getMBeanInfo(ObjectName objectName) throws InstanceNotFoundException, IntrospectionException, ReflectionException {
+ return mbeanServer.getMBeanInfo(objectName);
}
public String getDefaultDomain() {
- return kernel.getKernelName();
+ return mbeanServer.getDefaultDomain();
+ }
+
+ public Object getAttribute(ObjectName objectName, String s) throws MBeanException, AttributeNotFoundException, InstanceNotFoundException, ReflectionException {
+ return mbeanServer.getAttribute(objectName, s);
+ }
+
+ public void setAttribute(ObjectName objectName, Attribute attribute) throws InstanceNotFoundException, AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
+ mbeanServer.setAttribute(objectName, attribute);
+ }
+
+ public AttributeList getAttributes(ObjectName objectName, String[] strings) throws InstanceNotFoundException, ReflectionException {
+ return mbeanServer.getAttributes(objectName, strings);
+ }
+
+ public AttributeList setAttributes(ObjectName objectName, AttributeList attributeList) throws InstanceNotFoundException, ReflectionException {
+ return mbeanServer.setAttributes(objectName, attributeList);
+ }
+
+ public Object invoke(ObjectName objectName, String s, Object[] objects, String[] strings) throws InstanceNotFoundException, MBeanException, ReflectionException {
+ return mbeanServer.invoke(objectName, s, objects, strings);
}
public Integer getMBeanCount() {
- return new Integer(kernel.listGBeans((ObjectName)null).size());
+ return mbeanServer.getMBeanCount();
+ }
+
+ public boolean isRegistered(ObjectName objectName) {
+ return mbeanServer.isRegistered(objectName);
}
- public MBeanInfo getMBeanInfo(ObjectName name) throws InstanceNotFoundException, ReflectionException {
- GBeanInfo gbeanInfo;
- try {
- gbeanInfo = kernel.getGBeanInfo(name);
- } catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.toString());
- } catch (InternalKernelException e) {
- throw new ReflectionException(unwrapInternalKernelException(e));
- }
- return GBeanJMXUtil.toMBeanInfo(gbeanInfo);
- }
-
- public Object invoke(ObjectName name, String operationName, Object[] params, String[] signature) throws InstanceNotFoundException, MBeanException, ReflectionException {
- try {
- return kernel.invoke(name, operationName, params, signature);
- } catch (NoSuchOperationException e) {
- throw new ReflectionException(new NoSuchMethodException(e.getMessage()));
- } catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.getCanonicalName());
- } catch (InternalKernelException e) {
- throw new MBeanException(unwrapInternalKernelException(e));
- } catch (Exception e) {
- throw new MBeanException(e);
- }
- }
-
- public boolean isRegistered(ObjectName name) {
- return kernel.isLoaded(name);
- }
-
- public Set queryNames(ObjectName pattern, QueryExp query) {
- if (query != null) {
- throw new IllegalArgumentException("NYI");
- }
- Set names = kernel.listGBeans(pattern);
- if (query == null) {
- return names;
- }
-
- // todo this will not work for non MBean server based queries
- // dain: I think we could create an MBeanServer wraper around
- // kernel that passed though most operations to kernel and
- // threw an UnsupportedOperationException for the operations
- // that have no equivilent Kernel method.
- query.setMBeanServer(kernel.getMBeanServer());
-
- Set filteredNames = new HashSet(names.size());
- for (Iterator iterator = names.iterator(); iterator.hasNext();) {
- ObjectName name = (ObjectName) iterator.next();
- try {
- if (query.apply(name)) {
- filteredNames.add(name);
- }
- } catch (Exception e) {
- // reject any name that threw an exception
- }
- }
- return filteredNames;
- }
-
- public void setAttribute(ObjectName name, Attribute attribute) throws InstanceNotFoundException, AttributeNotFoundException, MBeanException {
- String attributeName = attribute.getName();
- Object attributeValue = attribute.getValue();
- try {
- kernel.setAttribute(name, attributeName, attributeValue);
- } catch (NoSuchAttributeException e) {
- throw new AttributeNotFoundException(attributeName);
- } catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.getCanonicalName());
- } catch (InternalKernelException e) {
- throw new MBeanException(unwrapInternalKernelException(e));
- } catch (Exception e) {
- throw new MBeanException(e);
- }
- }
-
- public AttributeList setAttributes(ObjectName name, AttributeList attributes) throws InstanceNotFoundException, ReflectionException {
- AttributeList set = new AttributeList(attributes.size());
- for (Iterator iterator = attributes.iterator(); iterator.hasNext();) {
- Attribute attribute = (Attribute) iterator.next();
- String attributeName = attribute.getName();
- Object attributeValue = attribute.getValue();
- try {
- kernel.setAttribute(name, attributeName, attributeValue);
- set.add(attribute);
- } catch (NoSuchAttributeException e) {
- // ignored - caller will see value was not set because this attribute will not be in the attribute list
- } catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.getCanonicalName());
- } catch (InternalKernelException e) {
- throw new ReflectionException(unwrapInternalKernelException(e));
- } catch (Exception e) {
- // ignored - caller will see value was not set because this attribute will not be in the attribute list
- }
- }
- return set;
+ public Set queryNames(ObjectName objectName, QueryExp queryExp) {
+ return mbeanServer.queryNames(objectName, queryExp);
}
public ListenerRegistration getListenerRegistry() {
@@ -202,27 +98,6 @@
}
-// //ListenerRegistration implementation
-// public void addNotificationListener(ObjectName name, NotificationListener listener, NotificationFilter filter, Object handback) throws InstanceNotFoundException {
-// try {
-// kernel.invoke(name, "addNotificationListener", new Object[]{listener, filter, handback}, new String[]{NotificationListener.class.getName(), NotificationFilter.class.getName(), Object.class.getName()});
-// } catch (InstanceNotFoundException e) {
-// throw e;
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
-// }
-//
-// public void removeNotificationListener(ObjectName name, NotificationListener listener) throws InstanceNotFoundException, ListenerNotFoundException {
-// try {
-// kernel.invoke(name, "removeNotificationListener", new Object[]{listener}, new String[]{NotificationListener.class.getName()});
-// } catch (InstanceNotFoundException e) {
-// throw e;
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
-// }
-
// EJBObject implementation
public EJBHome getEJBHome() {
return null;
@@ -243,18 +118,11 @@
public void remove() throws RemoveException {
}
- private static Exception unwrapInternalKernelException(InternalKernelException e) {
- if (e.getCause() instanceof Exception) {
- return (Exception) e.getCause();
- }
- return e;
- }
-
public static final GBeanInfo GBEAN_INFO;
static {
GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder(MEJB.class);
- infoBuilder.addAttribute("kernel", KernelMBean.class, false);
+ infoBuilder.addAttribute("kernel", Kernel.class, false);
infoBuilder.addInterface(Management.class);
infoBuilder.setConstructor(new String[]{"kernel"});
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java Tue Dec 7 07:55:36 2004
@@ -23,7 +23,7 @@
import javax.management.ObjectName;
import junit.framework.TestCase;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl;
import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
import org.apache.geronimo.j2ee.management.impl.JVMImpl;
@@ -48,20 +48,22 @@
super.setUp();
kernel = new Kernel(DOMAIN);
kernel.boot();
- GBeanMBean gbean;
- gbean = new GBeanMBean(ServerInfo.getGBeanInfo());
+
+ ClassLoader classLoader = getClass().getClassLoader();
+ GBeanData gbean;
+ gbean = new GBeanData(SERVER_INFO_NAME, ServerInfo.getGBeanInfo());
gbean.setAttribute("baseDirectory", System.getProperty("java.io.tmpdir"));
- kernel.loadGBean(SERVER_INFO_NAME, gbean);
+ kernel.loadGBean(gbean, classLoader);
- gbean = new GBeanMBean(J2EEDomainImpl.GBEAN_INFO);
- kernel.loadGBean(DOMAIN_NAME, gbean);
+ gbean = new GBeanData(DOMAIN_NAME, J2EEDomainImpl.GBEAN_INFO);
+ kernel.loadGBean(gbean, classLoader);
- gbean = new GBeanMBean(J2EEServerImpl.GBEAN_INFO);
+ gbean = new GBeanData(SERVER_NAME, J2EEServerImpl.GBEAN_INFO);
gbean.setReferencePatterns("ServerInfo", Collections.singleton(SERVER_INFO_NAME));
- kernel.loadGBean(SERVER_NAME, gbean);
+ kernel.loadGBean(gbean, classLoader);
- kernel.loadGBean(JVM_NAME, new GBeanMBean(JVMImpl.GBEAN_INFO));
+ kernel.loadGBean(new GBeanData(JVM_NAME, JVMImpl.GBEAN_INFO), classLoader);
kernel.startGBean(SERVER_INFO_NAME);
kernel.startGBean(DOMAIN_NAME);
kernel.startGBean(SERVER_NAME);
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Tue Dec 7 07:55:36 2004
@@ -44,7 +44,7 @@
import javax.security.jacc.WebUserDataPermission;
import javax.transaction.UserTransaction;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.GBeanHelper;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.GBeanData;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Tue Dec 7 07:55:36 2004
@@ -16,38 +16,36 @@
*/
package org.apache.geronimo.jetty.deployment;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
-import java.util.List;
-import java.util.Iterator;
-import java.util.jar.JarFile;
import java.io.File;
import java.net.URI;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
import javax.management.ObjectName;
import javax.naming.Reference;
import junit.framework.TestCase;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.config.ConfigurationModuleType;
-import org.apache.geronimo.kernel.management.State;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
+import org.apache.geronimo.deployment.util.UnpackedJarFile;
import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
-import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.deployment.EARContext;
-import org.apache.geronimo.j2ee.deployment.RefContext;
import org.apache.geronimo.j2ee.deployment.EJBReferenceBuilder;
+import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.j2ee.deployment.RefContext;
import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
+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.jetty.JettyContainerImpl;
import org.apache.geronimo.jetty.connector.HTTPConnector;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.management.State;
+import org.apache.geronimo.security.SecurityServiceImpl;
import org.apache.geronimo.transaction.GeronimoTransactionManager;
import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
-import org.apache.geronimo.deployment.util.UnpackedJarFile;
-import org.apache.geronimo.deployment.DeploymentException;
-import org.apache.geronimo.security.SecurityServiceImpl;
/**
* @version $Rev: $ $Date: $
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java Tue Dec 7 07:55:36 2004
@@ -22,15 +22,13 @@
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.util.Map;
-import java.util.Set;
import java.util.HashMap;
import java.util.HashSet;
-
+import java.util.Map;
+import java.util.Set;
import javax.security.jacc.WebResourcePermission;
import javax.security.jacc.WebUserDataPermission;
-import org.apache.geronimo.kernel.jmx.MBeanProxyFactory;
import org.apache.geronimo.security.SecurityService;
import org.apache.geronimo.security.deploy.AutoMapAssistant;
import org.apache.geronimo.security.deploy.DefaultPrincipal;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java Tue Dec 7 07:55:36 2004
@@ -21,6 +21,7 @@
import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
+import javax.management.MBeanServer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -29,6 +30,7 @@
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.jmx.MBeanServerDelegate;
/**
* A Connector that supports the server sideof JSR 160 JMX Remoting.
@@ -106,7 +108,8 @@
} else {
log.warn("Starting unauthenticating JMXConnector for " + serviceURL);
}
- server = JMXConnectorServerFactory.newJMXConnectorServer(serviceURL, env, kernel.getMBeanServer());
+ MBeanServer mbeanServer = new MBeanServerDelegate(kernel);
+ server = JMXConnectorServerFactory.newJMXConnectorServer(serviceURL, env, mbeanServer);
server.start();
log.info("Started JMXConnector " + server.getAddress());
}
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GOperationSignature.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GOperationSignature.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GOperationSignature.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GOperationSignature.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GOperationSignature.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GOperationSignature.java Tue Dec 7 07:55:36 2004
@@ -19,8 +19,6 @@
import java.lang.reflect.Method;
import java.util.List;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanParameterInfo;
/**
* This is a key class based on a MBean operation name and parameters.
@@ -38,15 +36,6 @@
argumentTypes = new String[parameters.length];
for (int i = 0; i < parameters.length; i++) {
argumentTypes[i] = parameters[i].getName();
- }
- }
-
- public GOperationSignature(MBeanOperationInfo operationInfo) {
- name = operationInfo.getName();
- MBeanParameterInfo[] parameters = operationInfo.getSignature();
- argumentTypes = new String[parameters.length];
- for (int i = 0; i < parameters.length; i++) {
- argumentTypes[i] = parameters[i].getType();
}
}
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanJMXUtil.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanJMXUtil.java?view=auto&rev=110109
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java Tue Dec 7 07:55:36 2004
@@ -17,38 +17,15 @@
package org.apache.geronimo.gbean.jmx;
-import java.util.Iterator;
import java.util.Set;
import javax.management.Attribute;
-import javax.management.AttributeList;
import javax.management.AttributeNotFoundException;
-import javax.management.DynamicMBean;
-import javax.management.JMException;
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanNotificationInfo;
-import javax.management.MBeanRegistration;
-import javax.management.MBeanServer;
-import javax.management.NotificationEmitter;
-import javax.management.NotificationFilter;
-import javax.management.NotificationListener;
import javax.management.ObjectName;
import javax.management.ReflectionException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanConstructorInfo;
-import javax.management.MBeanOperationInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GOperationSignature;
import org.apache.geronimo.gbean.InvalidConfigurationException;
-import org.apache.geronimo.gbean.runtime.GBeanInstance;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.NoSuchAttributeException;
-import org.apache.geronimo.kernel.NoSuchOperationException;
-import org.apache.geronimo.kernel.management.NotificationType;
/**
* A GBeanMBean is a J2EE Management Managed Object, and is standard base for Geronimo services.
@@ -58,15 +35,7 @@
*
* @version $Rev$ $Date$
*/
-public final class GBeanMBean implements DynamicMBean, MBeanRegistration, NotificationEmitter {
- private static final Log log = LogFactory.getLog(GBeanMBean.class);
- private static final MBeanInfo DEFAULT_MBEAN_INFO = new MBeanInfo("java.lang.Object", "", new MBeanAttributeInfo[0], new MBeanConstructorInfo[0], new MBeanOperationInfo[0], new MBeanNotificationInfo[0]);
-
- /**
- * Gets the context class loader from the thread or the system class loader if there is no context class loader.
- *
- * @return the context class loader or the system classloader
- */
+public final class GBeanMBean {
private static ClassLoader getContextClassLoader() {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
if (classLoader == null) {
@@ -76,24 +45,9 @@
}
/**
- * The kernel in which this server is registered.
- */
- private Kernel kernel;
-
- /**
- * The unique name of this service.
- */
- private ObjectName objectName;
-
- /**
* The data of the
*/
- private GBeanData gbeanData;
-
- /**
- * The instance for this gbean mbean
- */
- private GBeanInstance gbeanInstance;
+ private final GBeanData gbeanData;
/**
* The classloader used for all invocations and creating targets.
@@ -101,322 +55,100 @@
private final ClassLoader classLoader;
/**
- * JMX sped mbeanInfo for this gbean (translation of the above gbeanInfo
- */
- private MBeanInfo mbeanInfo = DEFAULT_MBEAN_INFO;
-
- /**
- * The broadcaster for notifications
- */
- private JMXLifecycleBroadcaster lifecycleBroadcaster;
-
- /**
- * This is the constructor used by the kernel. This constructor should not be used dirctly.
- * Instedad you should use kernel.loadGBean(GBeanData gbeanData, ClassLoader classLoader)
- * @deprecated use kernel.loadGBean(GBeanData gbeanData, ClassLoader classLoader)
- */
- public GBeanMBean(Kernel kernel, GBeanData gbeanData, ClassLoader classLoader) throws InvalidConfigurationException {
- this.kernel = kernel;
- this.gbeanData = gbeanData;
- this.classLoader = classLoader;
-
- this.objectName = gbeanData.getName();
- }
-
- /**
- * This constructor allows the kernel to bootstrap and existing GBeanInstance directly into the MBeanServer.
- * @deprecated DO NOT USE
- */
- public GBeanMBean(Kernel kernel, GBeanInstance gbeanInstance, JMXLifecycleBroadcaster lifecycleBroadcaster) throws InvalidConfigurationException {
- this.kernel = kernel;
- this.gbeanInstance = gbeanInstance;
- this.lifecycleBroadcaster = lifecycleBroadcaster;
-
- this.objectName = gbeanInstance.getObjectNameObject();
- this.gbeanData = gbeanInstance.getGBeanData();
- this.classLoader = gbeanInstance.getClassLoader();
- }
-
- /**
- * Constructa a GBeanMBean using the supplied GBeanData and class loader
- *
- * @param gbeanData the data for the new GBean including GBeanInfo, intial attribute values, and reference patterns
- * @param classLoader the class loader used to load the gbean instance and attribute/reference types
- * @throws InvalidConfigurationException if the gbeanInfo is inconsistent with the actual java classes, such as
- * mismatched attribute types or the intial data can not be set
- * @deprecated use kernel.loadGBean(GBeanData gbeanData, ClassLoader classLoader)
+ * @deprecated use GBeanData instead
*/
public GBeanMBean(GBeanData gbeanData, ClassLoader classLoader) throws InvalidConfigurationException {
- this.classLoader = classLoader;
this.gbeanData = gbeanData;
+ this.classLoader = classLoader;
}
/**
- * Constructa a GBeanMBean using the supplied gbeanInfo and class loader
- *
- * @param gbeanInfo the metadata describing the attributes, operations, constructor and references of the gbean
- * @param classLoader the class loader used to load the gbean instance and attribute/reference types
- * @throws InvalidConfigurationException if the gbeanInfo is inconsistent with the actual java classes, such as
- * mismatched attribute types
- * @deprecated use kernel.loadGBean(GBeanData gbeanData, ClassLoader classLoader)
+ * @deprecated use GBeanData instead
*/
public GBeanMBean(GBeanInfo gbeanInfo, ClassLoader classLoader) throws InvalidConfigurationException {
- this(new GBeanData(gbeanInfo), classLoader);
+ this.gbeanData = new GBeanData(gbeanInfo);
+ this.classLoader = classLoader;
}
/**
* @deprecated use kernel.loadGBean(GBeanData gbeanData, ClassLoader classLoader)
*/
public GBeanMBean(GBeanInfo gbeanInfo) throws InvalidConfigurationException {
- this(new GBeanData(gbeanInfo), getContextClassLoader());
+ this.gbeanData = new GBeanData(gbeanInfo);
+ this.classLoader = getContextClassLoader();
}
/**
* @deprecated use kernel.loadGBean(GBeanData gbeanData, ClassLoader classLoader)
*/
public GBeanMBean(String className, ClassLoader classLoader) throws Exception {
- this(new GBeanData(GBeanInfo.getGBeanInfo(className, classLoader)), classLoader);
+ this.gbeanData = new GBeanData(GBeanInfo.getGBeanInfo(className, classLoader));
+ this.classLoader = classLoader;
}
/**
- * @deprecated use kernel.loadGBean(GBeanData gbeanData, ClassLoader classLoader)
+ * @deprecated use GBeanData instead
*/
public GBeanMBean(String className) throws Exception {
- this(className, ClassLoader.getSystemClassLoader());
+ this.classLoader = ClassLoader.getSystemClassLoader();
+ this.gbeanData = new GBeanData(GBeanInfo.getGBeanInfo(className, classLoader));
}
/**
- * Gets the MBeanInfo equivilent of the GBeanInfo used to construct this gbean.
- *
- * @return the MBeanInfo for this gbean
+ * @deprecated use GBeanData instead
*/
- public MBeanInfo getMBeanInfo() {
- return mbeanInfo;
- }
-
public ClassLoader getClassLoader() {
return classLoader;
}
- public synchronized ObjectName preRegister(MBeanServer server, ObjectName objectName) throws Exception {
- if (gbeanInstance == null) {
- this.objectName = objectName;
- try {
- String kernelName = (String) server.getAttribute(Kernel.KERNEL, "KernelName");
- kernel = Kernel.getKernel(kernelName);
- } catch (Exception e) {
- throw new IllegalStateException("No kernel is registered in this MBeanServer");
- }
-
- gbeanData.setName(objectName);
- lifecycleBroadcaster = new JMXLifecycleBroadcaster(objectName, kernel.getLifecycleMonitor().createLifecycleBroadcaster(objectName));
- gbeanInstance = new GBeanInstance(kernel, gbeanData, lifecycleBroadcaster, classLoader);
- mbeanInfo = GBeanJMXUtil.toMBeanInfo(gbeanInstance.getGBeanInfo());
- }
- return gbeanInstance.getObjectNameObject();
- }
-
- public synchronized void postRegister(Boolean registrationDone) {
- if (!registrationDone.booleanValue()) {
- if (gbeanInstance != null) {
- gbeanInstance.destroy();
- gbeanInstance = null;
- }
- mbeanInfo = DEFAULT_MBEAN_INFO;
- lifecycleBroadcaster = null;
- kernel = null;
- objectName = null;
- }
- }
-
- public void preDeregister() throws Exception {
- }
-
- public synchronized void postDeregister() {
- if (gbeanInstance != null) {
- gbeanData = gbeanInstance.getGBeanData();
- gbeanInstance.destroy();
- gbeanInstance = null;
- }
- mbeanInfo = DEFAULT_MBEAN_INFO;
- kernel = null;
- objectName = null;
- }
-
/**
- * Gets the gbean data for the gbean held by this gbean mbean.
- * @return the gbean data
+ * @deprecated use GBeanData instead
*/
public GBeanData getGBeanData() {
- if (gbeanInstance != null) {
- return gbeanInstance.getGBeanData();
- } else {
- return gbeanData;
- }
- }
-
- public void setGBeanData(GBeanData gbeanData) throws Exception {
- if (gbeanInstance != null) {
- gbeanInstance.setGBeanData(gbeanData);
- } else {
- this.gbeanData = gbeanData;
- }
+ return gbeanData;
}
+ /**
+ * @deprecated use GBeanData instead
+ */
public Object getAttribute(String name) throws ReflectionException, AttributeNotFoundException {
- if (gbeanInstance == null) {
- return gbeanData.getAttribute(name);
- } else {
- try {
- return gbeanInstance.getAttribute(name);
- } catch (NoSuchAttributeException e) {
- throw new AttributeNotFoundException(name);
- } catch (Exception e) {
- throw new ReflectionException(e);
- }
- }
+ return gbeanData.getAttribute(name);
}
+ /**
+ * @deprecated use GBeanData instead
+ */
public void setAttribute(String name, Object value) throws ReflectionException, AttributeNotFoundException {
- if (gbeanInstance == null) {
- gbeanData.setAttribute(name, value);
- } else {
- try {
- gbeanInstance.setAttribute(name, value);
- } catch (NoSuchAttributeException e) {
- throw new AttributeNotFoundException(name);
- } catch (Exception e) {
- throw new ReflectionException(e);
- }
- }
+ gbeanData.setAttribute(name, value);
}
+ /**
+ * @deprecated use GBeanData instead
+ */
public void setAttribute(Attribute attribute) throws ReflectionException, AttributeNotFoundException {
String name = attribute.getName();
Object value = attribute.getValue();
- if (gbeanInstance == null) {
- gbeanData.setAttribute(name, value);
- } else {
- try {
- gbeanInstance.setAttribute(name, value);
- } catch (NoSuchAttributeException e) {
- throw new AttributeNotFoundException(name);
- } catch (Exception e) {
- throw new ReflectionException(e);
- }
- }
- }
-
- public AttributeList getAttributes(String[] attributes) {
- AttributeList results = new AttributeList(attributes.length);
- for (int i = 0; i < attributes.length; i++) {
- String name = attributes[i];
- try {
- Object value = getAttribute(name);
- results.add(new Attribute(name, value));
- } catch (JMException e) {
- log.warn("Exception while getting attribute " + name, e);
- }
- }
- return results;
- }
-
- public AttributeList setAttributes(AttributeList attributes) {
- AttributeList results = new AttributeList(attributes.size());
- for (Iterator iterator = attributes.iterator(); iterator.hasNext();) {
- Attribute attribute = (Attribute) iterator.next();
- try {
- setAttribute(attribute);
- results.add(attribute);
- } catch (JMException e) {
- log.warn("Exception while setting attribute " + attribute.getName(), e);
- }
- }
- return results;
- }
-
- public Object invoke(String operationName, Object[] arguments, String[] types) throws ReflectionException {
- if (gbeanInstance == null) {
- throw new IllegalStateException("An offline gbean can not be invoked: " + objectName);
- } else {
- try {
- return gbeanInstance.invoke(operationName, arguments, types);
- } catch (NoSuchOperationException e) {
- throw new ReflectionException(new NoSuchMethodException(new GOperationSignature(operationName, types).toString()));
- } catch (Exception e) {
- throw new ReflectionException(e);
- }
- }
+ gbeanData.setAttribute(name, value);
}
/**
- * Gets the object name patters for a reference.
- *
- * @param name the reference name
- * @return the object name patterns for the reference
+ * @deprecated use GBeanData instead
*/
public Set getReferencePatterns(String name) {
- if (gbeanInstance != null) {
- return gbeanInstance.getReferencePatterns(name);
- } else {
- return gbeanData.getReferencePatterns(name);
- }
+ return gbeanData.getReferencePatterns(name);
}
/**
- * Sets a single object name pattern for a reference.
- *
- * @param name the reference name
- * @param pattern the new single object name pattern for the reference
+ * @deprecated use GBeanData instead
*/
public void setReferencePattern(String name, ObjectName pattern) {
- if (gbeanInstance != null) {
- gbeanInstance.setReferencePattern(name, pattern);
- } else {
- gbeanData.setReferencePattern(name, pattern);
- }
+ gbeanData.setReferencePattern(name, pattern);
}
/**
- * Sets the object name patterns for a reference.
- *
- * @param name the reference name
- * @param patterns the new object name patterns for the reference
+ * @deprecated use GBeanData instead
*/
public void setReferencePatterns(String name, Set patterns) {
- if (gbeanInstance != null) {
- gbeanInstance.setReferencePatterns(name, patterns);
- } else {
- gbeanData.setReferencePatterns(name, patterns);
- }
- }
-
- public final String getObjectName() {
- return objectName.getCanonicalName();
- }
-
- public MBeanNotificationInfo[] getNotificationInfo() {
- return new MBeanNotificationInfo[]{
- new MBeanNotificationInfo(NotificationType.TYPES, "javax.management.Notification", "J2EE Notifications")
- };
- }
-
- public void addNotificationListener(NotificationListener listener, NotificationFilter filter, Object handback) {
- lifecycleBroadcaster.addNotificationListener(listener, filter, handback);
- }
-
- public void removeNotificationListener(NotificationListener listener) throws ListenerNotFoundException {
- lifecycleBroadcaster.removeNotificationListener(listener);
- }
-
- public void removeNotificationListener(NotificationListener listener, NotificationFilter filter, Object handback) throws ListenerNotFoundException {
- lifecycleBroadcaster.removeNotificationListener(listener, filter, handback);
- }
-
- public String toString() {
- if (objectName == null) {
- return super.toString();
- }
- return objectName.toString();
+ gbeanData.setReferencePatterns(name, patterns);
}
}
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/JMXLifecycleBroadcaster.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/JMXLifecycleBroadcaster.java?view=auto&rev=110109
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java Tue Dec 7 07:55:36 2004
@@ -27,11 +27,12 @@
import org.apache.geronimo.gbean.GReferenceInfo;
import org.apache.geronimo.gbean.InvalidConfigurationException;
import org.apache.geronimo.kernel.ClassLoading;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.LifecycleAdapter;
-import org.apache.geronimo.kernel.LifecycleListener;
import org.apache.geronimo.kernel.NoSuchAttributeException;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.DependencyManager;
+import org.apache.geronimo.kernel.lifecycle.LifecycleAdapter;
+import org.apache.geronimo.kernel.lifecycle.LifecycleListener;
import org.apache.geronimo.kernel.management.State;
/**
@@ -79,21 +80,37 @@
*/
private final Set targets = new HashSet();
+ /**
+ * The metadata for this reference
+ */
private final GReferenceInfo referenceInfo;
/**
* The kernel to which the reference is bound.
*/
- private Kernel kernel;
+ private final Kernel kernel;
+
+ /**
+ * The dependency manager of the kernel.
+ */
+ private final DependencyManager dependencyManager;
/**
* Proxy for this reference
*/
private Object proxy;
- public AbstractGBeanReference(GBeanInstance gbeanInstance, GReferenceInfo referenceInfo) throws InvalidConfigurationException {
+ /**
+ * is this reference online
+ */
+ private boolean isOnline = false;
+
+ public AbstractGBeanReference(GBeanInstance gbeanInstance, GReferenceInfo referenceInfo, Kernel kernel, DependencyManager dependencyManager) throws InvalidConfigurationException {
this.gbeanInstance = gbeanInstance;
this.referenceInfo = referenceInfo;
+ this.kernel = kernel;
+ this.dependencyManager = dependencyManager;
+
this.name = referenceInfo.getName();
try {
this.referenceType = ClassLoading.loadClass(referenceInfo.getReferenceType(), gbeanInstance.getClassLoader());
@@ -158,6 +175,10 @@
return kernel;
}
+ protected DependencyManager getDependencyManager() {
+ return dependencyManager;
+ }
+
public final GBeanInstance getGBeanInstance() {
return gbeanInstance;
}
@@ -191,7 +212,7 @@
}
public final void setPatterns(Set patterns) {
- if (kernel != null) {
+ if (isOnline) {
throw new IllegalStateException("Pattern set can not be modified while online");
}
@@ -210,9 +231,7 @@
}
}
- public final synchronized void online(Kernel kernel) {
- this.kernel = kernel;
-
+ public final synchronized void online() {
Set gbeans = kernel.listGBeans(patterns);
for (Iterator objectNameIterator = gbeans.iterator(); objectNameIterator.hasNext();) {
ObjectName target = (ObjectName) objectNameIterator.next();
@@ -226,6 +245,7 @@
}
kernel.getLifecycleMonitor().addLifecycleListener(listener, patterns);
+ isOnline = true;
}
public final synchronized void offline() {
@@ -235,7 +255,7 @@
kernel.getLifecycleMonitor().removeLifecycleListener(listener);
targets.clear();
- kernel = null;
+ isOnline = false;
}
protected abstract void targetAdded(ObjectName target);
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanCollectionReference.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanCollectionReference.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanCollectionReference.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanCollectionReference.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanCollectionReference.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanCollectionReference.java Tue Dec 7 07:55:36 2004
@@ -21,13 +21,15 @@
import org.apache.geronimo.gbean.GReferenceInfo;
import org.apache.geronimo.gbean.InvalidConfigurationException;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.DependencyManager;
/**
* @version $Rev: 71492 $ $Date: 2004-11-14 21:31:50 -0800 (Sun, 14 Nov 2004) $
*/
public class GBeanCollectionReference extends AbstractGBeanReference {
- public GBeanCollectionReference(GBeanInstance gbeanInstance, GReferenceInfo referenceInfo) throws InvalidConfigurationException {
- super(gbeanInstance, referenceInfo);
+ public GBeanCollectionReference(GBeanInstance gbeanInstance, GReferenceInfo referenceInfo, Kernel kernel, DependencyManager dependencyManager) throws InvalidConfigurationException {
+ super(gbeanInstance, referenceInfo, kernel, dependencyManager);
}
public synchronized void start() throws Exception {
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Tue Dec 7 07:55:36 2004
@@ -45,6 +45,7 @@
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.NoSuchAttributeException;
import org.apache.geronimo.kernel.NoSuchOperationException;
+import org.apache.geronimo.kernel.DependencyManager;
import org.apache.geronimo.kernel.management.EventProvider;
import org.apache.geronimo.kernel.management.ManagedObject;
import org.apache.geronimo.kernel.management.NotificationType;
@@ -66,11 +67,6 @@
public static final String RAW_INVOKER = "$$RAW_INVOKER$$";
/**
- * Attribute name used to retrieve the GBeanData for the GBean
- */
- public static final String GBEAN_DATA = "$$GBEAN_DATA$$";
-
- /**
* The kernel in which this server is registered.
*/
private final Kernel kernel;
@@ -189,11 +185,11 @@
* @throws org.apache.geronimo.gbean.InvalidConfigurationException if the gbeanInfo is inconsistent with the actual java classes, such as
* mismatched attribute types or the intial data can not be set
*/
- public GBeanInstance(Kernel kernel, GBeanData gbeanData, LifecycleBroadcaster lifecycleBroadcaster, ClassLoader classLoader) throws InvalidConfigurationException {
- this.kernel = kernel;
+ public GBeanInstance(GBeanData gbeanData, Kernel kernel, DependencyManager dependencyManager, LifecycleBroadcaster lifecycleBroadcaster, ClassLoader classLoader) throws InvalidConfigurationException {
this.objectName = gbeanData.getName();
+ this.kernel = kernel;
this.lifecycleBroadcaster = lifecycleBroadcaster;
- this.gbeanInstanceState = new GBeanInstanceState(kernel, objectName, new GBeanLifecycleCallback(), lifecycleBroadcaster);
+ this.gbeanInstanceState = new GBeanInstanceState(objectName, kernel, dependencyManager, new GBeanLifecycleCallback(), lifecycleBroadcaster);
this.classLoader = classLoader;
gbeanLifecycleController = new GBeanInstanceLifecycleController(this);
@@ -227,9 +223,9 @@
for (Iterator iterator = gbeanInfo.getReferences().iterator(); iterator.hasNext();) {
GReferenceInfo referenceInfo = (GReferenceInfo) iterator.next();
if (referenceInfo.getProxyType().equals(Collection.class.getName())) {
- referencesSet.add(new GBeanCollectionReference(this, referenceInfo));
+ referencesSet.add(new GBeanCollectionReference(this, referenceInfo, kernel, dependencyManager));
} else {
- referencesSet.add(new GBeanSingleReference(this, referenceInfo));
+ referencesSet.add(new GBeanSingleReference(this, referenceInfo, kernel, dependencyManager));
}
}
references = (GBeanReference[]) referencesSet.toArray(new GBeanReference[gbeanInfo.getReferences().size()]);
@@ -294,7 +290,7 @@
}
for (int i = 0; i < references.length; i++) {
- references[i].online(this.kernel);
+ references[i].online();
}
lifecycleBroadcaster.fireLoadedEvent();
}
@@ -454,10 +450,9 @@
* Moves this GBeanInstance to the starting state and then attempts to move this MBean immediately
* to the running state.
*
- * @throws Exception If an exception occurs while starting this MBean
* @throws IllegalStateException If the gbean is disabled
*/
- public final void start() throws Exception {
+ public final void start() {
synchronized (this) {
if (!enabled) {
throw new IllegalStateException("A disabled GBean can not be started: objectName=" + objectName);
@@ -469,10 +464,9 @@
/**
* Starts this GBeanInstance and then attempts to start all of its start dependent children.
*
- * @throws Exception if a problem occurs will starting this MBean or any child MBean
* @throws IllegalStateException If the gbean is disabled
*/
- public final void startRecursive() throws Exception {
+ public final void startRecursive() {
synchronized (this) {
if (!enabled) {
throw new IllegalStateException("A disabled GBean can not be started: objectName=" + objectName);
@@ -484,10 +478,8 @@
/**
* Moves this GBeanInstance to the STOPPING state, calls stop on all start dependent children, and then attempt
* to move this MBean to the STOPPED state.
- *
- * @throws Exception If an exception occurs while stoping this MBean or any of the childern
*/
- public final void stop() throws Exception {
+ public final void stop() {
gbeanInstanceState.stop();
}
@@ -592,12 +584,6 @@
if (attributeName.equals(RAW_INVOKER)) {
return rawInvoker;
}
-
- if (attributeName.equals(GBEAN_DATA)) {
- return getGBeanData();
-
- }
-
throw e;
}
@@ -941,6 +927,16 @@
new MethodInvoker() {
public Object invoke(Object target, Object[] arguments) throws Exception {
return new Boolean(isEventProvider());
+ }
+ }));
+
+ attributesMap.put("eventTypes",
+ GBeanAttribute.createFrameworkAttribute(this,
+ "eventTypes",
+ Boolean.TYPE,
+ new MethodInvoker() {
+ public Object invoke(Object target, Object[] arguments) throws Exception {
+ return getEventTypes();
}
}));
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java Tue Dec 7 07:55:36 2004
@@ -16,22 +16,21 @@
*/
package org.apache.geronimo.gbean.runtime;
-import java.util.Set;
import java.util.Iterator;
-
+import java.util.Set;
import javax.management.ObjectName;
-import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.kernel.LifecycleAdapter;
-import org.apache.geronimo.kernel.LifecycleListener;
-import org.apache.geronimo.kernel.Kernel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.DependencyManager;
import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.NoSuchAttributeException;
-import org.apache.geronimo.gbean.WaitingException;
-import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.kernel.lifecycle.LifecycleAdapter;
+import org.apache.geronimo.kernel.lifecycle.LifecycleListener;
+import org.apache.geronimo.kernel.management.State;
/**
* @version $Rev$ $Date$
@@ -74,10 +73,10 @@
// objects check if each other are in one state or another (i.e., classic A calls B while B calls A)
private volatile State state = State.STOPPED;
- GBeanInstanceState(Kernel kernel, ObjectName objectName, GBeanLifecycle gbeanLifecycle, LifecycleBroadcaster lifecycleBroadcaster) {
- this.kernel = kernel;
- this.dependencyManager = kernel.getDependencyManager();
+ GBeanInstanceState(ObjectName objectName, Kernel kernel, DependencyManager dependencyManager, GBeanLifecycle gbeanLifecycle, LifecycleBroadcaster lifecycleBroadcaster) {
this.objectName = objectName;
+ this.kernel = kernel;
+ this.dependencyManager = dependencyManager;
this.gbeanLifecycle = gbeanLifecycle;
this.lifecycleBroadcaster = lifecycleBroadcaster;
}
@@ -89,10 +88,8 @@
* Note: This method cannot be called while the current thread holds a synchronized lock on this MBean,
* because this method sends JMX notifications. Sending a general notification from a synchronized block
* is a bad idea and therefore not allowed.
- *
- * @throws Exception If an exception occurs while starting this MBean
*/
- public final void start() throws Exception {
+ public final void start() {
assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
// Move to the starting state
@@ -122,10 +119,8 @@
* Note: This method cannot be call while the current thread holds a synchronized lock on this MBean,
* because this method sends JMX notifications. Sending a general notification from a synchronized block
* is a bad idea and therefore not allowed.
- *
- * @throws Exception if a problem occurs will starting this MBean or any child MBean
*/
- public final void startRecursive() throws Exception {
+ public final void startRecursive() {
assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
State state = getStateInstance();
@@ -143,18 +138,18 @@
Set dependents = dependencyManager.getChildren(objectName);
for (Iterator iterator = dependents.iterator(); iterator.hasNext();) {
ObjectName dependent = (ObjectName) iterator.next();
- boolean enabled = true;
try {
- enabled = ((Boolean) kernel.getAttribute(dependent, "gbeanEnabled")).booleanValue();
+ if (((Boolean) kernel.getAttribute(dependent, "gbeanEnabled")).booleanValue()) {
+ kernel.startRecursiveGBean(dependent);
+ }
} catch (NoSuchAttributeException e) {
// this is ok didn't have the attribute....
- }
- if (enabled) {
- try {
- kernel.invoke(dependent, "startRecursive", null, null);
- } catch (NoSuchMethodException e) {
- // did not have a startRecursive method - ok
- }
+ } catch (GBeanNotFoundException e) {
+ // this is ok the gbean died before we could start it
+ continue;
+ } catch (Exception e) {
+ // the is something wrong with this gbean... skip it
+ continue;
}
}
}
@@ -166,10 +161,8 @@
* Note: This method can not be call while the current thread holds a syncronized lock on this MBean,
* because this method sends JMX notifications. Sending a general notification from a synchronized block
* is a bad idea and therefore not allowed.
- *
- * @throws Exception If an exception occurs while stopping this MBean or any of the children
*/
- public final void stop() throws Exception {
+ public final void stop() {
assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
// move to the stopping state
@@ -238,11 +231,10 @@
* Attempts to bring the component into {@link org.apache.geronimo.kernel.management.State#RUNNING} state. If an Exception occurs while
* starting the component, the component will be failed.
*
- * @throws Exception if a problem occurs while starting the component
* <p/>
* Note: Do not call this from within a synchronized block as it makes may send a JMX notification
*/
- void attemptFullStart() throws Exception {
+ void attemptFullStart() {
assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
State newState = null;
@@ -327,14 +319,12 @@
} catch (WaitingException e) {
log.debug("Waiting to start: objectName=\"" + objectName + "\" reason=\"" + e.getMessage() + "\"");
return;
+ } catch (Exception e) {
+ log.error("Error while starting: objectName=\"" + objectName+ "\"", e);
+ return;
}
setStateInstance(State.RUNNING);
newState = State.RUNNING;
- } catch (Exception e) {
- doSafeFail();
- setStateInstance(State.FAILED);
- newState = State.FAILED;
- throw e;
} catch (Error e) {
doSafeFail();
setStateInstance(State.FAILED);
@@ -353,11 +343,10 @@
* Attempt to bring the component into the fully stopped state.
* If an exception occurs while stopping the component, the component will be failed.
*
- * @throws Exception if a problem occurs while stopping the component
* <p/>
* Note: Do not call this from within a synchronized block as it may send a JMX notification
*/
- void attemptFullStop() throws Exception {
+ void attemptFullStop() {
assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
State newState = null;
@@ -399,14 +388,12 @@
} catch (WaitingException e) {
log.debug("Waiting to stop: objectName=\"" + objectName + "\" reason=\"" + e.getMessage() + "\"");
return;
+ } catch (Exception e) {
+ log.error("Error while stopping: objectName=\"" + objectName+ "\"", e);
+ return;
}
setStateInstance(State.STOPPED);
newState = State.STOPPED;
- } catch (Exception e) {
- doSafeFail();
- setStateInstance(State.FAILED);
- newState = State.FAILED;
- throw e;
} catch (Error e) {
doSafeFail();
setStateInstance(State.FAILED);
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java Tue Dec 7 07:55:36 2004
@@ -18,7 +18,6 @@
import java.util.Set;
-import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.gbean.GReferenceInfo;
/**
@@ -37,7 +36,7 @@
void setPatterns(Set patterns);
- void online(Kernel kernel);
+ void online();
void offline();
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java Tue Dec 7 07:55:36 2004
@@ -26,6 +26,7 @@
import org.apache.geronimo.gbean.InvalidConfigurationException;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.DependencyManager;
import org.apache.geronimo.kernel.management.State;
/**
@@ -44,8 +45,8 @@
*/
private ObjectName proxyTarget;
- public GBeanSingleReference(GBeanInstance gbeanInstance, GReferenceInfo referenceInfo) throws InvalidConfigurationException {
- super(gbeanInstance, referenceInfo);
+ public GBeanSingleReference(GBeanInstance gbeanInstance, GReferenceInfo referenceInfo, Kernel kernel, DependencyManager dependencyManager) throws InvalidConfigurationException {
+ super(gbeanInstance, referenceInfo, kernel, dependencyManager);
}
public synchronized void start() throws Exception {
@@ -73,30 +74,30 @@
waitingForMe = false;
// stop all gbeans that would match our patterns from starting
- Kernel kernel = getKernel();
ObjectName objectName = getGBeanInstance().getObjectNameObject();
- kernel.getDependencyManager().addStartHolds(objectName, getPatterns());
+ DependencyManager dependencyManager = getDependencyManager();
+ dependencyManager.addStartHolds(objectName, getPatterns());
// add a dependency on our target and create the proxy
ObjectName target = (ObjectName) targets.iterator().next();
- setProxy(kernel.getProxyManager().createProxy(target, getReferenceType()));
+ setProxy(getKernel().getProxyManager().createProxy(target, getReferenceType()));
proxyTarget = target;
- kernel.getDependencyManager().addDependency(objectName, target);
+ dependencyManager.addDependency(objectName, target);
}
public synchronized void stop() {
waitingForMe = false;
- Kernel kernel = getKernel();
ObjectName objectName = getGBeanInstance().getObjectNameObject();
Set patterns = getPatterns();
+ DependencyManager dependencyManager = getDependencyManager();
if (!patterns.isEmpty()) {
- kernel.getDependencyManager().removeStartHolds(objectName, patterns);
+ dependencyManager.removeStartHolds(objectName, patterns);
}
Object proxy = getProxy();
if (proxy != null) {
- kernel.getDependencyManager().removeDependency(objectName, proxyTarget);
- kernel.getProxyManager().destroyProxy(proxy);
+ dependencyManager.removeDependency(objectName, proxyTarget);
+ getKernel().getProxyManager().destroyProxy(proxy);
setProxy(null);
proxyTarget = null;
}
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/ClassLoading.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/ClassLoading.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/ClassLoading.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/ClassLoading.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/ClassLoading.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/ClassLoading.java Tue Dec 7 07:55:36 2004
@@ -27,17 +27,6 @@
* @version $Rev$ $Date$
*/
public class ClassLoading {
- /**
- * Load a class for the given name using the context class loader.
- *
- * @param className The name of the Class to be loaded.
- * @return The Class object for the given name.
- * @throws ClassNotFoundException Failed to load Class object.
- * @see #loadClass(String,ClassLoader)
- */
- public static Class loadClass(final String className) throws ClassNotFoundException {
- return loadClass(className, getContextClassLoader());
- }
/**
* Load a class for the given name.
@@ -127,16 +116,6 @@
rc.append(VM_PRIMITIVES_REVERSE.get(clazz));
}
return rc.toString();
- }
-
- /**
- * This method acts equivalently to invoking
- * <code>Thread.currentThread().getContextClassLoader()</code>.
- *
- * @return The thread context class Loader.
- */
- private static ClassLoader getContextClassLoader() {
- return Thread.currentThread().getContextClassLoader();
}
/**
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/DependencyManager.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/DependencyManager.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/DependencyManager.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/DependencyManager.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/DependencyManager.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/DependencyManager.java Tue Dec 7 07:55:36 2004
@@ -28,6 +28,10 @@
import java.util.Set;
import javax.management.ObjectName;
+import org.apache.geronimo.kernel.lifecycle.LifecycleAdapter;
+import org.apache.geronimo.kernel.lifecycle.LifecycleListener;
+import org.apache.geronimo.kernel.lifecycle.LifecycleMonitor;
+
/**
* DependencyManager is the record keeper of the dependencies in Geronimo. The DependencyManager
* does not enforce any dependencies, it is simply a place where components can register their intent
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java Tue Dec 7 07:55:36 2004
@@ -30,14 +30,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.management.Attribute;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.JMException;
-import javax.management.JMRuntimeException;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -45,8 +37,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
-import org.apache.geronimo.gbean.jmx.JMXLifecycleBroadcaster;
import org.apache.geronimo.gbean.runtime.GBeanInstance;
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationManager;
@@ -54,8 +44,14 @@
import org.apache.geronimo.kernel.config.InvalidConfigException;
import org.apache.geronimo.kernel.config.NoSuchConfigException;
import org.apache.geronimo.kernel.config.NoSuchStoreException;
+import org.apache.geronimo.kernel.jmx.JMXLifecycleBroadcaster;
import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.kernel.lifecycle.BasicLifecycleMonitor;
+import org.apache.geronimo.kernel.lifecycle.LifecycleMonitor;
+import org.apache.geronimo.kernel.lifecycle.LifecycleMonitorFlyweight;
import org.apache.geronimo.kernel.proxy.ProxyManager;
+import org.apache.geronimo.kernel.registry.BasicGBeanRegistry;
+import org.apache.geronimo.kernel.registry.GBeanRegistry;
/**
@@ -77,7 +73,7 @@
*
* @version $Rev$ $Date$
*/
-public class Kernel implements KernelMBean {
+public class Kernel {
/**
* The JMX name used by a Kernel to register itself when it boots.
@@ -118,11 +114,6 @@
private final String kernelName;
/**
- * JMX domain name of this kernel
- */
- private final String domainName;
-
- /**
* The log
*/
private Log log;
@@ -138,9 +129,9 @@
private Date bootTime;
/**
- * The MBean server used by this kernel
+ * The gbean registry
*/
- private MBeanServer mbServer;
+ private final GBeanRegistry gbeanRegistry;
/**
* Listeners for when the kernel shutdown
@@ -164,49 +155,54 @@
/**
* Monitors the lifecycle of all gbeans.
- * @deprecated don't use this yet... it may go away
*/
- private LifecycleMonitor lifecycleMonitor;
+ private BasicLifecycleMonitor lifecycleMonitor;
+ private LifecycleMonitor publicLifecycleMonitor;
/**
* This factory gbean proxies, and tracks all proxies in the system
- * @deprecated don't use this yet... it may go away
*/
private ProxyManager proxyManager;
/**
* No-arg constructor allowing this class to be used as a GBean reference.
*/
- public Kernel() {
+ protected Kernel() {
kernelName = null;
- domainName = null;
+ gbeanRegistry = null;
}
/**
- * Construct a Kernel which does not have a config store.
+ * Construct a Kernel with the specified name and GBeanRegistry implementation.
*
- * @param kernelName the domain name to be used for the JMX MBeanServer
+ * @param kernelName the name of the kernel
+ * @param gbeanRegistry the GBeanRegistry implementation to use for this contianer
*/
- public Kernel(String kernelName) {
+ public Kernel(String kernelName, GBeanRegistry gbeanRegistry) {
+ if (kernelName.indexOf(':') >= 0 || kernelName.indexOf('*') >= 0 || kernelName.indexOf('?') >= 0) {
+ throw new IllegalArgumentException("Kernel name may not contain a ':', '*' or '?' character");
+ }
this.kernelName = kernelName;
- this.domainName = kernelName;
+ this.gbeanRegistry = gbeanRegistry;
}
/**
- * Construct a Kernel which does not have a config store.
+ * Construct a Kernel with the specified name and an unspecified GBeanRegistry implementation.
*
- * @param kernelName the name of the kernel that uniquely indentifies the kernel in a VM
- * @param domainName the domain name to be used for the JMX MBeanServer
- * @deprecated we are dropping the ability to have multiple kernels in a single mbean server, as the kernels will
- * stomp on each others namespace
+ * @param kernelName the name of the kernel
*/
- public Kernel(String kernelName, String domainName) {
- this.kernelName = kernelName;
- this.domainName = domainName;
+ public Kernel(String kernelName) {
+ this(kernelName, new BasicGBeanRegistry());
}
- public MBeanServer getMBeanServer() {
- return mbServer;
+ /**
+ * Construct a Kernel with the specified name and an unspecified GBeanRegistry implementation.
+ *
+ * @param kernelName the name of the kernel
+ * @deprecated use new Kernel(kernelName)
+ */
+ public Kernel(String kernelName, String ignored) {
+ this(kernelName);
}
public String getKernelName() {
@@ -258,6 +254,9 @@
}
}
+ /**
+ * @deprecated this will be removed as when we add generalized dependencies to gbeans... the only current user is Configuration
+ */
public DependencyManager getDependencyManager() {
return dependencyManager;
}
@@ -271,7 +270,7 @@
* @deprecated don't use this yet... it may change or go away
*/
public LifecycleMonitor getLifecycleMonitor() {
- return lifecycleMonitor;
+ return publicLifecycleMonitor;
}
/**
@@ -282,50 +281,14 @@
return proxyManager;
}
- public Object getAttribute(ObjectName objectName, String attributeName) throws GBeanNotFoundException, NoSuchAttributeException, InternalKernelException, Exception {
- try {
- return mbServer.getAttribute(objectName, attributeName);
- } catch (Exception e) {
- Throwable cause = unwrapJMException(e);
- if (cause instanceof InstanceNotFoundException) {
- throw new GBeanNotFoundException(objectName.getCanonicalName());
- } else if (cause instanceof AttributeNotFoundException) {
- throw new NoSuchAttributeException(cause.getMessage());
- } else if (cause instanceof JMException) {
- throw new InternalKernelException(cause);
- } else if (cause instanceof JMRuntimeException) {
- throw new InternalKernelException(cause);
- } else if (cause instanceof Error) {
- throw (Error) cause;
- } else if (cause instanceof Exception) {
- throw (Exception) cause;
- } else {
- throw new InternalKernelException("Unknown throwable", cause);
- }
- }
+ public Object getAttribute(ObjectName objectName, String attributeName) throws GBeanNotFoundException, NoSuchAttributeException, Exception {
+ GBeanInstance gbeanInstance = gbeanRegistry.getGBeanInstance(objectName);
+ return gbeanInstance.getAttribute(attributeName);
}
- public void setAttribute(ObjectName objectName, String attributeName, Object attributeValue) throws GBeanNotFoundException, NoSuchAttributeException, InternalKernelException, Exception {
- try {
- mbServer.setAttribute(objectName, new Attribute(attributeName, attributeValue));
- } catch (Exception e) {
- Throwable cause = unwrapJMException(e);
- if (cause instanceof InstanceNotFoundException) {
- throw new GBeanNotFoundException(objectName.getCanonicalName());
- } else if (cause instanceof AttributeNotFoundException) {
- throw new NoSuchAttributeException(cause.getMessage());
- } else if (cause instanceof JMException) {
- throw new InternalKernelException(cause);
- } else if (cause instanceof JMRuntimeException) {
- throw new InternalKernelException(cause);
- } else if (cause instanceof Error) {
- throw (Error) cause;
- } else if (cause instanceof Exception) {
- throw (Exception) cause;
- } else {
- throw new InternalKernelException("Unknown throwable", cause);
- }
- }
+ public void setAttribute(ObjectName objectName, String attributeName, Object attributeValue) throws GBeanNotFoundException, NoSuchAttributeException, Exception {
+ GBeanInstance gbeanInstance = gbeanRegistry.getGBeanInstance(objectName);
+ gbeanInstance.setAttribute(attributeName, attributeValue);
}
public Object invoke(ObjectName objectName, String methodName) throws GBeanNotFoundException, NoSuchOperationException, InternalKernelException, Exception {
@@ -333,147 +296,61 @@
}
public Object invoke(ObjectName objectName, String methodName, Object[] args, String[] types) throws GBeanNotFoundException, NoSuchOperationException, InternalKernelException, Exception {
- try {
- return mbServer.invoke(objectName, methodName, args, types);
- } catch (Exception e) {
- Throwable cause = unwrapJMException(e);
- if (cause instanceof InstanceNotFoundException) {
- throw new GBeanNotFoundException(objectName.getCanonicalName());
- } else if (cause instanceof NoSuchMethodException) {
- throw new NoSuchOperationException(cause.getMessage());
- } else if (cause instanceof JMException) {
- throw new InternalKernelException(cause);
- } else if (cause instanceof JMRuntimeException) {
- throw new InternalKernelException(cause);
- } else if (cause instanceof Error) {
- throw (Error) cause;
- } else if (cause instanceof Exception) {
- throw (Exception) cause;
- } else {
- throw new InternalKernelException("Unknown throwable", cause);
- }
- }
- }
-
- private Throwable unwrapJMException(Throwable cause) {
- while ((cause instanceof JMException || cause instanceof JMRuntimeException) && cause.getCause() != null) {
- cause = cause.getCause();
- }
- return cause;
+ GBeanInstance gbeanInstance = gbeanRegistry.getGBeanInstance(objectName);
+ return gbeanInstance.invoke(methodName, args, types);
}
-
public boolean isLoaded(ObjectName name) {
- try {
- return mbServer != null && mbServer.isRegistered(name);
- } catch (RuntimeException e) {
- throw new InternalKernelException(e);
- }
+ return gbeanRegistry.isRegistered(name);
}
- public GBeanInfo getGBeanInfo(ObjectName name) throws GBeanNotFoundException, InternalKernelException {
- try {
- return (GBeanInfo) getAttribute(name, "gbeanInfo");
- } catch (GBeanNotFoundException e) {
- throw e;
- } catch (InternalKernelException e) {
- throw e;
- } catch (Exception e) {
- throw new InternalKernelException(e);
- }
+ public GBeanInfo getGBeanInfo(ObjectName name) throws GBeanNotFoundException {
+ GBeanInstance gbeanInstance = gbeanRegistry.getGBeanInstance(name);
+ return gbeanInstance.getGBeanInfo();
}
public GBeanData getGBeanData(ObjectName name) throws GBeanNotFoundException, InternalKernelException {
- try {
- return (GBeanData) getAttribute(name, GBeanInstance.GBEAN_DATA);
- } catch (GBeanNotFoundException e) {
- throw e;
- } catch (InternalKernelException e) {
- throw e;
- } catch (Exception e) {
- throw new InternalKernelException(e);
- }
+ GBeanInstance gbeanInstance = gbeanRegistry.getGBeanInstance(name);
+ return gbeanInstance.getGBeanData();
}
public void loadGBean(GBeanData gbeanData, ClassLoader classLoader) throws GBeanAlreadyExistsException, InternalKernelException {
- try {
- GBeanMBean gbean = new GBeanMBean(this, gbeanData, classLoader);
- mbServer.registerMBean(gbean, gbeanData.getName());
- } catch (InstanceAlreadyExistsException e) {
- throw new GBeanAlreadyExistsException("A GBean is alreayd registered witht then name " + gbeanData.getName());
- } catch (Exception e) {
- throw new InternalKernelException("Error loading GBean " + gbeanData.getName().getCanonicalName(), unwrapJMException(e));
- }
+ ObjectName objectName = gbeanData.getName();
+ GBeanInstance gbeanInstance = new GBeanInstance(gbeanData, this, dependencyManager, lifecycleMonitor.createLifecycleBroadcaster(objectName), classLoader);
+ gbeanRegistry.register(gbeanInstance);
}
/**
* @deprecated use loadGBean(GBeanData gbeanData, ClassLoader classLoader)
*/
- public void loadGBean(ObjectName name, GBeanMBean gbean) throws GBeanAlreadyExistsException, InternalKernelException {
+ public void loadGBean(ObjectName name, org.apache.geronimo.gbean.jmx.GBeanMBean gbean) throws GBeanAlreadyExistsException, InternalKernelException {
GBeanData gbeanData = gbean.getGBeanData();
gbeanData.setName(name);
ClassLoader classLoader = gbean.getClassLoader();
loadGBean(gbeanData, classLoader);
}
- public void startGBean(ObjectName name) throws GBeanNotFoundException, InternalKernelException {
- try {
- invoke(name, "start");
- } catch (GBeanNotFoundException e) {
- throw e;
- } catch (InternalKernelException e) {
- throw e;
- } catch (NoSuchOperationException e) {
- throw new InternalKernelException("GBean is not state manageable: " + name.getCanonicalName(), e);
- } catch (Exception e) {
- throw new InternalKernelException("Invalid GBean configuration for " + name, unwrapJMException(e));
- }
+ public void startGBean(ObjectName name) throws GBeanNotFoundException, InternalKernelException, IllegalStateException {
+ GBeanInstance gbeanInstance = gbeanRegistry.getGBeanInstance(name);
+ gbeanInstance.start();
}
- public void startRecursiveGBean(ObjectName name) throws GBeanNotFoundException, InternalKernelException {
- try {
- invoke(name, "startRecursive");
- } catch (GBeanNotFoundException e) {
- throw e;
- } catch (InternalKernelException e) {
- throw e;
- } catch (NoSuchOperationException e) {
- throw new InternalKernelException("GBean is not state manageable: " + name.getCanonicalName(), e);
- } catch (Exception e) {
- throw new InternalKernelException("Invalid GBean configuration for " + name, e);
- }
+ public void startRecursiveGBean(ObjectName name) throws GBeanNotFoundException, InternalKernelException, IllegalStateException {
+ GBeanInstance gbeanInstance = gbeanRegistry.getGBeanInstance(name);
+ gbeanInstance.startRecursive();
}
- public void stopGBean(ObjectName name) throws GBeanNotFoundException, InternalKernelException {
- try {
- invoke(name, "stop");
- } catch (GBeanNotFoundException e) {
- throw e;
- } catch (InternalKernelException e) {
- throw e;
- } catch (NoSuchOperationException e) {
- throw new InternalKernelException("GBean is not state manageable: " + name.getCanonicalName(), e);
- } catch (Exception e) {
- throw new InternalKernelException("Invalid GBean configuration for " + name, e);
- }
+ public void stopGBean(ObjectName name) throws GBeanNotFoundException, InternalKernelException, IllegalStateException {
+ GBeanInstance gbeanInstance = gbeanRegistry.getGBeanInstance(name);
+ gbeanInstance.stop();
}
- public void unloadGBean(ObjectName name) throws GBeanNotFoundException, InternalKernelException {
- try {
- mbServer.unregisterMBean(name);
- } catch (InstanceNotFoundException e) {
- throw new GBeanNotFoundException(name.getCanonicalName());
- } catch (Exception e) {
- throw new InternalKernelException("Error unloading GBean " + name, unwrapJMException(e));
- }
+ public void unloadGBean(ObjectName name) throws GBeanNotFoundException, InternalKernelException, IllegalStateException {
+ gbeanRegistry.unregister(name);
}
public Set listGBeans(ObjectName pattern) {
- try {
- return mbServer.queryNames(pattern, null);
- } catch (RuntimeException e) {
- throw new InternalKernelException("Error while applying pattern " + pattern, e);
- }
+ return gbeanRegistry.listGBeans(pattern);
}
public Set listGBeans(Set patterns) {
@@ -518,18 +395,16 @@
}
public int getConfigurationState(URI configID) throws NoSuchConfigException, InternalKernelException {
- try {
- ObjectName configName = Configuration.getConfigurationObjectName(configID);
- return ((Integer)getAttribute(configName, "state")).intValue();
- } catch (MalformedObjectNameException e) {
- throw new NoSuchConfigException(e);
- } catch (GBeanNotFoundException e) {
- throw new NoSuchConfigException(e);
- } catch (InternalKernelException e) {
- throw e;
- } catch (Exception e) {
- throw new InternalKernelException(e);
- }
+ GBeanInstance gbeanInstance = null;
+ try {
+ ObjectName configName = Configuration.getConfigurationObjectName(configID);
+ gbeanInstance = gbeanRegistry.getGBeanInstance(configName);
+ } catch (MalformedObjectNameException e) {
+ throw new NoSuchConfigException(e);
+ } catch (GBeanNotFoundException e) {
+ throw new NoSuchConfigException(e);
+ }
+ return gbeanInstance.getState();
}
/**
@@ -546,6 +421,7 @@
log = LogFactory.getLog(Kernel.class.getName());
log.info("Starting boot");
+ // todo cleanup when boot fails
synchronized (kernels) {
if (kernels.containsKey(kernelName)) {
throw new IllegalStateException("A kernel is already running this kernel name: " + kernelName);
@@ -553,10 +429,11 @@
kernels.put(kernelName, new KernelReference(kernelName, this));
}
- mbServer = MBeanServerFactory.createMBeanServer(domainName);
- mbServer.registerMBean(this, KERNEL);
- lifecycleMonitor = new LifecycleMonitor(this);
- dependencyManager = new DependencyManager(lifecycleMonitor);
+ gbeanRegistry.start(this);
+
+ lifecycleMonitor = new BasicLifecycleMonitor(this);
+ publicLifecycleMonitor = new LifecycleMonitorFlyweight(lifecycleMonitor);
+ dependencyManager = new DependencyManager(publicLifecycleMonitor);
proxyManager = new ProxyManager(this);
// set up the data for the new configuration manager instance
@@ -565,14 +442,16 @@
// create the connfiguration manager instance
JMXLifecycleBroadcaster lifecycleBroadcaster = new JMXLifecycleBroadcaster(CONFIGURATION_MANAGER_NAME, lifecycleMonitor.createLifecycleBroadcaster(CONFIGURATION_MANAGER_NAME));
- configurationManagerInstance = new GBeanInstance(this, configurationData, lifecycleBroadcaster, getClass().getClassLoader());
+ configurationManagerInstance = new GBeanInstance(configurationData, this, dependencyManager, lifecycleBroadcaster, getClass().getClassLoader());
configurationManagerInstance.start();
configurationManager = (ConfigurationManager) configurationManagerInstance.getTarget();
assert configurationManager != null: "ConfigurationManager failed to start";
+ gbeanRegistry.register(configurationManagerInstance);
- // wrap it in an mbean and register it
- GBeanMBean configurationManagerGBean = new GBeanMBean(this, configurationManagerInstance, lifecycleBroadcaster);
- mbServer.registerMBean(configurationManagerGBean, CONFIGURATION_MANAGER_NAME);
+ // load and start the kernel gbean
+ GBeanData kernelGBeanData = new GBeanData(KERNEL, KernelGBean.GBEAN_INFO);
+ loadGBean(kernelGBeanData, getClass().getClassLoader());
+ startGBean(KERNEL);
running = true;
log.info("Booted");
@@ -609,17 +488,11 @@
notifyShutdownHooks();
shutdownConfigManager();
- try {
- mbServer.unregisterMBean(KERNEL);
- } catch (Exception e) {
- // ignore
- }
+ gbeanRegistry.stop();
dependencyManager.close();
dependencyManager = null;
- MBeanServerFactory.releaseMBeanServer(mbServer);
- mbServer = null;
synchronized (this) {
notify();
}
@@ -654,7 +527,7 @@
// ignore
}
try {
- mbServer.unregisterMBean(CONFIGURATION_MANAGER_NAME);
+ gbeanRegistry.unregister(CONFIGURATION_MANAGER_NAME);
} catch (Exception e) {
// ignore
}
@@ -667,13 +540,8 @@
}
public ClassLoader getClassLoaderFor(ObjectName name) throws GBeanNotFoundException {
- try {
- return mbServer.getClassLoaderFor(name);
- } catch (InstanceNotFoundException e) {
- throw new GBeanNotFoundException(name.getCanonicalName());
- } catch (RuntimeException e) {
- throw new InternalKernelException("Error while attemping to get class loader for " + name.getCanonicalName(), e);
- }
+ GBeanInstance gbeanInstance = gbeanRegistry.getGBeanInstance(name);
+ return gbeanInstance.getClassLoader();
}
private static void processQueue() {
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelGBean.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelGBean.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelGBean.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelGBean.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelGBean.java&r2=110110
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelMBean.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/KernelMBean.java?view=auto&rev=110109
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/LifecycleAdapter.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/LifecycleAdapter.java?view=auto&rev=110109
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/LifecycleListener.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/LifecycleListener.java?view=auto&rev=110109
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/LifecycleMonitor.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/LifecycleMonitor.java?view=auto&rev=110109
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java Tue Dec 7 07:55:36 2004
@@ -211,6 +211,7 @@
log.trace("Registering GBean " + name);
kernel.loadGBean(gbeanData, configurationClassLoader);
objectNames.add(name);
+ // todo change this to a dependency on the gbeanData itself as soon as we add that feature
kernel.getDependencyManager().addDependency(name, this.objectName);
}
this.objectNames = objectNames;
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Run.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Run.java?view=auto&rev=110109
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/GBeanMBean.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/GBeanMBean.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/GBeanMBean.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/GBeanMBean.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/GBeanMBean.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGBeanRegistry.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGBeanRegistry.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGBeanRegistry.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGBeanRegistry.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGBeanRegistry.java&r2=110110
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGetAttributeInvoker.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXGetAttributeInvoker.java?view=auto&rev=110109
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXInvocationHandler.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXInvocationHandler.java?view=auto&rev=110109
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXInvoker.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXInvoker.java?view=auto&rev=110109
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXLifecycleBroadcaster.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXLifecycleBroadcaster.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXLifecycleBroadcaster.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXLifecycleBroadcaster.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXLifecycleBroadcaster.java&r2=110110
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXOperationInvoker.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXOperationInvoker.java?view=auto&rev=110109
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXSetAttributeInvoker.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXSetAttributeInvoker.java?view=auto&rev=110109
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXUtil.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXUtil.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXUtil.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXUtil.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXUtil.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXUtil.java Tue Dec 7 07:55:36 2004
@@ -17,8 +17,22 @@
package org.apache.geronimo.kernel.jmx;
+import java.util.Set;
+import java.util.Iterator;
+import java.util.List;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import javax.management.MBeanInfo;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanConstructorInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanParameterInfo;
+import javax.management.MBeanNotificationInfo;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GAttributeInfo;
+import org.apache.geronimo.gbean.GOperationInfo;
+import org.apache.geronimo.kernel.management.NotificationType;
/**
@@ -31,11 +45,6 @@
}
/**
- * the ObjectName of the MBeanServerDelegate
- */
- public static final ObjectName DELEGATE_NAME = getObjectName("JMImplementation:type=MBeanServerDelegate");
-
- /**
* Convert a String to an ObjectName
*
* @param name the name
@@ -48,5 +57,56 @@
} catch (MalformedObjectNameException e) {
throw new IllegalArgumentException("Malformed ObjectName: " + name);
}
+ }
+
+ public static MBeanInfo toMBeanInfo(GBeanInfo gBeanInfo) {
+ String className = gBeanInfo.getClassName();
+ String description = "No description available";
+
+ // attributes
+ Set gbeanAttributes = gBeanInfo.getAttributes();
+ MBeanAttributeInfo[] attributes = new MBeanAttributeInfo[gbeanAttributes.size()];
+ int a = 0;
+ for (Iterator iterator = gbeanAttributes.iterator(); iterator.hasNext();) {
+ GAttributeInfo gAttributeInfo = (GAttributeInfo) iterator.next();
+ attributes[a] = new MBeanAttributeInfo(gAttributeInfo.getName(), gAttributeInfo.getType(), "no description available", gAttributeInfo.isReadable(), gAttributeInfo.isWritable(), isIs(gAttributeInfo));
+ a++;
+ }
+
+ //we don't expose managed constructors
+ MBeanConstructorInfo[] constructors = new MBeanConstructorInfo[0];
+
+ // operations
+ Set gbeanOperations = gBeanInfo.getOperations();
+ MBeanOperationInfo[] operations = new MBeanOperationInfo[gbeanOperations.size()];
+ int o = 0;
+ for (Iterator iterator = gbeanOperations.iterator(); iterator.hasNext();) {
+ GOperationInfo gOperationInfo = (GOperationInfo) iterator.next();
+ //list of class names
+ List gparameters = gOperationInfo.getParameterList();
+ MBeanParameterInfo[] parameters = new MBeanParameterInfo[gparameters.size()];
+ int p = 0;
+ for (Iterator piterator = gparameters.iterator(); piterator.hasNext();) {
+ String type = (String) piterator.next();
+ parameters[p] = new MBeanParameterInfo("parameter" + p, type, "no description available");
+ p++;
+ }
+ operations[o] = new MBeanOperationInfo(gOperationInfo.getName(), "no description available", parameters, "java.lang.Object", MBeanOperationInfo.UNKNOWN);
+ o++;
+ }
+
+ MBeanNotificationInfo[] notifications = new MBeanNotificationInfo[1];
+ notifications[0] = new MBeanNotificationInfo(NotificationType.TYPES, "javax.management.Notification", "J2EE Notifications");
+
+ MBeanInfo mbeanInfo = new MBeanInfo(className, description, attributes, constructors, operations, notifications);
+ return mbeanInfo;
+ }
+
+ private static boolean isIs(GAttributeInfo gAttributeInfo) {
+ String getterName = gAttributeInfo.getGetterName();
+ if (getterName == null) {
+ return false;
+ }
+ return getterName.startsWith("is");
}
}
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelDelegate.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelDelegate.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelDelegate.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelDelegate.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelDelegate.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelMBean.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelMBean.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelMBean.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelMBean.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelMBean.java&r2=110110
==============================================================================
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanProxyFactory.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanProxyFactory.java?view=auto&rev=110109
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/BasicLifecycleMonitor.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/BasicLifecycleMonitor.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/BasicLifecycleMonitor.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/BasicLifecycleMonitor.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/BasicLifecycleMonitor.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleAdapter.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleAdapter.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleAdapter.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleAdapter.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleAdapter.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleListener.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleListener.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleListener.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleListener.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleListener.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitor.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitor.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitor.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitor.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitor.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitorFlyweight.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitorFlyweight.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitorFlyweight.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitorFlyweight.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/lifecycle/LifecycleMonitorFlyweight.java&r2=110110
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java Tue Dec 7 07:55:36 2004
@@ -33,9 +33,6 @@
// todo use weak keys for this
private final IdentityHashMap interceptors = new IdentityHashMap();
- /**
- * @deprecated don't use this yet... it may change or go away
- */
public ProxyManager(Kernel kernel) {
this.kernel = kernel;
}
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/BasicGBeanRegistry.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/BasicGBeanRegistry.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/BasicGBeanRegistry.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/BasicGBeanRegistry.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/BasicGBeanRegistry.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/GBeanRegistry.java (from r109996, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/GBeanRegistry.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/GBeanRegistry.java?view=diff&rev=110110&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/GBeanRegistry.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/registry/GBeanRegistry.java&r2=110110
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java Tue Dec 7 07:55:36 2004
@@ -95,7 +95,7 @@
printResults("FastClass", end, start, iterations);
// start a kernel
- Kernel kernel = new Kernel();
+ Kernel kernel = new Kernel("speed");
kernel.boot();
GBeanMBean mockGBean = new GBeanMBean(MockGBean.getGBeanInfo(), Speed.class.getClassLoader());
mockGBean.setAttribute("Name", "bar");
@@ -225,7 +225,7 @@
printResults("FastClass", end, start, iterations);
// start a kernel
- Kernel kernel = new Kernel();
+ Kernel kernel = new Kernel("speed");
kernel.boot();
GBeanMBean mockGBean = new GBeanMBean(MockGBean.getGBeanInfo(), Speed.class.getClassLoader());
mockGBean.setAttribute("Name", "bar");
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java Tue Dec 7 07:55:36 2004
@@ -348,12 +348,14 @@
kernel = new Kernel("test");
kernel.boot();
- gbeanInstance = new GBeanInstance(kernel,
- new GBeanData(new ObjectName("test:MockGBean=normal"), MockGBean.getGBeanInfo()),
+ gbeanInstance = new GBeanInstance(new GBeanData(new ObjectName("test:MockGBean=normal"), MockGBean.getGBeanInfo()),
+ kernel,
+ kernel.getDependencyManager(),
new MyLifecycleBroadcaster(),
MockGBean.class.getClassLoader());
- dynamicGBeanInstance = new GBeanInstance(kernel,
- new GBeanData(new ObjectName("test:MockGBean=dynamic"), MockDynamicGBean.getGBeanInfo()),
+ dynamicGBeanInstance = new GBeanInstance(new GBeanData(new ObjectName("test:MockGBean=dynamic"), MockDynamicGBean.getGBeanInfo()),
+ kernel,
+ kernel.getDependencyManager(),
new MyLifecycleBroadcaster(),
MockGBean.class.getClassLoader());
getInvoker = new MethodInvoker() {
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/ClassloadingTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/ClassloadingTest.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/ClassloadingTest.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/ClassloadingTest.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/ClassloadingTest.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/ClassloadingTest.java Tue Dec 7 07:55:36 2004
@@ -24,32 +24,9 @@
*
* @version $Rev$ $Date$
*/
-public class ClassloadingTest
- extends TestCase {
- protected Class loadClass(final String name) {
- Class type = null;
-
- try {
- type = ClassLoading.loadClass(name);
- } catch (ClassNotFoundException e) {
- fail("Class should have been found: " + e);
- }
-
- assertNotNull(type);
-
- return type;
- }
-
+public class ClassloadingTest extends TestCase {
public void testLoadClass_Null() {
try {
- ClassLoading.loadClass(null);
- fail("Expected NullArgumentException");
- } catch (IllegalArgumentException ignore) {
- } catch (ClassNotFoundException e) {
- fail("Class should have been found: " + e);
- }
-
- try {
ClassLoading.loadClass("org.apache.geronimo.kernel.ClassLoading", null);
fail("Expected NullArgumentException");
} catch (IllegalArgumentException ignore) {
@@ -64,15 +41,6 @@
assertEquals(className, type.getName());
}
- public void testLoadClass_Missing() {
- String className = "some.class.that.does.not.Exist";
- try {
- ClassLoading.loadClass(className);
- fail("Expected ClassNotFoundException: " + className);
- } catch (ClassNotFoundException ignore) {
- }
- }
-
public void testLoadClass_Primitives() {
String className = "boolean";
Class type = loadClass(className);
@@ -146,5 +114,19 @@
y = loadClass(x);
assertEquals(t, y);
+ }
+
+ private Class loadClass(String name) {
+ Class type = null;
+
+ try {
+ type = ClassLoading.loadClass(name, getClass().getClassLoader());
+ } catch (ClassNotFoundException e) {
+ fail("Class should have been found: " + e);
+ }
+
+ assertNotNull(type);
+
+ return type;
}
}
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/config/RunTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/config/RunTest.java?view=auto&rev=110109
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/project.xml?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/project.xml&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/project.xml&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/project.xml (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/project.xml Tue Dec 7 07:55:36 2004
@@ -58,6 +58,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Tue Dec 7 07:55:36 2004
@@ -30,7 +30,7 @@
import javax.naming.Reference;
import javax.transaction.UserTransaction;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.RefContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
@@ -47,6 +47,7 @@
import org.apache.geronimo.xbeans.j2ee.MessageDestinationRefType;
import org.apache.geronimo.xbeans.j2ee.ResourceEnvRefType;
import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
+import org.apache.geronimo.xbeans.j2ee.XsdStringType;
/**
* @version $Rev$ $Date$
@@ -56,9 +57,9 @@
public static void addEnvEntries(EnvEntryType[] envEntries, ComponentContextBuilder builder) throws DeploymentException {
for (int i = 0; i < envEntries.length; i++) {
EnvEntryType envEntry = envEntries[i];
- String name = envEntry.getEnvEntryName().getStringValue();
- String type = envEntry.getEnvEntryType().getStringValue();
- String text = envEntry.getEnvEntryValue().getStringValue();
+ String name = getStringValue(envEntry.getEnvEntryName());
+ String type = getStringValue(envEntry.getEnvEntryType());
+ String text = getStringValue(envEntry.getEnvEntryValue());
try {
builder.addEnvEntry(name, type, text);
} catch (NumberFormatException e) {
@@ -79,8 +80,8 @@
for (int i = 0; i < resourceRefs.length; i++) {
ResourceRefType resourceRef = resourceRefs[i];
- String name = resourceRef.getResRefName().getStringValue();
- String type = resourceRef.getResType().getStringValue();
+ String name = getStringValue(resourceRef.getResRefName());
+ String type = getStringValue(resourceRef.getResType());
GerResourceRefType gerResourceRef = (GerResourceRefType) refMap.get(name);
Class iface = null;
try {
@@ -122,19 +123,19 @@
//throws exception if it can't locate ref.
containerId = refContext.getConnectionFactoryContainerId(uri, name, j2eeContext);
} else if (gerResourceRef.isSetResourceLink()) {
- containerId = refContext.getConnectionFactoryContainerId(uri, gerResourceRef.getResourceLink(), j2eeContext);
+ containerId = refContext.getConnectionFactoryContainerId(uri, getStringValue(gerResourceRef.getResourceLink()), j2eeContext);
} else if (gerResourceRef.isSetTargetName()) {
- containerId = gerResourceRef.getTargetName();
+ containerId = getStringValue(gerResourceRef.getTargetName());
} else {
//construct name from components
try {
- containerId = NameFactory.getResourceComponentNameString(gerResourceRef.getDomain(),
- gerResourceRef.getServer(),
- gerResourceRef.getApplication(),
- gerResourceRef.getModule(),
- gerResourceRef.getName(),
+ containerId = NameFactory.getResourceComponentNameString(getStringValue(gerResourceRef.getDomain()),
+ getStringValue(gerResourceRef.getServer()),
+ getStringValue(gerResourceRef.getApplication()),
+ getStringValue(gerResourceRef.getModule()),
+ getStringValue(gerResourceRef.getName()),
//todo determine type from iface class
- gerResourceRef.getType() == null ? NameFactory.JCA_MANAGED_CONNECTION_FACTORY : gerResourceRef.getType(),
+ gerResourceRef.getType() == null ? NameFactory.JCA_MANAGED_CONNECTION_FACTORY : gerResourceRef.getType().trim(),
j2eeContext);
} catch (MalformedObjectNameException e) {
throw new DeploymentException("could not construct object name for resource", e);
@@ -152,8 +153,8 @@
for (int i = 0; i < resourceEnvRefArray.length; i++) {
ResourceEnvRefType resourceEnvRef = resourceEnvRefArray[i];
- String name = resourceEnvRef.getResourceEnvRefName().getStringValue();
- String type = resourceEnvRef.getResourceEnvRefType().getStringValue();
+ String name = getStringValue(resourceEnvRef.getResourceEnvRefName());
+ String type = getStringValue(resourceEnvRef.getResourceEnvRefType());
Class iface = null;
try {
iface = cl.loadClass(type);
@@ -179,17 +180,17 @@
//throws exception if it can't locate ref.
containerId = refContext.getAdminObjectContainerId(uri, name, j2eeContext);
} else if (gerResourceEnvRef.isSetMessageDestinationLink()) {
- containerId = refContext.getAdminObjectContainerId(uri, gerResourceEnvRef.getMessageDestinationLink(), j2eeContext);
+ containerId = refContext.getAdminObjectContainerId(uri, getStringValue(gerResourceEnvRef.getMessageDestinationLink()), j2eeContext);
} else if (gerResourceEnvRef.isSetTargetName()) {
- containerId = gerResourceEnvRef.getTargetName();
+ containerId = getStringValue(gerResourceEnvRef.getTargetName());
} else {
//construct name from components
try {
- containerId = NameFactory.getResourceComponentNameString(gerResourceEnvRef.getDomain(),
- gerResourceEnvRef.getServer(),
- gerResourceEnvRef.getApplication(),
- gerResourceEnvRef.getModule(),
- gerResourceEnvRef.getName(),
+ containerId = NameFactory.getResourceComponentNameString(getStringValue(gerResourceEnvRef.getDomain()),
+ getStringValue(gerResourceEnvRef.getServer()),
+ getStringValue(gerResourceEnvRef.getApplication()),
+ getStringValue(gerResourceEnvRef.getModule()),
+ getStringValue(gerResourceEnvRef.getName()),
NameFactory.JMS_RESOURCE,
//gerResourceEnvRef.getType(),
j2eeContext);
@@ -204,9 +205,9 @@
RefContext refContext = earContext.getRefContext();
for (int i = 0; i < messageDestinationRefs.length; i++) {
MessageDestinationRefType messageDestinationRef = messageDestinationRefs[i];
- String name = messageDestinationRef.getMessageDestinationRefName().getStringValue();
- String linkName = messageDestinationRef.getMessageDestinationLink().getStringValue();
- String type = messageDestinationRef.getMessageDestinationType().getStringValue();
+ String name = getStringValue(messageDestinationRef.getMessageDestinationRefName());
+ String linkName = getStringValue(messageDestinationRef.getMessageDestinationLink());
+ String type = getStringValue(messageDestinationRef.getMessageDestinationType());
Class iface = null;
try {
iface = cl.loadClass(type);
@@ -233,22 +234,22 @@
for (int i = 0; i < ejbRefs.length; i++) {
EjbRefType ejbRef = ejbRefs[i];
- String ejbRefName = ejbRef.getEjbRefName().getStringValue();
+ String ejbRefName = getStringValue(ejbRef.getEjbRefName());
- String remote = ejbRef.getRemote().getStringValue();
+ String remote = getStringValue(ejbRef.getRemote());
assureEJBObjectInterface(remote, cl);
- String home = ejbRef.getHome().getStringValue();
+ String home = getStringValue(ejbRef.getHome());
assureEJBHomeInterface(home, cl);
- boolean isSession = "Session".equals(ejbRef.getEjbRefType().getStringValue());
+ boolean isSession = "Session".equals(getStringValue(ejbRef.getEjbRefType()));
String ejbLink = null;
GerEjbRefType remoteRef = (GerEjbRefType) ejbRefMap.get(ejbRefName);
if (remoteRef != null && remoteRef.isSetEjbLink()) {
ejbLink = remoteRef.getEjbLink();
} else if (ejbRef.isSetEjbLink()) {
- ejbLink = getJ2eeStringValue(ejbRef.getEjbLink());
+ ejbLink = getStringValue(ejbRef.getEjbLink());
}
Reference ejbReference;
@@ -256,16 +257,16 @@
ejbReference = refContext.getEJBRemoteRef(uri, ejbLink, isSession, home, remote);
} else if (remoteRef != null) {
if (remoteRef.isSetTargetName()) {
- ejbReference = refContext.getEJBRemoteRef(remoteRef.getTargetName(), isSession, home, remote);
+ ejbReference = refContext.getEJBRemoteRef(getStringValue(remoteRef.getTargetName()), isSession, home, remote);
} else {
String containerId = null;
try {
- containerId = NameFactory.getEjbComponentNameString(remoteRef.getDomain(),
- remoteRef.getServer(),
- remoteRef.getApplication(),
- remoteRef.getModule(),
- remoteRef.getName(),
- remoteRef.getType(),
+ containerId = NameFactory.getEjbComponentNameString(getStringValue(remoteRef.getDomain()),
+ getStringValue(remoteRef.getServer()),
+ getStringValue(remoteRef.getApplication()),
+ getStringValue(remoteRef.getModule()),
+ getStringValue(remoteRef.getName()),
+ getStringValue(remoteRef.getType()),
j2eeContext);
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Could not construct ejb object name: " + remoteRef.getName(), e);
@@ -290,22 +291,22 @@
for (int i = 0; i < ejbLocalRefs.length; i++) {
EjbLocalRefType ejbLocalRef = ejbLocalRefs[i];
- String ejbRefName = ejbLocalRef.getEjbRefName().getStringValue();
+ String ejbRefName = getStringValue(ejbLocalRef.getEjbRefName());
- String local = ejbLocalRef.getLocal().getStringValue();
+ String local = getStringValue(ejbLocalRef.getLocal());
assureEJBLocalObjectInterface(local, cl);
- String localHome = ejbLocalRef.getLocalHome().getStringValue();
+ String localHome = getStringValue(ejbLocalRef.getLocalHome());
assureEJBLocalHomeInterface(localHome, cl);
- boolean isSession = "Session".equals(ejbLocalRef.getEjbRefType().getStringValue());
+ boolean isSession = "Session".equals(getStringValue(ejbLocalRef.getEjbRefType()));
String ejbLink = null;
GerEjbLocalRefType localRef = (GerEjbLocalRefType) ejbLocalRefMap.get(ejbRefName);
if (localRef != null && localRef.isSetEjbLink()) {
ejbLink = localRef.getEjbLink();
} else if (ejbLocalRef.isSetEjbLink()) {
- ejbLink = getJ2eeStringValue(ejbLocalRef.getEjbLink());
+ ejbLink = getStringValue(ejbLocalRef.getEjbLink());
}
Reference ejbReference;
@@ -313,16 +314,16 @@
ejbReference = refContext.getEJBLocalRef(uri, ejbLink, isSession, localHome, local);
} else if (localRef != null) {
if (localRef.isSetTargetName()) {
- ejbReference = refContext.getEJBLocalRef(localRef.getTargetName(), isSession, localHome, local);
+ ejbReference = refContext.getEJBLocalRef(getStringValue(localRef.getTargetName()), isSession, localHome, local);
} else {
String containerId = null;
try {
- containerId = NameFactory.getEjbComponentNameString(localRef.getDomain(),
- localRef.getServer(),
- localRef.getApplication(),
- localRef.getModule(),
- localRef.getName(),
- localRef.getType(),
+ containerId = NameFactory.getEjbComponentNameString(getStringValue(localRef.getDomain()),
+ getStringValue(localRef.getServer()),
+ getStringValue(localRef.getApplication()),
+ getStringValue(localRef.getModule()),
+ getStringValue(localRef.getName()),
+ getStringValue(localRef.getType()),
j2eeContext);
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Could not construct ejb object name: " + localRef.getName(), e);
@@ -378,11 +379,24 @@
}
}
- private static String getJ2eeStringValue(org.apache.geronimo.xbeans.j2ee.String string) {
+ private static String getStringValue(org.apache.geronimo.xbeans.j2ee.String string) {
if (string == null) {
return null;
}
- return string.getStringValue().trim();
+ String s = string.getStringValue();
+ return s == null ? null : s.trim();
+ }
+
+ private static String getStringValue(XsdStringType string) {
+ if (string == null) {
+ return null;
+ }
+ String s = string.getStringValue();
+ return s == null ? null : s.trim();
+ }
+
+ private static String getStringValue(String string) {
+ return string == null ? null : string.trim();
}
@@ -397,11 +411,11 @@
if (!URL.class.getName().equals(resourceRefType.getResType().getStringValue().trim())) {
GerResourceRefType gerResourceRef = (GerResourceRefType) refMap.get(resourceRefType.getResRefName().getStringValue());
- String containerId = getResourceContainerId(getJ2eeStringValue(resourceRefType.getResRefName()), uri, gerResourceRef, refContext, j2eeContext);
- if ("Unshareable".equals(getJ2eeStringValue(resourceRefType.getResSharingScope()))) {
+ String containerId = getResourceContainerId(getStringValue(resourceRefType.getResRefName()), uri, gerResourceRef, refContext, j2eeContext);
+ if ("Unshareable".equals(getStringValue(resourceRefType.getResSharingScope()))) {
unshareableResources.add(containerId);
}
- if ("Application".equals(getJ2eeStringValue(resourceRefType.getResAuth()))) {
+ if ("Application".equals(getStringValue(resourceRefType.getResAuth()))) {
applicationManagedSecurityResources.add(containerId);
}
}
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java Tue Dec 7 07:55:36 2004
@@ -18,6 +18,7 @@
package org.apache.geronimo.remoting.jmx;
import javax.management.ObjectName;
+import javax.management.MBeanServer;
import org.apache.geronimo.core.service.Interceptor;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -25,6 +26,7 @@
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.kernel.jmx.MBeanServerDelegate;
import org.apache.geronimo.proxy.ProxyContainer;
import org.apache.geronimo.proxy.ReflexiveInterceptor;
import org.apache.geronimo.remoting.DeMarshalingInterceptor;
@@ -63,7 +65,8 @@
router.register(objectName, this);
// Setup the server side contianer..
- Interceptor firstInterceptor = new ReflexiveInterceptor(kernel.getMBeanServer());
+ MBeanServer mbeanServer = new MBeanServerDelegate(kernel);
+ Interceptor firstInterceptor = new ReflexiveInterceptor(mbeanServer);
demarshaller = new DeMarshalingInterceptor(firstInterceptor, getClass().getClassLoader());
serverContainer = new ProxyContainer(firstInterceptor);
}
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/test/org/apache/geronimo/remoting/JMXRemotingTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/test/org/apache/geronimo/remoting/JMXRemotingTest.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/test/org/apache/geronimo/remoting/JMXRemotingTest.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/test/org/apache/geronimo/remoting/JMXRemotingTest.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/test/org/apache/geronimo/remoting/JMXRemotingTest.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/remoting/src/test/org/apache/geronimo/remoting/JMXRemotingTest.java Tue Dec 7 07:55:36 2004
@@ -23,10 +23,14 @@
import javax.management.ObjectName;
import junit.framework.TestCase;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.remoting.jmx.MBeanServerStub;
import org.apache.geronimo.remoting.jmx.RemoteMBeanServerFactory;
+import org.apache.geronimo.remoting.router.JMXRouter;
+import org.apache.geronimo.remoting.router.SubsystemRouter;
import org.apache.geronimo.remoting.transport.BytesMarshalledObject;
+import org.apache.geronimo.remoting.transport.TransportLoader;
/**
@@ -43,32 +47,32 @@
MBeanServer remoteProxy;
public void setUp() throws Exception {
- kernel = new Kernel("test.kernel", "simple.geronimo.test");
+ kernel = new Kernel("simple.geronimo.test");
kernel.boot();
- GBeanMBean gbean;
+ GBeanData gbean;
ClassLoader cl = Thread.currentThread().getContextClassLoader();
// Create all the parts
- gbean = new GBeanMBean("org.apache.geronimo.remoting.router.SubsystemRouter", cl);
subsystemRouter = new ObjectName("geronimo.remoting:router=SubsystemRouter");
- kernel.loadGBean(subsystemRouter, gbean);
+ gbean = new GBeanData(subsystemRouter, SubsystemRouter.GBEAN_INFO);
+ kernel.loadGBean(gbean, cl);
- gbean = new GBeanMBean("org.apache.geronimo.remoting.transport.TransportLoader", cl);
+ asyncTransport = new ObjectName("geronimo.remoting:transport=async");
+ gbean = new GBeanData(asyncTransport, TransportLoader.GBEAN_INFO);
gbean.setAttribute("bindURI", new URI("async://0.0.0.0:0"));
gbean.setReferencePatterns("Router", Collections.singleton(subsystemRouter));
- asyncTransport = new ObjectName("geronimo.remoting:transport=async");
- kernel.loadGBean(asyncTransport, gbean);
+ kernel.loadGBean(gbean, cl);
- gbean = new GBeanMBean("org.apache.geronimo.remoting.router.JMXRouter", cl);
- gbean.setReferencePatterns("SubsystemRouter", Collections.singleton(subsystemRouter));
jmxRouter = new ObjectName("geronimo.remoting:router=JMXRouter");
- kernel.loadGBean(jmxRouter, gbean);
+ gbean = new GBeanData(jmxRouter, JMXRouter.GBEAN_INFO);
+ gbean.setReferencePatterns("SubsystemRouter", Collections.singleton(subsystemRouter));
+ kernel.loadGBean(gbean, cl);
- gbean = new GBeanMBean("org.apache.geronimo.remoting.jmx.MBeanServerStub", cl);
- gbean.setReferencePatterns("Router", Collections.singleton(jmxRouter));
serverStub = new ObjectName("geronimo.remoting:target=MBeanServerStub");
- kernel.loadGBean(serverStub, gbean);
+ gbean = new GBeanData(serverStub, MBeanServerStub.GBEAN_INFO);
+ gbean.setReferencePatterns("Router", Collections.singleton(jmxRouter));
+ kernel.loadGBean(gbean, cl);
kernel.startGBean(subsystemRouter);
kernel.startGBean(asyncTransport);
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java Tue Dec 7 07:55:36 2004
@@ -36,7 +36,6 @@
import org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal;
import org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.kernel.jmx.MBeanProxyFactory;
import org.apache.geronimo.kernel.Kernel;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java Tue Dec 7 07:55:36 2004
@@ -24,7 +24,7 @@
import javax.management.ObjectName;
import org.apache.geronimo.common.propertyeditor.PropertyEditors;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GAttributeInfo;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java Tue Dec 7 07:55:36 2004
@@ -17,8 +17,8 @@
package org.apache.geronimo.deployment.service;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.DeploymentException;
/**
*
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Tue Dec 7 07:55:36 2004
@@ -30,9 +30,9 @@
import java.util.jar.JarFile;
import javax.management.MalformedObjectNameException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ConfigurationBuilder;
import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.DeploymentException;
import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
import org.apache.geronimo.deployment.xbeans.ConfigurationType;
import org.apache.geronimo.deployment.xbeans.DependencyType;
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java Tue Dec 7 07:55:36 2004
@@ -20,9 +20,6 @@
import java.util.Collections;
import javax.management.ObjectName;
-import org.apache.geronimo.system.main.CommandLine;
-import org.apache.geronimo.system.main.ExceptionUtil;
-
/**
* @version $Revision$ $Date$
*/
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java Tue Dec 7 07:55:36 2004
@@ -32,6 +32,7 @@
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.kernel.jmx.JMXGBeanRegistry;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.log.GeronimoLogging;
import org.apache.geronimo.system.url.GeronimoURLFactory;
@@ -97,8 +98,8 @@
ois.close();
}
- // build a basic kernel without a configuration-store, our configuration store is
- final Kernel kernel = new Kernel("geronimo.kernel", "geronimo");
+ // build a jms kernel
+ final Kernel kernel = new Kernel("geronimo", new JMXGBeanRegistry());
// boot the kernel
try {
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml Tue Dec 7 07:55:36 2004
@@ -79,12 +79,7 @@
<copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/mx4j/jars"
file="${maven.repo.local}/mx4j/jars/mx4j-&mx4j-version;.jar"/>
- <copy todir="${geronimoHome}/var/catalina/conf" file="src/var/server.xml"/>
<copy todir="${geronimoHome}/var/catalina/conf" file="src/var/web.xml"/>
-
- <j:set var="tomcatWebappDir" value="${geronimoHome}/var/catalina/webapps"/>
- <echo>Deploy your webapps to ${tomcatWebappDir}</echo>
- <mkdir dir="${tomcatWebappDir}"/>
<echo>Deploying Apache Tomcat configuration</echo>
<java fork="true" jar="../assembly/target/geronimo-${pom.currentVersion}/bin/deployer.jar" failonerror="true">
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml Tue Dec 7 07:55:36 2004
@@ -49,6 +49,21 @@
<dependencies>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
@@ -65,6 +80,19 @@
<repository>true</repository>
</properties>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <xmlbeans>true</xmlbeans>
+ </properties>
+ </dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>catalina</artifactId>
@@ -168,6 +196,16 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>&xerces-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>&xml-parser-apis-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean-apache</artifactId>
+ <version>&xmlbeans-version;</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java Tue Dec 7 07:55:36 2004
@@ -16,13 +16,17 @@
*/
package org.apache.geronimo.tomcat;
-import org.apache.catalina.startup.Catalina;
+import org.apache.catalina.Context;
+import org.apache.catalina.Engine;
+import org.apache.catalina.Host;
+import org.apache.catalina.connector.Connector;
+import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.startup.Embedded;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
/**
* Apache Tomcat GBean
@@ -35,39 +39,47 @@
public class TomcatContainer implements GBeanLifecycle {
private static final Log log = LogFactory.getLog(TomcatContainer.class);
-
+
/**
- * Reference to the org.apache.catalina.startup.Bootstrap shell. Right now
- * we're just wrapping up the shell, but we'll be replacing it with our own
- * GBean shell for ease of management.
+ * The default value of CATALINA_HOME variable
*/
- private Catalina shell;
+ private static final String CATALINA_HOME = "var/catalina";
/**
- * Used to resolve the location of the configuration file.
+ * Reference to the org.apache.catalina.Embedded embedded.
*/
- private final ServerInfo serverInfo;
+ private Embedded embedded;
- private String catalinaHome;
+ /**
+ * Tomcat Host that will contain deployed contexts (webapps)
+ */
+ private Host host;
- private String catalinaBase;
+ /**
+ * Tomcat Engine that will contain the host
+ */
+ private Engine engine;
- private String catalinaConfig = "var/catalina/server.xml";
+ /**
+ * Tomcat Connector that will process requests
+ *
+ * TODO: Make it a GBean
+ */
+ private Connector connector;
/**
- * Reference to the Catalina shell, to which calls are delegated.
+ * Tomcat default Context
*
- * The catalina shell relies on the "catalina.home" and "catalina.base"
- * System properties. Presumably, these could be added in a simple
- * properties file, but I'm going to work under the assumption that we'll
- * want them as persistent attributes in a server configuration. This will
- * make them more easily manageable (in theory--we'll see)
+ * TODO: Make it a gbean
*/
- public TomcatContainer(ServerInfo serverInfo, String catalinaHome, String catalinaBase, String catalinaConfig) {
- this.serverInfo = serverInfo;
- this.catalinaHome = catalinaHome;
- this.catalinaBase = catalinaBase;
- this.catalinaConfig = catalinaConfig;
+ private Context defaultContext;
+
+ /**
+ * GBean constructor (invoked dynamically when the gbean is declared in a
+ * plan)
+ */
+ public TomcatContainer() {
+ System.setProperty("catalina.home", CATALINA_HOME);
}
public void doFail() {
@@ -77,48 +89,112 @@
}
}
+ /**
+ * Instantiate and start up Tomcat's Embedded class
+ *
+ * See org.apache.catalina.startup.Embedded for details (TODO: provide the
+ * link to the javadoc)
+ */
public void doStart() throws Exception {
- log.debug("catalinaHome: " + catalinaHome + ", catalinaBase: " + catalinaBase + ", catalinaConfig: "
- + catalinaConfig);
- if (shell == null) {
- shell = new Catalina();
- }
- if (catalinaHome != null && catalinaHome.length() > 0) {
- catalinaHome = serverInfo.resolve(catalinaHome).getPath();
- log.debug("catalinaHome ServerInfo.resolve'd: " + catalinaHome);
- shell.setCatalinaHome(catalinaHome);
- }
- if (catalinaBase != null && catalinaBase.length() > 0) {
- catalinaBase = serverInfo.resolve(catalinaBase).getPath();
- log.debug("catalinaBase ServerInfo.resolve'd: " + catalinaBase);
- shell.setCatalinaBase(catalinaBase);
- }
- if (catalinaConfig != null && catalinaConfig.length() > 0) {
- shell.setConfig(catalinaConfig);
- }
- shell.setParentClassLoader(this.getClass().getClassLoader());
- shell.setUseNaming(false);
- shell.start();
+ log.debug("doStart()");
+
+ // The comments are from the javadoc of the Embedded class
+
+ // 1. Instantiate a new instance of this class.
+ if (embedded == null) {
+ embedded = new Embedded();
+ }
+
+ // 2. Set the relevant properties of this object itself. In particular,
+ // you will want to establish the default Logger to be used, as well as
+ // the default Realm if you are using container-managed security.
+ embedded.setUseNaming(false);
+
+ // 3. Call createEngine() to create an Engine object, and then call its
+ // property setters as desired.
+ engine = embedded.createEngine();
+ engine.setName("Geronimo");
+ engine.setDefaultHost("localhost");
+
+ // 4. Call createHost() to create at least one virtual Host associated
+ // with the newly created Engine, and then call its property setters as
+ // desired. After you customize this Host, add it to the corresponding
+ // Engine with engine.addChild(host).
+ host = embedded.createHost("localhost", "");
+ // TODO: Make it that gbean's attribute or tomcatwebappcontext's one
+ ((StandardHost) host).setWorkDir(CATALINA_HOME);
+
+ engine.addChild(host);
+
+ // 5. Call createContext() to create at least one Context associated
+ // with each newly created Host, and then call its property setters as
+ // desired. You SHOULD create a Context with a pathname equal to a
+ // zero-length string, which will be used to process all requests not
+ // mapped to some other Context. After you customize this Context, add
+ // it to the corresponding Host with host.addChild(context).
+ defaultContext = embedded.createContext("", "");
+ defaultContext.setParentClassLoader(this.getClass().getClassLoader());
+ host.addChild(defaultContext);
+
+ // 6. Call addEngine() to attach this Engine to the set of defined
+ // Engines for this object.
+ embedded.addEngine(engine);
+
+ // 7. Call createConnector() to create at least one TCP/IP connector,
+ // and then call its property setters as desired.
+
+ // It doesn't work - there's no HTTP connector created
+ // connector = embedded.createConnector((String) null, 8080, "http");
+
+ // Create an HTTP/1.1 connector manually
+ connector = new Connector("HTTP/1.1");
+ connector.setPort(8080);
+
+ // 8. Call addConnector() to attach this Connector to the set of defined
+ // Connectors for this object. The added Connector will use the most
+ // recently added Engine to process its received requests.
+ embedded.addConnector(connector);
+
+ // 9. Call start() to initiate normal operations of all the attached
+ // components.
+ embedded.start();
}
public void doStop() throws Exception {
- if (shell != null) {
- shell.stop();
- shell = null;
+ if (embedded != null) {
+ embedded.stop();
+ embedded = null;
}
}
+ /**
+ * Creates and adds the context to the running host
+ *
+ * It simply delegates the call to Tomcat's Embedded and Host classes
+ *
+ * @param ctx
+ * the context to be added
+ *
+ * @see org.apache.catalina.startup.Embedded
+ * @see org.apache.catalina.Host
+ */
+ public void addContext(Context ctx) {
+ ctx.setParentClassLoader(this.getClass().getClassLoader());
+ host.addChild(ctx);
+ }
+
+ public void removeContext(Context ctx) {
+ embedded.removeContext(ctx);
+ }
+
public static final GBeanInfo GBEAN_INFO;
static {
GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Tomcat Web Container", TomcatContainer.class);
- infoFactory.setConstructor(new String[] { "ServerInfo", "CatalinaHome", "CatalinaBase", "CatalinaConfig" });
+ infoFactory.addOperation("addContext", new Class[] { Context.class });
+ infoFactory.addOperation("removeContext", new Class[] { Context.class });
- infoFactory.addReference("ServerInfo", ServerInfo.class);
- infoFactory.addAttribute("CatalinaHome", String.class, true);
- infoFactory.addAttribute("CatalinaBase", String.class, true);
- infoFactory.addAttribute("CatalinaConfig", String.class, true);
GBEAN_INFO = infoFactory.getBeanInfo();
}
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (from r109996, geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?view=diff&rev=110110&p1=geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java&r2=110110
==============================================================================
Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (from r109996, geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java)
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?view=diff&rev=110110&p1=geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java&r1=109996&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java&r2=110110
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/plan/tomcat-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/plan/tomcat-plan.xml?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/plan/tomcat-plan.xml&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/plan/tomcat-plan.xml&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/plan/tomcat-plan.xml (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/plan/tomcat-plan.xml Tue Dec 7 07:55:36 2004
@@ -68,11 +68,6 @@
<uri>xerces/jars/xercesImpl-2.6.0.jar</uri>
</dependency>
- <gbean name="geronimo.server:type=WebContainer,container=Apache Tomcat" class="org.apache.geronimo.tomcat.TomcatContainer">
- <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
- <attribute name="CatalinaHome" type="java.lang.String">var/catalina</attribute>
- <attribute name="CatalinaBase" type="java.lang.String">var/catalina</attribute>
- <attribute name="CatalinaConfig" type="java.lang.String">conf/server.xml</attribute>
- </gbean>
+ <gbean name="geronimo.server:type=WebContainer,container=Tomcat" class="org.apache.geronimo.tomcat.TomcatContainer"/>
</configuration>
Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/var/server.xml
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/var/server.xml?view=auto&rev=110109
==============================================================================
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java Tue Dec 7 07:55:36 2004
@@ -29,6 +29,7 @@
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.jmx.JMXGBeanRegistry;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.log.GeronimoLogging;
import org.apache.geronimo.system.url.GeronimoURLFactory;
@@ -105,7 +106,7 @@
}
// build a basic kernel without a configuration-store, our configuration store is
- Kernel kernel = new Kernel(getKernelName(), getDomainName());
+ Kernel kernel = new Kernel(getKernelName(), new JMXGBeanRegistry());
kernel.boot();
ConfigurationManager configurationManager = kernel.getConfigurationManager();
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StopRemoteServer.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StopRemoteServer.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StopRemoteServer.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StopRemoteServer.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StopRemoteServer.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StopRemoteServer.java Tue Dec 7 07:55:36 2004
@@ -1,17 +1,16 @@
package org.apache.geronimo.deployment.mavenplugin;
-import org.apache.geronimo.kernel.KernelMBean;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.jmx.MBeanProxyFactory;
-import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
-
+import java.util.HashMap;
+import java.util.Map;
import javax.management.MBeanServerConnection;
import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXServiceURL;
import javax.management.remote.JMXConnectorFactory;
-import java.util.Map;
-import java.util.HashMap;
-import java.io.IOException;
+import javax.management.remote.JMXServiceURL;
+
+import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.jmx.KernelMBean;
+import org.apache.geronimo.kernel.jmx.KernelDelegate;
/**
*/
@@ -36,7 +35,7 @@
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
JMXConnector jmxConnector = JMXConnectorFactory.connect(address, environment);
mbServerConnection = jmxConnector.getMBeanServerConnection();
- kernel = (KernelMBean) MBeanProxyFactory.getProxy(KernelMBean.class, mbServerConnection, Kernel.KERNEL);
+ kernel = new KernelDelegate(mbServerConnection);
kernel.shutdown();
} finally {
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/WaitForStarted.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/WaitForStarted.java?view=diff&rev=110110&p1=geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/WaitForStarted.java&r1=110109&p2=geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/WaitForStarted.java&r2=110110
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/WaitForStarted.java (original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/WaitForStarted.java Tue Dec 7 07:55:36 2004
@@ -16,20 +16,18 @@
*/
package org.apache.geronimo.deployment.mavenplugin;
-import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelMBean;
-import org.apache.geronimo.kernel.jmx.MBeanProxyFactory;
-import org.apache.geronimo.kernel.management.State;
-
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
import javax.management.MBeanServerConnection;
import javax.management.remote.JMXConnector;
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
-import java.io.IOException;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
+
+import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
+import org.apache.geronimo.kernel.jmx.KernelDelegate;
+import org.apache.geronimo.kernel.jmx.KernelMBean;
+import org.apache.geronimo.kernel.management.State;
public class WaitForStarted extends AbstractModuleCommand {
@@ -65,9 +63,9 @@
try {
JMXConnector jmxConnector = JMXConnectorFactory.connect(address, environment);
mbServerConnection = jmxConnector.getMBeanServerConnection();
- kernel = (KernelMBean) MBeanProxyFactory.getProxy(KernelMBean.class, mbServerConnection, Kernel.KERNEL);
+ kernel = new KernelDelegate(mbServerConnection);
break;
- } catch (IOException e) {
+ } catch (Exception e) {
if (tries == 0) {
throw new Exception("Could not connect");
}