geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r355335 [1/2] - in /geronimo/branches/1.0: ./ applications/console-core/src/java/org/apache/geronimo/console/util/ applications/console-standard/ applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ applications...
Date Fri, 09 Dec 2005 03:11:47 GMT
Author: ammulder
Date: Thu Dec  8 19:11:29 2005
New Revision: 355335

URL: http://svn.apache.org/viewcvs?rev=355335&view=rev
Log:
Merge HEAD fixes to branch
Update many hardcoded 1.0-SNAPSHOT references to 1.0 in the branch

Added:
    geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbyLog.java
      - copied unchanged from r355267, geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyLog.java
    geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbyLogGBean.java
      - copied unchanged from r355267, geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyLogGBean.java
    geronimo/branches/1.0/modules/management/src/java/org/apache/geronimo/management/geronimo/Log.java
      - copied unchanged from r355267, geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/Log.java
Removed:
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/logmanager/WebAccessLogCriteria.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/logmanager/WebAccessLogHelper.java
Modified:
    geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
    geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java
    geronimo/branches/1.0/applications/console-standard/project.xml
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/DerbyLogViewerPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/ObjectNameConstants.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
    geronimo/branches/1.0/applications/daytrader/dayTrader-plan.xml
    geronimo/branches/1.0/applications/daytrader/modules/ear/src/application/META-INF/application.xml
    geronimo/branches/1.0/applications/daytrader/modules/streamer/src/client/META-INF/MANIFEST.MF
    geronimo/branches/1.0/applications/daytrader/modules/web/src/webapp/WEB-INF/web.xml
    geronimo/branches/1.0/applications/daytrader/modules/wsappclient/src/client/META-INF/MANIFEST.MF
    geronimo/branches/1.0/applications/daytrader/project.properties
    geronimo/branches/1.0/applications/daytrader/project.xml
    geronimo/branches/1.0/applications/demo/src/webapp/WEB-INF/geronimo-web.xml
    geronimo/branches/1.0/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml
    geronimo/branches/1.0/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
    geronimo/branches/1.0/applications/magicGball/src/webapp/WEB-INF/web.xml
    geronimo/branches/1.0/applications/remote-deploy/src/webapp/WEB-INF/geronimo-web.xml
    geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties   (contents, props changed)
    geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties   (contents, props changed)
    geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties   (contents, props changed)
    geronimo/branches/1.0/configs/system-database/src/plan/plan.xml
    geronimo/branches/1.0/modules/deploy-jsr88/src/conf/manifest.mf
    geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
    geronimo/branches/1.0/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
    geronimo/branches/1.0/modules/derby/project.xml
    geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbySystem.java
    geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
    geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
    geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
    geronimo/branches/1.0/modules/management/src/java/org/apache/geronimo/management/geronimo/WebAccessLog.java
    geronimo/branches/1.0/modules/tomcat/src/plan/tomcat-plan.xml
    geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties
    geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml
    geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties
    geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.xml
    geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties
    geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties
    geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties
    geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml
    geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties
    geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml
    geronimo/branches/1.0/pom.xml

Modified: geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java (original)
+++ geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java Thu Dec  8 19:11:29 2005
@@ -16,66 +16,69 @@
  */
 package org.apache.geronimo.console.util;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
-import javax.security.auth.spi.LoginModule;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.NameCallback;
-
-import org.apache.geronimo.management.J2EEDomain;
-import org.apache.geronimo.management.J2EEDeployedObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.GBeanQuery;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.j2ee.management.impl.Util;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.proxy.ProxyManager;
+import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.management.AppClientModule;
-import org.apache.geronimo.management.WebModule;
+import org.apache.geronimo.management.EJB;
 import org.apache.geronimo.management.EJBModule;
+import org.apache.geronimo.management.J2EEDeployedObject;
+import org.apache.geronimo.management.J2EEDomain;
+import org.apache.geronimo.management.J2EEModule;
 import org.apache.geronimo.management.J2EEResource;
+import org.apache.geronimo.management.JCAConnectionFactory;
 import org.apache.geronimo.management.JCAResource;
+import org.apache.geronimo.management.JDBCDataSource;
+import org.apache.geronimo.management.JDBCDriver;
 import org.apache.geronimo.management.JDBCResource;
 import org.apache.geronimo.management.JMSResource;
-import org.apache.geronimo.management.J2EEModule;
-import org.apache.geronimo.management.EJB;
-import org.apache.geronimo.management.Servlet;
 import org.apache.geronimo.management.ResourceAdapter;
-import org.apache.geronimo.management.JDBCDataSource;
-import org.apache.geronimo.management.JDBCDriver;
-import org.apache.geronimo.management.JCAConnectionFactory;
-import org.apache.geronimo.management.geronimo.J2EEServer;
+import org.apache.geronimo.management.Servlet;
+import org.apache.geronimo.management.WebModule;
+import org.apache.geronimo.management.geronimo.EJBConnector;
+import org.apache.geronimo.management.geronimo.EJBManager;
 import org.apache.geronimo.management.geronimo.J2EEApplication;
+import org.apache.geronimo.management.geronimo.J2EEServer;
+import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
+import org.apache.geronimo.management.geronimo.JMSBroker;
+import org.apache.geronimo.management.geronimo.JMSConnector;
+import org.apache.geronimo.management.geronimo.JMSManager;
 import org.apache.geronimo.management.geronimo.JVM;
 import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
-import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.WebAccessLog;
 import org.apache.geronimo.management.geronimo.WebConnector;
+import org.apache.geronimo.management.geronimo.WebContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
-import org.apache.geronimo.management.geronimo.WebAccessLog;
-import org.apache.geronimo.management.geronimo.EJBManager;
-import org.apache.geronimo.management.geronimo.EJBConnector;
-import org.apache.geronimo.management.geronimo.JMSManager;
-import org.apache.geronimo.management.geronimo.JMSBroker;
-import org.apache.geronimo.management.geronimo.JMSConnector;
-import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
-import org.apache.geronimo.j2ee.management.impl.Util;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.kernel.proxy.ProxyManager;
-import org.apache.geronimo.system.logging.SystemLog;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.pool.GeronimoExecutor;
-import org.apache.geronimo.security.realm.SecurityRealm;
 import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
 import org.apache.geronimo.security.jaas.server.JaasLoginServiceMBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.security.realm.SecurityRealm;
+import org.apache.geronimo.system.logging.SystemLog;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * An implementation of the ManagementHelper interface that uses a Geronimo
@@ -953,6 +956,17 @@
             module.abort();
         }
         return null;
+    }
+
+    public Object[] findByInterface(Class iface) {
+        Set set = kernel.listGBeans(new GBeanQuery(null, iface.getName()));
+        Object[] result = new Object[set.size()];
+        int i=0;
+        for (Iterator it = set.iterator(); it.hasNext();) {
+            ObjectName name = (ObjectName) it.next();
+            result[i++] = kernel.getProxyManager().createProxy(name, iface.getClassLoader());
+        }
+        return result;
     }
 
     /**

Modified: geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java (original)
+++ geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java Thu Dec  8 19:11:29 2005
@@ -16,10 +16,6 @@
  */
 package org.apache.geronimo.console.util;
 
