geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: rev 46228 - in geronimo/trunk/modules: connector/src/java/org/apache/geronimo/connector/deployment j2ee/src/java/org/apache/geronimo/j2ee/management j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo j2ee/src/java/org/apache/geronimo/j2ee/management/impl j2ee/src/test/org/apache/geronimo/j2ee/management
Date Fri, 17 Sep 2004 01:21:05 GMT
Author: dain
Date: Thu Sep 16 18:21:04 2004
New Revision: 46228

Modified:
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResouceAdapterModuleImpl.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/J2EEServer.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/geronimo/JVM.java
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.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
Log:
Chaged method signatures to use normal JavaBeans naming conventions from the naming conventions
of JMX standard mbeans, since we no longer use JMX standard mbeans.


Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java
(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java
Thu Sep 16 18:21:04 2004
@@ -41,7 +41,7 @@
     }
 
     public String getServer() {
-        return server.getobjectName();
+        return server.getObjectName();
     }
 
     public String getManagedConnectionFactory() {

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResouceAdapterModuleImpl.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResouceAdapterModuleImpl.java
(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResouceAdapterModuleImpl.java
Thu Sep 16 18:21:04 2004
@@ -61,18 +61,18 @@
     }
 
     public String getServer() {
-        return server.getobjectName();
+        return server.getObjectName();
     }
 
     public String getApplication() {
         if (application == null) {
             return null;
         }
-        return application.getobjectName();
+        return application.getObjectName();
     }
 
     public String[] getJavaVMs() {
-        return server.getjavaVMs();
+        return server.getJavaVMs();
     }
 
     public String[] getResourceAdapters() throws MalformedObjectNameException {

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEApplication.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEApplication.java
(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEApplication.java
Thu Sep 16 18:21:04 2004
@@ -29,5 +29,5 @@
      * @see "JSR77.3.6.1.1"
      * @return the modules in this EAR
      */
-    String[] getmodules();
+    String[] getModules();
 }

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDeployedObject.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDeployedObject.java
(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDeployedObject.java
Thu Sep 16 18:21:04 2004
@@ -29,12 +29,12 @@
      * @see "JSR77.3.5.0.1"
      * @return this module's deployment descriptor
      */
-    String getdeploymentDescriptor();
+    String getDeploymentDescriptor();
 
     /**
      * The J2EE server the application or module is deployed on.
      * @see "JSR77.3.5.0.2"
      * @return the server this module is deployed on
      */
-    String getserver();
+    String getServer();
 }

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDomain.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDomain.java
(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDomain.java
Thu Sep 16 18:21:04 2004
@@ -28,5 +28,5 @@
      * @see "JSR77.3.2.1.1"
      * @return all J2EE Servers
      */
-    String[] getservers();
+    String[] getServers();
 }

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEManagedObject.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEManagedObject.java
(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEManagedObject.java
Thu Sep 16 18:21:04 2004
@@ -17,7 +17,7 @@
 
 package org.apache.geronimo.j2ee.management;
 
-import org.apache.geronimo.kernel.management.ManagedObject;
+
 
 /**
  * 
@@ -31,26 +31,26 @@
      *
      * @return the unique name of this object within the server
      */
-    String getobjectName();
+    String getObjectName();
 
     /**
      * Determines if this object implements the state manageable type defined in the J2EE
Management specification.
      *
      * @return true if this class also implements the state manageable type; false otherwise
      */
-    boolean isstateManageable();
+    boolean isStateManageable();
 
     /**
      * Determines if this object implemnts the statistics provider type defined in the J2EE
Management specification.
      *
      * @return true if this class also implements the state manageable type; false otherwise
      */
-    boolean isstatisticsProvider();
+    boolean isStatisticsProvider();
 
     /**
      * Determines if this object implemnts the event provider type defined in the J2EE Management
specification.
      *
      * @return true if this class also implements the event manageable type; false otherwise
      */
-    boolean iseventProvider();
+    boolean isEventProvider();
 }

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEServer.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEServer.java
(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEServer.java
Thu Sep 16 18:21:04 2004
@@ -28,33 +28,33 @@
      * @see "JSR77.3.3.1.1"
      * @return the deployed objects on this server
      */
-    String[] getdeployedObjects();
+    String[] getDeployedObjects();
 
     /**
      * A list of resources available to this server.
      * @see "JSR77.3.3.1.2"
      * @return the resources available to this server
      */
-    String[] getresources();
+    String[] getResources();
 
     /**
      * A list of all Java virtual machines on which this J2EEServer has running threads.
      * @see "JSR77.3.3.1.3"
      * @return the JVMs for this server
      */
-    String[] getjavaVMs();
+    String[] getJavaVMs();
 
     /**
      * Identifies the J2EE platform vendor of this J2EEServer.
      * @see "JSR77.3.3.1.4"
      * @return the server vendor
      */
-    String getserverVendor();
+    String getServerVendor();
 
     /**
      * Identifies the J2EE implemetation version of this J2EEServer.
      * @see "JSR77.3.3.1.5"
      * @return the server version
      */
-    String getserverVersion();
+    String getServerVersion();
 }

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JVM.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JVM.java	(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JVM.java	Thu
Sep 16 18:21:04 2004
@@ -29,7 +29,7 @@
      * @see "JSR77.3.4.1.1"
      * @return the JVMImpl version
      */
-    String getjavaVersion();
+    String getJavaVersion();
 
     /**
      * The vendor of the JVMImpl we are running on.
@@ -37,7 +37,7 @@
      * @see "JSR77.3.4.1.2"
      * @return the JVMImpl version
      */
-    String getjavaVendor();
+    String getJavaVendor();
 
     /**
      * The node we are running on.
@@ -46,5 +46,5 @@
      * @see "JSR77.3.4.1.3"
      * @return the node we are running on
      */
-    String getnode();
+    String getNode();
 }

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/JVM.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/JVM.java
(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/JVM.java
Thu Sep 16 18:21:04 2004
@@ -23,8 +23,8 @@
  * @version $Rev$ $Date$
  */
 public interface JVM extends org.apache.geronimo.j2ee.management.JVM {
-    long getfreeMemory();
-    long gettotalMemory();
-    long getmaxMemory();
-    int getavailableProcessors();
+    long getFreeMemory();
+    long getTotalMemory();
+    long getMaxMemory();
+    int getAvailableProcessors();
 }

Modified: 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/J2EEApplicationImpl.java
(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java
Thu Sep 16 18:21:04 2004
@@ -80,12 +80,12 @@
                 new String[]{"AppClientModule", "EJBModule", "WebModule", "ResourceAdapterModule"});
     }
 
-    public String getdeploymentDescriptor() {
+    public String getDeploymentDescriptor() {
         return deploymentDescriptor;
     }
 
-    public String getserver() {
-        return server.getobjectName();
+    public String getServer() {
+        return server.getObjectName();
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/DomainTest.java
==============================================================================
--- 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 Sep 16 18:21:04 2004
@@ -27,8 +27,8 @@
     private J2EEDomain domain;
 
     public void testStandardInterface() throws Exception {
-        assertEquals(DOMAIN_NAME.toString(), domain.getobjectName());
-        assertObjectNamesEqual(new String[]{SERVER_NAME.toString()}, domain.getservers());
+        assertEquals(DOMAIN_NAME.toString(), domain.getObjectName());
+        assertObjectNamesEqual(new String[]{SERVER_NAME.toString()}, domain.getServers());
     }
 
     public void testStandardAttributes() throws Exception {

Modified: geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java
==============================================================================
--- 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 Sep 16 18:21:04 2004
@@ -31,10 +31,10 @@
     private Runtime runtime;
 
     public void testStandardInterface() {
-        assertEquals(JVM_NAME.getCanonicalName(), jvm.getobjectName());
-        assertEquals(System.getProperty("java.version"), jvm.getjavaVersion());
-        assertEquals(System.getProperty("java.vendor"), jvm.getjavaVendor());
-        assertEquals(node, jvm.getnode());
+        assertEquals(JVM_NAME.getCanonicalName(), jvm.getObjectName());
+        assertEquals(System.getProperty("java.version"), jvm.getJavaVersion());
+        assertEquals(System.getProperty("java.vendor"), jvm.getJavaVendor());
+        assertEquals(node, jvm.getNode());
     }
 
     public void testStandardAttributes() throws Exception {
@@ -45,12 +45,12 @@
     }
 
     public void testGeronimoInterface() {
-        assertEquals(runtime.availableProcessors(), jvmEx.getavailableProcessors());
+        assertEquals(runtime.availableProcessors(), jvmEx.getAvailableProcessors());
 
         // I'm going to leave these in but I am not sure the results are deterministic
-//        assertEquals(runtime.freeMemory(), jvmEx.getfreeMemory());
-        assertEquals(runtime.maxMemory(), jvmEx.getmaxMemory());
-        assertEquals(runtime.totalMemory(), jvmEx.gettotalMemory());
+//        assertEquals(runtime.freeMemory(), jvmEx.getFreeMemory());
+        assertEquals(runtime.maxMemory(), jvmEx.getMaxMemory());
+        assertEquals(runtime.totalMemory(), jvmEx.getTotalMemory());
 
     }
 

Modified: geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java
==============================================================================
--- 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 Sep 16 18:21:04 2004
@@ -27,12 +27,12 @@
     private String version;
 
     public void testStandardInterface() throws Exception {
-        assertEquals(SERVER_NAME.toString(), server.getobjectName());
-        assertEquals(0, server.getdeployedObjects().length);
-        assertEquals(0, server.getresources().length);
-        assertObjectNamesEqual(new String[]{JVM_NAME.toString()}, server.getjavaVMs());
-        assertEquals("The Apache Software Foundation", server.getserverVendor());
-        assertEquals(version, server.getserverVersion());
+        assertEquals(SERVER_NAME.toString(), server.getObjectName());
+        assertEquals(0, server.getDeployedObjects().length);
+        assertEquals(0, server.getResources().length);
+        assertObjectNamesEqual(new String[]{JVM_NAME.toString()}, server.getJavaVMs());
+        assertEquals("The Apache Software Foundation", server.getServerVendor());
+        assertEquals(version, server.getServerVersion());
     }
 
     public void testStandardAttributes() throws Exception {

Mime
View raw message