geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r233346 [2/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...
Date Thu, 18 Aug 2005 18:09:48 GMT
Modified: geronimo/trunk/modules/jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/project.xml?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/project.xml (original)
+++ geronimo/trunk/modules/jetty/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-security</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java Thu Aug 18 11:08:26 2005
@@ -21,7 +21,7 @@
 import org.mortbay.http.HttpListener;
 import org.mortbay.http.RequestLog;
 import org.mortbay.http.UserRealm;
-import org.apache.geronimo.j2ee.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.WebContainer;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java Thu Aug 18 11:08:26 2005
@@ -44,6 +44,7 @@
 import org.apache.geronimo.jetty.connector.HTTPConnector;
 import org.apache.geronimo.jetty.connector.HTTPSConnector;
 import org.apache.geronimo.jetty.connector.AJP13Connector;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.mortbay.http.*;
@@ -234,6 +235,9 @@
             connector = new GBeanData(name, HTTPConnector.GBEAN_INFO);
         } else if(protocol.equals(PROTOCOL_HTTPS)) {
             connector = new GBeanData(name, HTTPSConnector.GBEAN_INFO);
+            GBeanQuery query = new GBeanQuery(null, ServerInfo.class.getName());
+            Set set = kernel.listGBeans(query);
+            connector.setReferencePattern("ServerInfo", (ObjectName)set.iterator().next());
             //todo: default HTTPS settings
         } else if(protocol.equals(PROTOCOL_AJP)) {
             connector = new GBeanData(name, AJP13Connector.GBEAN_INFO);

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettySecureConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettySecureConnector.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettySecureConnector.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettySecureConnector.java Thu Aug 18 11:08:26 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.geronimo.jetty;
 
-import org.apache.geronimo.j2ee.management.geronimo.SecureConnector;
+import org.apache.geronimo.management.geronimo.SecureConnector;
 
 /**
  * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $

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=233346&r1=233345&r2=233346&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 Thu Aug 18 11:08:26 2005
@@ -39,9 +39,9 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.management.J2EEApplication;
-import org.apache.geronimo.j2ee.management.J2EEServer;
-import org.apache.geronimo.j2ee.management.WebModule;
+import org.apache.geronimo.management.J2EEApplication;
+import org.apache.geronimo.management.J2EEServer;
+import org.apache.geronimo.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;

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java Thu Aug 18 11:08:26 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.geronimo.jetty;
 
-import org.apache.geronimo.j2ee.management.geronimo.WebConnector;
+import org.apache.geronimo.management.geronimo.WebConnector;
 
 /**
  * A Jetty-specific extension to the standard Geronimo web connector interface.

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java Thu Aug 18 11:08:26 2005
@@ -20,7 +20,7 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.jetty.JettyContainer;
-import org.apache.geronimo.j2ee.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.WebContainer;
 import org.mortbay.http.ajp.AJP13Listener;
 
 /**

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java Thu Aug 18 11:08:26 2005
@@ -20,7 +20,7 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.jetty.JettyContainer;
-import org.apache.geronimo.j2ee.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.WebContainer;
 import org.mortbay.http.SocketListener;
 
 /**

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java Thu Aug 18 11:08:26 2005
@@ -24,7 +24,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.WebContainer;
+import org.apache.geronimo.management.geronimo.WebContainer;
 import org.apache.geronimo.jetty.JettyContainer;
 import org.apache.geronimo.jetty.JettySecureConnector;
 import org.apache.geronimo.system.serverinfo.ServerInfo;

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java Thu Aug 18 11:08:26 2005
@@ -27,6 +27,7 @@
 import org.apache.geronimo.jetty.JettyWebConnector;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.mortbay.http.HttpListener;
+import org.mortbay.http.SocketListener;
 import org.mortbay.util.ThreadedServer;
 
 /**
@@ -110,31 +111,66 @@
     }
 
     public void setBufferSizeBytes(int bytes) {
-        throw new UnsupportedOperationException(); //todo: is this supported?
+        if(listener instanceof SocketListener) {
+            SocketListener socketListener = (SocketListener)listener;
+            socketListener.setBufferSize(bytes);
+        } else {
+            throw new UnsupportedOperationException(); //todo: can this happen?
+        }
     }
 
     public int getAcceptQueueSize() {
-        throw new UnsupportedOperationException(); //todo: where does this come from?
+        if(listener instanceof SocketListener) {
+            SocketListener socketListener = (SocketListener)listener;
+            return socketListener.getAcceptQueueSize();
+        } else {
+            throw new UnsupportedOperationException(); //todo: can this happen?
+        }
     }
 
     public void setAcceptQueueSize(int size) {
-        throw new UnsupportedOperationException(); //todo: where does this come from?
+        if(listener instanceof SocketListener) {
+            SocketListener socketListener = (SocketListener)listener;
+            socketListener.setAcceptQueueSize(size);
+        } else {
+            throw new UnsupportedOperationException(); //todo: can this happen?
+        }
     }
 
     public int getLingerMillis() {
-        throw new UnsupportedOperationException(); //todo: where does this come from?
+        if(listener instanceof SocketListener) {
+            SocketListener socketListener = (SocketListener)listener;
+            return socketListener.getLingerTimeSecs()*1000;
+        } else {
+            throw new UnsupportedOperationException(); //todo: can this happen?
+        }
     }
 
     public void setLingerMillis(int millis) {
-        throw new UnsupportedOperationException(); //todo: where does this come from?
+        if(listener instanceof SocketListener) {
+            SocketListener socketListener = (SocketListener)listener;
+            socketListener.setLingerTimeSecs(Math.round((float)millis/1000f));
+        } else {
+            throw new UnsupportedOperationException(); //todo: can this happen?
+        }
     }
 
     public boolean isTcpNoDelay() {
-        throw new UnsupportedOperationException(); //todo: where does this come from?
+        if(listener instanceof SocketListener) {
+            SocketListener socketListener = (SocketListener)listener;
+            return socketListener.getTcpNoDelay();
+        } else {
+            throw new UnsupportedOperationException(); //todo: can this happen?
+        }
     }
 
     public void setTcpNoDelay(boolean enable) {
-        throw new UnsupportedOperationException(); //todo: where does this come from?
+        if(listener instanceof SocketListener) {
+            SocketListener socketListener = (SocketListener)listener;
+            socketListener.setTcpNoDelay(enable);
+        } else {
+            throw new UnsupportedOperationException(); //todo: can this happen?
+        }
     }
 
     public int getRedirectPort() {
@@ -142,7 +178,15 @@
     }
 
     public void setRedirectPort(int port) {
-        throw new UnsupportedOperationException(); //todo: is this supported?
+        if(listener instanceof SocketListener) {
+            SocketListener socketListener = (SocketListener)listener;
+            socketListener.setConfidentialPort(port);
+            socketListener.setIntegralPort(port);
+            socketListener.setIntegralScheme("https");
+            socketListener.setConfidentialScheme("https");
+        } else {
+            throw new UnsupportedOperationException(); //todo: can this happen?
+        }
     }
 
     public abstract String getProtocol();

Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java (original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java Thu Aug 18 11:08:26 2005
@@ -48,7 +48,7 @@
 import org.apache.geronimo.security.jaas.LoginModuleGBean;
 import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
 import org.apache.geronimo.security.realm.GenericSecurityRealm;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import org.apache.geronimo.transaction.context.OnlineUserTransaction;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
@@ -181,7 +181,7 @@
         loginConfigurationGBean.setReferencePatterns("Configurations", configurations);
 
         serverInfoName = new ObjectName("geronimo.system:name=ServerInfo");
-        serverInfoGBean = new GBeanData(serverInfoName, ServerInfo.GBEAN_INFO);
+        serverInfoGBean = new GBeanData(serverInfoName, BasicServerInfo.GBEAN_INFO);
         serverInfoGBean.setAttribute("baseDirectory", ".");
 
         securityServiceName = new ObjectName("geronimo.server:j2eeType=SecurityService");

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanAttribute.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanAttribute.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanAttribute.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanAttribute.java Thu Aug 18 11:08:26 2005
@@ -254,7 +254,7 @@
 
     private void initializePersistentValue(Object value) {
         if (persistent || special) {
-            if (value == null && type.isPrimitive()) {
+            if (value == null && type.isPrimitive() && isConstructorArg) {
                 if (type == Boolean.TYPE) {
                     value = Boolean.FALSE;
                 } else if (type == Byte.TYPE) {
@@ -314,7 +314,7 @@
     }
 
     public void inject(Object target) throws Exception {
-        if ((persistent || special) && !isConstructorArg && writable) {
+        if ((persistent || special) && !isConstructorArg && writable && persistentValue != null) {
             setValue(target, persistentValue);
         }
     }

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Thu Aug 18 11:08:26 2005
@@ -303,7 +303,9 @@
                 if ("gbeanEnabled".equals(attributeName)) {
                     enabled = ((Boolean)attributeValue).booleanValue();
                 } else {
-                    setAttribute(attributeName, attributeValue);
+                    if(entry.getValue() != null) {
+                        setAttribute(attributeName, attributeValue);
+                    }
                 }
             }
 

Modified: geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java (original)
+++ geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java Thu Aug 18 11:08:26 2005
@@ -28,6 +28,11 @@
 import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.proxy.ProxyManager;
 import org.apache.geronimo.kernel.basic.BasicProxyManager;
+import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.PatternLayout;
 
 /**
  * @version $Rev$ $Date$
@@ -184,6 +189,8 @@
     }
 
     protected void setUp() throws Exception {
+        Logger.getRootLogger().addAppender(new ConsoleAppender(new PatternLayout("%p [%t] %m %n")));
+        Logger.getRootLogger().setLevel(Level.DEBUG);
         name = new ObjectName("test:name=MyMockGBean");
         name2 = new ObjectName("test:name=MyMockGBean2");
         kernel = KernelFactory.newInstance().createKernel("test");

Propchange: geronimo/trunk/modules/management/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 18 11:08:26 2005
@@ -0,0 +1,2 @@
+target
+*.iml

Added: geronimo/trunk/modules/management/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/LICENSE.txt?rev=233346&view=auto
==============================================================================
--- geronimo/trunk/modules/management/LICENSE.txt (added)
+++ geronimo/trunk/modules/management/LICENSE.txt Thu Aug 18 11:08:26 2005
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Added: geronimo/trunk/modules/management/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/NOTICE.txt?rev=233346&view=auto
==============================================================================
--- geronimo/trunk/modules/management/NOTICE.txt (added)
+++ geronimo/trunk/modules/management/NOTICE.txt Thu Aug 18 11:08:26 2005
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/trunk/modules/management/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/maven.xml?rev=233346&view=auto
==============================================================================
--- geronimo/trunk/modules/management/maven.xml (added)
+++ geronimo/trunk/modules/management/maven.xml Thu Aug 18 11:08:26 2005
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 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.
+-->
+  
+
+<!-- $Rev: 56771 $ $Date: 2004-11-06 14:58:54 -0500 (Sat, 06 Nov 2004) $ -->
+
+<project default="default">
+
+</project>

Added: geronimo/trunk/modules/management/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/project.properties?rev=233346&view=auto
==============================================================================
--- geronimo/trunk/modules/management/project.properties (added)
+++ geronimo/trunk/modules/management/project.properties Thu Aug 18 11:08:26 2005
@@ -0,0 +1,4 @@
+##
+## $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
+##
+

Added: geronimo/trunk/modules/management/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/project.xml?rev=233346&view=auto
==============================================================================
--- geronimo/trunk/modules/management/project.xml (added)
+++ geronimo/trunk/modules/management/project.xml Thu Aug 18 11:08:26 2005
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 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.
+-->
+
+<!-- $Rev: 57362 $ $Date: 2004-11-10 15:40:05 -0500 (Wed, 10 Nov 2004) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+
+    <!-- ===================== -->
+    <!-- Module Identification -->
+    <!-- ===================== -->
+
+    <name>Geronimo :: Management API</name>
+    <id>geronimo-management</id>
+    <shortDescription>Geronimo Management API</shortDescription>
+    <description>Contains interfaces that define the management API for
+      Geronimo</description>
+    <package>org.apache.geronimo.management</package>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- Module Dependencies -->
+<!--
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+            <version>${geronimo_spec_j2ee_deployment_version}</version>
+        </dependency>
+-->
+    </dependencies>
+
+    <build>
+        <resources>
+        </resources>
+        <unitTest>
+            <includes>
+                <include>**/*Test.java</include>
+            </includes>
+        </unitTest>
+    </build>
+</project>

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/AppClientModule.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/AppClientModule.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/AppClientModule.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/AppClientModule.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/AppClientModule.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/AppClientModule.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/AppClientModule.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EJB.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EJB.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EJB.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJB.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EJB.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EJBModule.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EJBModule.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EJBModule.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EJBModule.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EJBModule.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EntityBean.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EntityBean.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EntityBean.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/EntityBean.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/EntityBean.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEApplication.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEApplication.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEApplication.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEApplication.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEApplication.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEApplication.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEApplication.java Thu Aug 18 11:08:26 2005
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Identifies a J2EE application EAR that has been deployed.

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEDeployedObject.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDeployedObject.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEDeployedObject.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEDeployedObject.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDeployedObject.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDeployedObject.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEDeployedObject.java Thu Aug 18 11:08:26 2005
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * 

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEDomain.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDomain.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEDomain.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEDomain.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDomain.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEDomain.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEDomain.java Thu Aug 18 11:08:26 2005
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * 

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEManagedObject.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEManagedObject.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEManagedObject.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEManagedObject.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEManagedObject.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEManagedObject.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEManagedObject.java Thu Aug 18 11:08:26 2005
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 
 

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEModule.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEModule.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEModule.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEModule.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEModule.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEResource.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEResource.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEResource.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEResource.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEResource.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEResource.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEResource.java Thu Aug 18 11:08:26 2005
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * 

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEServer.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEServer.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEServer.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEServer.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEServer.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/J2EEServer.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/J2EEServer.java Thu Aug 18 11:08:26 2005
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * 

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAConnectionFactory.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAConnectionFactory.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAConnectionFactory.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAConnectionFactory.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAConnectionFactory.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAManagedConnectionFactory.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAManagedConnectionFactory.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAManagedConnectionFactory.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAManagedConnectionFactory.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAManagedConnectionFactory.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAResource.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAResource.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAResource.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JCAResource.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JCAResource.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCDataSource.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCDataSource.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCDataSource.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDataSource.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCDataSource.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCDriver.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCDriver.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCDriver.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCDriver.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCDriver.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCResource.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCResource.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCResource.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JDBCResource.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JDBCResource.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JMSResource.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JMSResource.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JMSResource.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JMSResource.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JMSResource.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JTAResource.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JTAResource.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JTAResource.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JTAResource.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JTAResource.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JVM.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JVM.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JVM.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JVM.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JVM.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JVM.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JVM.java Thu Aug 18 11:08:26 2005
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * 

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JavaMailResource.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JavaMailResource.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JavaMailResource.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/JavaMailResource.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/JavaMailResource.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/MessageDrivenBean.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/MessageDrivenBean.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/MessageDrivenBean.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/MessageDrivenBean.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/MessageDrivenBean.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/RMIIIOPResource.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/RMIIIOPResource.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/RMIIIOPResource.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/RMIIIOPResource.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/RMIIIOPResource.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/ResourceAdapter.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/ResourceAdapter.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/ResourceAdapter.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapter.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/ResourceAdapter.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/ResourceAdapterModule.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/ResourceAdapterModule.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/ResourceAdapterModule.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/ResourceAdapterModule.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/ResourceAdapterModule.java Thu Aug 18 11:08:26 2005
@@ -1,4 +1,20 @@
-package org.apache.geronimo.j2ee.management;
+/**
+ *
+ * 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.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/Servlet.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/Servlet.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/Servlet.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/Servlet.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/Servlet.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/SessionBean.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/SessionBean.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/SessionBean.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/SessionBean.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/SessionBean.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/StatefulSessionBean.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/StatefulSessionBean.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/StatefulSessionBean.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatefulSessionBean.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/StatefulSessionBean.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/StatelessSessionBean.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/StatelessSessionBean.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/StatelessSessionBean.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/StatelessSessionBean.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/StatelessSessionBean.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/URLResource.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/URLResource.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/URLResource.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/URLResource.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/URLResource.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/WebModule.java (from r233174, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/WebModule.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/WebModule.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java&r1=233174&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/WebModule.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/WebModule.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management;
+package org.apache.geronimo.management;
 
 /**
  * Represents the JSR-77 type with the same name

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/EJBConnector.java (from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/EJBConnector.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/EJBConnector.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/EJBConnector.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/EJBConnector.java&r1=233342&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/EJBConnector.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/EJBConnector.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management.geronimo;
+package org.apache.geronimo.management.geronimo;
 
 /**
  * Management interface for network connectors used to communicate with an

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/EJBContainer.java (from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/EJBContainer.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/EJBContainer.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/EJBContainer.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/EJBContainer.java&r1=233342&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/EJBContainer.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/EJBContainer.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management.geronimo;
+package org.apache.geronimo.management.geronimo;
 
 /**
  * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEApplication.java (from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEApplication.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEApplication.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEApplication.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEApplication.java&r1=233342&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEApplication.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEApplication.java Thu Aug 18 11:08:26 2005
@@ -14,14 +14,14 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management.geronimo;
+package org.apache.geronimo.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 {
+public interface J2EEApplication extends org.apache.geronimo.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

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java (from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEServer.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEServer.java&r1=233342&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/J2EEServer.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management.geronimo;
+package org.apache.geronimo.management.geronimo;
 
 /**
  * Geronimo-specific extensions to the standard J2EE server management
@@ -22,7 +22,7 @@
  *
  * @version $Rev: 46228 $ $Date: 2004-09-16 21:21:04 -0400 (Thu, 16 Sep 2004) $
  */
-public interface J2EEServer extends org.apache.geronimo.j2ee.management.J2EEServer {
+public interface J2EEServer extends org.apache.geronimo.management.J2EEServer {
     /**
      * Gets the ObjectName of the Web Container associated with this
      * J2EEServer, or null if there is none in the current server

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/JVM.java (from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/JVM.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/JVM.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/JVM.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/JVM.java&r1=233342&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/JVM.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/JVM.java Thu Aug 18 11:08:26 2005
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.j2ee.management.geronimo;
+package org.apache.geronimo.management.geronimo;
 
 import java.util.Date;
 import java.util.Properties;
@@ -25,7 +25,7 @@
  *
  * @version $Rev$ $Date$
  */
-public interface JVM extends org.apache.geronimo.j2ee.management.JVM {
+public interface JVM extends org.apache.geronimo.management.JVM {
     long getFreeMemory();
     long getTotalMemory();
     long getMaxMemory();

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkConnector.java (from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/NetworkConnector.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkConnector.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkConnector.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/NetworkConnector.java&r1=233342&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/NetworkConnector.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkConnector.java Thu Aug 18 11:08:26 2005
@@ -14,11 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management.geronimo;
+package org.apache.geronimo.management.geronimo;
 
 import java.net.UnknownHostException;
 import java.net.InetSocketAddress;
-import org.apache.geronimo.kernel.management.StateManageable;
 
 /**
  * Base management interface for a network connector used to handle some

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkContainer.java (from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/NetworkContainer.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkContainer.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkContainer.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/NetworkContainer.java&r1=233342&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/NetworkContainer.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkContainer.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management.geronimo;
+package org.apache.geronimo.management.geronimo;
 
 /**
  * Base management interface for a server component that has associated

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/SecureConnector.java (from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/SecureConnector.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/SecureConnector.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/SecureConnector.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/SecureConnector.java&r1=233342&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/SecureConnector.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/SecureConnector.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management.geronimo;
+package org.apache.geronimo.management.geronimo;
 
 /**
  * Common configuration settings for connectors that use SSL/TLS to conduct

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/WebConnector.java (from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/WebConnector.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/WebConnector.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/WebConnector.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/WebConnector.java&r1=233342&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/WebConnector.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/WebConnector.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management.geronimo;
+package org.apache.geronimo.management.geronimo;
 
 /**
  * The common configuration settings for a web container network connector --

Copied: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/WebContainer.java (from r233342, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/WebContainer.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/WebContainer.java?p2=geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/WebContainer.java&p1=geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/WebContainer.java&r1=233342&r2=233346&rev=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo/WebContainer.java (original)
+++ geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/WebContainer.java Thu Aug 18 11:08:26 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.j2ee.management.geronimo;
+package org.apache.geronimo.management.geronimo;
 
 /**
  * The common configuration settings for a web container (currently, Tomcat or

Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java (original)
+++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java Thu Aug 18 11:08:26 2005
@@ -39,6 +39,11 @@
 import org.apache.geronimo.security.realm.GenericSecurityRealm;
 import org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
+import org.apache.log4j.Logger;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.PatternLayout;
+import org.apache.log4j.Level;
 
 
 /**
@@ -126,6 +131,8 @@
     }
 
     protected void setUp() throws Exception {
+        Logger.getRootLogger().addAppender(new ConsoleAppender(new PatternLayout("%p [%t] %m %n")));
+        Logger.getRootLogger().setLevel(Level.DEBUG);
         kernel = KernelFactory.newInstance().createKernel("test.kernel");
         kernel.boot();
 
@@ -134,7 +141,7 @@
         // Create all the parts
 
         serverInfo = new ObjectName("geronimo.system:role=ServerInfo");
-        gbean = new GBeanData(serverInfo, ServerInfo.GBEAN_INFO);
+        gbean = new GBeanData(serverInfo, BasicServerInfo.GBEAN_INFO);
         gbean.setAttribute("baseDirectory", ".");
         kernel.loadGBean(gbean, ServerInfo.class.getClassLoader());
         kernel.startGBean(serverInfo);

Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java?rev=233346&r1=233345&r2=233346&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java (original)
+++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java Thu Aug 18 11:08:26 2005
@@ -34,6 +34,7 @@
 import org.apache.geronimo.security.RealmPrincipal;
 import org.apache.geronimo.security.realm.GenericSecurityRealm;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 
 
 /**
@@ -54,7 +55,7 @@
         GBeanData gbean;
 
         serverInfo = new ObjectName("geronimo.system:role=ServerInfo");
-        gbean = new GBeanData(serverInfo, ServerInfo.GBEAN_INFO);
+        gbean = new GBeanData(serverInfo, BasicServerInfo.GBEAN_INFO);
         gbean.setAttribute("baseDirectory", ".");
         kernel.loadGBean(gbean, ServerInfo.class.getClassLoader());
         kernel.startGBean(serverInfo);



Mime
View raw message