-import java.util.Map;
-import javax.security.auth.spi.LoginModule;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.management.AppClientModule;
 import org.apache.geronimo.management.EJB;
@@ -52,10 +48,15 @@
 import org.apache.geronimo.management.geronimo.WebContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.pool.GeronimoExecutor;
+import org.apache.geronimo.security.jaas.server.JaasLoginServiceMBean;
+import org.apache.geronimo.security.realm.SecurityRealm;
 import org.apache.geronimo.system.logging.SystemLog;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.security.realm.SecurityRealm;
-import org.apache.geronimo.security.jaas.server.JaasLoginServiceMBean;
+
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+import java.util.Map;
 
 /**
  * A helper interface to navigate between management objects.  This is not
@@ -151,6 +152,7 @@
     String getGBeanDescription(String objectName);
 
     // Misc
-   void testLoginModule(J2EEServer server, LoginModule module, Map options);
-   Subject testLoginModule(J2EEServer server, LoginModule module, Map options, String username, String password) throws LoginException;
+    void testLoginModule(J2EEServer server, LoginModule module, Map options);
+    Subject testLoginModule(J2EEServer server, LoginModule module, Map options, String username, String password) throws LoginException;
+    Object[] findByInterface(Class iface);
 }

Modified: geronimo/branches/1.0/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/project.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/project.xml (original)
+++ geronimo/branches/1.0/applications/console-standard/project.xml Thu Dec  8 19:11:29 2005
@@ -32,6 +32,11 @@
          </dependency>
          <dependency>
              <groupId>geronimo</groupId>
+             <artifactId>geronimo-derby</artifactId>
+             <version>${pom.currentVersion}</version>
+         </dependency>
+         <dependency>
+             <groupId>geronimo</groupId>
              <artifactId>geronimo-deployment</artifactId>
              <version>${pom.currentVersion}</version>
          </dependency>

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Thu Dec  8 19:11:29 2005
@@ -17,38 +17,35 @@
 
 package org.apache.geronimo.console.configmanager;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.management.ObjectName;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
 import org.apache.geronimo.console.BasePortlet;
-import org.apache.geronimo.console.util.ObjectNameConstants;
 import org.apache.geronimo.console.util.SecurityConstants;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.config.NoSuchStoreException;
-import org.apache.geronimo.kernel.config.Configuration;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.kernel.management.State;
 
+import javax.management.ObjectName;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
 public class ConfigManagerPortlet extends BasePortlet {
 
     private static final String START_ACTION = "start";
@@ -100,11 +97,12 @@
             URI configID = URI.create(config);
 
             if (START_ACTION.equals(action)) {
-                if (!configurationManager.isLoaded(configID)) {
-                    configurationManager.load(configID);
+                List list = configurationManager.loadRecursive(configID);
+                for (Iterator it = list.iterator(); it.hasNext();) {
+                    URI uri = (URI) it.next();
+                    configurationManager.loadGBeans(uri);
+                    configurationManager.start(uri);
                 }
-                configurationManager.loadGBeans(configID);
-                configurationManager.start(configID);
                 messageStatus = "Started application<br /><br />";
             } else if (STOP_ACTION.equals(action)) {
                 configurationManager.stop(configID);

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java Thu Dec  8 19:11:29 2005
@@ -30,9 +30,9 @@
     /**
      * todo: EVIL!!!  Should be replaced with something, somehow!
      */
