geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r535346 - in /geronimo/server/trunk: assemblies/ assemblies/geronimo-jetty6-jee5/src/main/assembly/ assemblies/geronimo-jetty6-minimal/src/main/assembly/ assemblies/geronimo-tomcat6-jee5/src/main/assembly/ assemblies/geronimo-tomcat6-minima...
Date Fri, 04 May 2007 18:41:49 GMT
Author: akulshreshtha
Date: Fri May  4 11:41:32 2007
New Revision: 535346

URL: http://svn.apache.org/viewvc?view=rev&rev=535346
Log:
GERONIMO-3123 Reverting 535158 due to tck breakage

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/pom.xml
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java
  (contents, props changed)

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml?view=diff&rev=535346&r1=535345&r2=535346
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml Fri May
 4 11:41:32 2007
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
     
-       http://www.apache.org/licenses/LICENSE-2.0
+     http://www.apache.org/licenses/LICENSE-2.0
     
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -83,7 +83,7 @@
                 <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
             </includes>
         </dependencySet>
-
+        
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
@@ -107,7 +107,6 @@
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>META-INF/**</exclude>
-                <exclude>var/**</exclude>
             </excludes>
         </fileSet>
         
@@ -145,15 +144,10 @@
             </includes>
             <lineEnding>dos</lineEnding>
         </fileSet>
-
-        <fileSet>
-            <directory>target/boilerplate/var</directory>
-            <outputDirectory>${templateDir}/var</outputDirectory>
-        </fileSet>
         
         <fileSet>
             <directory>target/classes</directory>
-            <outputDirectory>${templateDir}</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <includes>
                 <include>var/config/**</include>
             </includes>
@@ -165,30 +159,7 @@
         
         <fileSet>
             <directory>target/classes</directory>
-            <outputDirectory>${templateDir}</outputDirectory>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>var/config/config.xml</include>
-            </includes>
-        </fileSet>
-
-        <!-- make a copy of var for default server named geronimo0 -->
-        <fileSet>
-            <directory>target/boilerplate/var</directory>
-            <outputDirectory>${defaultServerName}/var</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>${defaultServerName}</outputDirectory>
-            <includes>
-                <include>var/config/**</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>${defaultServerName}</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>var/config/config.xml</include>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml?view=diff&rev=535346&r1=535345&r2=535346
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml Fri
May  4 11:41:32 2007
@@ -99,7 +99,6 @@
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>META-INF/**</exclude>
-                <exclude>var/**</exclude>
             </excludes>
         </fileSet>
         
@@ -137,15 +136,10 @@
             </includes>
             <lineEnding>dos</lineEnding>
         </fileSet>
-
-        <fileSet>
-            <directory>target/boilerplate/var</directory>
-            <outputDirectory>${templateDir}/var</outputDirectory>
-        </fileSet>
         
         <fileSet>
             <directory>target/classes</directory>
-            <outputDirectory>${templateDir}</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <includes>
                 <include>var/config/**</include>
             </includes>
@@ -157,30 +151,7 @@
         
         <fileSet>
             <directory>target/classes</directory>
-            <outputDirectory>${templateDir}</outputDirectory>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>var/config/config.xml</include>
-            </includes>
-        </fileSet>
-
-        <!-- make a copy of var for default server named geronimo0 -->
-        <fileSet>
-            <directory>target/boilerplate/var</directory>
-            <outputDirectory>${defaultServerName}/var</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>${defaultServerName}</outputDirectory>
-            <includes>
-                <include>var/config/**</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>${defaultServerName}</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>var/config/config.xml</include>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml?view=diff&rev=535346&r1=535345&r2=535346
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml Fri May
 4 11:41:32 2007
@@ -107,7 +107,6 @@
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>META-INF/**</exclude>
-                <exclude>var/**</exclude>
             </excludes>
         </fileSet>
         
@@ -145,15 +144,10 @@
             </includes>
             <lineEnding>dos</lineEnding>
         </fileSet>
-
-        <fileSet>
-            <directory>target/boilerplate/var</directory>
-            <outputDirectory>${templateDir}/var</outputDirectory>
-        </fileSet>
         
         <fileSet>
             <directory>target/classes</directory>
-            <outputDirectory>${templateDir}</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <includes>
                 <include>var/config/**</include>
             </includes>
@@ -165,30 +159,7 @@
         
         <fileSet>
             <directory>target/classes</directory>
-            <outputDirectory>${templateDir}</outputDirectory>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>var/config/config.xml</include>
-            </includes>
-        </fileSet>
-
-        <!-- make a copy of var for default server named geronimo0 -->
-        <fileSet>
-            <directory>target/boilerplate/var</directory>
-            <outputDirectory>${defaultServerName}/var</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>${defaultServerName}</outputDirectory>
-            <includes>
-                <include>var/config/**</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>${defaultServerName}</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>var/config/config.xml</include>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml?view=diff&rev=535346&r1=535345&r2=535346
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml Fri
May  4 11:41:32 2007
@@ -43,7 +43,7 @@
         <!--
         NOTE: lib/endorsed/ is picked up from boilerplate.
         -->
-
+        
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>server.jar</outputFileNameMapping>
@@ -67,7 +67,7 @@
                 <include>org.apache.geronimo.configs:online-deployer</include>
             </includes>
         </dependencySet>
-        
+
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
@@ -75,7 +75,7 @@
                 <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
             </includes>
         </dependencySet>
-
+        
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
@@ -99,7 +99,6 @@
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>META-INF/**</exclude>
-                <exclude>var/**</exclude>
             </excludes>
         </fileSet>
         
@@ -137,15 +136,10 @@
             </includes>
             <lineEnding>dos</lineEnding>
         </fileSet>
-
-        <fileSet>
-            <directory>target/boilerplate/var</directory>
-            <outputDirectory>${templateDir}/var</outputDirectory>
-        </fileSet>
         
         <fileSet>
             <directory>target/classes</directory>
-            <outputDirectory>${templateDir}</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <includes>
                 <include>var/config/**</include>
             </includes>
@@ -157,30 +151,7 @@
         
         <fileSet>
             <directory>target/classes</directory>
-            <outputDirectory>${templateDir}</outputDirectory>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>var/config/config.xml</include>
-            </includes>
-        </fileSet>
-
-        <!-- make a copy of var for default server named geronimo0 -->
-        <fileSet>
-            <directory>target/boilerplate/var</directory>
-            <outputDirectory>${defaultServerName}/var</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>${defaultServerName}</outputDirectory>
-            <includes>
-                <include>var/config/**</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>${defaultServerName}</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>var/config/config.xml</include>

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?view=diff&rev=535346&r1=535345&r2=535346
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Fri May  4 11:41:32 2007
@@ -35,11 +35,35 @@
     <packaging>pom</packaging>
 
     <properties>
-        <!-- The template dir = GHOME/${templateDir} -->
-        <!-- default server instance is at GHOME/${defaultServerName} -->
-
-        <templateDir>template</templateDir>
-        <defaultServerName>geronimo0</defaultServerName>
+        <!--
+        TODO: Move this where it can be shared with the configs/pom.xml values
+        
+        <PlanServerHostname>0.0.0.0</PlanServerHostname>
+        <PlanNamingPort>1099</PlanNamingPort>
+        <PlanOpenEJBPort>4201</PlanOpenEJBPort>
+        <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
+        <PlanIIOPPort>9000</PlanIIOPPort>
+        <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
+        <PlanCOSNamingPort>1050</PlanCOSNamingPort>
+        <PlanCOSSunNamingPort>1050</PlanCOSSunNamingPort>
+        <PlanORBHost>localhost</PlanORBHost>
+        <PlanORBPort>6882</PlanORBPort>
+        <PlanORBSunPort>6882</PlanORBSunPort>
+        <PlanORBSSLHost>localhost</PlanORBSSLHost>
+        <PlanORBSSLPort>2001</PlanORBSSLPort>
+        <PlanORBSunSSLPort>2001</PlanORBSunSSLPort>
+        <PlanActiveMQPort>61616</PlanActiveMQPort>
+        <PlanDerbyPort>1527</PlanDerbyPort>
+        <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
+        <PlanLdapPort>1389</PlanLdapPort>
+        <PlanHTTPPortPrimary>8080</PlanHTTPPortPrimary>
+        <PlanHTTPSPortPrimary>8443</PlanHTTPSPortPrimary>
+        <PlanAJPPortPrimary>8009</PlanAJPPortPrimary>
+        <PlanHTTPPortSecondary>8090</PlanHTTPPortSecondary>
+        <PlanHTTPSPortSecondary>8453</PlanHTTPSPortSecondary>
+        <PlanAJPPortSecondary>8019</PlanAJPPortSecondary>
+        <PlanJMXPort>9999</PlanJMXPort>
+        -->
         <PlanJettyWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</PlanJettyWebBuilderDefaultNamespace>
         <PlanTomcatWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</PlanTomcatWebBuilderDefaultNamespace>
     </properties>

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java?view=diff&rev=535346&r1=535345&r2=535346
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java
(original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java
Fri May  4 11:41:32 2007
@@ -26,17 +26,14 @@
 
 /**
  *
- * @version $Rev$ $Date$
+ * @version $Rev: 476049 $ $Date: 2006-11-17 15:35:17 +1100 (Fri, 17 Nov 2006) $
  */
 public class MainConfigurationBootstrapper {
     public final static String ARGUMENT_VERBOSE_SHORTFORM = "-v";
     public final static String ARGUMENT_VERBOSE = "--verbose";
     public final static String ARGUMENT_MORE_VERBOSE_SHORTFORM = "-vv";
     public final static String ARGUMENT_MORE_VERBOSE = "--veryverbose";
-    public final static String SERVER_NAME_SYS_PROP = "org.apache.geronimo.server.name";
-    public final static String SERVER_DIR_SYS_PROP = "org.apache.geronimo.server.dir";
-    public final static String DEFAULT_SERVER_NAME = "geronimo0";
-    
+
     public static String getVerboseLevel(String[] args) {
         String verboseArg = null;
         for (int i = 0; i < args.length; i++) {
@@ -70,7 +67,6 @@
     }
 
     public static void main(MainConfigurationBootstrapper bootstrapper, String[] args) {
-        setSysProperties();
         bootstrapper.initializeLogging(args);
         
         Main main = bootstrapper.getMain(MainConfigurationBootstrapper.class.getClassLoader());
@@ -160,14 +156,6 @@
             }
         }
         GeronimoLogging.initialize(level);
-    }
-    
-    private static void setSysProperties() {
-        String serverDir = System.getProperty(SERVER_DIR_SYS_PROP);
-        if ((serverDir == null) || (serverDir.length() == 0)) {
-            // use server name to set server dir
-            System.setProperty(SERVER_NAME_SYS_PROP, System.getProperty(SERVER_NAME_SYS_PROP,
DEFAULT_SERVER_NAME));
-        }
     }
     
 }

Propchange: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java
            ('svn:eol-style' removed)

Propchange: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java
            ('svn:keywords' removed)

Propchange: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java
            ('svn:mime-type' removed)



Mime
View raw message