geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Vamsavardhana Reddy" <c1vams...@gmail.com>
Subject Re: svn commit: r578812 - /geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
Date Wed, 03 Oct 2007 08:34:44 GMT
I am surprised that the ServerInfo reference is not there in the file
because
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/src/plan/plan.xml?r1=577801&r2=577800&pathrev=577801shows
that it is there in the commit!!

Vamsi

On 9/24/07, djencks@apache.org <djencks@apache.org> wrote:
>
> Author: djencks
> Date: Mon Sep 24 06:42:43 2007
> New Revision: 578812
>
> URL: http://svn.apache.org/viewvc?rev=578812&view=rev
> Log:
> GERONIMO-2964 apparently missed new reference
>
> Modified:
>     geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
>
> Modified: geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml?rev=578812&r1=578811&r2=578812&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml Mon Sep 24
> 06:42:43 2007
> @@ -41,9 +41,12 @@
>
>      <!-- default WAR container using Jetty -->
>      <gbean name="JettyWebContainer" class="
> org.apache.geronimo.jetty6.JettyContainerImpl">
> -      <reference name="WebManager">
> -        <name>JettyWebManager</name>
> -      </reference>
> +        <reference name="WebManager">
> +            <name>JettyWebManager</name>
> +        </reference>
> +        <reference name="ServerInfo">
> +            <name>ServerInfo</name>
> +        </reference>
>      </gbean>
>
>      <gbean name="JettyRequestLog" class="
> org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
> @@ -88,29 +91,29 @@
>      </gbean>
>
>      <!-- DONT USE THIS ONE -->
> -<!--
> -    <gbean name="JettySSLConnector" class="
> org.apache.geronimo.jetty6.connector.HTTPSSocketConnector">
> -        <attribute name="host">${PlanServerHostname}</attribute>
> -        <attribute name="port">${PlanHTTPSPort}</attribute>
> -        <attribute name="keyStore">geronimo-default</attribute>
> -        <attribute name="keyAlias">geronimo</attribute>
> -        <attribute name="trustStore">geronimo-default</attribute>
> -        <attribute name="clientAuthRequired">false</attribute>
> -        <attribute name="algorithm">Default</attribute>
> -        <attribute name="secureProtocol">TLS</attribute>
> -        <attribute name="maxThreads">50</attribute>
> -        <reference name="JettyContainer">
> -            <name>JettyWebContainer</name>
> -        </reference>
> -        <reference name="ThreadPool">
> -            <name>DefaultThreadPool</name>
> -        </reference>
> -        <reference name="KeystoreManager">
> -            <name>KeystoreManager</name>
> -        </reference>
> -    </gbean>
> --->
> -<!-- USE THIS ONE -->
> +    <!--
> +        <gbean name="JettySSLConnector" class="
> org.apache.geronimo.jetty6.connector.HTTPSSocketConnector">
> +            <attribute name="host">${PlanServerHostname}</attribute>
> +            <attribute name="port">${PlanHTTPSPort}</attribute>
> +            <attribute name="keyStore">geronimo-default</attribute>
> +            <attribute name="keyAlias">geronimo</attribute>
> +            <attribute name="trustStore">geronimo-default</attribute>
> +            <attribute name="clientAuthRequired">false</attribute>
> +            <attribute name="algorithm">Default</attribute>
> +            <attribute name="secureProtocol">TLS</attribute>
> +            <attribute name="maxThreads">50</attribute>
> +            <reference name="JettyContainer">
> +                <name>JettyWebContainer</name>
> +            </reference>
> +            <reference name="ThreadPool">
> +                <name>DefaultThreadPool</name>
> +            </reference>
> +            <reference name="KeystoreManager">
> +                <name>KeystoreManager</name>
> +            </reference>
> +        </gbean>
> +    -->
> +    <!-- USE THIS ONE -->
>      <gbean name="JettySSLConnector" class="
> org.apache.geronimo.jetty6.connector.HTTPSSelectChannelConnector">
>          <attribute name="host">${PlanServerHostname}</attribute>
>          <attribute name="port">${PlanHTTPSPort}</attribute>
>
>
>

Mime
View raw message