You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/08/18 20:09:48 UTC
svn commit: r233346 [1/3] - in /geronimo/trunk: applications/console-core/
applications/console-core/src/java/org/apache/geronimo/console/util/
applications/console-standard/
applications/console-standard/src/java/org/apache/geronimo/console/infomanage...
Author: ammulder
Date: Thu Aug 18 11:08:26 2005
New Revision: 233346
URL: http://svn.apache.org/viewcvs?rev=233346&view=rev
Log:
Base ServerInfo on an interface
Move management interfaces to a separate module (modules/management)
Make Tomcat implement webcontainer/webconnector management interfaces
Complete Jetty implementation of webconnector
Make the web portlets work for both Tomcat and Jetty (though only
Jetty has the statistics interfaces so far)
Change kernel so non-constructor GBean persistent properties don't
have setters called during startup unless a value was provided in
the deployment plan (or a non-null value is in the saved state)
Added:
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/BaseWebPortlet.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/StatisticsHelper.java
geronimo/trunk/modules/management/ (with props)
geronimo/trunk/modules/management/LICENSE.txt
geronimo/trunk/modules/management/NOTICE.txt
geronimo/trunk/modules/management/maven.xml
geronimo/trunk/modules/management/project.properties
geronimo/trunk/modules/management/project.xml
geronimo/trunk/modules/management/src/
geronimo/trunk/modules/management/src/java/
geronimo/trunk/modules/management/src/java/org/
geronimo/trunk/modules/management/src/java/org/apache/
geronimo/trunk/modules/management/src/java/org/apache/geronimo/
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/AppClientModule.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/AppClientModule.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EJB.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EJBModule.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EntityBean.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEApplication.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEApplication.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEDeployedObject.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDeployedObject.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEDomain.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDomain.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEManagedObject.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEManagedObject.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEModule.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEResource.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEResource.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEServer.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEServer.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAConnectionFactory.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAManagedConnectionFactory.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAResource.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCDataSource.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCDriver.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCResource.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JMSResource.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JTAResource.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JVM.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JVM.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JavaMailResource.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/MessageDrivenBean.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/RMIIIOPResource.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/ResourceAdapter.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/ResourceAdapterModule.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/Servlet.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/SessionBean.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/StatefulSessionBean.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/StatelessSessionBean.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/URLResource.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/WebModule.java
- copied, changed from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/
- copied from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/EJBConnector.java
- copied, changed from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/EJBConnector.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/EJBContainer.java
- copied, changed from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/EJBContainer.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEApplication.java
- copied, changed from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEApplication.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java
- copied, changed from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEServer.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/JVM.java
- copied, changed from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/JVM.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkConnector.java
- copied, changed from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/NetworkConnector.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkContainer.java
- copied, changed from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/NetworkContainer.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/SecureConnector.java
- copied, changed from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/SecureConnector.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/WebConnector.java
- copied, changed from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/WebConnector.java
geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/WebContainer.java
- copied, changed from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/WebContainer.java
geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebConnector.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebContainer.java
Removed:
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/AppClientModule.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEApplication.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDeployedObject.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDomain.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEManagedObject.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEResource.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEServer.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JVM.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/
Modified:
geronimo/trunk/applications/console-core/project.xml
geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java
geronimo/trunk/applications/console-standard/project.xml
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-plan.xml
geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml
geronimo/trunk/modules/connector-builder/project.xml
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/trunk/modules/connector/project.xml
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImplGBean.java
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java
geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java
geronimo/trunk/modules/j2ee-builder/project.xml
geronimo/trunk/modules/j2ee/project.xml
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEAppClientModuleImpl.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java
geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/DomainTest.java
geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java
geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java
geronimo/trunk/modules/jetty-builder/project.xml
geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
geronimo/trunk/modules/jetty/project.xml
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettySecureConnector.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanAttribute.java
geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java
geronimo/trunk/modules/tomcat-builder/project.xml
geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
geronimo/trunk/modules/tomcat/project.xml
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java
Modified: geronimo/trunk/applications/console-core/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/project.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/project.xml (original)
+++ geronimo/trunk/applications/console-core/project.xml Thu Aug 18 11:08:26 2005
@@ -34,9 +34,14 @@
<artifactId>geronimo-j2ee-builder</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
Modified: geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java (original)
+++ geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java Thu Aug 18 11:08:26 2005
@@ -21,31 +21,31 @@
import java.util.List;
import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
-import org.apache.geronimo.j2ee.management.geronimo.JVM;
-import org.apache.geronimo.j2ee.management.geronimo.J2EEApplication;
-import org.apache.geronimo.j2ee.management.geronimo.WebContainer;
-import org.apache.geronimo.j2ee.management.geronimo.J2EEServer;
-import org.apache.geronimo.j2ee.management.geronimo.WebConnector;
-import org.apache.geronimo.j2ee.management.geronimo.EJBContainer;
-import org.apache.geronimo.j2ee.management.geronimo.EJBConnector;
-import org.apache.geronimo.j2ee.management.J2EEDomain;
-import org.apache.geronimo.j2ee.management.J2EEDeployedObject;
-import org.apache.geronimo.j2ee.management.AppClientModule;
-import org.apache.geronimo.j2ee.management.WebModule;
-import org.apache.geronimo.j2ee.management.EJBModule;
-import org.apache.geronimo.j2ee.management.ResourceAdapterModule;
-import org.apache.geronimo.j2ee.management.J2EEResource;
-import org.apache.geronimo.j2ee.management.JCAResource;
-import org.apache.geronimo.j2ee.management.JDBCResource;
-import org.apache.geronimo.j2ee.management.JMSResource;
-import org.apache.geronimo.j2ee.management.J2EEModule;
-import org.apache.geronimo.j2ee.management.EJB;
-import org.apache.geronimo.j2ee.management.Servlet;
-import org.apache.geronimo.j2ee.management.ResourceAdapter;
-import org.apache.geronimo.j2ee.management.JDBCDataSource;
-import org.apache.geronimo.j2ee.management.JDBCDriver;
-import org.apache.geronimo.j2ee.management.JCAConnectionFactory;
-import org.apache.geronimo.j2ee.management.JCAManagedConnectionFactory;
+import org.apache.geronimo.management.geronimo.JVM;
+import org.apache.geronimo.management.geronimo.J2EEApplication;
+import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.J2EEServer;
+import org.apache.geronimo.management.geronimo.WebConnector;
+import org.apache.geronimo.management.geronimo.EJBContainer;
+import org.apache.geronimo.management.geronimo.EJBConnector;
+import org.apache.geronimo.management.J2EEDomain;
+import org.apache.geronimo.management.J2EEDeployedObject;
+import org.apache.geronimo.management.AppClientModule;
+import org.apache.geronimo.management.WebModule;
+import org.apache.geronimo.management.EJBModule;
+import org.apache.geronimo.management.ResourceAdapterModule;
+import org.apache.geronimo.management.J2EEResource;
+import org.apache.geronimo.management.JCAResource;
+import org.apache.geronimo.management.JDBCResource;
+import org.apache.geronimo.management.JMSResource;
+import org.apache.geronimo.management.J2EEModule;
+import org.apache.geronimo.management.EJB;
+import org.apache.geronimo.management.Servlet;
+import org.apache.geronimo.management.ResourceAdapter;
+import org.apache.geronimo.management.JDBCDataSource;
+import org.apache.geronimo.management.JDBCDriver;
+import org.apache.geronimo.management.JCAConnectionFactory;
+import org.apache.geronimo.management.JCAManagedConnectionFactory;
import org.apache.geronimo.j2ee.management.impl.Util;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.Kernel;
Modified: geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java (original)
+++ geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java Thu Aug 18 11:08:26 2005
@@ -16,31 +16,31 @@
*/
package org.apache.geronimo.console.util;
-import org.apache.geronimo.j2ee.management.J2EEDomain;
-import org.apache.geronimo.j2ee.management.J2EEDeployedObject;
-import org.apache.geronimo.j2ee.management.J2EEResource;
-import org.apache.geronimo.j2ee.management.AppClientModule;
-import org.apache.geronimo.j2ee.management.WebModule;
-import org.apache.geronimo.j2ee.management.EJBModule;
-import org.apache.geronimo.j2ee.management.ResourceAdapterModule;
-import org.apache.geronimo.j2ee.management.J2EEModule;
-import org.apache.geronimo.j2ee.management.JCAResource;
-import org.apache.geronimo.j2ee.management.JDBCResource;
-import org.apache.geronimo.j2ee.management.JMSResource;
-import org.apache.geronimo.j2ee.management.JDBCDataSource;
-import org.apache.geronimo.j2ee.management.JDBCDriver;
-import org.apache.geronimo.j2ee.management.JCAConnectionFactory;
-import org.apache.geronimo.j2ee.management.JCAManagedConnectionFactory;
-import org.apache.geronimo.j2ee.management.EJB;
-import org.apache.geronimo.j2ee.management.Servlet;
-import org.apache.geronimo.j2ee.management.ResourceAdapter;
-import org.apache.geronimo.j2ee.management.geronimo.JVM;
-import org.apache.geronimo.j2ee.management.geronimo.J2EEApplication;
-import org.apache.geronimo.j2ee.management.geronimo.J2EEServer;
-import org.apache.geronimo.j2ee.management.geronimo.WebContainer;
-import org.apache.geronimo.j2ee.management.geronimo.WebConnector;
-import org.apache.geronimo.j2ee.management.geronimo.EJBConnector;
-import org.apache.geronimo.j2ee.management.geronimo.EJBContainer;
+import org.apache.geronimo.management.J2EEDomain;
+import org.apache.geronimo.management.J2EEDeployedObject;
+import org.apache.geronimo.management.J2EEResource;
+import org.apache.geronimo.management.AppClientModule;
+import org.apache.geronimo.management.WebModule;
+import org.apache.geronimo.management.EJBModule;
+import org.apache.geronimo.management.ResourceAdapterModule;
+import org.apache.geronimo.management.J2EEModule;
+import org.apache.geronimo.management.JCAResource;
+import org.apache.geronimo.management.JDBCResource;
+import org.apache.geronimo.management.JMSResource;
+import org.apache.geronimo.management.JDBCDataSource;
+import org.apache.geronimo.management.JDBCDriver;
+import org.apache.geronimo.management.JCAConnectionFactory;
+import org.apache.geronimo.management.JCAManagedConnectionFactory;
+import org.apache.geronimo.management.EJB;
+import org.apache.geronimo.management.Servlet;
+import org.apache.geronimo.management.ResourceAdapter;
+import org.apache.geronimo.management.geronimo.JVM;
+import org.apache.geronimo.management.geronimo.J2EEApplication;
+import org.apache.geronimo.management.geronimo.J2EEServer;
+import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.WebConnector;
+import org.apache.geronimo.management.geronimo.EJBConnector;
+import org.apache.geronimo.management.geronimo.EJBContainer;
import org.apache.geronimo.system.logging.SystemLog;
import org.apache.geronimo.pool.GeronimoExecutor;
Modified: geronimo/trunk/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/project.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/project.xml (original)
+++ geronimo/trunk/applications/console-standard/project.xml Thu Aug 18 11:08:26 2005
@@ -51,6 +51,11 @@
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-servlet</artifactId>
<version>${geronimo_spec_servlet_version}</version>
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java Thu Aug 18 11:08:26 2005
@@ -33,7 +33,7 @@
import javax.portlet.WindowState;
import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.j2ee.management.geronimo.JVM;
+import org.apache.geronimo.management.geronimo.JVM;
/**
* Calculates various information about the server to display in the server
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java Thu Aug 18 11:08:26 2005
@@ -22,13 +22,13 @@
import javax.naming.NamingException;
import org.apache.geronimo.kernel.KernelRegistry;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.j2ee.management.J2EEDomain;
-import org.apache.geronimo.j2ee.management.geronimo.JVM;
-import org.apache.geronimo.j2ee.management.geronimo.J2EEServer;
-import org.apache.geronimo.j2ee.management.geronimo.WebContainer;
-import org.apache.geronimo.j2ee.management.geronimo.WebConnector;
-import org.apache.geronimo.j2ee.management.geronimo.EJBContainer;
-import org.apache.geronimo.j2ee.management.geronimo.EJBConnector;
+import org.apache.geronimo.management.J2EEDomain;
+import org.apache.geronimo.management.geronimo.JVM;
+import org.apache.geronimo.management.geronimo.J2EEServer;
+import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.WebConnector;
+import org.apache.geronimo.management.geronimo.EJBContainer;
+import org.apache.geronimo.management.geronimo.EJBConnector;
import org.apache.geronimo.system.logging.SystemLog;
import org.apache.geronimo.pool.GeronimoExecutor;
import org.apache.commons.logging.Log;
Added: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/BaseWebPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/BaseWebPortlet.java?rev=233346&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/BaseWebPortlet.java (added)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/BaseWebPortlet.java Thu Aug 18 11:08:26 2005
@@ -0,0 +1,90 @@
+package org.apache.geronimo.console.webmanager;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import javax.portlet.GenericPortlet;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @version $Revision: 1.0$
+ */
+public class BaseWebPortlet extends GenericPortlet {
+ private final static Log log = LogFactory.getLog(BaseWebPortlet.class);
+ protected final static String SERVER_JETTY = "jetty";
+ protected final static String SERVER_TOMCAT = "tomcat";
+ protected final static String SERVER_GENERIC = "generic";
+
+ protected final static String getServerType(Class cls) {
+ Class[] intfs = cls.getInterfaces();
+ for (int i = 0; i < intfs.length; i++) {
+ Class intf = intfs[i];
+ if(intf.getName().indexOf("Jetty") > -1) {
+ return SERVER_JETTY;
+ } else if(intf.getName().indexOf("Tomcat") > -1) {
+ return SERVER_TOMCAT;
+ }
+ }
+ return SERVER_GENERIC;
+ }
+
+ public final static void setProperty(Object target, String name, Object value) {
+ boolean found = false;
+ Class cls = target.getClass();
+ String setter = "set"+Character.toUpperCase(name.charAt(0))+name.substring(1);
+ Method[] list = cls.getMethods();
+ for (int i = 0; i < list.length; i++) {
+ Method method = list[i];
+ if(method.getName().equals(setter) && method.getParameterTypes().length == 1 && Modifier.isPublic(method.getModifiers()) &&
+ !Modifier.isStatic(method.getModifiers())) {
+ found = true;
+ try {
+ method.invoke(target, new Object[]{value});
+ } catch (Exception e) {
+ log.error("Unable to set property "+name+" on "+target.getClass().getName());
+ }
+ break;
+ }
+ }
+ if(!found) {
+ throw new IllegalArgumentException("No such method found ("+setter+" on "+target.getClass().getName()+")");
+ }
+ }
+
+ public final static Object getProperty(Object target, String name) {
+ Class cls = target.getClass();
+ String getter = "get"+Character.toUpperCase(name.charAt(0))+name.substring(1);
+ Method[] list = cls.getMethods();
+ for (int i = 0; i < list.length; i++) {
+ Method method = list[i];
+ if(method.getName().equals(getter) && method.getParameterTypes().length == 0 && Modifier.isPublic(method.getModifiers()) &&
+ !Modifier.isStatic(method.getModifiers())) {
+ try {
+ return method.invoke(target, new Object[0]);
+ } catch (Exception e) {
+ log.error("Unable to get property "+name+" on "+target.getClass().getName());
+ }
+ break;
+ }
+ }
+ throw new IllegalArgumentException("No such method found ("+getter+" on "+target.getClass().getName()+")");
+ }
+
+ public final static Object callOperation(Object target, String operation, Object[] args) {
+ Class cls = target.getClass();
+ Method[] list = cls.getMethods();
+ for (int i = 0; i < list.length; i++) {
+ Method method = list[i];
+ if(method.getName().equals(operation) && ((args == null && method.getParameterTypes().length == 0) || (args != null && args.length == method.getParameterTypes().length))
+ && Modifier.isPublic(method.getModifiers()) && !Modifier.isStatic(method.getModifiers())) {
+ try {
+ return method.invoke(target, args);
+ } catch (Exception e) {
+ log.error("Unable to invoke "+operation+" on "+target.getClass().getName());
+ }
+ break;
+ }
+ }
+ throw new IllegalArgumentException("No such method found ("+operation+" on "+target.getClass().getName()+")");
+ }
+}
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java Thu Aug 18 11:08:26 2005
@@ -20,6 +20,8 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -34,18 +36,14 @@
import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.j2ee.management.geronimo.WebContainer;
-import org.apache.geronimo.j2ee.management.geronimo.WebConnector;
-import org.apache.geronimo.j2ee.management.geronimo.SecureConnector;
-import org.apache.geronimo.jetty.JettyContainer;
-import org.apache.geronimo.jetty.JettyWebConnector;
-import org.apache.geronimo.jetty.JettySecureConnector;
+import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.WebConnector;
+import org.apache.geronimo.management.geronimo.SecureConnector;
import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
-import org.apache.geronimo.tomcat.TomcatContainer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-public class ConnectorPortlet extends GenericPortlet {
+public class ConnectorPortlet extends BaseWebPortlet {
private final static Log log = LogFactory.getLog(ConnectorPortlet.class);
private PortletRequestDispatcher normalView;
@@ -61,12 +59,7 @@
ActionResponse actionResponse) throws PortletException, IOException {
String mode = actionRequest.getParameter("mode");
WebContainer container = PortletManager.getCurrentWebContainer(actionRequest);
- String server = "generic";
- if(container instanceof JettyContainer) {
- server = "jetty";
- } else if (container instanceof TomcatContainer) {
- server = "tomcat";
- }
+ String server = getServerType(container.getClass());
actionResponse.setRenderParameter("server", server);
if(mode.equals("new")) {
// User selected to add a new connector, need to show criteria portlet
@@ -86,9 +79,9 @@
WebConnector connector = PortletManager.createWebConnector(actionRequest, name, protocol, host, port);
connector.setMaxThreads(maxThreads);
// todo: more configurable HTTP/Jetty values
- if(connector instanceof JettyWebConnector) {
+ if(server.equals(SERVER_JETTY)) {
if(minThreads != null) {
- ((JettyWebConnector)connector).setMinThreads(minThreads.intValue());
+ setProperty(connector, "minThreads", minThreads);
}
}
if(protocol.equals(WebContainer.PROTOCOL_HTTPS)) {
@@ -106,8 +99,8 @@
if(isValid(secureProtocol)) {secure.setSecureProtocol(secureProtocol);}
if(isValid(algorithm)) {secure.setAlgorithm(algorithm);}
secure.setClientAuthRequired(clientAuth);
- if(secure instanceof JettySecureConnector) {
- if(isValid(privateKeyPass)) {((JettySecureConnector)secure).setKeyPassword(privateKeyPass);}
+ if(server.equals(SERVER_JETTY)) {
+ if(isValid(privateKeyPass)) {setProperty(secure, "keyPassword", privateKeyPass);}
}
}
// Start the connector
@@ -139,9 +132,9 @@
connector.setHost(host);
connector.setPort(port);
connector.setMaxThreads(maxThreads);
- if(connector instanceof JettyWebConnector) {
+ if(server.equals(SERVER_JETTY)) {
if(minThreads != null) {
- ((JettyWebConnector)connector).setMinThreads(minThreads.intValue());
+ setProperty(connector,"minThreads",minThreads);
}
}
if(connector instanceof SecureConnector) {
@@ -159,8 +152,8 @@
if(isValid(secureProtocol)) {secure.setSecureProtocol(secureProtocol);}
if(isValid(algorithm)) {secure.setAlgorithm(algorithm);}
secure.setClientAuthRequired(clientAuth);
- if(secure instanceof JettySecureConnector) {
- if(isValid(privateKeyPass)) {((JettySecureConnector)secure).setKeyPassword(privateKeyPass);}
+ if(server.equals(SERVER_JETTY)) {
+ if(isValid(privateKeyPass)) {setProperty(secure, "keyPassword", privateKeyPass);}
}
}
}
@@ -242,13 +235,14 @@
if(mode == null || mode.equals("")) {
mode = "list";
}
- renderRequest.setAttribute("server", renderRequest.getParameter("server"));
WebContainer container = PortletManager.getCurrentWebContainer(renderRequest);
+ String server = getServerType(container.getClass());
+ renderRequest.setAttribute("server", server);
if(mode.equals("new")) {
String protocol = renderRequest.getParameter("protocol");
renderRequest.setAttribute("maxThreads", "50");
- if(container instanceof JettyWebConnector) {
+ if(server.equals(SERVER_JETTY)) {
renderRequest.setAttribute("minThreads", "10");
}
renderRequest.setAttribute("protocol", protocol);
@@ -278,8 +272,8 @@
renderRequest.setAttribute("host", connector.getHost());
int maxThreads = connector.getMaxThreads();
renderRequest.setAttribute("maxThreads", Integer.toString(maxThreads));
- if(connector instanceof JettyWebConnector) {
- int minThreads = ((JettyWebConnector)connector).getMinThreads();
+ if(server.equals(SERVER_JETTY)) {
+ int minThreads = ((Number)getProperty(connector, "minThreads")).intValue();
renderRequest.setAttribute("minThreads", String.valueOf(minThreads));
}
renderRequest.setAttribute("mode", "save");
@@ -365,4 +359,5 @@
public final static boolean isValid(String s) {
return s != null && !s.equals("");
}
+
}
Added: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java?rev=233346&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java (added)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java Thu Aug 18 11:08:26 2005
@@ -0,0 +1,32 @@
+package org.apache.geronimo.console.webmanager;
+
+import javax.portlet.RenderRequest;
+import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.jetty.JettyContainer;
+
+/**
+ * @version $Revision: 1.0$
+ */
+public class JettyStatisticsHelper implements StatisticsHelper {
+ public void gatherStatistics(WebContainer container, RenderRequest renderRequest) {
+ JettyContainer jetty = ((JettyContainer)container);
+ boolean statsOn = jetty.getCollectStatistics();
+ renderRequest.setAttribute("statsOn", statsOn ? Boolean.TRUE : Boolean.FALSE);
+ if (statsOn) {
+ renderRequest.setAttribute("connections", new Integer(jetty.getConnections()));
+ renderRequest.setAttribute("connectionsOpen", new Integer(jetty.getConnectionsOpen()));
+ renderRequest.setAttribute("connectionsOpenMax", new Integer(jetty.getConnectionsOpenMax()));
+ renderRequest.setAttribute("connectionsDurationAve", new Long(jetty.getConnectionsDurationAve()));
+ renderRequest.setAttribute("connectionsDurationMax", new Long(jetty.getConnectionsDurationMax()));
+ renderRequest.setAttribute("connectionsRequestsAve", new Integer(jetty.getConnectionsRequestsAve()));
+ renderRequest.setAttribute("connectionsRequestsMax", new Integer(jetty.getConnectionsRequestsMax()));
+ renderRequest.setAttribute("errors", new Integer(jetty.getErrors()));
+ renderRequest.setAttribute("requests", new Integer(jetty.getRequests()));
+ renderRequest.setAttribute("requestsActive", new Integer(jetty.getRequestsActive()));
+ renderRequest.setAttribute("requestsActiveMax", new Integer(jetty.getRequestsActiveMax()));
+ renderRequest.setAttribute("requestsDurationAve", new Long(jetty.getRequestsDurationAve()));
+ renderRequest.setAttribute("requestsDurationMax", new Long(jetty.getRequestsDurationMax()));
+ }
+ }
+
+}
Added: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/StatisticsHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/StatisticsHelper.java?rev=233346&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/StatisticsHelper.java (added)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/StatisticsHelper.java Thu Aug 18 11:08:26 2005
@@ -0,0 +1,11 @@
+package org.apache.geronimo.console.webmanager;
+
+import javax.portlet.RenderRequest;
+import org.apache.geronimo.management.geronimo.WebContainer;
+
+/**
+ * @version $Revision: 1.0$
+ */
+public interface StatisticsHelper {
+ public void gatherStatistics(WebContainer container, RenderRequest renderRequest);
+}
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java Thu Aug 18 11:08:26 2005
@@ -30,10 +30,9 @@
import javax.portlet.WindowState;
import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.j2ee.management.geronimo.WebContainer;
-import org.apache.geronimo.jetty.JettyContainer;
+import org.apache.geronimo.management.geronimo.WebContainer;
-public class WebManagerPortlet extends GenericPortlet {
+public class WebManagerPortlet extends BaseWebPortlet {
private PortletRequestDispatcher normalView;
private PortletRequestDispatcher maximizedView;
@@ -44,16 +43,17 @@
ActionResponse actionResponse) throws PortletException, IOException {
try {
WebContainer container = PortletManager.getCurrentWebContainer(actionRequest);
+ String server = getServerType(container.getClass());
String action = actionRequest.getParameter("stats");
if (action != null) {
boolean stats = action.equals("true");
- if(container instanceof JettyContainer) {
- ((JettyContainer)container).setCollectStatistics(stats);
+ if(server.equals(SERVER_JETTY)) {
+ setProperty(container, "collectStatistics", stats ? Boolean.TRUE : Boolean.FALSE);
}
}
if (actionRequest.getParameter("resetStats") != null) {
- if(container instanceof JettyContainer) {
- ((JettyContainer)container).resetStatistics();
+ if(server.equals(SERVER_JETTY)) {
+ callOperation(container, "resetStatistics", null);
}
}
} catch (Exception e) {
@@ -68,25 +68,15 @@
}
try {
WebContainer container = PortletManager.getCurrentWebContainer(renderRequest);
- if(container instanceof JettyContainer) {
- JettyContainer jetty = ((JettyContainer)container);
- boolean statsOn = jetty.getCollectStatistics();
- renderRequest.setAttribute("statsOn", statsOn ? Boolean.TRUE : Boolean.FALSE);
- if (statsOn) {
- renderRequest.setAttribute("connections", new Integer(jetty.getConnections()));
- renderRequest.setAttribute("connectionsOpen", new Integer(jetty.getConnectionsOpen()));
- renderRequest.setAttribute("connectionsOpenMax", new Integer(jetty.getConnectionsOpenMax()));
- renderRequest.setAttribute("connectionsDurationAve", new Long(jetty.getConnectionsDurationAve()));
- renderRequest.setAttribute("connectionsDurationMax", new Long(jetty.getConnectionsDurationMax()));
- renderRequest.setAttribute("connectionsRequestsAve", new Integer(jetty.getConnectionsRequestsAve()));
- renderRequest.setAttribute("connectionsRequestsMax", new Integer(jetty.getConnectionsRequestsMax()));
- renderRequest.setAttribute("errors", new Integer(jetty.getErrors()));
- renderRequest.setAttribute("requests", new Integer(jetty.getRequests()));
- renderRequest.setAttribute("requestsActive", new Integer(jetty.getRequestsActive()));
- renderRequest.setAttribute("requestsActiveMax", new Integer(jetty.getRequestsActiveMax()));
- renderRequest.setAttribute("requestsDurationAve", new Long(jetty.getRequestsDurationAve()));
- renderRequest.setAttribute("requestsDurationMax", new Long(jetty.getRequestsDurationMax()));
- }
+ String server = getServerType(container.getClass());
+ StatisticsHelper helper = null;
+ if(server.equals(SERVER_JETTY)) {
+ helper = new JettyStatisticsHelper();
+ } else if(server.equals(SERVER_TOMCAT)) {
+ //todo
+ }
+ if(helper != null) {
+ helper.gatherStatistics(container, renderRequest);
}
} catch (Exception e) {
throw new PortletException(e);
Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Thu Aug 18 11:08:26 2005
@@ -231,6 +231,15 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
<version>${pom.currentVersion}</version>
<properties>
Modified: geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml Thu Aug 18 11:08:26 2005
@@ -34,7 +34,7 @@
>
<!-- ServerInfo service -->
- <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
+ <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
<!-- URLFactory service -->
<gbean name="URLFactory" class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
Modified: geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml Thu Aug 18 11:08:26 2005
@@ -29,7 +29,7 @@
>
<!-- ServerInfo service -->
- <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.ServerInfo">
+ <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo">
</gbean>
<!-- Configuration Store service -->
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Thu Aug 18 11:08:26 2005
@@ -87,6 +87,9 @@
<uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>
</dependency>
<dependency>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Thu Aug 18 11:08:26 2005
@@ -42,6 +42,9 @@
<uri>geronimo/jars/geronimo-activation-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
</dependency>
<dependency>
Modified: geronimo/trunk/modules/assembly/src/plan/system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-plan.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-plan.xml Thu Aug 18 11:08:26 2005
@@ -34,7 +34,7 @@
>
<!-- ServerInfo service -->
- <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
+ <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
<!-- URLFactory service -->
<gbean name="URLFactory" class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
Modified: geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml Thu Aug 18 11:08:26 2005
@@ -126,68 +126,52 @@
<gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
<attribute name="name">HTTP</attribute>
- <attribute name="initParams">
- address=0.0.0.0
- port=${PlanHTTPPort}
- maxHttpHeaderSize=8192
- maxThreads=150
- minSpareThreads=25
- maxSpareThreads=75
- enableLookups=false
- redirectPort=${PlanHTTPSPort}
- acceptCount=100
- connectionTimeout=20000
- disableUploadTimeout=true
- </attribute>
+ <attribute name="host">0.0.0.0</attribute>
+ <attribute name="port">${PlanHTTPPort}</attribute>
+ <attribute name="maxHttpHeaderSizeBytes">8192</attribute>
+ <attribute name="maxThreads">150</attribute>
+ <attribute name="minSpareThreads">25</attribute>
+ <attribute name="maxSpareThreads">75</attribute>
+ <attribute name="hostLookupEnabled">false</attribute>
+ <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
+ <attribute name="acceptQueueSize">100</attribute>
+ <attribute name="connectionTimeoutMillis">20000</attribute>
+ <attribute name="uploadTimeoutEnabled">false</attribute>
<reference name="TomcatContainer">
<name>WebContainer</name>
</reference>
- <reference name="ServerInfo">
- <module>org/apache/geronimo/System</module>
- <name>ServerInfo</name>
- </reference>
</gbean>
<gbean name="TomcatAJPConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
- <attribute name="protocol">AJP/1.3</attribute>
+ <attribute name="protocol">AJP</attribute>
<attribute name="name">AJP</attribute>
- <attribute name="initParams">
- address=0.0.0.0
- port=${PlanAJPPort}
- enableLookups=false
- redirectPort=${PlanHTTPSPort}
- </attribute>
+ <attribute name="host">0.0.0.0</attribute>
+ <attribute name="port">${PlanAJPPort}</attribute>
+ <attribute name="hostLookupEnabled">false</attribute>
+ <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
<reference name="TomcatContainer">
<name>WebContainer</name>
</reference>
- <reference name="ServerInfo">
- <module>org/apache/geronimo/System</module>
- <name>ServerInfo</name>
- </reference>
</gbean>
<!-- SSL support
NOTE: If keystoreFile is a relative path, it is relative to GERONIMO_HOME
-->
- <gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
+ <gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.HttpsConnectorGBean">
<attribute name="name">HTTPS</attribute>
- <attribute name="initParams">
- address=0.0.0.0
- port=${PlanHTTPSPort}
- maxHttpHeaderSize=8192
- maxThreads=150
- minSpareThreads=25
- maxSpareThreads=75
- enableLookups=false
- disableUploadTimeout=true
- acceptCount=100
- scheme=https
- secure=true
- clientAuth=false
- sslProtocol=TLS
- keystoreFile=var/security/keystore
- keystorePass=secret
- </attribute>
+ <attribute name="host">0.0.0.0</attribute>
+ <attribute name="port">${PlanHTTPSPort}</attribute>
+ <attribute name="maxHttpHeaderSizeBytes">8192</attribute>
+ <attribute name="maxThreads">150</attribute>
+ <attribute name="minSpareThreads">25</attribute>
+ <attribute name="maxSpareThreads">75</attribute>
+ <attribute name="hostLookupEnabled">false</attribute>
+ <attribute name="acceptQueueSize">100</attribute>
+ <attribute name="uploadTimeoutEnabled">false</attribute>
+ <attribute name="clientAuthRequired">false</attribute>
+ <attribute name="secureProtocol">TLS</attribute>
+ <attribute name="keystoreFileName">var/security/keystore</attribute>
+ <attribute name="keystorePassword">secret</attribute>
<reference name="TomcatContainer"><name>WebContainer</name></reference>
<reference name="ServerInfo">
<module>org/apache/geronimo/System</module>
Modified: geronimo/trunk/modules/connector-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/project.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/project.xml (original)
+++ geronimo/trunk/modules/connector-builder/project.xml Thu Aug 18 11:08:26 2005
@@ -106,6 +106,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java (original)
+++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java Thu Aug 18 11:08:26 2005
@@ -21,7 +21,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.management.J2EEServer;
+import org.apache.geronimo.management.J2EEServer;
import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
import org.apache.geronimo.kernel.jmx.JMXUtil;
Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java (original)
+++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java Thu Aug 18 11:08:26 2005
@@ -22,8 +22,8 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.management.J2EEApplication;
-import org.apache.geronimo.j2ee.management.J2EEServer;
+import org.apache.geronimo.management.J2EEApplication;
+import org.apache.geronimo.management.J2EEServer;
import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
import org.apache.geronimo.j2ee.management.impl.Util;
import org.apache.geronimo.kernel.Kernel;
Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Thu Aug 18 11:08:26 2005
@@ -41,7 +41,6 @@
import junit.framework.TestCase;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.deployment.util.DeploymentUtil;
@@ -74,7 +73,7 @@
import org.apache.geronimo.kernel.management.State;
import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
import org.tranql.sql.jdbc.JDBCUtil;
/**
@@ -118,11 +117,11 @@
return null;
}
- public Reference getImplicitEJBRemoteRef(URI module, String refName, boolean isSession, String home, String remote, NamingContext context) throws DeploymentException {
+ public Reference getImplicitEJBRemoteRef(URI module, String refName, boolean isSession, String home, String remote, NamingContext context) {
return null;
}
- public Reference getImplicitEJBLocalRef(URI module, String refName, boolean isSession, String localHome, String local, NamingContext context) throws DeploymentException {
+ public Reference getImplicitEJBLocalRef(URI module, String refName, boolean isSession, String localHome, String local, NamingContext context) {
return null;
}
};
@@ -398,7 +397,7 @@
kernel.startGBean(baseConfigName);
ObjectName serverInfoObjectName = ObjectName.getInstance(j2eeContext.getJ2eeDomainName() + ":name=ServerInfo");
- GBeanData serverInfoGBean = new GBeanData(serverInfoObjectName, ServerInfo.GBEAN_INFO);
+ GBeanData serverInfoGBean = new GBeanData(serverInfoObjectName, BasicServerInfo.GBEAN_INFO);
serverInfoGBean.setAttribute("baseDirectory", ".");
kernel.loadGBean(serverInfoGBean, cl);
kernel.startGBean(serverInfoObjectName);
Modified: geronimo/trunk/modules/connector/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/project.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/project.xml (original)
+++ geronimo/trunk/modules/connector/project.xml Thu Aug 18 11:08:26 2005
@@ -62,6 +62,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java Thu Aug 18 11:08:26 2005
@@ -22,9 +22,9 @@
import javax.management.ObjectName;
import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.j2ee.management.J2EEApplication;
-import org.apache.geronimo.j2ee.management.J2EEServer;
-import org.apache.geronimo.j2ee.management.ResourceAdapterModule;
+import org.apache.geronimo.management.J2EEApplication;
+import org.apache.geronimo.management.J2EEServer;
+import org.apache.geronimo.management.ResourceAdapterModule;
import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
import org.apache.geronimo.kernel.jmx.JMXUtil;
Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImplGBean.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImplGBean.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImplGBean.java Thu Aug 18 11:08:26 2005
@@ -23,9 +23,9 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.management.J2EEApplication;
-import org.apache.geronimo.j2ee.management.J2EEServer;
-import org.apache.geronimo.j2ee.management.ResourceAdapterModule;
+import org.apache.geronimo.management.J2EEApplication;
+import org.apache.geronimo.management.J2EEServer;
+import org.apache.geronimo.management.ResourceAdapterModule;
/**
*
Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java Thu Aug 18 11:08:26 2005
@@ -20,7 +20,7 @@
import javax.management.ObjectName;
-import org.apache.geronimo.j2ee.management.J2EEServer;
+import org.apache.geronimo.management.J2EEServer;
import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
import org.apache.geronimo.kernel.jmx.JMXUtil;
Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java Thu Aug 18 11:08:26 2005
@@ -19,7 +19,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.management.J2EEServer;
+import org.apache.geronimo.management.J2EEServer;
/**
*
Modified: geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java (original)
+++ geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java Thu Aug 18 11:08:26 2005
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
/**
* @version $Rev: 47413 $ $Date: 2004-09-28 11:46:39 -0700 (Tue, 28 Sep 2004) $
@@ -34,7 +35,7 @@
private File systemDir;
public void testCreateSystemUsingServerInfo() throws Exception {
- ServerInfo serverInfo = new ServerInfo(systemDir.toString());
+ ServerInfo serverInfo = new BasicServerInfo(systemDir.toString());
String derbyDir = "var/dbderby";
DerbySystemGBean gbean = new DerbySystemGBean(serverInfo, derbyDir);
try {
Modified: geronimo/trunk/modules/j2ee-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/project.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/project.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/project.xml Thu Aug 18 11:08:26 2005
@@ -99,6 +99,11 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/trunk/modules/j2ee/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/project.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/project.xml (original)
+++ geronimo/trunk/modules/j2ee/project.xml Thu Aug 18 11:08:26 2005
@@ -61,6 +61,12 @@
</dependency>
<dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-ejb</artifactId>
<version>${geronimo_spec_ejb_version}</version>
Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEAppClientModuleImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEAppClientModuleImpl.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEAppClientModuleImpl.java (original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEAppClientModuleImpl.java Thu Aug 18 11:08:26 2005
@@ -21,9 +21,9 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.management.J2EEApplication;
-import org.apache.geronimo.j2ee.management.J2EEServer;
-import org.apache.geronimo.j2ee.management.AppClientModule;
+import org.apache.geronimo.management.J2EEApplication;
+import org.apache.geronimo.management.J2EEServer;
+import org.apache.geronimo.management.AppClientModule;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.jmx.JMXUtil;
Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java (original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java Thu Aug 18 11:08:26 2005
@@ -21,8 +21,8 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.management.J2EEServer;
-import org.apache.geronimo.j2ee.management.geronimo.J2EEApplication;
+import org.apache.geronimo.management.J2EEServer;
+import org.apache.geronimo.management.geronimo.J2EEApplication;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java (original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java Thu Aug 18 11:08:26 2005
@@ -25,7 +25,7 @@
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.management.J2EEDomain;
+import org.apache.geronimo.management.J2EEDomain;
/**
* @version $Rev$ $Date$
Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java (original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java Thu Aug 18 11:08:26 2005
@@ -29,9 +29,9 @@
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.management.geronimo.J2EEServer;
-import org.apache.geronimo.j2ee.management.geronimo.WebContainer;
-import org.apache.geronimo.j2ee.management.geronimo.EJBContainer;
+import org.apache.geronimo.management.geronimo.J2EEServer;
+import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.EJBContainer;
import org.apache.geronimo.pool.GeronimoExecutor;
/**
Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java (original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java Thu Aug 18 11:08:26 2005
@@ -27,7 +27,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.management.geronimo.JVM;
+import org.apache.geronimo.management.geronimo.JVM;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.commons.logging.LogFactory;
Modified: geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java (original)
+++ geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java Thu Aug 18 11:08:26 2005
@@ -30,7 +30,7 @@
import org.apache.geronimo.kernel.KernelFactory;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
import org.apache.log4j.Logger;
import org.apache.log4j.Level;
import org.apache.log4j.ConsoleAppender;
@@ -58,7 +58,7 @@
ClassLoader classLoader = getClass().getClassLoader();
GBeanData gbean;
- gbean = new GBeanData(SERVER_INFO_NAME, ServerInfo.getGBeanInfo());
+ gbean = new GBeanData(SERVER_INFO_NAME, BasicServerInfo.getGBeanInfo());
gbean.setAttribute("baseDirectory", System.getProperty("java.io.tmpdir"));
kernel.loadGBean(gbean, classLoader);
Modified: geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/DomainTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/DomainTest.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/DomainTest.java (original)
+++ geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/DomainTest.java Thu Aug 18 11:08:26 2005
@@ -14,11 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.geronimo.j2ee.management;
-
-
+import org.apache.geronimo.management.J2EEDomain;
/**
* @version $Rev$ $Date$
Modified: geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java (original)
+++ geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java Thu Aug 18 11:08:26 2005
@@ -18,13 +18,14 @@
package org.apache.geronimo.j2ee.management;
import java.net.InetAddress;
+import org.apache.geronimo.management.JVM;
/**
* @version $Rev$ $Date$
*/
public class JVMTest extends Abstract77Test {
private JVM jvm;
- private org.apache.geronimo.j2ee.management.geronimo.JVM jvmEx;
+ private org.apache.geronimo.management.geronimo.JVM jvmEx;
private String node;
private Runtime runtime;
@@ -65,7 +66,7 @@
protected void setUp() throws Exception {
super.setUp();
jvm = (JVM) kernel.getProxyManager().createProxy(JVM_NAME, JVM.class);
- jvmEx = (org.apache.geronimo.j2ee.management.geronimo.JVM) kernel.getProxyManager().createProxy(JVM_NAME, org.apache.geronimo.j2ee.management.geronimo.JVM.class);
+ jvmEx = (org.apache.geronimo.management.geronimo.JVM) kernel.getProxyManager().createProxy(JVM_NAME, org.apache.geronimo.management.geronimo.JVM.class);
node = InetAddress.getLocalHost().toString();
runtime = Runtime.getRuntime();
}
Modified: geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java (original)
+++ geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java Thu Aug 18 11:08:26 2005
@@ -17,6 +17,7 @@
package org.apache.geronimo.j2ee.management;
+import org.apache.geronimo.management.J2EEServer;
/**
Modified: geronimo/trunk/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/project.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/project.xml (original)
+++ geronimo/trunk/modules/jetty-builder/project.xml Thu Aug 18 11:08:26 2005
@@ -109,9 +109,15 @@
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Thu Aug 18 11:08:26 2005
@@ -72,7 +72,7 @@
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.kernel.management.State;
import org.apache.geronimo.security.SecurityServiceImpl;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
@@ -267,7 +267,7 @@
WebServiceBuilder webServiceBuilder = new UnavailableWebServiceBuilder();
serverInfoName = new ObjectName("geronimo.system:name=ServerInfo");
- serverInfoGBean = new GBeanData(serverInfoName, ServerInfo.GBEAN_INFO);
+ serverInfoGBean = new GBeanData(serverInfoName, BasicServerInfo.GBEAN_INFO);
serverInfoGBean.setAttribute("baseDirectory", ".");
start(serverInfoGBean);