Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 96410 invoked from network); 12 Apr 2007 01:42:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Apr 2007 01:42:37 -0000 Received: (qmail 93940 invoked by uid 500); 12 Apr 2007 01:42:43 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 93886 invoked by uid 500); 12 Apr 2007 01:42:42 -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 93875 invoked by uid 99); 12 Apr 2007 01:42:42 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2007 18:42:42 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2007 18:42:35 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id AD1331A9838; Wed, 11 Apr 2007 18:42:14 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r527746 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/ modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/ modules/geronimo-deploy-tool/src/main/java/org/apache/ger... Date: Thu, 12 Apr 2007 01:42:14 -0000 To: scm@geronimo.apache.org From: akulshreshtha@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070412014214.AD1331A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akulshreshtha Date: Wed Apr 11 18:42:13 2007 New Revision: 527746 URL: http://svn.apache.org/viewvc?view=rev&rev=527746 Log: GERONIMO-3011 Change default RMINaming port to 1098 Added system property admin.disabled=true Removed PluginBootstrap, it was used by Maven1 build Removed: geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap.java Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties?view=diff&rev=527746&r1=527745&r2=527746 ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties Wed Apr 11 18:42:13 2007 @@ -23,7 +23,7 @@ ## Try portOffset=10 #portOffset=0 PlanServerHostname=0.0.0.0 -PlanNamingPort=1099 +PlanNamingPort=1098 PlanOpenEJBPort=4201 PlanClientAddresses=127.0.0.1 PlanIIOPPort=9000 Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java?view=diff&rev=527746&r1=527745&r2=527746 ============================================================================== --- geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java (original) +++ geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java Wed Apr 11 18:42:13 2007 @@ -40,7 +40,7 @@ public static final String RMI_NAMING_CONFG_ID = "org/apache/geronimo/RMINaming"; - public static final String DEFAULT_PORT = "1099"; + public static final String DEFAULT_PORT = "1098"; // 1099 is used by java.rmi.registry.Registry String port; Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?view=diff&rev=527746&r1=527745&r2=527746 ============================================================================== --- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java (original) +++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Wed Apr 11 18:42:13 2007 @@ -95,6 +95,7 @@ this.classLoader = classLoader; System.setProperty("duct tape",""); + System.setProperty("admin.disabled", "true"); SystemInstance systemInstance = SystemInstance.get(); String format = systemInstance.getProperty("openejb.deploymentId.format");