geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r279663 - in /geronimo/trunk/modules/assembly: ./ src/plan/
Date Thu, 08 Sep 2005 22:41:16 GMT
Author: djencks
Date: Thu Sep  8 15:41:06 2005
New Revision: 279663

URL: http://svn.apache.org/viewcvs?rev=279663&view=rev
Log:
remove obsolete -config.xml files.  Add back *WebManager gbeans removed by mistake

Removed:
    geronimo/trunk/modules/assembly/src/plan/jetty-config.xml
    geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml
    geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml
    geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml
    geronimo/trunk/modules/assembly/src/plan/tomcat-deployer-config.xml
    geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml
Modified:
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=279663&r1=279662&r2=279663&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Thu Sep  8 15:41:06 2005
@@ -272,7 +272,6 @@
         <j:set var="PlanDerbyPort" value="1527"/>
         <j:set var="PlanRemoteLoginPort" value="4242"/>
         <j:set var="PlanLdapPort" value="1389"/>
-        <echo>CHOOSING CONTAINER ${geronimo.web.container}</echo>
         <j:if test="${context.getVariable('geronimo.web.container').equals('jetty')}">
             <echo>JETTY CONTAINER</echo>
             <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/web/jetty"/>
@@ -294,7 +293,6 @@
             <j:set var="PlanHTTPSPort2" value="8443"/>
             <j:set var="PlanAJPPort2" value="8009"/>
         </j:if>
-        <echo>CHOSE CONTAINER</echo>
 
         <fileScanner var="plans">
             <fileset dir="${basedir}/src/plan">
@@ -304,24 +302,6 @@
 
         <!-- Prepare the web container -->
         <ant:mkdir dir="${basedir}/target/tmp"/>
-        <!--        <velocity:merge-->
-        <!--            basedir="${basedir}/src/plan"-->
-        <!--            template="${geronimo.web.container}-config.xml"-->
-        <!--            name="${basedir}/target/tmp/${geronimo.web.container}-config.xml"/>-->
-        <!--        <loadfile property="webcontainer"-->
-        <!--            srcFile="${basedir}/target/tmp/${geronimo.web.container}-config.xml"/>-->
-        <velocity:merge
-            basedir="${basedir}/src/plan"
-            template="${geronimo.web.container}-deployer-config.xml"
-            name="${basedir}/target/tmp/${geronimo.web.container}-deployer-config.xml"/>
-        <loadfile property="webdeployer"
-            srcFile="${basedir}/target/tmp/${geronimo.web.container}-deployer-config.xml"/>
-        <velocity:merge
-            basedir="${basedir}/src/plan"
-            template="${geronimo.web.container}-runtime-deployer-config.xml"
-            name="${basedir}/target/tmp/${geronimo.web.container}-runtime-deployer-config.xml"/>
-        <loadfile property="webruntimedeployer"
-            srcFile="${basedir}/target/tmp/${geronimo.web.container}-runtime-deployer-config.xml"/>
 
         <ant:mkdir dir="${basedir}/target/plan"/>
         <j:forEach var="plan" items="${plans.iterator()}">

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml?rev=279663&r1=279662&r2=279663&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml Thu Sep  8 15:41:06 2005
@@ -31,6 +31,11 @@
         <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
     </dependency>
 
+    <!-- david jencks is not convinced that this gbean should be in this plan and thinks
it might
+    belong in the console plan -->
+    <gbean name="JettyWebManager" class="org.apache.geronimo.jetty.JettyManagerImpl">
+    </gbean>
+
     <!-- default WAR container using Jetty -->
     <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
     </gbean>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml?rev=279663&r1=279662&r2=279663&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml Thu Sep  8 15:41:06 2005
@@ -27,10 +27,6 @@
     parentId="org/apache/geronimo/RMINaming"
     >
 