-    private final static String TRANQL_RAR_NAME = "tranql/tranql-connector/1.0/rar";
-    private final static String DERBY_EMBEDDED_RAR_NAME = "tranql/tranql-connector-derby-embed-xa/1.0/rar";
-    private final static String DERBY_NETWORK_RAR_NAME = "tranql/tranql-connector-derby-client-xa/1.0/rar";
+    private final static String TRANQL_RAR_NAME = "tranql/tranql-connector/1.1-SNAPSHOT/rar";
+    private final static String DERBY_EMBEDDED_RAR_NAME = "tranql/tranql-connector-derby-embed-xa/1.1-SNAPSHOT/rar";
+    private final static String DERBY_NETWORK_RAR_NAME = "tranql/tranql-connector-derby-client-xa/1.1-SNAPSHOT/rar";
 
     //todo: Load this from a config file or something
     public static final DatabaseInfo[] ALL_DATABASES = new DatabaseInfo[]{

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Thu Dec  8 19:11:29 2005
@@ -812,7 +812,7 @@
                 Connector15DCBRoot root = (Connector15DCBRoot) config.getDConfigBeanRoot(ddBeanRoot);
                 ConnectorDCB connector = (ConnectorDCB) root.getDConfigBean(ddBeanRoot.getChildBean(root.getXpaths()[0])[0]);
                 connector.setConfigID("user/database-pool"+data.getName() + "/1/car");
-                connector.setParentID("geronimo/j2ee-server/1.0-SNAPSHOT/car");
+                connector.setParentID("geronimo/j2ee-server/1.0/car");
                 if(data.jar1 != null && !data.jar1.equals("")) {
                     Dependency dep = new Dependency();
                     connector.setDependency(new Dependency[]{dep});

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/DerbyLogViewerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/DerbyLogViewerPortlet.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/DerbyLogViewerPortlet.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/DerbyLogViewerPortlet.java Thu Dec  8 19:11:29 2005
@@ -17,18 +17,23 @@
 
 package org.apache.geronimo.console.derbylogmanager;
 
-import java.io.IOException;
+import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.derby.DerbyLog;
 
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletException;
 import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSession;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-
-import org.apache.geronimo.console.BasePortlet;
+import javax.portlet.WindowState;
+import java.io.IOException;
+import java.io.Serializable;
 
 public class DerbyLogViewerPortlet extends BasePortlet {
+    private final static String CRITERIA_KEY = "org.apache.geronimo.console.derby.log.CRITERIA";
 
     protected PortletRequestDispatcher normalView;
 
@@ -41,28 +46,57 @@
     }
 
     protected void doHelp(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws PortletException, IOException {
+                          RenderResponse renderResponse) throws PortletException, IOException {
         helpView.include(renderRequest, renderResponse);
     }
 
     protected void doView(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws PortletException, IOException {
+                          RenderResponse renderResponse) throws PortletException, IOException {
+        if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
+            return;
+        }
         String action = renderRequest.getParameter("action");
+
+        DerbyLog log = (DerbyLog) PortletManager.getManagedBeans(renderRequest, DerbyLog.class)[0];//todo: what if it's not there?
+        Criteria criteria;
         if ("refresh".equals(action)) {
-            DerbyLogHelper.refresh();
+            criteria = (Criteria) renderRequest.getPortletSession(true).getAttribute(CRITERIA_KEY, PortletSession.PORTLET_SCOPE);
+        } else {
+            String startPos = renderRequest.getParameter("startPos");
+            String endPos = renderRequest.getParameter("endPos");
+            String maxRows = renderRequest.getParameter("maxRows");
+            String searchString = renderRequest.getParameter("searchString");
+            if(maxRows == null || maxRows.equals("")) {
+                maxRows = "10";
+            }
+            criteria = new Criteria();
+            criteria.max = new Integer(maxRows);
+            criteria.start = startPos == null || startPos.equals("") ? null : new Integer(startPos);
+            criteria.stop = endPos == null || endPos.equals("") ? null : new Integer(endPos);
+            criteria.text = searchString == null || searchString.equals("") ? null : searchString;
+            renderRequest.getPortletSession(true).setAttribute(CRITERIA_KEY, criteria, PortletSession.PORTLET_SCOPE);
         }
-        try {
-            renderRequest.setAttribute("logs", DerbyLogHelper.getLogs());
-            renderRequest.setAttribute("lines", new Integer(DerbyLogHelper
-                    .getLineCount()));
-            normalView.include(renderRequest, renderResponse);
-        } catch (Exception e) {
-            renderResponse.setContentType("text/html");
-            renderResponse.getWriter().println(
-                    "<b>Could not load portlet: " + e.getMessage()
-                            + "</b></br>");
-            throw new PortletException(e);
+
+        DerbyLog.SearchResults results = log.searchLog(criteria.start, criteria.stop,
+                         criteria.max, criteria.text);
+        renderRequest.setAttribute("searchResults", results.getResults());
+        renderRequest.setAttribute("lineCount", new Integer(results.getLineCount()));
+        renderRequest.setAttribute("startPos", criteria.start);
+        renderRequest.setAttribute("endPos", criteria.stop);
+        renderRequest.setAttribute("searchString", criteria.text);
+        renderRequest.setAttribute("maxRows", criteria.max);
+        if(results.isCapped()) {
+            renderRequest.setAttribute("capped", Boolean.TRUE);
         }
+
+        normalView.include(renderRequest, renderResponse);
+    }
+
+    private static class Criteria implements Serializable {
+        Integer max;
+        Integer start;
+        Integer stop;
+        String text;
     }
 
     public void init(PortletConfig portletConfig) throws PortletException {

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java Thu Dec  8 19:11:29 2005
@@ -17,15 +17,14 @@
 
 package org.apache.geronimo.console.jmsmanager;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.databasemanager.DataSourceInfo;
+import org.apache.geronimo.console.jmsmanager.activemqCF.ActiveMQConnectorHelper;
+import org.apache.geronimo.gbean.GAttributeInfo;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.jmx.JMXUtil;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -40,21 +39,21 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
-
-import org.apache.geronimo.console.BasePortlet;
-import org.apache.geronimo.console.databasemanager.DataSourceInfo;
-import org.apache.geronimo.console.jmsmanager.activemqCF.ActiveMQConnectorHelper;
-import org.apache.geronimo.gbean.GAttributeInfo;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class JMSConnectionFactoryManagerPortlet extends BasePortlet {
 
     private final static ActiveMQConnectorHelper helper = new ActiveMQConnectorHelper();
 
-    private final static String PARENT_ID = "org/apache/geronimo/SystemJMS";
+    private final static String PARENT_ID = "geronimo/activemq-broker/1.0/car";
 
     private final static String ADD_MODE = "addACF";
 
@@ -126,7 +125,7 @@
                         trimStr(acfName), trimStr(serverURL),
                         trimStr(userName), pword, trimStr(acfName),
                         trimStr(poolMaxSize), trimStr(blocking) };
-                helper.deployPlan(args);
+                helper.deployPlan(actionRequest, args);
                 // Set mode to list after creating the new ConnectionFactories
                 actionResponse.setRenderParameter("mode", "list");
             }
@@ -146,7 +145,7 @@
             return;
         }
 
-        List dependencies = helper.getDependencies();
+        List dependencies = helper.getDependencies(renderRequest);
         // pass them to the render request
         renderRequest.setAttribute("dependencies", (String[]) dependencies
                 .toArray(new String[dependencies.size()]));

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java Thu Dec  8 19:11:29 2005
@@ -17,39 +17,38 @@
 
 package org.apache.geronimo.console.jmsmanager.activemqCF;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.console.util.ObjectNameConstants;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.repository.ListableRepository;
+
+import javax.portlet.PortletRequest;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.console.util.ObjectNameConstants;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.ConfigurationUtil;
-
 public class ActiveMQConnectorHelper {
+    //todo: this class is horrible and needs to be burned!
+    private final static Log log = LogFactory.getLog(ActiveMQConnectorHelper.class);
 
-    private final static File REPO_FOLDER;
+    private static String MODULE_FILE;
 
-    private final static String PLAN_FILE;
-
-    private final static String MODULE_FILE;
-
-    private final static String ACTIVEMQ_RA = "/activemq/activemq-ra/3.2/rar";
-
-    private final static String PLAN_XML = "/activemq/rars/amqconnectorPlan.xml";
+    private final static String ACTIVEMQ_RAR = "repository/activemq/rars/activemq-ra-3.2.1.rar";
 
     private static final String LINE_SEP = System.getProperty("line.separator");
 
@@ -60,44 +59,12 @@
 
     private static final String DEPLOY_METHOD = "deploy";
 
-    private static final String[] REPO_ARGS = { URI.class.getName() };
-
-    private static final String GETURL_METHOD = "getURL";
-
-    static {
-        // Initialize static vars
-        REPO_FOLDER = getRepositoryFile();
-        MODULE_FILE = REPO_FOLDER.getAbsolutePath() + ACTIVEMQ_RA;
-        PLAN_FILE = REPO_FOLDER.getAbsolutePath() + PLAN_XML;
-    }
-
-    private static File getRepositoryFile() {
-        File repoFile = null;
-
-        try {
-            Kernel kernel = KernelRegistry.getSingleKernel();
-            URI uri = new URI(".");
-            URL rootURL = (URL) kernel.invoke(ObjectNameConstants.REPO_OBJECT_NAME, GETURL_METHOD,
-                    new Object[] {uri}, REPO_ARGS);
-            uri = new URI(rootURL.toString());
-            repoFile = new File(uri);
-        } catch (URISyntaxException e) {
-            System.out.println("ERROR: Invalid repository URL");
-            e.printStackTrace();
-        } catch (Exception e) {
-            System.out.println("ERROR: Problem getting repository location");
-            e.printStackTrace();
-        }
-
-        return repoFile;
-    }
-
     private static String getPlanTemplate() {
         StringBuffer sb = new StringBuffer();
         sb.append("<?xml version=\"1.0\"?>\n");
         sb
                 .append("<connector xmlns=\"http://geronimo.apache.org/xml/ns/j2ee/connector-1.0\"\n");
-        sb.append("    version=\"1.5\" configId=\"{0}\" parentId=\"{1}\">\n");
+        sb.append("    configId=\"{0}\" parentId=\"{1}\">\n");
         sb.append("  <resourceadapter>\n");
         sb.append("    <resourceadapter-instance>\n");
         sb.append("      <resourceadapter-name>{2}</resourceadapter-name>\n");
@@ -131,8 +98,6 @@
         sb.append("              <match-one/>\n");
         sb.append("            </single-pool>\n");
         sb.append("          </connectionmanager>\n");
-        sb
-                .append("          <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>\n");
         sb.append("        </connectiondefinition-instance>\n");
         sb.append("      </connection-definition>\n");
         sb.append("    </outbound-resourceadapter>\n");
@@ -142,12 +107,11 @@
         return sb.toString();
     }
 
-    private void savePlan(String filename, Object[] args) {
+    private void savePlan(File f, Object[] args) {
         MessageFormat mf = new MessageFormat(PLAN_TEMPLATE);
         String plan = mf.format(args);
 
         try {
-            File f = new File(filename);
             f.createNewFile();
             FileOutputStream fos = new FileOutputStream(f);
             OutputStreamWriter osw = new OutputStreamWriter(fos);
@@ -163,9 +127,18 @@
         }
     }
 
-    public void deployPlan(Object[] args) {
-        savePlan(PLAN_FILE, args);
-        deployPlan(new File(MODULE_FILE), new File(PLAN_FILE));
+    public void deployPlan(PortletRequest request, Object[] args) {
+        try {
+            File file = File.createTempFile("console-jms-connector-plan-", ".xml");
+            file.deleteOnExit();
+            savePlan(file, args);
+            if(MODULE_FILE == null) {
+                MODULE_FILE = PortletManager.getServerInfo(request).resolvePath(ACTIVEMQ_RAR);
+            }
+            deployPlan(new File(MODULE_FILE), file);
+        } catch (IOException e) {
+            log.error("Unable to write deployment plan", e);
+        }
     }
 
     public void deployPlan(File moduleFile, File planFile) {
@@ -206,48 +179,22 @@
         }
     }
 
-    public List getDependencies() {
-        List dependencies = null;
-
-        try {
-            dependencies = getListing(REPO_FOLDER, REPO_FOLDER
-                    .getCanonicalPath());
-            Collections.sort(dependencies);
-        } catch (Exception e) {
-            System.out.println("ERROR: Problem getting dependencies");
-            e.printStackTrace();
+    public List getDependencies(PortletRequest request) {
+        ListableRepository[] repo = PortletManager.getListableRepositories(request);
+        List dependencies = new ArrayList();
+        for (int i = 0; i < repo.length; i++) {
+            ListableRepository repository = repo[i];
+            try {
+                URI[] uris = repository.listURIs();
+                for (int j = 0; j < uris.length; j++) {
+                    URI uri = uris[j];
+                    dependencies.add(uri.toString());
+                }
+            } catch (URISyntaxException e) {
+                e.printStackTrace();
+            }
         }
 
         return dependencies;
     }
-
-    private List getListing(File dir, String basepath)
-            throws java.io.IOException {
-        if (dir == null) {
-            throw new IllegalArgumentException("directory argument is null");
-        }
-
-        if (!dir.isDirectory()) {
-            throw new IllegalArgumentException("directory argument expected");
-        }
-
-        List listing = new ArrayList();
-
-        List ls = Arrays.asList(dir.listFiles());
-        Iterator iter = ls.iterator();
-
-        while (iter.hasNext()) {
-            File f = (File) iter.next();
-
-            if (f.isDirectory()) {
-                List listing1 = getListing(f, basepath);
-                listing.addAll(listing1);
-            } else {
-                listing.add(f.getCanonicalPath().substring(
-                        basepath.length() + 1).replace('\\', '/'));
-            }
-        }
-        return listing;
-    }
-
 }

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java Thu Dec  8 19:11:29 2005
@@ -17,21 +17,6 @@
 
 package org.apache.geronimo.console.jmsmanager.handlers;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.util.List;
-import java.util.Arrays;
-
-import javax.jms.Queue;
-import javax.jms.Topic;
-import javax.management.ObjectName;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-
-import org.activemq.message.ActiveMQQueue;
-import org.activemq.message.ActiveMQTopic;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.connector.AdminObjectWrapper;
@@ -48,13 +33,23 @@
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 
-public class CreateDestinationHandler extends AbstractJMSManager implements
-        PortletResponseHandler {
+import javax.jms.Queue;
+import javax.jms.Topic;
+import javax.management.ObjectName;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
 
+public class CreateDestinationHandler extends AbstractJMSManager implements PortletResponseHandler {
     protected static Log log = LogFactory
             .getLog(CreateDestinationHandler.class);
 
-    private static final List parentId = Arrays.asList(new URI[] {URI.create("org/apache/geronimo/Console")});
+    private static final List parentId = Arrays.asList(new URI[] {URI.create("geronimo/activemq-broker/1.0/car")});
 
     static final GBeanInfo QUEUE_INFO;
 
@@ -91,16 +86,12 @@
             GBeanData adminObjectData;
             if (Topic.class.getName().equals(destinationType)) {
                 adminObjectData = new GBeanData(adminObjectName, TOPIC_INFO);
-                adminObjectData.setAttribute("adminObjectInterface",
-                        Topic.class.getName());
-                adminObjectData.setAttribute("adminObjectClass",
-                        ActiveMQTopic.class.getName());
+                adminObjectData.setAttribute("adminObjectInterface", "javax.jms.Topic");
+                adminObjectData.setAttribute("adminObjectClass", "org.activemq.message.ActiveMQTopic");
             } else if (Queue.class.getName().equals(destinationType)) {
                 adminObjectData = new GBeanData(adminObjectName, QUEUE_INFO);
-                adminObjectData.setAttribute("adminObjectInterface",
-                        Queue.class.getName());
-                adminObjectData.setAttribute("adminObjectClass",
-                        ActiveMQQueue.class.getName());
+                adminObjectData.setAttribute("adminObjectInterface", "javax.jms.Queue");
+                adminObjectData.setAttribute("adminObjectClass", "org.activemq.message.ActiveMQQueue.class");
             } else {
                 throw new PortletException(
                         "Invalid choice destination, must be FQCL of Topic or Queue, not "

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/ObjectNameConstants.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/ObjectNameConstants.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/ObjectNameConstants.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/ObjectNameConstants.java Thu Dec  8 19:11:29 2005
@@ -17,45 +17,24 @@
 
 package org.apache.geronimo.console.util;
 
-import java.util.Set;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
 
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import java.util.Set;
+
 public final class ObjectNameConstants {
 
     // Security object names
     public static final ObjectName SE_REALM_MBEAN_NAME;
-    //= "geronimo.server:J2EEApplication=org/apache/geronimo/Console,J2EEModule=null,J2EEServer=geronimo,j2eeType=GBean,name=PropertiesLoginManager";
-
-//    public static final ObjectName SE_REALM_IMMUTABLE_MBEAN_NAME;
-    //= "geronimo.server:name=PropertiesLoginManager,J2EEServer=geronimo,J2EEApplication=null,j2eeType=GBean,J2EEModule=null";
-
-    public static final ObjectName REQUEST_LOGGER_OBJECT_NAME;
-    //= "geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyRequestLog";
-
-    public static final ObjectName REPO_OBJECT_NAME;
-    //= "geronimo.server:name=Repository,J2EEServer=geronimo,J2EEApplication=null,j2eeType=GBean,J2EEModule=org/apache/geronimo/System";
-
-    public static final ObjectName SERVER_INFO_OBJECT_NAME;
-    //= "geronimo.server:name=ServerInfo,J2EEServer=geronimo,J2EEApplication=null,j2eeType=GBean,J2EEModule=org/apache/geronimo/System";
-
     public static final ObjectName DEPLOYER_OBJECT_NAME;
-    //= "geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/RuntimeDeployer,J2EEServer=geronimo,j2eeType=Deployer,name=Deployer";
-
     public static final ObjectName KEYSTORE_OBJ_NAME;
-    //= "geronimo.security:type=KeyStore";
 
     static {
         Kernel kernel = KernelRegistry.getSingleKernel();
         try {
             SE_REALM_MBEAN_NAME = getUniquename("*:J2EEModule=null,j2eeType=GBean,name=PropertiesLoginManager,*", kernel);
-//            SE_REALM_IMMUTABLE_MBEAN_NAME = getUniquename("geronimo.server:name=PropertiesLoginManager,J2EEServer=geronimo,J2EEApplication=null,j2eeType=GBean,J2EEModule=null", kernel);
-            REQUEST_LOGGER_OBJECT_NAME = getUniquename("*:J2EEApplication=null,j2eeType=GBean,name=JettyRequestLog,*", kernel);
-            REPO_OBJECT_NAME = getUniquename("*:J2EEApplication=null,j2eeType=GBean,name=Repository,*", kernel);
-            SERVER_INFO_OBJECT_NAME = getUniquename("*:J2EEApplication=null,j2eeType=GBean,name=ServerInfo,*", kernel);
             DEPLOYER_OBJECT_NAME = getUniquename("*:J2EEApplication=null,j2eeType=Deployer,name=Deployer,*", kernel);
             KEYSTORE_OBJ_NAME = getUniquename("*:J2EEModule=null,j2eeType=GBean,name=KeyStore,*", kernel);
         } catch (MalformedObjectNameException e) {

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java Thu Dec  8 19:11:29 2005
@@ -16,19 +16,6 @@
  */
 package org.apache.geronimo.console.util;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.enterprise.deploy.spi.DeploymentManager;
-import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.servlet.http.HttpSession;
-import javax.security.auth.spi.LoginModule;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.Subject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
@@ -52,9 +39,25 @@
 import org.apache.geronimo.management.geronimo.WebContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.pool.GeronimoExecutor;
+import org.apache.geronimo.security.realm.SecurityRealm;
 import org.apache.geronimo.system.logging.SystemLog;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.security.realm.SecurityRealm;
+
+import javax.enterprise.deploy.spi.DeploymentManager;
+import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderResponse;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
@@ -370,8 +373,37 @@
         return log;
     }
 
+    public static GeronimoManagedBean[] getManagedBeans(PortletRequest request, Class intrface) {
+        ManagementHelper helper = getManagementHelper(request);
+        Object[] obs = helper.findByInterface(intrface);
+        GeronimoManagedBean[] results = new GeronimoManagedBean[obs.length];
+        for (int i = 0; i < results.length; i++) {
+            results[i] = (GeronimoManagedBean) obs[i];
+        }
+        return results;
+    }
+
     public static GeronimoManagedBean getManagedBean(PortletRequest request, String name) {
         ManagementHelper helper = getManagementHelper(request);
         return (GeronimoManagedBean) helper.getObject(name);
+    }
+
+    /**
+     * Looks up the context prefix used by the portal, even if the thing running
+     * is in one of the portlets.  We're kind of hacking our way there, but hey,
+     * it beats hardcoding.
+     */
+    public static String getConsoleFrameworkServletPath (HttpServletRequest request) {
+        String contextPath = "";
+        Object o = request.getAttribute("javax.portlet.response");
+        if (o!=null && o instanceof RenderResponse) { // request came from a portlet
+            RenderResponse renderResponse = (RenderResponse)o;
+            contextPath = renderResponse.createRenderURL().toString();
+            int index = contextPath.indexOf(request.getPathInfo());
+            contextPath = contextPath.substring(0,index);
+        } else { // request did not come from a portlet
+            contextPath = request.getContextPath();
+        }
+        return contextPath;
     }
 }

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java Thu Dec  8 19:11:29 2005
@@ -17,30 +17,31 @@
 
 package org.apache.geronimo.console.webmanager;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
+import org.apache.geronimo.management.geronimo.SecureConnector;
+import org.apache.geronimo.management.geronimo.WebConnector;
+import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.management.geronimo.WebManager;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
 import javax.portlet.PortletException;
 import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
-import javax.portlet.PortletContext;
-import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
-import org.apache.geronimo.console.BasePortlet;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.management.geronimo.WebContainer;
-import org.apache.geronimo.management.geronimo.WebConnector;
-import org.apache.geronimo.management.geronimo.SecureConnector;
-import org.apache.geronimo.management.geronimo.WebManager;
-import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A portlet that lets you list, add, remove, start, stop, and edit web
@@ -68,14 +69,21 @@
         if(managerName != null) actionResponse.setRenderParameter("managerObjectName", managerName);
         if(containerName != null) actionResponse.setRenderParameter("containerObjectName", containerName);
 
-        WebContainer container = PortletManager.getWebContainer(actionRequest, containerName);
-        String server = getWebServerType(container.getClass());
+        String server = null;
+        if(containerName != null) {
+            WebContainer container = PortletManager.getWebContainer(actionRequest, containerName);
+            server = getWebServerType(container.getClass());
+        } else {
+            server = "unknown";
+        }
         actionResponse.setRenderParameter("server", server);
         if(mode.equals("new")) {
             // User selected to add a new connector, need to show criteria portlet
             actionResponse.setRenderParameter("mode", "new");
             String protocol = actionRequest.getParameter("protocol");
+            String containerDisplayName = actionRequest.getParameter("containerDisplayName");
             actionResponse.setRenderParameter("protocol", protocol);
+            actionResponse.setRenderParameter("containerDisplayName", containerDisplayName);
         } else if(mode.equals("add")) { // User just submitted the form to add a new connector
             // Get submitted values
             //todo: lots of validation
@@ -295,6 +303,7 @@
 
             if(mode.equals("new")) {
                 String protocol = renderRequest.getParameter("protocol");
+                String containerDisplayName = renderRequest.getParameter("containerDisplayName");
                 renderRequest.setAttribute("maxThreads", "50");
                 if(server.equals(WEB_SERVER_JETTY)) {
                     renderRequest.setAttribute("minThreads", "10");
@@ -307,6 +316,7 @@
                 }
                 renderRequest.setAttribute("protocol", protocol);
                 renderRequest.setAttribute("mode", "add");
+                renderRequest.setAttribute("containerDisplayName", containerDisplayName);
                 if(protocol.equals(WebManager.PROTOCOL_HTTPS)) {
                     editHttpsView.include(renderRequest, renderResponse);
                 } else {
@@ -327,6 +337,14 @@
                 if(connector == null) {
                     doList(renderRequest, renderResponse);
                 } else {
+                    String displayName = PortletManager.getGBeanDescription(renderRequest, objectName);
+                    try {
+                        ObjectName realName = ObjectName.getInstance(objectName);
+                        displayName = realName.getKeyProperty("name");
+                    } catch (MalformedObjectNameException e) {
+                        log.error("Bad object name for web connector", e);
+                    }
+                    renderRequest.setAttribute("name", displayName);
                     renderRequest.setAttribute("objectName", objectName);
                     renderRequest.setAttribute("port", new Integer(connector.getPort()));
                     renderRequest.setAttribute("host", connector.getHost());

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp Thu Dec  8 19:11:29 2005
@@ -1,37 +1,50 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<c:set var="increment" value="10"/>
+
 <table>
 <tr>
 <td>
-<a href="<portlet:renderURL><portlet:param name="action" value="refresh"/></portlet:renderURL>">Refresh</a> 
-</td>     
+<a href="<portlet:renderURL><portlet:param name="action" value="refresh"/></portlet:renderURL>">Refresh</a>
+</td>
 </tr>
 <tr>
-    <td>     
+    <td class="Smaller" valign="middle">
+    <form action="<portlet:renderURL/>" name="<portlet:namespace/>searchForm" >
+    <b>Filter results:</b>
+    <input type="hidden" value="search" name="action"/>
+    Lines <input type="text" name="startPos" value="${startPos}" size="3"/>
+    to <input type="text" name="endPos" value="${endPos}" size="3"/>
+    Max Results <input type="text" name="maxRows" value="${maxRows}" size="3"/>
+    Containing text <input type="text" name="searchString" value="${searchString}"/>
+    <input type="submit" value="Go"/>
+    </form>
+    </td>
+</tr>
+<tr>
+    <td>
 <c:choose>
-<c:when test="${logs != null && fn:length(logs) > 0}">
+<c:when test="${searchResults != null && fn:length(searchResults) > 0}">
     <table>
         <tr>
             <td class="Smaller">
-            <b>${lines} total line(s) in log file.</b>
+            <b>${lineCount} total message(s) in log file. ${fn:length(searchResults)} matched your criteria<c:if test="${!empty capped}"> (number of results capped)</c:if>.</b>
             </td>
-        </tr>    
-            
-    <c:forEach var="line" items="${logs}">
+        </tr>
+
+    <c:forEach var="line" items="${searchResults}">
         <tr>
             <td class="Smaller">
-            ${line}
+            ${line.lineNumber}:&nbsp;${line.lineContent}
             </td>
         </tr>
     </c:forEach>
     </table>
 </c:when>
 <c:otherwise>
- No logs found.
+ No entries found with the specified criteria.
 </c:otherwise>
-</c:choose>  
-</td>     
+</c:choose>
+</td>
 </tr>
 </table>

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp Thu Dec  8 19:11:29 2005
@@ -48,7 +48,6 @@
 }
 </script>
 
-<c:set var="increment" value="10"/>
 <table>
 <tr>
 <td>

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp Thu Dec  8 19:11:29 2005
@@ -69,7 +69,7 @@
     xmlns="http://geronimo.apache.org/xml/ns/web"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
     configId="MyConfigName"
-    parentId="geronimo/j2ee-server/1.0-SNAPSHOT/car"&gt;
+    parentId="geronimo/j2ee-server/1.0/car"&gt;
 
     &lt;context-root&gt;/MyWebApp&lt;/context-root&gt;
     &lt;context-priority-classloader&gt;true&lt;/context-priority-classloader&gt;

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp Thu Dec  8 19:11:29 2005
@@ -12,6 +12,16 @@
 </c:if>
 <table width="100%%"  border="0">
 
+<!-- Current Task -->
+<c:choose>
+  <c:when test="${mode eq 'add'}">
+    <tr><th colspan="2" align="left">Add new ${protocol} listener for ${containerDisplayName}</th></tr>
+  </c:when>
+  <c:otherwise>
+    <tr><th colspan="2" align="left">Edit connector ${name}</th></tr>
+  </c:otherwise>
+</c:choose>
+
 <!-- Name Field -->
 <c:if test="${mode eq 'add'}">
   <tr>

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp Thu Dec  8 19:11:29 2005
@@ -14,6 +14,16 @@
 
 <%-- THIS PART SHOULD BE THE SAME AS THE HTTP CONNECTOR --%>
 
+<!-- Current Task -->
+<c:choose>
+  <c:when test="${mode eq 'add'}">
+    <tr><th colspan="2" align="left">Add new ${protocol} listener for ${containerDisplayName}</th></tr>
+  </c:when>
+  <c:otherwise>
+    <tr><th colspan="2" align="left">Edit connector ${name}</th></tr>
+  </c:otherwise>
+</c:choose>
+
 <!-- Name Field -->
 <c:if test="${mode eq 'add'}">
   <tr>

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp Thu Dec  8 19:11:29 2005
@@ -75,6 +75,7 @@
            <portlet:param name="protocol" value="${protocol}" />
            <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
            <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+           <portlet:param name="containerDisplayName" value="${container.name}" />
          </portlet:actionURL>">Add new ${protocol} listener for ${container.name}</a>
 </c:forEach>
 

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Thu Dec  8 19:11:29 2005
@@ -1,5 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ page import="org.apache.geronimo.console.util.PortletManager" %>
 <portlet:defineObjects/>
 
 
@@ -48,16 +49,13 @@
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
-                        <%-- Is there any way to not hardcode /console?  The problem is, this
-                             code runs from /console-standard, so the context root is not correct.
-                             Perhaps there's some tag to point to a different portlet, but what
-                             about the images?  --%>
-                        <img src="/console/images/ico_db_16x16.gif" /><a href="/console/portal/services/services_jdbc">Database Pools</a><br />
-                        <img src="/console/images/ico_lock_16x16.gif" /><a href="/console/portal/Security/Security_realms">Security Realms</a><br />
-                        <img src="/console/images/ico_beanjar_16x16.gif" /><a href="/console/portal/services/services_jms">JMS Resources</a><br />
-                        <img src="/console/images/ico_list_16x16.gif" /><a href="/console/portal/apps/apps_all">Deploy Applications</a><br />
-                        <img src="/console/images/ico_servcomp_16x16.gif" /><a href="/console/portal/server/server_web">Web Server Ports</a><br />
-                        <img src="/console/images/ico_look_16x16.gif" /><a href="/console/portal/server/server_info">Memory &amp; Uptime</a><br />
+	                    <% String consoleServletPath = PortletManager.getConsoleFrameworkServletPath(request); %>
+                        <img src="<%=consoleServletPath%>/../images/ico_db_16x16.gif" /><a href="<%=consoleServletPath%>/services/services_jdbc">Database Pools</a><br />
+                        <img src="<%=consoleServletPath%>/../images/ico_lock_16x16.gif" /><a href="<%=consoleServletPath%>/Security/Security_realms">Security Realms</a><br />
+                        <img src="<%=consoleServletPath%>/../images/ico_beanjar_16x16.gif" /><a href="<%=consoleServletPath%>/services/services_jms">JMS Resources</a><br />
+                        <img src="<%=consoleServletPath%>/../images/ico_list_16x16.gif" /><a href="<%=consoleServletPath%>/apps/apps_all">Deploy Applications</a><br />
+                        <img src="<%=consoleServletPath%>/../images/ico_servcomp_16x16.gif" /><a href="<%=consoleServletPath%>/server/server_web">Web Server Ports</a><br />
+                        <img src="<%=consoleServletPath%>/../images/ico_look_16x16.gif" /><a href="<%=consoleServletPath%>/server/server_info">Memory &amp; Uptime</a><br />
                         &nbsp;<br />
                     </td>
                 </tr>

Modified: geronimo/branches/1.0/applications/daytrader/dayTrader-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/dayTrader-plan.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/dayTrader-plan.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/dayTrader-plan.xml Thu Dec  8 19:11:29 2005
@@ -3,7 +3,7 @@
     configId="Trade">
 
     <module>
-        <web>daytrader-web-1.0-SNAPSHOT.war</web>
+        <web>daytrader-web-1.0.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/web"
             configId="Web" parentId="Trade">
             <context-priority-classloader>false</context-priority-classloader>
@@ -30,7 +30,7 @@
     ##
     -->
     <module>
-        <ejb>daytrader-ejb-1.0-SNAPSHOT.jar</ejb>     <!--  Note this must match the -->
+        <ejb>daytrader-ejb-1.0.jar</ejb>     <!--  Note this must match the -->
         <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
                      configId="TradeEJBs"
                      parentId="Web">
@@ -513,7 +513,7 @@
 
 
     <module>
-        <java>daytrader-streamer-1.0-SNAPSHOT.jar</java>
+        <java>daytrader-streamer-1.0.jar</java>
         <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
             configId="foo"
             clientConfigId="tradeStreamerAppclient">
@@ -571,7 +571,7 @@
     </module>
     <ext-module>
         <connector>TradeDataSource</connector>
-        <external-path>tranql/tranql-connector-derby-embed-xa/1.1-SNAPSHOT/rar</external-path>
+        <external-path>tranql/tranql-connector-derby-embed-xa/1.1/rar</external-path>
         <connector
             xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
             configId="TradeDataSource"

Modified: geronimo/branches/1.0/applications/daytrader/modules/ear/src/application/META-INF/application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/ear/src/application/META-INF/application.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/ear/src/application/META-INF/application.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/ear/src/application/META-INF/application.xml Thu Dec  8 19:11:29 2005
@@ -5,18 +5,18 @@
       <description>Application description</description>
       <display-name>Trade</display-name>
       <module>
-         <java>daytrader-streamer-1.0-SNAPSHOT.jar</java>
+         <java>daytrader-streamer-1.0.jar</java>
       </module>
       <module>
-         <java>daytrader-wsappclient-1.0-SNAPSHOT.jar</java>
+         <java>daytrader-wsappclient-1.0.jar</java>
       </module>
       <module>
          <web>
-            <web-uri>daytrader-web-1.0-SNAPSHOT.war</web-uri>
+            <web-uri>daytrader-web-1.0.war</web-uri>
             <context-root>/daytrader</context-root>
          </web>
       </module>
       <module>
-         <ejb>daytrader-ejb-1.0-SNAPSHOT.jar</ejb>
+         <ejb>daytrader-ejb-1.0.jar</ejb>
       </module>
 </application>

Modified: geronimo/branches/1.0/applications/daytrader/modules/streamer/src/client/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/streamer/src/client/META-INF/MANIFEST.MF?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/streamer/src/client/META-INF/MANIFEST.MF (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/streamer/src/client/META-INF/MANIFEST.MF Thu Dec  8 19:11:29 2005
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Class-Path:  daytrader-ejb-1.0-SNAPSHOT.jar
+Class-Path:  daytrader-ejb-1.0.jar
 Created-By: 1.4.2_08 (Sun Microsystems Inc.)
 Ant-Version: Apache Ant 1.5.4 
 Main-Class: org.apache.geronimo.samples.daytrader.client.TradeClient

Modified: geronimo/branches/1.0/applications/daytrader/modules/web/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/web/src/webapp/WEB-INF/web.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/web/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/web/src/webapp/WEB-INF/web.xml Thu Dec  8 19:11:29 2005
@@ -410,13 +410,13 @@
          <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
          <message-destination-type>javax.jms.Queue</message-destination-type>
          <message-destination-usage>Produces</message-destination-usage>
-         <message-destination-link>daytrader-ejb-1.0-SNAPSHOT.jar#TradeBrokerQueue</message-destination-link>
+         <message-destination-link>daytrader-ejb-1.0.jar#TradeBrokerQueue</message-destination-link>
       </message-destination-ref>
       <message-destination-ref id="MessageDestinationRef_2">
          <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
          <message-destination-type>javax.jms.Topic</message-destination-type>
          <message-destination-usage>Produces</message-destination-usage>
-         <message-destination-link>daytrader-ejb-1.0-SNAPSHOT.jar#TradeStreamerTopic</message-destination-link>
+         <message-destination-link>daytrader-ejb-1.0.jar#TradeStreamerTopic</message-destination-link>
       </message-destination-ref>
       <service-ref>
         <description>WSDL Service Trade</description>

Modified: geronimo/branches/1.0/applications/daytrader/modules/wsappclient/src/client/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/wsappclient/src/client/META-INF/MANIFEST.MF?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/wsappclient/src/client/META-INF/MANIFEST.MF (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/wsappclient/src/client/META-INF/MANIFEST.MF Thu Dec  8 19:11:29 2005
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Class-Path: daytrader-ejb-1.0-SNAPSHOT.jar
+Class-Path: daytrader-ejb-1.0.jar
 Created-By: 1.4.2_08 (Sun Microsystems Inc.)
 Ant-Version: Apache Ant 1.5.4 
 Main-Class: org.apache.geronimo.samples.daytrader.client.ws.ClientApp

Modified: geronimo/branches/1.0/applications/daytrader/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/project.properties?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/project.properties (original)
+++ geronimo/branches/1.0/applications/daytrader/project.properties Thu Dec  8 19:11:29 2005
@@ -5,7 +5,5 @@
 maven.multiproject.ear.includes=modules/ear/project.xml
 maven.multiproject.streamer.includes=modules/streamer/project.xml
 maven.multiproject.jar.includes=modules/core/project.xml,modules/wsappclient/project.xml
-
-#geronimo_version=1.0-SNAPSHOT
+#geronimo_version=1.0
 #activemq_version=3.2.1
-

Modified: geronimo/branches/1.0/applications/daytrader/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/project.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/project.xml Thu Dec  8 19:11:29 2005
@@ -14,7 +14,7 @@
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-SNAPSHOT -->
 
-  <currentVersion>1.0-SNAPSHOT</currentVersion>
+  <currentVersion>1.0</currentVersion>
   <!-- details about the organization that 'owns' the project -->
 
   <organization>

Modified: geronimo/branches/1.0/applications/demo/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/demo/src/webapp/WEB-INF/geronimo-web.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/demo/src/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.0/applications/demo/src/webapp/WEB-INF/geronimo-web.xml Thu Dec  8 19:11:29 2005
@@ -19,8 +19,8 @@
 <web-app
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
     xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
-    configId="geronimo/security-demo/1.0-SNAPSHOT/car"
-    parentId="geronimo/security/1.0-SNAPSHOT/car">
+    configId="geronimo/security-demo/1.0/car"
+    parentId="geronimo/security/1.0/car">
 
 <!--
     configId="geronimo/security-demo/${pom.currentVersion}/car"

Modified: geronimo/branches/1.0/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.0/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml Thu Dec  8 19:11:29 2005
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
-    configId="geronimo/debug-console/1.0-SNAPSHOT/car"
-    parentId="geronimo/j2ee-server/1.0-SNAPSHOT/car"
+    configId="geronimo/debug-console/1.0/car"
+    parentId="geronimo/j2ee-server/1.0/car"
     >
 <!--
     configId="geronimo/debug-console/${pom.currentVersion}/car"

Modified: geronimo/branches/1.0/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml (original)
+++ geronimo/branches/1.0/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml Thu Dec  8 19:11:29 2005
@@ -2,7 +2,7 @@
 <application
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/MagicGBallCorbaNoSec"
-    parentId="geronimo/j2ee-server-corba/1.0-SNAPSHOT/car">
+    parentId="geronimo/j2ee-server-corba/1.0/car">
 
     <import>
         <uri>org/apache/geronimo/Security</uri>

Modified: geronimo/branches/1.0/applications/magicGball/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/magicGball/src/webapp/WEB-INF/web.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/magicGball/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/branches/1.0/applications/magicGball/src/webapp/WEB-INF/web.xml Thu Dec  8 19:11:29 2005
@@ -21,6 +21,6 @@
 		<ejb-ref-type>Session</ejb-ref-type>
 		<local-home>org.acme.MagicGBallLocalHome</local-home>
 		<local>org.acme.MagicGBallLocal</local>
-		<ejb-link>magicGball-ejb-1.0-SNAPSHOT.jar#MagicGBall</ejb-link>
+		<ejb-link>magicGball-ejb-1.0.jar#MagicGBall</ejb-link>
 	</ejb-local-ref>
 </web-app>

Modified: geronimo/branches/1.0/applications/remote-deploy/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/remote-deploy/src/webapp/WEB-INF/geronimo-web.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/remote-deploy/src/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.0/applications/remote-deploy/src/webapp/WEB-INF/geronimo-web.xml Thu Dec  8 19:11:29 2005
@@ -3,11 +3,11 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
          xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.0"
-         configId="geronimo/remote-deploy/1.0-SNAPSHOT/car">
+         configId="geronimo/remote-deploy/1.0/car">
     <cfg:dependency>
         <cfg:groupId>geronimo</cfg:groupId>
         <cfg:artifactId>geronimo-remote-deploy-lib</cfg:artifactId>
-        <cfg:version>1.0-SNAPSHOT</cfg:version>
+        <cfg:version>1.0</cfg:version>
     </cfg:dependency>
     <context-root>/remote-deploy</context-root>
     <context-priority-classloader>true</context-priority-classloader>

Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties Thu Dec  8 19:11:29 2005
@@ -88,6 +88,7 @@
 log4j.category.org.apache.jk.common.ChannelSocket=WARN
 log4j.category.org.apache.jk.server.JkMain=WARN
 log4j.category.org.apache.coyote.http11.Http11BaseProtocol=WARN
+log4j.category.org.apache.catalina.core.ContainerBase=WARN
 
 # Emits a spurious WARN during startup on /some-path/* security mappings
 log4j.category.org.apache.catalina.deploy.SecurityCollection=ERROR
@@ -108,4 +109,4 @@
 # Prints stuff for AJAX calls
 log4j.category.uk.ltd.getahead.dwr.impl.DefaultConfiguration=WARN
 log4j.category.uk.ltd.getahead.dwr.impl.ExecuteQuery=WARN
-log4j.category.uk.ltd.getahead.util.Logger=WARN
+log4j.category.uk.ltd.getahead.dwr.util.Logger=WARN

Propchange: geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties Thu Dec  8 19:11:29 2005
@@ -88,6 +88,7 @@
 log4j.category.org.apache.jk.common.ChannelSocket=WARN
 log4j.category.org.apache.jk.server.JkMain=WARN
 log4j.category.org.apache.coyote.http11.Http11BaseProtocol=WARN
+log4j.category.org.apache.catalina.core.ContainerBase=WARN
 
 # Emits a spurious WARN during startup on /some-path/* security mappings
 log4j.category.org.apache.catalina.deploy.SecurityCollection=ERROR
@@ -108,4 +109,4 @@
 # Prints stuff for AJAX calls
 log4j.category.uk.ltd.getahead.dwr.impl.DefaultConfiguration=WARN
 log4j.category.uk.ltd.getahead.dwr.impl.ExecuteQuery=WARN
-log4j.category.uk.ltd.getahead.util.Logger=WARN
+log4j.category.uk.ltd.getahead.dwr.util.Logger=WARN

Propchange: geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties Thu Dec  8 19:11:29 2005
@@ -88,6 +88,7 @@
 log4j.category.org.apache.jk.common.ChannelSocket=WARN
 log4j.category.org.apache.jk.server.JkMain=WARN
 log4j.category.org.apache.coyote.http11.Http11BaseProtocol=WARN
+log4j.category.org.apache.catalina.core.ContainerBase=WARN
 
 # Emits a spurious WARN during startup on /some-path/* security mappings
 log4j.category.org.apache.catalina.deploy.SecurityCollection=ERROR
@@ -108,4 +109,4 @@
 # Prints stuff for AJAX calls
 log4j.category.uk.ltd.getahead.dwr.impl.DefaultConfiguration=WARN
 log4j.category.uk.ltd.getahead.dwr.impl.ExecuteQuery=WARN
-log4j.category.uk.ltd.getahead.util.Logger=WARN
+log4j.category.uk.ltd.getahead.dwr.util.Logger=WARN

Propchange: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.0/configs/system-database/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/system-database/src/plan/plan.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/system-database/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/system-database/src/plan/plan.xml Thu Dec  8 19:11:29 2005
@@ -56,6 +56,9 @@
         <attribute name="host">localhost</attribute>
         <attribute name="port">1527</attribute>
     </gbean>
+    <gbean name="DerbyLog" class="org.apache.geronimo.derby.DerbyLogGBean">
+        <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
+    </gbean>
 
     <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
         <attribute name="repeatCount">5</attribute>

Modified: geronimo/branches/1.0/modules/deploy-jsr88/src/conf/manifest.mf
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/deploy-jsr88/src/conf/manifest.mf?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/deploy-jsr88/src/conf/manifest.mf (original)
+++ geronimo/branches/1.0/modules/deploy-jsr88/src/conf/manifest.mf Thu Dec  8 19:11:29 2005
@@ -1,7 +1,6 @@
-Class-Path:  ../lib/geronimo-common-1.0-SNAPSHOT.jar ../lib/geronimo-d
- eployment-1.0-SNAPSHOT.jar ../lib/geronimo-deploy-jsr88-1.0-SNAPSHOT.
- jar ../lib/geronimo-kernel-1.0-SNAPSHOT.jar ../lib/geronimo-system-1.
- 0-SNAPSHOT.jar  ../lib/geronimo-spec-j2ee-deployment-1.1-rc4.jar ../
- lib/cglib-nodep-2.1_3.jar ../lib/mx4j-3.0.1.jar ../lib/mx4j-remote-3.
- 0.1.jar
+Class-Path:  ../lib/geronimo-common-1.0.jar ../lib/geronimo-deployment
+ -1.0.jar ../lib/geronimo-deploy-jsr88-1.0.jar ../lib/geronimo-kernel-
+ 1.0.jar ../lib/geronimo-system-1.0.jar  ../lib/geronimo-spec-j2ee-dep
+ loyment_1.1_spec-1.0.jar ../lib/cglib-nodep-2.1_3.jar ../lib/mx4j-3.0
+ .1.jar ../lib/mx4j-remote-3.0.1.jar
 J2EE-DeploymentFactory-Implementation-Class: org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl



Mime
View raw message