Author: jboynes Date: Tue Feb 22 20:10:45 2005 New Revision: 154947 URL: http://svn.apache.org/viewcvs?view=rev&rev=154947 Log: Remove deprecated constructor Kernel(String,String) Also change a few testcases that still used it to use the one-arg form.
Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java geronimo/trunk/modules/interop/src/test/org/apache/geronimo/interop/InteropGBeanTest.java geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java geronimo/trunk/modules/mail/src/test/org/apache/geronimo/mail/MailGBeanTest.java geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java geronimo/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java (original) +++ geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java Tue Feb 22 20:10:45 2005 @@ -142,7 +142,7 @@ // } protected void setUp() throws Exception { - kernel = new Kernel(KERNEL_NAME, "test.domain"); + kernel = new Kernel(KERNEL_NAME); kernel.boot(); GBeanMBean ctc = new GBeanMBean(MockConnectionTrackingCoordinator.getGBeanInfo()); ctcName = ObjectName.getInstance("test:role=ConnectionTrackingCoordinator"); Modified: geronimo/trunk/modules/interop/src/test/org/apache/geronimo/interop/InteropGBeanTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/test/org/apache/geronimo/interop/InteropGBeanTest.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/modules/interop/src/test/org/apache/geronimo/interop/InteropGBeanTest.java (original) +++ geronimo/trunk/modules/interop/src/test/org/apache/geronimo/interop/InteropGBeanTest.java Tue Feb 22 20:10:45 2005 @@ -95,7 +95,7 @@ protected void setUp() throws Exception { log("setUp():"); - kernel = new Kernel(KERNEL_NAME, "test.domain"); + kernel = new Kernel(KERNEL_NAME); log("setUp(): kernel = " + kernel); Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java (original) +++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java Tue Feb 22 20:10:45 2005 @@ -198,16 +198,6 @@ this(kernelName, new BasicGBeanRegistry()); } - /** - * Construct a Kernel with the specified name and an unspecified GBeanRegistry implementation. - * - * @param kernelName the name of the kernel - * @deprecated use new Kernel(kernelName) - */ - public Kernel(String kernelName, String ignored) { - this(kernelName); - } - public String getKernelName() { return kernelName; } Modified: geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java (original) +++ geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/GBeanTest.java Tue Feb 22 20:10:45 2005 @@ -84,7 +84,7 @@ protected void setUp() throws Exception { name = new ObjectName("test:name=MyMockGBean"); name2 = new ObjectName("test:name=MyMockGBean2"); - kernel = new Kernel("test.kernel", "test"); + kernel = new Kernel("test"); kernel.boot(); } Modified: geronimo/trunk/modules/mail/src/test/org/apache/geronimo/mail/MailGBeanTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/test/org/apache/geronimo/mail/MailGBeanTest.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/modules/mail/src/test/org/apache/geronimo/mail/MailGBeanTest.java (original) +++ geronimo/trunk/modules/mail/src/test/org/apache/geronimo/mail/MailGBeanTest.java Tue Feb 22 20:10:45 2005 @@ -233,7 +233,7 @@ } protected void setUp() throws Exception { - kernel = new Kernel(KERNEL_NAME, "test.domain"); + kernel = new Kernel(KERNEL_NAME); kernel.boot(); } Modified: geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java (original) +++ geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java Tue Feb 22 20:10:45 2005 @@ -85,7 +85,7 @@ // builder.addResourceEnvRef("resourceenvref", List.class, localRef); SimpleReadOnlyContext context = new SimpleReadOnlyContext(builder.getContext()); - Kernel kernel = new Kernel("test.kernel", "test.domain"); + Kernel kernel = new Kernel("test.kernel"); kernel.boot(); try { assertEquals(kernel, Kernel.getKernel("test.kernel")); Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java (original) +++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java Tue Feb 22 20:10:45 2005 @@ -48,7 +48,7 @@ protected ObjectName serverStub; protected void setUp() throws Exception { - kernel = new Kernel("test.kernel", "simple.geronimo.test"); + kernel = new Kernel("test.kernel"); kernel.boot(); GBeanMBean gbean; Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java (original) +++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java Tue Feb 22 20:10:45 2005 @@ -122,7 +122,7 @@ } protected void setUp() throws Exception { - kernel = new Kernel("test.kernel", "simple.geronimo.test"); + kernel = new Kernel("test.kernel"); kernel.boot(); GBeanMBean gbean; Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java (original) +++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java Tue Feb 22 20:10:45 2005 @@ -49,7 +49,7 @@ protected ObjectName clientCE; public void setUp() throws Exception { - kernel = new Kernel("test.kernel", "simple.geronimo.test"); + kernel = new Kernel("test.kernel"); kernel.boot(); GBeanMBean gbean; Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java (original) +++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java Tue Feb 22 20:10:45 2005 @@ -80,7 +80,7 @@ } public void setUp() throws Exception { - kernel = new Kernel("test.kernel", "simple.geronimo.test"); + kernel = new Kernel("test.kernel"); kernel.boot(); GBeanMBean gbean; Modified: geronimo/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java?view=diff&r1=154946&r2=154947 ============================================================================== --- geronimo/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java (original) +++ geronimo/trunk/plugins/maven-geronimo-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java Tue Feb 22 20:10:45 2005 @@ -108,7 +108,7 @@ } // build a basic kernel without a configuration-store, our configuration store is - Kernel kernel = new Kernel(getKernelName(), new BasicGBeanRegistry()); + Kernel kernel = new Kernel(getKernelName()); kernel.boot(); ConfigurationManager configurationManager = kernel.getConfigurationManager();