You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2007/10/05 15:20:57 UTC

svn commit: r582249 - in /geronimo/server/branches/2.0/assemblies: geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties geronimo-jetty6-minimal/src/main/resources/var/config/config.xml

Author: dwoods
Date: Fri Oct  5 06:20:56 2007
New Revision: 582249

URL: http://svn.apache.org/viewvc?rev=582249&view=rev
Log:
GERONIMO-3505 JettyAJP13Connector in geronimo-jetty6-minimal isn't using config-substitutions.properties.  Also removed the unused Secondary port definitions from config-substitutions.properties.  Mario, thanks for pointing this out.

Modified:
    geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
    geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml

Modified: geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties?rev=582249&r1=582248&r2=582249&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties (original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties Fri Oct  5 06:20:56 2007
@@ -45,9 +45,6 @@
 HTTPPortPrimary=8080
 HTTPSPortPrimary=8443
 AJPPortPrimary=8009
-HTTPPortSecondary=8090
-HTTPSPortSecondary=8453
-AJPPortSecondary=8019
 JMXPort=9999
 NodeName=NODE1
 WebConnectorConTimeout=20000

Modified: geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml?rev=582249&r1=582248&r2=582249&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml Fri Oct  5 06:20:56 2007
@@ -63,11 +63,10 @@
             <attribute name="host">${ServerHostname}</attribute>
             <attribute name="port">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
-<!--        <gbean name="JettyAJP13Connector">
-            <attribute name="host">0.0.0.0</attribute>
-            <attribute name="port">8009</attribute>
+        <gbean name="JettyAJP13Connector">
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${AJPPortPrimary + PortOffset}</attribute>
         </gbean>
--->
     </module>
     
     <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">