Changeset 29740

Show
Ignore:
Timestamp:
01/28/08 19:02:51 (10 months ago)
Author:
onazarov
Message:

patch: cleaning up XSL

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • nuxeo-ep/trunk/jboss-patch/pom.xml

    r29715 r29740  
    5454                    <include>deploy/http-invoker.sar/META-INF/jboss-service.xml</include> 
    5555                    <include>deploy/management/console-mgr.sar/META-INF/jboss-service.xml</include> 
    56                     <include>deploy/ejb3-deployer/META-INF/jboss-service.xml</include> 
     56                    <include>deploy/ejb3.deployer/META-INF/jboss-service.xml</include> 
    5757                    <include>deploy/jms/uil2-service.xml</include> 
    5858                    <include>deploy/jms/jbossmq-httpil.sar/META-INF/jboss-service.xml</include> 
    …… 
    7777                  <dir>${jboss.server}</dir> 
    7878                  <includes> 
    79                     <include>deploy/*-ds.xml</include> 
     79                    <include>deploy/**/*-ds.xml</include> 
    8080                  </includes> 
    8181                  <stylesheet>src/main/xsl/ds.xsl</stylesheet> 

  • nuxeo-ep/trunk/jboss-patch/src/main/xsl/jboss-service.xsl

    r29715 r29740  
    7575  <xsl:template match="mbean[@name='jboss.admin:service=PluginManager']/depends[text()='jboss.jmx:type=adaptor,name=Invoker,protocol=jrmp,service=proxyFactory']"> 
    7676     <xsl:comment>Nuxeo patch: Replacing proxy dependency for mbean[jboss.admin:service=PluginManager]</xsl:comment><xsl:text> 
    77      </xsl:text><depends>jboss.jmx:type=adaptor,name=Invoker,protocol=http,service=proxyFactory</depends> 
     77     </xsl:text><depends>jboss.jmx:type=adaptor,name=Invoker,protocol=http,service=proxyFactory</depends><xsl:text> 
     78     </xsl:text><depends>jboss.jmx:alias=jmx/rmi/RMIAdaptor</depends> 
    7879  </xsl:template> 
    7980 
    …… 
    8283  </xsl:template> 
    8384 
     85  <xsl:template match="mbean[@name='jboss.jmx:type=adaptor,name=MBeanProxyRemote,protocol=http']"> 
     86        <xsl:comment>Nuxeo patch: mbean[jboss.jmx:type=adaptor,name=MBeanProxyRemote,protocol=http] removed</xsl:comment> 
     87  </xsl:template> 
     88  <xsl:template match="mbean[@name='jboss.jmx:type=adaptor,name=MBeanProxyRemote,protocol=jrmp']"> 
     89        <xsl:comment>Nuxeo patch: mbean[jboss.jmx:type=adaptor,name=MBeanProxyRemote,protocol=jrmp] removed</xsl:comment> 
     90  </xsl:template> 
    8491  <xsl:template match="mbean[@name='jboss.jmx:alias=jmx/rmi/RMIAdaptor']"> 
    85         <xsl:comment>Nuxeo patch: mbean[jboss.jmx:alias=jmx/rmi/RMIAdaptor] removed</xsl:comment> 
     92      <xsl:comment>Nuxeo patch: added naming aliases to the Http Proxy</xsl:comment><xsl:text> 
     93      </xsl:text><mbean code="org.jboss.naming.NamingAlias" name="jboss.jmx:alias=jmx/invoker/RMIAdaptor"><xsl:text> 
     94         </xsl:text><attribute name="FromName">jmx/invoker/RMIAdaptor</attribute><xsl:text> 
     95         </xsl:text><attribute name="ToName">jmx/invoker/HttpAdaptor</attribute><xsl:text> 
     96         </xsl:text><depends>jboss:service=Naming</depends><xsl:text> 
     97      </xsl:text></mbean><xsl:text> 
     98      </xsl:text><xsl:comment>Nuxeo patch: mbean[jboss.jmx:alias=jmx/rmi/RMIAdaptor] replaced</xsl:comment><xsl:text> 
     99      </xsl:text><mbean code="org.jboss.naming.NamingAlias" name="jboss.jmx:alias=jmx/rmi/RMIAdaptor"><xsl:text> 
     100         </xsl:text><attribute name="FromName">jmx/rmi/RMIAdaptor</attribute><xsl:text> 
     101         </xsl:text><attribute name="ToName">jmx/invoker/HttpAdaptor</attribute><xsl:text> 
     102         </xsl:text><depends>jboss:service=Naming</depends><xsl:text> 
     103      </xsl:text></mbean> 
     104  </xsl:template> 
     105  <xsl:template match="mbean[@name='jboss.jmx:alias=jmx/invoker/RMIAdaptor']"> 
     106        <xsl:comment>Nuxeo patch: mbean[jboss.jmx:alias=jmx/invoker/RMIAdaptor] removed</xsl:comment> 
    86107  </xsl:template> 
    87108 
    …… 
    90111        <xsl:comment>Nuxeo patch: mbean[jboss.remoting:service=Connector,transport=socket] replaced</xsl:comment><xsl:text> 
    91112   </xsl:text><mbean code="org.jboss.remoting.transport.Connector" name="jboss.remoting:service=Connector,transport=SSLServlet" display-name="SSL Servlet transport Connector"><xsl:text> 
    92       </xsl:text><attribute name="InvokerLocator">sslservlet://${jboss.bind.address}/invoker/ServerInvokerServlet</attribute><xsl:text> 
     113      </xsl:text><attribute name="InvokerLocator">servlet://${jboss.bind.address}/invoker/ServerInvokerServlet</attribute><xsl:text> 
    93114      </xsl:text><attribute name="Configuration"><xsl:text> 
    94115         </xsl:text><config><xsl:text> 
    …… 
    170191  </xsl:template> 
    171192 
     193 
    172194  <!-- Making sure EAR deployer depends on HTTPS invoker --> 
    173   <xsl:template match="mbean[@name='jboss.j2ee:service=EARDeployer']/attribute[1]"> 
    174     <xsl:copy> 
    175       <xsl:apply-templates select="@*|node()"/> 
    176     </xsl:copy><xsl:text> 
    177     </xsl:text><xsl:comment>Nuxeo patch: mbean[jboss.j2ee:service=EARDeployer] now depends on HTTP invoker</xsl:comment><xsl:text> 
    178        </xsl:text><depends>jboss:service=invoker,type=http</depends><xsl:text> 
    179        </xsl:text><xsl:comment><xsl:text> 
    180         NXJBossExtensions: A flag indicating that the preprocessor 
     195  <xsl:template match="mbean[@name='jboss.j2ee:service=EARDeployer']"> 
     196     <xsl:comment>Nuxeo patch: mbean[jboss.j2ee:service=EARDeployer]: removing redundant attribute</xsl:comment><xsl:text> 
     197   </xsl:text><mbean code="org.nuxeo.runtime.jboss.deployment.NuxeoDeployer" name="jboss.j2ee:service=EARDeployer"><xsl:text> 
     198      </xsl:text><xsl:comment><xsl:text> A flag indicating if ear deployments should have their own scoped 
     199      class loader to isolate their classes from other deployments. 
     200      </xsl:text></xsl:comment><xsl:text> 
     201      </xsl:text><attribute name="Isolated">false</attribute><xsl:text> 
     202      </xsl:text><xsl:comment><xsl:text>A flag indicating if the ear components should have in VM call 
     203      optimization disabled. 
     204      </xsl:text></xsl:comment><xsl:text> 
     205      </xsl:text><attribute name="CallByValue">false</attribute><xsl:text> 
     206      </xsl:text><xsl:comment><xsl:text> NXJBossExtensions: A flag indicating that the preprocessor 
    181207           must always run before deploying the EAR. 
    182208           On live systems you may want to avoid running the preprocessor 
    …… 
    184210           either from the JMX console or by deleting the file 
    185211           ".predeploy" and restarting JBoss. 
    186         </xsl:text></xsl:comment><xsl:text> 
    187        </xsl:text><attribute name="Debug">true</attribute> 
    188   </xsl:template> 
    189  
    190   <!-- Removing redundant EAR deployer depends on HTTPS invoker --> 
    191   <xsl:template match="mbean[@name='jboss.j2ee:service=EARDeployer']/attribute[@name='Debug']"> 
    192      <xsl:comment>Nuxeo patch: mbean[jboss.j2ee:service=EARDeployer]: removing redundant attribute</xsl:comment> 
    193   </xsl:template> 
    194   <xsl:template match="mbean[@name='jboss.j2ee:service=EARDeployer']/depends[text()='jboss:service=invoker,type=http']"> 
    195      <xsl:comment>Nuxeo patch: mbean[jboss.j2ee:service=EARDeployer]: removing redundant dependency</xsl:comment> 
     212      </xsl:text></xsl:comment><xsl:text> 
     213      </xsl:text><attribute name="Debug">true</attribute><xsl:text> 
     214   </xsl:text></mbean> 
    196215  </xsl:template> 
    197216 
    …… 
    200219      <xsl:comment>Nuxeo patch: mbean[jboss.j2ee:service=EARDeployer] now depends on HTTP invoker</xsl:comment><xsl:text> 
    201220      </xsl:text><depends>jboss:service=invoker,type=http</depends><xsl:text> 
    202       </xsl:text><attribute name="InvokerLocator">sslservlet://${jboss.bind.address}/invoker/Ejb3InvokerServlet</attribute> 
     221      </xsl:text><attribute name="InvokerLocator">servlet://${jboss.bind.address}/invoker/Ejb3InvokerServlet</attribute> 
    203222  </xsl:template> 
    204223