[jboss-cvs] JBossAS SVN: r101464 - in trunk: tomcat/src/resources and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 25 06:33:32 EST 2010
Author: remy.maucherat at jboss.com
Date: 2010-02-25 06:33:32 -0500 (Thu, 25 Feb 2010)
New Revision: 101464
Modified:
trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
trunk/tomcat/src/resources/server.xml
trunk/varia/src/resources/services/invoker/http/jboss-service.xml
trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml
Log:
JBAS-7466: Drop XSL transform to deal with server.xml, it now uses system properties.
Modified: trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2010-02-25 11:20:58 UTC (rev 101463)
+++ trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2010-02-25 11:33:32 UTC (rev 101464)
@@ -259,7 +259,6 @@
Same binding config can be used by the following services, or really
anything else that needs to point to the JBoss Web HTTP connector
- but doesn't need an XSL Transform
jboss:service=invoker,type=http
jboss:service=invoker,type=http,target=Naming
@@ -270,16 +269,13 @@
-->
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss.web:service=WebServer</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">jboss.web:service=WebServer</property>
+ <property name="bindingName">HttpConnector</property>
<property name="port">8080</property>
<property name="description">JBoss Web HTTP connector socket; also drives the values for the HTTPS and AJP sockets</property>
-
- <!--
- Inject a XSLT transform configuration (see below) that describes
- how to transform server.xml
- If the binding value request doesn't require an XSL Transform, this config
- will be ignored.
- -->
- <property name="serviceBindingValueSourceConfig"><inject bean="JBossWebConnectorXSLTConfig"/></property>
</bean>
<!-- For services like those listed above that need to know the
@@ -291,6 +287,15 @@
<property name="description">JBoss Web HTTPS connector socket</property>
</bean>
+ <!-- For services like those listed above that need to know the
+ port of the AJP connector -->
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">jboss.web:service=WebServer</property>
+ <property name="bindingName">AjpConnector</property>
+ <property name="port">8009</property>
+ <property name="description">JBoss Web AJP connector socket</property>
+ </bean>
+
<!-- ********************* deploy/messaging/remoting-bisocket-service.xml ********************** -->
<!-- Standard JBM bisocket connector -->
@@ -436,65 +441,46 @@
</parameter>
</constructor>
</bean>
+ <!-- Web HTTP connector -->
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.web.http.port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpConnector</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <!-- Web HTTPS connector -->
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.web.https.port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpsConnector</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <!-- Web AJP connector -->
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.web.ajp.port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>jboss.web:service=WebServer</parameter>
+ <parameter>AjpConnector</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
</set>
</parameter>
</constructor>
</bean>
- <!-- XSL Transform to apply to server.xml -->
- <bean name="JBossWebConnectorXSLTConfig"
- class="org.jboss.services.binding.impl.XSLTServiceBindingValueSourceConfig">
-
- <constructor>
- <parameter><![CDATA[
- <xsl:stylesheet
- xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
-
- <xsl:output method="xml" />
- <xsl:param name="port"/>
-
- <xsl:variable name="portAJP" select="$port - 71"/>
- <xsl:variable name="portHttps" select="$port + 363"/>
-
- <xsl:template match="/">
- <xsl:apply-templates/>
- </xsl:template>
-
- <xsl:template match = "Connector">
- <Connector>
- <xsl:for-each select="@*">
- <xsl:choose>
- <xsl:when test="(name() = 'port' and . = '8080')">
- <xsl:attribute name="port"><xsl:value-of select="$port" /></xsl:attribute>
- </xsl:when>
- <xsl:when test="(name() = 'port' and . = '8009')">
- <xsl:attribute name="port"><xsl:value-of select="$portAJP" /></xsl:attribute>
- </xsl:when>
- <xsl:when test="(name() = 'redirectPort' and . = '8443')">
- <xsl:attribute name="redirectPort"><xsl:value-of select="$portHttps" /></xsl:attribute>
- </xsl:when>
- <xsl:when test="(name() = 'port' and . = '8443')">
- <xsl:attribute name="port"><xsl:value-of select="$portHttps" /></xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <xsl:apply-templates/>
- </Connector>
- </xsl:template>
-
- <xsl:template match="*|@*">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
- </xsl:stylesheet>
- ]]>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
+</deployment>
\ No newline at end of file
Modified: trunk/tomcat/src/resources/server.xml
===================================================================
--- trunk/tomcat/src/resources/server.xml 2010-02-25 11:20:58 UTC (rev 101463)
+++ trunk/tomcat/src/resources/server.xml 2010-02-25 11:33:32 UTC (rev 101464)
@@ -12,8 +12,8 @@
<Service name="jboss.web">
<!-- A HTTP/1.1 Connector on port 8080 -->
- <Connector protocol="HTTP/1.1" port="8080" address="${jboss.bind.address}"
- connectionTimeout="20000" redirectPort="8443" />
+ <Connector protocol="HTTP/1.1" port="${jboss.web.http.port}" address="${jboss.bind.address}"
+ connectionTimeout="20000" redirectPort="${jboss.web.https.port}" />
<!-- Add this option to the connector to avoid problems with
.NET clients that don't implement HTTP/1.1 correctly
@@ -21,12 +21,12 @@
-->
<!-- A AJP 1.3 Connector on port 8009 -->
- <Connector protocol="AJP/1.3" port="8009" address="${jboss.bind.address}"
- redirectPort="8443" />
+ <Connector protocol="AJP/1.3" port="${jboss.web.ajp.port}" address="${jboss.bind.address}"
+ redirectPort="${jboss.web.https.port}" />
<!-- SSL/TLS Connector configuration using the admin devl guide keystore
<Connector protocol="HTTP/1.1" SSLEnabled="true"
- port="8443" address="${jboss.bind.address}"
+ port="${jboss.web.https.port}" address="${jboss.bind.address}"
scheme="https" secure="true" clientAuth="false"
keystoreFile="${jboss.server.home.dir}/conf/chap8.keystore"
keystorePass="rmi+ssl" sslProtocol = "TLS" />
Modified: trunk/varia/src/resources/services/invoker/http/jboss-service.xml
===================================================================
--- trunk/varia/src/resources/services/invoker/http/jboss-service.xml 2010-02-25 11:20:58 UTC (rev 101463)
+++ trunk/varia/src/resources/services/invoker/http/jboss-service.xml 2010-02-25 11:33:32 UTC (rev 101464)
@@ -18,6 +18,7 @@
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpConnector</parameter>
<parameter>:${port}/invoker/EJBInvokerServlet</parameter>
</value-factory>
</attribute>
@@ -36,6 +37,7 @@
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpConnector</parameter>
<parameter>:${port}/invoker/JMXInvokerServlet</parameter>
</value-factory>
</attribute>
@@ -64,6 +66,7 @@
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpConnector</parameter>
<parameter>:${port}/invoker/readonly/JMXInvokerServlet</parameter>
</value-factory>
</attribute>
@@ -79,5 +82,4 @@
</interceptors>
</attribute>
</mbean>
-</server>
-
+</server>
\ No newline at end of file
Modified: trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml
===================================================================
--- trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml 2010-02-25 11:20:58 UTC (rev 101463)
+++ trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml 2010-02-25 11:33:32 UTC (rev 101464)
@@ -18,6 +18,7 @@
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpConnector</parameter>
<parameter>:${port}/invoker/EJBInvokerServlet</parameter>
</value-factory>
</attribute>
@@ -36,6 +37,7 @@
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpConnector</parameter>
<parameter>:${port}/invoker/EJBInvokerHAServlet</parameter>
</value-factory>
</attribute>
@@ -54,6 +56,7 @@
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpConnector</parameter>
<parameter>:${port}/invoker/JMXInvokerServlet</parameter>
</value-factory>
</attribute>
@@ -82,6 +85,7 @@
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpConnector</parameter>
<parameter>:${port}/invoker/readonly/JMXInvokerServlet</parameter>
</value-factory>
</attribute>
@@ -110,6 +114,7 @@
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpConnector</parameter>
<parameter>:${port}/invoker/JMXInvokerHAServlet</parameter>
</value-factory>
</attribute>
@@ -125,4 +130,4 @@
</interceptors>
</attribute>
</mbean>
-</server>
+</server>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list