geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r224401 - in /geronimo/trunk/modules: connector/src/java/org/apache/geronimo/connector/ j2ee/src/java/org/apache/geronimo/j2ee/management/ j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/ j2ee/src/java/org/apache/geronimo/j2ee/ma...
Date Fri, 22 Jul 2005 21:19:06 GMT
Author: ammulder
Date: Fri Jul 22 14:18:41 2005
New Revision: 224401

URL: http://svn.apache.org/viewcvs?rev=224401&view=rev
Log:
Start work on Management API
 - define interfaces for remaining JSR-77 types
 - make the domain, server, JVM, application, and module types implement
   the corresponding JSR-77 interfaces
 - add a minor Geronimo extension to J2EEApplication

Added:
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/AppClientModule.java
      - copied, changed from r220329, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEAppClientModule.java
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java   (with props)
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEApplication.java   (with props)
Removed:
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEAppClientModule.java
Modified:
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java
    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/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java

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=224401&r1=224400&r2=224401&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 Fri Jul 22 14:18:41 2005
@@ -27,13 +27,14 @@
 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.j2ee.management.impl.InvalidObjectNameException;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 
 /**
  * @version $Rev$ $Date$
  */
-public class ResourceAdapterModuleImpl {
+public class ResourceAdapterModuleImpl implements ResourceAdapterModule {
     private final J2EEServer server;
     private final J2EEApplication application;
     private final String deploymentDescriptor;
@@ -43,6 +44,7 @@
     private final Map activationSpecInfoMap;
     private final Map adminObjectInfoMap;
     private final Map managedConnectionFactoryInfoMap;
+    private final String objectName;
 
     public ResourceAdapterModuleImpl(String resourceAdapter,
                                      String objectName, 
@@ -53,6 +55,7 @@
                                      Map activationSpecInfoMap,
                                      Map adminObjectInfoMap,
                                      Map managedConnectionFactoryInfoMap) {
+        this.objectName = objectName;
         ObjectName myObjectName = JMXUtil.getObjectName(objectName);
         verifyObjectName(myObjectName);
 
@@ -68,6 +71,22 @@
         this.managedConnectionFactoryInfoMap = managedConnectionFactoryInfoMap;
     }
 
+    public String getObjectName() {
+        return objectName;
+    }
+
+    public boolean isStateManageable() {
+        return true;
+    }
+
+    public boolean isStatisticsProvider() {
+        return false;
+    }
+
+    public boolean isEventProvider() {
+        return true;
+    }
+
     public String getDeploymentDescriptor() {
         return deploymentDescriptor;
     }
@@ -87,7 +106,7 @@
         return server.getJavaVMs();
     }
 
-    public String[] getResourceAdapters() throws MalformedObjectNameException {
+    public String[] getResourceAdapters() {
         return resourceAdapters;
     }
 
@@ -152,8 +171,9 @@
 
         infoBuilder.addAttribute("resourceAdapterGBeanData", GBeanData.class, true);
         infoBuilder.addAttribute("activationSpecInfoMap", Map.class, true);
-         infoBuilder.addAttribute("adminObjectInfoMap", Map.class, true);
+        infoBuilder.addAttribute("adminObjectInfoMap", Map.class, true);
         infoBuilder.addAttribute("managedConnectionFactoryInfoMap", Map.class, true);
+        infoBuilder.addInterface(ResourceAdapterModule.class);
 
         infoBuilder.setConstructor(new String[]{
             "resourceAdapter",

Copied: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/AppClientModule.java (from r220329, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEAppClientModule.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/AppClientModule.java?p2=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/AppClientModule.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEAppClientModule.java&r1=220329&r2=224401&rev=224401&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEAppClientModule.java (original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/AppClientModule.java Fri Jul 22 14:18:41 2005
@@ -17,7 +17,9 @@
 package org.apache.geronimo.j2ee.management;
 
 /**
+ * Represents the JSR-77 type with the same name
+ *
  * @version $Revision$ $Date$
  */
-public interface J2EEAppClientModule extends J2EEManagedObject {
+public interface AppClientModule extends J2EEManagedObject {
 }

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface EJB extends J2EEManagedObject {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface EJBModule extends J2EEModule {
+    /**
+     * A list of EJBs included in this EJB JAR
+     * @see "JSR77.3.9.1.1"
+     * @return the ObjectNames of the EJBs in this EJB JAR
+     */
+    String[] getEJBs();
+}
\ No newline at end of file

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface EntityBean extends EJB {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,32 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface J2EEModule extends J2EEDeployedObject {
+    /**
+     * A list of JVMs this module is running on.  Each JVM listed here must
+     * be present in the owning J2EEServer's list of JVMs.
+     * @see "JSR77.3.7.1.1"
+     * @return the ObjectNames of the JVMs the module is running on
+     */
+    String[] getJavaVMs();
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,34 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface JCAConnectionFactory extends J2EEManagedObject {
+    /**
+     * The managed connection factory used by this connection factory.  In
+     * JDBC terms, the managed connection factory is the driver and the
+     * connection factory is the database connection pool.
+     * @see "JSR77.3.23.1.1"
+     * @return the ObjectName of the managed connection factory used by
+     *         this connection factory.
+     */
+    String getManagedConnectionFactory();
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface JCAManagedConnectionFactory extends J2EEManagedObject {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,32 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface JCAResource extends J2EEResource {
+    /**
+     * A list of connection factories provided by this resource.
+     * @see "JSR77.3.22.1.1"
+     * @return the ObjectNames of the connection factories provided by this
+     *         resource
+     */
+    String[] getConnectionFactories();
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface JDBCDataSource extends J2EEManagedObject {
+    /**
+     * The driver used by this data source to connect to the database.
+     * @see "JSR77.3.26.1.1"
+     * @return the ObjectName of the JDBCDriver.
+     */
+    String getJDBCDataSources();
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface JDBCDriver extends J2EEManagedObject {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface JDBCResource extends J2EEResource {
+    /**
+     * A list of data sources this JDBC resource provides.
+     * @see "JSR77.3.25.1.1"
+     * @return the ObjectNames of the JDBCDataSources
+     */
+    String[] getJDBCDataSources();
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface JMSResource extends J2EEResource {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface JTAResource extends J2EEResource {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface JavaMailResource extends J2EEResource {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface MessageDrivenBean extends EJB {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface RMIIIOPResource extends J2EEResource {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,32 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface ResourceAdapter extends J2EEManagedObject {
+    /**
+     * A list of JCA resources provided by this resource adapter.
+     * @see "JSR77.3.19.1.1"
+     * @return the ObjectNames of the JCAResources provided by this
+     *         resource adapter
+     */
+    String[] getJCAResources();
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,15 @@
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface ResourceAdapterModule extends J2EEModule {
+    /**
+     * A list of Resource Adapters included in this RAR
+     * @see "JSR77.3.18.1.1"
+     * @return the ObjectNames of the Resource Adapters in this RAR
+     */
+    String[] getResourceAdapters();
+}
\ No newline at end of file

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface Servlet extends J2EEManagedObject {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface SessionBean extends EJB {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface StatefulSessionBean extends SessionBean {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface StatelessSessionBean extends SessionBean {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface URLResource extends J2EEResource {
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface WebModule extends J2EEModule {
+    /**
+     * A list of Servlets included in this WAR
+     * @see "JSR77.3.16.1.1"
+     * @return the ObjectNames of the Servlets in this WAR
+     */
+    String[] getServlets();
+}
\ No newline at end of file

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEApplication.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEApplication.java?rev=224401&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEApplication.java (added)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEApplication.java Fri Jul 22 14:18:41 2005
@@ -0,0 +1,33 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.j2ee.management.geronimo;
+
+/**
+ * Represents the JSR-77 type with the same name
+ *
+ * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
+ */
+public interface J2EEApplication extends org.apache.geronimo.j2ee.management.J2EEApplication {
+    /**
+     * A list of J2EEResources deployed with this application.  This is not
+     * a standard JSR-77 feature, I guess because most servers deploy most
+     * resources at the top level, but RARs can always be embedded...
+     *
+     * @return the ObjectName Strings of the resources deployed with this EAR
+     */
+    String[] getResources();
+}

Propchange: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEApplication.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=224401&r1=224400&r2=224401&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 Fri Jul 22 14:18:41 2005
@@ -23,14 +23,14 @@
 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.J2EEAppClientModule;
+import org.apache.geronimo.j2ee.management.AppClientModule;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 
 /**
  * @version $Revision$ $Date$
  */
-public class J2EEAppClientModuleImpl implements J2EEAppClientModule {
+public class J2EEAppClientModuleImpl implements AppClientModule {
     private final String deploymentDescriptor;
     private final J2EEServer server;
     private final J2EEApplication application;
@@ -128,6 +128,7 @@
         infoFactory.addAttribute("application", String.class, false);
         infoFactory.addAttribute("javaVMs", String[].class, false);
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
+        infoFactory.addInterface(AppClientModule.class);
 
 
         infoFactory.setConstructor(new String[]{

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=224401&r1=224400&r2=224401&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 Fri Jul 22 14:18:41 2005
@@ -22,7 +22,7 @@
 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.J2EEApplication;
+import org.apache.geronimo.j2ee.management.geronimo.J2EEApplication;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
@@ -99,6 +99,12 @@
                 new String[]{"AppClientModule", "EJBModule", "WebModule", "ResourceAdapterModule"});
     }
 
+    public String[] getResources() {
+        return Util.getObjectNames(kernel,
+                baseName,
+                new String[]{"JavaMailResource", "JCAConnectionFactory", "JDBCResource", "JDBCDriver", "JMSResource", "JNDIResource", "JTAResource", "RMI_IIOPResource", "URLResource"});
+    }
+
     public String getDeploymentDescriptor() {
         return deploymentDescriptor;
     }
@@ -117,6 +123,8 @@
         infoFactory.addAttribute("deploymentDescriptor", String.class, true);
         infoFactory.addAttribute("server", String.class, false);
         infoFactory.addAttribute("modules", String[].class, false);
+        infoFactory.addAttribute("resources", String[].class, false);
+        infoFactory.addInterface(J2EEApplication.class);
 
         infoFactory.setConstructor(new String[]{
             "kernel",

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=224401&r1=224400&r2=224401&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 Fri Jul 22 14:18:41 2005
@@ -92,6 +92,7 @@
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("objectName", String.class, false);
         infoFactory.addAttribute("servers", String[].class, false);
+        infoFactory.addInterface(J2EEDomain.class);
 
         infoFactory.setConstructor(new String[]{"kernel", "objectName"});
 

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=224401&r1=224400&r2=224401&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 Fri Jul 22 14:18:41 2005
@@ -126,6 +126,7 @@
         infoFactory.addAttribute("javaVMs", String[].class, false);
         infoFactory.addAttribute("serverVendor", String.class, false);
         infoFactory.addAttribute("serverVersion", String.class, false);
+        infoFactory.addInterface(J2EEServer.class);
 
         infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
 

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=224401&r1=224400&r2=224401&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 Fri Jul 22 14:18:41 2005
@@ -128,6 +128,7 @@
         infoFactory.addAttribute("maxMemory", Long.TYPE, false);
         infoFactory.addAttribute("totalMemory", Long.TYPE, false);
         infoFactory.addAttribute("availableProcessors", Integer.TYPE, false);
+        infoFactory.addInterface(JVM.class);
         infoFactory.setConstructor(new String[] {"objectName"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java?rev=224401&r1=224400&r2=224401&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java Fri Jul 22 14:18:41 2005
@@ -41,6 +41,7 @@
 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.WebModule;
 import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
 import org.apache.geronimo.j2ee.management.impl.Util;
 import org.apache.geronimo.jetty.interceptor.BeforeAfter;
@@ -78,7 +79,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class JettyWebAppContext extends WebApplicationContext implements GBeanLifecycle, JettyServletRegistration {
+public class JettyWebAppContext extends WebApplicationContext implements GBeanLifecycle, JettyServletRegistration, WebModule {
     private static Log log = LogFactory.getLog(JettyWebAppContext.class);
 
     private final Kernel kernel;
@@ -101,6 +102,8 @@
     private final SecurityContextBeforeAfter securityInterceptor;
     private static final String[] J2EE_TYPES = {NameFactory.SERVLET};
 
+    private final String objectName;
+
     /**
      * @deprecated never use this... this is only here because Jetty WebApplicationContext is externalizable
      */
@@ -118,6 +121,7 @@
         contextLength = 0;
         securityInterceptor = null;
         welcomeFiles = null;
+        objectName = null;
 
     }
 
@@ -173,6 +177,7 @@
         this.kernel = kernel;
         this.server = server;
         this.application = application;
+        this.objectName = objectName;
         ObjectName myObjectName = JMXUtil.getObjectName(objectName);
         verifyObjectName(myObjectName);
         moduleContext = J2eeContextImpl.newContext(myObjectName, NameFactory.WEB_MODULE);
@@ -262,6 +267,22 @@
         handler.addFilterPathMapping("/*", "jsr154", Dispatcher.__REQUEST | Dispatcher.__FORWARD | Dispatcher.__INCLUDE | Dispatcher.__ERROR );
     }
 
+    public String getObjectName() {
+        return objectName;
+    }
+
+    public boolean isStateManageable() {
+        return true;
+    }
+
+    public boolean isStatisticsProvider() {
+        return false;
+    }
+
+    public boolean isEventProvider() {
+        return true;
+    }
+
     public Object enterContextScope(HttpRequest httpRequest, HttpResponse httpResponse) {
         Object[] context = new Object[contextLength];
         chain.before(context, httpRequest, httpResponse);
@@ -422,8 +443,13 @@
         return server.getJavaVMs();
     }
 
-    public String[] getServlets() throws MalformedObjectNameException {
-        return Util.getObjectNames(kernel, moduleContext, J2EE_TYPES);
+    public String[] getServlets() {
+        try {
+            return Util.getObjectNames(kernel, moduleContext, J2EE_TYPES);
+        } catch (MalformedObjectNameException e) {
+            log.error(e);
+            return new String[0];
+        }
     }
 
     /**
@@ -537,6 +563,8 @@
         infoBuilder.addAttribute("application", String.class, false);
         infoBuilder.addAttribute("javaVMs", String[].class, false);
         infoBuilder.addAttribute("servlets", String[].class, false);
+
+        infoBuilder.addInterface(WebModule.class);
 
         infoBuilder.setConstructor(new String[]{
             "objectName",

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java?rev=224401&r1=224400&r2=224401&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java Fri Jul 22 14:18:41 2005
@@ -31,11 +31,14 @@
 import org.apache.geronimo.kernel.proxy.ProxyFactory;
 import org.apache.geronimo.kernel.proxy.ProxyManager;
 import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * @version $Rev$ $Date$
  */
 public class BasicProxyManager implements ProxyManager {
+    private final static Log log = LogFactory.getLog(BasicProxyManager.class);
     private final Kernel kernel;
 
     // todo use weak keys for this
@@ -67,6 +70,7 @@
         try {
             GBeanInfo info = kernel.getGBeanInfo(target);
             if(info.getInterfaces().size() == 0) {
+                log.warn("No interfaces found for "+target+" ("+info.getClassName()+")");
                 return null;
             }
             Class[] intfs = (Class[]) info.getInterfaces().toArray(new Class[0]);

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=224401&r1=224400&r2=224401&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Fri Jul 22 14:18:41 2005
@@ -38,6 +38,7 @@
 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.WebModule;
 import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
@@ -52,7 +53,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class TomcatWebAppContext implements GBeanLifecycle, TomcatContext {
+public class TomcatWebAppContext implements GBeanLifecycle, TomcatContext, WebModule {
 
     private static Log log = LogFactory.getLog(TomcatWebAppContext.class);
 
@@ -96,6 +97,10 @@
 
     private final Map webServices;
 
+    private final String objectName;
+
+    private final String originalSpecDD;
+
     public TomcatWebAppContext(
             ClassLoader classLoader,
             String objectName,
@@ -131,8 +136,11 @@
         assert componentContext != null;
         assert container != null;
 
+
+        this.objectName = objectName;
         this.webAppRoot = webAppRoot;
         this.container = container;
+        this.originalSpecDD = originalSpecDD;
 
         this.setDocBase(this.webAppRoot.getPath());
         this.virtualServer = virtualServer;
@@ -198,6 +206,22 @@
 
     }
 
+    public String getObjectName() {
+        return objectName;
+    }
+
+    public boolean isStateManageable() {
+        return true;
+    }
+
+    public boolean isStatisticsProvider() {
+        return false;
+    }
+
+    public boolean isEventProvider() {
+        return true;
+    }
+
     public String getServer() {
         return server.getObjectName();
     }
@@ -311,6 +335,19 @@
         }
     }
 
+
+    public String[] getServlets() {
+        return new String[0]; //todo: implement me: ObjectNames (as Strings) of the Servlets in this Web App
+    }
+
+    public String[] getJavaVMs() {
+        return server.getJavaVMs();
+    }
+
+    public String getDeploymentDescriptor() {
+        return originalSpecDD;
+    }
+
     public void doStart() throws Exception {
 
         // See the note of TomcatContainer::addContext
@@ -372,6 +409,8 @@
         infoBuilder.addReference("J2EEServer", J2EEServer.class);
         infoBuilder.addReference("J2EEApplication", J2EEApplication.class);
         infoBuilder.addAttribute("kernel", Kernel.class, false);
+
+        infoBuilder.addInterface(WebModule.class);
 
         infoBuilder.setConstructor(new String[] {
                 "classLoader",



Mime
View raw message