Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 34946 invoked from network); 19 Apr 2006 21:58:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Apr 2006 21:58:32 -0000 Received: (qmail 48782 invoked by uid 500); 19 Apr 2006 21:58:32 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 48756 invoked by uid 500); 19 Apr 2006 21:58:31 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 48745 invoked by uid 99); 19 Apr 2006 21:58:31 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Apr 2006 14:58:31 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 19 Apr 2006 14:58:30 -0700 Received: (qmail 34802 invoked by uid 65534); 19 Apr 2006 21:58:10 -0000 Message-ID: <20060419215810.34801.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r395403 - in /geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console: ./ internaldb/ jmsmanager/ jmsmanager/handlers/ Date: Wed, 19 Apr 2006 21:58:09 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Wed Apr 19 14:58:07 2006 New Revision: 395403 URL: http://svn.apache.org/viewcvs?rev=395403&view=rev Log: eliminate bogus hardcoded version class Removed: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java?rev=395403&r1=395402&r2=395403&view=diff ============================================================================== --- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java (original) +++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java Wed Apr 19 14:58:07 2006 @@ -24,7 +24,6 @@ import javax.management.ObjectName; import javax.sql.DataSource; -import org.apache.geronimo.console.GeronimoVersion; import org.apache.geronimo.kernel.KernelRegistry; import org.apache.geronimo.kernel.ObjectNameUtil; @@ -54,7 +53,7 @@ private static final String EMPTY_PROPS = ""; private static final ObjectName SYSTEM_DATASOURCE_NAME = ObjectNameUtil - .getObjectName("geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/system-database/"+GeronimoVersion.GERONIMO_VERSION+"/car,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource"); + .getObjectName("geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/system-database/"+org.apache.geronimo.system.serverinfo.ServerConstants.getVersion()+"/car,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource"); /** * Get database connection. @@ -87,7 +86,7 @@ * the name of the database to connect to. * @param properties * the properties to pass to the connection string. - * @return + * @return connection */ public static Connection getDerbyConnection(String dbName, String properties) throws SQLException { @@ -119,7 +118,7 @@ * Get the datasource if dbName is == SYSTEM_DB, otherwise returns null. * * @param dbName - * @return + * @return datasource */ public static DataSource getDataSource(String dbName) { try { Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java?rev=395403&r1=395402&r2=395403&view=diff ============================================================================== --- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java (original) +++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java Wed Apr 19 14:58:07 2006 @@ -17,40 +17,32 @@ package org.apache.geronimo.console.jmsmanager; -import java.util.Iterator; -import java.util.Set; import java.util.Map; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import javax.jms.Topic; import javax.jms.Queue; +import javax.jms.Topic; -import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext; -import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl; +import org.apache.geronimo.gbean.AbstractName; +import org.apache.geronimo.gbean.AbstractNameQuery; +import org.apache.geronimo.gbean.GBeanData; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.geronimo.kernel.GBeanNotFoundException; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.KernelRegistry; -import org.apache.geronimo.kernel.GBeanNotFoundException; +import org.apache.geronimo.kernel.config.Configuration; import org.apache.geronimo.kernel.config.ConfigurationManager; import org.apache.geronimo.kernel.config.ConfigurationUtil; -import org.apache.geronimo.kernel.config.Configuration; import org.apache.geronimo.kernel.repository.Artifact; -import org.apache.geronimo.console.GeronimoVersion; -import org.apache.geronimo.gbean.GBeanData; -import org.apache.geronimo.gbean.AbstractName; -import org.apache.geronimo.gbean.AbstractNameQuery; public abstract class AbstractJMSManager { - protected static final Artifact ACTIVEMQ_BROKER_ARTIFACT = new Artifact("geronimo", "activemq-broker", GeronimoVersion.GERONIMO_VERSION, "car"); - protected static final Artifact ACTIVEMQ_ARTIFACT = new Artifact("geronimo", "activemq", GeronimoVersion.GERONIMO_VERSION, "car"); + protected static final Artifact ACTIVEMQ_BROKER_ARTIFACT = new Artifact("geronimo", "activemq-broker", org.apache.geronimo.system.serverinfo.ServerConstants.getVersion(), "car"); + protected static final Artifact ACTIVEMQ_ARTIFACT = new Artifact("geronimo", "activemq", org.apache.geronimo.system.serverinfo.ServerConstants.getVersion(), "car"); protected static final Kernel kernel = KernelRegistry.getSingleKernel(); protected static final ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel); protected final Configuration BROKER_CONFIGURATION = configurationManager.getConfiguration(ACTIVEMQ_BROKER_ARTIFACT); protected final Configuration CONNECTOR_CONFIGURATION = configurationManager.getConfiguration(ACTIVEMQ_ARTIFACT); -// protected static final String JMS_SERVER_MBEAN_NAME = "geronimo.server:J2EEApplication=null,J2EEModule=geronimo/activemq-broker/" + GeronimoVersion.GERONIMO_VERSION + "/car,J2EEServer=geronimo,j2eeType=JMSServer,name=ActiveMQl"; private static final AbstractName earName = kernel.getNaming().createRootName(ACTIVEMQ_ARTIFACT, NameFactory.NULL, NameFactory.J2EE_APPLICATION); protected static final AbstractName RESOURCE_ADAPTER_MODULE_NAME = kernel.getNaming().createChildName(earName, ACTIVEMQ_ARTIFACT.toString(), NameFactory.RESOURCE_ADAPTER_MODULE); @@ -83,8 +75,6 @@ protected static final String DESTINATION_MODULE_NAME = "destinationModuleName"; protected static final String DESTINATION_CONFIG_URI = "destinationConfigURI"; - -// protected static final String CONNECTION_FACTORY_NAME = "geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/activemq/" + GeronimoVersion.GERONIMO_VERSION + "/car,j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory"; protected static Object[] no_args = new Object[0]; Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java?rev=395403&r1=395402&r2=395403&view=diff ============================================================================== --- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java (original) +++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java Wed Apr 19 14:58:07 2006 @@ -17,15 +17,15 @@ package org.apache.geronimo.console.jmsmanager; -import org.apache.geronimo.console.BasePortlet; -import org.apache.geronimo.console.GeronimoVersion; -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.ObjectNameUtil; +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 javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -40,21 +40,21 @@ import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; import javax.portlet.WindowState; -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.ObjectNameUtil; public class JMSConnectionFactoryManagerPortlet extends BasePortlet { private final static ActiveMQConnectorHelper helper = new ActiveMQConnectorHelper(); - private final static String PARENT_ID = "geronimo/activemq-broker/" + GeronimoVersion.GERONIMO_VERSION + "/car"; + private final static String PARENT_ID = "geronimo/activemq-broker/" + org.apache.geronimo.system.serverinfo.ServerConstants.getVersion() + "/car"; private final static String ADD_MODE = "addACF"; Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java?rev=395403&r1=395402&r2=395403&view=diff ============================================================================== --- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java (original) +++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java Wed Apr 19 14:58:07 2006 @@ -30,7 +30,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.geronimo.console.GeronimoVersion; import org.apache.geronimo.console.core.jms.TopicBrowserGBean; import org.apache.geronimo.console.jmsmanager.AbstractJMSManager; import org.apache.geronimo.gbean.AbstractName; @@ -47,7 +46,7 @@ protected static Log log = LogFactory .getLog(CreateDestinationHandler.class); - private static final Artifact parentId = new Artifact("geronimo", "activemq-broker", GeronimoVersion.GERONIMO_VERSION, "car"); + private static final Artifact parentId = new Artifact("geronimo", "activemq-broker", org.apache.geronimo.system.serverinfo.ServerConstants.getVersion(), "car"); // static final GBeanInfo QUEUE_INFO; //