-<!--    <import>-->
-<!--        <uri>org/apache/geronimo/Security</uri>-->
-<!--    </import>-->
-
     <dependency>
         <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
     </dependency>
@@ -95,27 +91,10 @@
         <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
     </dependency>
 
-    <!-- JAAS Geronimo Login Configuration -->
-<!--    <gbean name="tomcat-properties-realm"-->
-<!--        class="org.apache.geronimo.security.realm.GenericSecurityRealm">-->
-<!--        <attribute name="realmName">Geronimo</attribute>-->
-<!--        <reference name="LoginModuleConfiguration">-->
-<!--            <name>tomcat-properties</name>-->
-<!--        </reference>-->
-<!--        <reference name="ServerInfo">-->
-<!--            <module>org/apache/geronimo/System</module>-->
-<!--            <name>ServerInfo</name>-->
-<!--        </reference>-->
-<!--        <reference name="LoginService"><module>*</module><name>JaasLoginService</name></reference>-->
-<!--    </gbean>-->
-<!---->
-<!--    <gbean name="tomcat-properties" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">-->
-<!--        <attribute name="controlFlag">REQUIRED</attribute>-->
-<!--        <reference name="LoginModule">-->
-<!--            <module>org/apache/geronimo/Security</module>-->
-<!--            <name>properties-login</name>-->
-<!--        </reference>-->
-<!--    </gbean>-->
+    <!-- david jencks is not convinced that this gbean should be in this plan and thinks
it might
+    belong in the console plan -->
+    <gbean name="TomcatWebManager" class="org.apache.geronimo.tomcat.TomcatManagerImpl">
+    </gbean>
 
     <!-- The following is the equivalent of the server.xml file, but done with GBeans
-->
 
@@ -179,7 +158,9 @@
         <attribute name="secureProtocol">TLS</attribute>
         <attribute name="keystoreFileName">var/security/keystore</attribute>
         <attribute name="keystorePassword">secret</attribute>
-        <reference name="TomcatContainer"><name>TomcatWebContainer</name></reference>
+        <reference name="TomcatContainer">
+            <name>TomcatWebContainer</name>
+        </reference>
         <reference name="ServerInfo">
             <module>org/apache/geronimo/System</module>
             <name>ServerInfo</name>
@@ -194,7 +175,9 @@
             defaultHost=${PlanServerHostname}
         </attribute>
         <references name="Hosts">
-            <pattern><gbean-name>geronimo.server:j2eeType=Host,*</gbean-name></pattern>
+            <pattern>
+                <gbean-name>geronimo.server:j2eeType=Host,*</gbean-name>
+            </pattern>
         </references>
         <reference name="RealmGBean">
             <name>TomcatJAASRealm</name>
@@ -212,11 +195,11 @@
             suffix=.txt
             pattern=common
         </attribute>
-    <!-- Uncomment this section to add second valve for a chain.  This example consists
of the Tomcat
-          AccessLogValve and SingleSignOn. Notice the dependency that chains the FirstValve
with the
-          SecondValve.  The valves will be added in the order that they are chained.
-        <reference name="NextValve"><moduleType>J2EEModule</moduleType><name>SecondValve</name></reference>
-    -->
+        <!-- Uncomment this section to add second valve for a chain.  This example consists
of the Tomcat
+              AccessLogValve and SingleSignOn. Notice the dependency that chains the FirstValve
with the
+              SecondValve.  The valves will be added in the order that they are chained.
+            <reference name="NextValve"><moduleType>J2EEModule</moduleType><name>SecondValve</name></reference>
+        -->
     </gbean>
     <!-- Uncomment this section to add this valve  to the chain.  This example consists
of the Tomcat
           SingleSignOn.
@@ -263,6 +246,6 @@
         -->
     </gbean>
 
-<!-- TOMCAT CONFIGURATION ENDS HERE -->
+    <!-- TOMCAT CONFIGURATION ENDS HERE -->
 
 </configuration>



Mime
View raw message