[jboss-cvs] JBossAS SVN: r80746 - in trunk: server/src/etc/conf and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Nov 10 13:08:46 EST 2008


Author: adrian at jboss.org
Date: 2008-11-10 13:08:46 -0500 (Mon, 10 Nov 2008)
New Revision: 80746

Added:
   trunk/server/src/etc/conf/web/
   trunk/server/src/etc/conf/web/jboss-service.xml
   trunk/server/src/etc/conf/web/jmx-invoker-service.xml
Removed:
   trunk/testsuite/src/resources/test-configs/web-profile/
Modified:
   trunk/build/build.xml
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
Log:
[JBAS-5897] - Include the web-profile in the distribution

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2008-11-10 16:18:15 UTC (rev 80745)
+++ trunk/build/build.xml	2008-11-10 18:08:46 UTC (rev 80746)
@@ -266,6 +266,12 @@
     <property name="install.minimal.deployers" value="${install.minimal}/deployers"/>
     <property name="install.minimal.conf" value="${install.minimal}/conf"/>
 
+    <property name="install.web" value="${install.server}/web"/>
+    <property name="install.web.lib" value="${install.web}/lib"/>
+    <property name="install.web.deploy" value="${install.web}/deploy"/>
+    <property name="install.web.deployers" value="${install.web}/deployers"/>
+    <property name="install.web.conf" value="${install.web}/conf"/>
+
     <!-- libs shared by the default/all configurations -->
     <property name="install.shared.lib" value="${install.server}/lib"/>
     
@@ -776,6 +782,51 @@
     <copy todir="${install.minimal.lib}"
       file="${project.root}/server/output/lib/jboss-minimal.jar" />
 
+    <!-- Build server/web manually -->
+    <mkdir dir="${install.web}"/>
+    <mkdir dir="${install.web.lib}"/> <!-- empty -->
+    <copy todir="${install.web.conf}">
+      <fileset dir="${install.default.conf}">
+        <include name="**"/>
+        <exclude name="jboss-service.xml"/>
+      </fileset>
+      <fileset dir="${install.default.conf}">
+        <include name="**"/>
+        <exclude name="jboss-service.xml"/>
+      </fileset>
+      <fileset dir="${project.root}/server/output/etc/conf/web">
+        <include name="jboss-service.xml"/>
+      </fileset>
+    </copy>
+    <copy todir="${install.web.deployers}">
+      <fileset dir="${install.default.deployers}">
+         <include name="alias-deployers-jboss-beans.xml"/>            
+         <include name="ejb3.deployer/**"/>            
+         <include name="jboss-jca.deployer/**"/>            
+         <include name="jboss-aop-jboss5.deployer/**"/>            
+         <include name="jbossweb.deployer/**"/>            
+         <include name="metadata-deployer-jboss-beans.xml"/>            
+         <include name="security-deployer-jboss-beans.xml"/>            
+      </fileset>
+    </copy>
+    <copy todir="${install.web.deploy}">
+      <fileset dir="${install.default.deploy}">
+         <include name="hsqldb-ds.xml"/>
+         <include name="jca-jboss-beans.xml"/>
+         <include name="jboss-local-jdbc.rar"/>
+         <include name="jbossweb.sar/**"/>
+         <include name="jboss-xa-jdbc.rar"/>
+         <include name="jmx-console.war/**"/>
+         <include name="http-invoker.sar/**"/>
+         <include name="ROOT.war/**"/>
+         <include name="security/**"/>
+         <include name="transaction-jboss-beans.xml"/>
+      </fileset>
+      <fileset dir="${project.root}/server/output/etc/conf/web">
+        <include name="jmx-invoker-service.xml"/>
+      </fileset>
+    </copy>
+
     <call target="jboss-all-client"/>
 
   </target>

Added: trunk/server/src/etc/conf/web/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/web/jboss-service.xml	                        (rev 0)
+++ trunk/server/src/etc/conf/web/jboss-service.xml	2008-11-10 18:08:46 UTC (rev 80746)
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: jboss-service.xml 76997 2008-08-12 22:29:19Z bstansberry at jboss.com $ -->
+
+<!-- ===================================================================== -->
+<!--  JBoss Server Configuration                                           -->
+<!-- ===================================================================== -->
+
+<server>
+
+   <!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
+        the shared JBOSS_HOME/server/lib directory. This can be restricted to
+        specific jars by specifying them in the archives attribute.
+   -->
+   <classpath codebase="${jboss.server.lib.url}" archives="*"/>
+   <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
+
+   <!-- ==================================================================== -->
+   <!-- Main Deployer                                                        -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.deployment.MainDeployer"
+          name="jboss.system:service=MainDeployer">
+   	<!-- This is used to delegate the deployment handling -->
+      <attribute name="KernelMainDeployer"><inject bean="MainDeployer" /></attribute>
+      <!-- This is used to validate incomplete deployments -->
+      <attribute name="Controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- SAR Deployer                                                         -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.deployment.SARDeployer"
+          name="jboss.system:service=ServiceDeployer">
+      <depends>jboss.system:service=MainDeployer</depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- JSR-77 Single JBoss Server Management Domain                         -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.management.j2ee.LocalJBossServerDomain"
+      name="jboss.management.local:j2eeType=J2EEDomain,name=Manager">
+      <attribute name="MainDeployer">jboss.system:service=MainDeployer</attribute>
+      <attribute name="SARDeployer">jboss.system:service=ServiceDeployer</attribute>
+      <attribute name="EARDeployer">jboss.j2ee:service=EARDeployer</attribute>
+      <attribute name="EJBDeployer">jboss.ejb:service=EJBDeployer</attribute>
+      <attribute name="RARDeployer">jboss.jca:service=RARDeployer</attribute>
+      <attribute name="CMDeployer">jboss.jca:service=ConnectionFactoryDeployer</attribute>
+      <attribute name="WARDeployer">jboss.web:service=WebServer</attribute>
+      <attribute name="CARDeployer">jboss.j2ee:service=ClientDeployer</attribute>
+      <attribute name="MailService">jboss:service=Mail</attribute>
+      <attribute name="JMSService">jboss.mq:service=DestinationManager</attribute>
+      <attribute name="JNDIService">jboss:service=Naming</attribute>
+      <attribute name="JTAService">jboss:service=TransactionManager</attribute>
+      <attribute name="UserTransactionService">jboss:service=DistributedTransactionManager</attribute>
+      <attribute name="RMI_IIOPService">jboss:service=CorbaORB</attribute>
+      <depends>jboss.system:service=MainDeployer</depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- XMBean Persistence                                                   -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.system.pm.AttributePersistenceService"
+      name="jboss:service=AttributePersistenceService"
+      xmbean-dd="resource:xmdesc/AttributePersistenceService-xmbean.xml">
+      <!-- the AttributePersistenceService is persistent, itself -->
+
+      <!--
+      <attribute name="AttributePersistenceManagerClass">org.jboss.system.pm.XMLAttributePersistenceManager</attribute>
+      <attribute name="AttributePersistenceManagerConfig">
+         <data-directory>data/xmbean-attrs</data-directory>
+      </attribute>
+      <attribute name="ApmDestroyOnServiceStop">false</attribute>
+      <attribute name="VersionTag"></attribute>
+      -->
+   </mbean>
+
+   <!-- A Thread pool service -->
+   <mbean code="org.jboss.util.threadpool.BasicThreadPool"
+      name="jboss.system:service=ThreadPool">
+      <attribute name="Name">JBoss System Threads</attribute>
+      <attribute name="ThreadGroupName">System Threads</attribute>
+      <!-- How long a thread will live without any tasks in MS -->
+      <attribute name="KeepAliveTime">60000</attribute>
+      <!-- The max number of threads in the pool -->
+      <attribute name="MaximumPoolSize">10</attribute>
+      <!-- The max number of tasks before the queue is full -->
+      <attribute name="MaximumQueueSize">1000</attribute>
+      <!-- The behavior of the pool when a task is added and the queue is full.
+      abort - a RuntimeException is thrown
+      run - the calling thread executes the task
+      wait - the calling thread blocks until the queue has room
+      discard - the task is silently discarded without being run
+      discardOldest - check to see if a task is about to complete and enque
+         the new task if possible, else run the task in the calling thread
+      -->
+      <attribute name="BlockingMode">run</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Log4j Initialization                                                 -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.logging.Log4jService"
+      name="jboss.system:type=Log4jService,service=Logging"
+	  xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
+      <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
+      <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
+      this needs to be set to avoid a possible deadlock on exception at the
+      appender level. See bug#696819.
+      -->
+      <attribute name="Log4jQuietMode">true</attribute>
+      <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
+      <attribute name="RefreshPeriod">60</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Active Alarm Table                                                   -->
+   <!-- ==================================================================== -->
+
+   <!--
+      | The ActiveAlarmTable service is a simple JMX notification listener
+      | that maintains a table with the received notifications (alarms).
+      | The alarms can be acknowledged through the jmx or the web console.
+      | Modify the SubscriptionList below to subscribe for any notification
+      | in the system and treat it as an alarm.
+      | The JMXNotificationAppender is a log4j Appender that can be configured
+      | in log4j.xml, that trasforms logging events to JMX notification so they
+      | can be fed back into the table. By storing the WARN or higher level logging
+      | events you can have a quick view of important system faults.
+      |
+      | The following attributes may be set:
+      |
+      | MaxTableSize (default 1000)
+      |  - set an upper limit to the number of stored alarms
+      | LogLevel (default DEBUG)
+      |  - the log level to use for received notification, can be set to NONE
+      | ServerId (default jboss)
+      |  - used to construct unique alarm ids
+      | SubscriptionList
+      |  - subscribe for the notifications to be stored in the table
+
+   <mbean code="org.jboss.monitor.services.ActiveAlarmTable"
+          name="jboss.monitor:service=ActiveAlarmTable">
+      <attribute name="SubscriptionList">
+         <subscription-list>
+            <mbean name="jboss.monitor:*">
+               <notification type="jboss.alarm"/>
+               <notification type="JBOSS_MONITOR_NOTIFICATION"/>
+            </mbean>
+            <mbean name="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+         </subscription-list>
+      </attribute>
+   </mbean>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- JBoss RMI Classloader - only install when available                  -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
+      name="jboss.rmi:type=RMIClassLoader">
+      <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
+      <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- JNDI                                                                 -->
+   <!-- ==================================================================== -->
+
+   <!-- A simple mbean wrapper around the jndi Naming object. This
+      only handles an in memory instance. The NamingService uses this
+      as the JNDI store and exposes it remotely.
+   -->
+   <mbean code="org.jnp.server.NamingBeanImpl"
+      name="jboss:service=NamingBeanImpl"
+      xmbean-dd="resource:xmdesc/NamingBean-xmbean.xml">
+   </mbean>
+   
+   <mbean code="org.jboss.naming.NamingService"
+      name="jboss:service=Naming"
+      xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
+      <!-- The call by value mode. true if all lookups are unmarshalled using
+         the caller's TCL, false if in VM lookups return the value by reference.
+      -->
+      <attribute name="CallByValue">false</attribute>
+      
+      <!-- The listening port for the bootstrap JNP service. Set this to -1
+         to run the NamingService without the JNP invoker listening port.
+      -->
+      <attribute name="Port">-1</attribute>
+      
+      <!-- The bootstrap JNP server bind address. This also sets the default
+         RMI service bind address. Empty == all addresses
+      -->
+      <attribute name="BindAddress">${jboss.bind.address}</attribute>
+      <!-- The port of the RMI naming service, 0 == anonymous -->
+      <attribute name="RmiPort">
+         <value-factory bean="ServiceBindingManager" method="getIntBinding">
+            <parameter>jboss:service=Naming</parameter>
+            <parameter>RmiPort</parameter>
+         </value-factory>
+      </attribute>
+      <!-- The RMI service bind address. Empty == all addresses
+      -->
+      <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
+      <!-- The thread pool service used to control the bootstrap lookups -->
+      <depends optional-attribute-name="LookupPool"
+         proxy-type="attribute">jboss.system:service=ThreadPool</depends>
+      <!-- An example of using the unifed invoker as the transport.
+         <depends optional-attribute-name="InvokerProxyFactory"
+         proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
+      -->
+      <depends optional-attribute-name="Naming"
+         proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
+   </mbean>
+   
+   <mbean code="org.jboss.naming.JNDIView"
+   	name="jboss:service=JNDIView"
+   	xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
+   	<!-- The HANamingService service name -->
+   	<attribute name="HANamingService">jboss:service=HAJNDI</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Security                                                             -->
+   <!-- ==================================================================== -->
+
+   <!-- JAAS security manager and realm mapping -->
+   <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
+      name="jboss.security:service=JaasSecurityManager">
+      <!-- A flag which indicates whether the SecurityAssociation server mode
+      is set on service creation. This is true by default since the
+      SecurityAssociation should be thread local for multi-threaded server
+      operation.
+      -->
+      <attribute name="ServerMode">true</attribute>
+      <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
+      <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute>
+      <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
+      in seconds.
+      If you want to disable caching of security credentials, set this to 0 to
+      force authentication to occur every time. This has no affect if the
+      AuthenticationCacheJndiName has been changed from the default value.
+      -->
+       <attribute name="DefaultCacheTimeout">1800</attribute>
+      <!-- DefaultCacheResolution: Specifies the default timed cache policy
+      resolution in seconds. This controls the interval at which the cache
+      current timestamp is updated and should be less than the DefaultCacheTimeout
+      in order for the timeout to be meaningful. This has no affect if the
+      AuthenticationCacheJndiName has been changed from the default value.
+      -->
+      <attribute name="DefaultCacheResolution">60</attribute>
+      <!-- DeepCopySubjectMode: This set the copy mode of subjects done by the
+      security managers to be deep copies that makes copies of the subject
+      principals and credentials if they are cloneable. It should be set to
+      true if subject include mutable content that can be corrupted when
+      multiple threads have the same identity and cache flushes/logout clearing
+      the subject in one thread results in subject references affecting other
+      threads.
+      -->
+      <attribute name="DeepCopySubjectMode">false</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- An MBean that is a registry for JDBC type-mapping metadata           -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
+      name="jboss.jdbc:service=metadata"/>
+
+</server>

Added: trunk/server/src/etc/conf/web/jmx-invoker-service.xml
===================================================================
--- trunk/server/src/etc/conf/web/jmx-invoker-service.xml	                        (rev 0)
+++ trunk/server/src/etc/conf/web/jmx-invoker-service.xml	2008-11-10 18:08:46 UTC (rev 80746)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: jboss-service.xml 59451 2007-01-09 19:13:25Z dimitris at jboss.org $ -->
+<server>
+
+   <!-- The HTTP invoker proxy configuration for the InvokerAdaptorService -->
+   <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+      name="jboss.jmx:type=adaptor,name=Invoker,protocol=http,service=proxyFactory">
+      <!-- Use the HTTP Invoker from conf/jboss-service.xxml -->
+      <depends optional-attribute-name="InvokerName">jboss:service=invoker,type=http</depends>
+      <!-- The target MBean is the InvokerAdaptorService configured below -->
+      <depends optional-attribute-name="TargetName">jboss.jmx:type=adaptor,name=Invoker</depends>
+      <!-- Where to bind the RMIAdaptor proxy -->
+      <attribute name="JndiName">jmx/invoker/RMIAdaptor</attribute>
+      <!-- The RMI compabitle MBeanServer interface -->
+      <attribute name="ExportedInterfaces">org.jboss.jmx.adaptor.rmi.RMIAdaptor,
+         org.jboss.jmx.adaptor.rmi.RMIAdaptorExt
+      </attribute>
+      <attribute name="ClientInterceptors">
+          <interceptors>
+             <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+             <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+             <interceptor>org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor</interceptor>
+             <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+          </interceptors>
+      </attribute>
+      <depends>jboss:service=Naming</depends>
+   </mbean>
+
+   <!--
+      Choose the remote proxy to expose mbean proxies over
+   -->
+   <mbean code="org.jboss.jmx.connector.invoker.MBeanProxyRemote"
+          name="jboss.jmx:type=adaptor,name=MBeanProxyRemote,protocol=jrmp">
+      <depends optional-attribute-name="MBeanServerConnection">jboss.jmx:type=adaptor,name=Invoker,protocol=http,service=proxyFactory</depends>
+   </mbean>
+
+   <!-- Create a mapping from the legacy jmx-rmi-adaptor.sar binding to the
+   jmx-invoker-adaptor-server.sar JndiName specified above for backwards
+   portability.
+   -->
+   <mbean code="org.jboss.naming.NamingAlias" name="jboss.jmx:alias=jmx/rmi/RMIAdaptor">
+      <attribute name="FromName">jmx/rmi/RMIAdaptor</attribute>
+      <attribute name="ToName">jmx/invoker/RMIAdaptor</attribute>
+      <depends>jboss:service=Naming</depends>
+   </mbean>
+
+   <!-- This is the service that handles the RMIAdaptor invocations by routing
+   them to the MBeanServer the service is deployed under.  -->
+   <mbean code="org.jboss.jmx.connector.invoker.InvokerAdaptorService"
+          name="jboss.jmx:type=adaptor,name=Invoker"
+      xmbean-dd="">
+      <xmbean>
+         <description>The JMX Detached Invoker Service</description>
+         <class>org.jboss.jmx.connector.invoker.InvokerAdaptorService</class>
+
+         <!-- Attributes -->
+         <attribute access="read-only" getMethod="getName">
+            <description>The class name of the MBean</description>
+            <name>Name</name>
+            <type>java.lang.String</type>
+         </attribute>
+         <attribute access="read-only" getMethod="getState">
+            <description>The status of the MBean</description>
+            <name>State</name>
+            <type>int</type>
+         </attribute>
+         <attribute access="read-only" getMethod="getStateString">
+         <description>The status of the MBean in text form</description>
+            <name>StateString</name>
+            <type>java.lang.String</type>
+         </attribute>
+         <attribute access="read-write" getMethod="getExportedInterfaces" setMethod="setExportedInterfaces">
+            <description>The interfaces the invoker proxy supports</description>
+            <name>ExportedInterfaces</name>
+            <type>[Ljava.lang.Class;</type>
+         </attribute>
+         <attribute access="read-only" getMethod="getMethodMap">
+            <description>Map(Long hash, Method) of the proxy interface methods</description>
+            <name>MethodMap</name>
+            <type>java.util.Map</type>
+         </attribute>
+         <!-- Operations -->
+         <operation>
+            <description>The start lifecycle operation</description>
+            <name>start</name>
+         </operation>
+         <operation>
+            <description>The stop lifecycle operation</description>
+            <name>stop</name>
+         </operation>
+         <operation>
+            <description>The detyped lifecycle operation (for internal use only)</description>
+            <name>jbossInternalLifecycle</name>
+            <parameter>
+               <description>The lifecycle operation</description>
+               <name>method</name>
+               <type>java.lang.String</type>
+            </parameter>
+            <return-type>void</return-type>
+         </operation>
+
+         <operation>
+            <description>The detached invoker entry point</description>
+            <name>invoke</name>
+            <parameter>
+               <description>The method invocation context</description>
+               <name>invocation</name>
+               <type>org.jboss.invocation.Invocation</type>
+            </parameter>
+            <return-type>java.lang.Object</return-type>
+            <descriptors>
+               <interceptors>
+                  <!-- Uncomment to require authenticated users
+                  <interceptor code="org.jboss.jmx.connector.invoker.AuthenticationInterceptor"
+                     securityDomain="java:/jaas/jmx-console"/>
+                  -->               
+                  <!-- Interceptor that deals with non-serializable results -->
+                  <interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
+                     policyClass="StripModelMBeanInfoPolicy"/>
+               </interceptors>
+            </descriptors>            
+         </operation>
+      </xmbean>
+      
+      <attribute name="ExportedInterfaces">org.jboss.jmx.adaptor.rmi.RMIAdaptor,
+         org.jboss.jmx.adaptor.rmi.RMIAdaptorExt
+      </attribute>
+   </mbean>
+
+</server>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-11-10 16:18:15 UTC (rev 80745)
+++ trunk/testsuite/build.xml	2008-11-10 18:08:46 UTC (rev 80746)
@@ -1053,10 +1053,9 @@
    </target>
 	
    <target name="tests-web-profile" description="Tests with the web profile">
-      <create-web-profile-config conf="web-profile"/>
-      <server:start name="web-profile"/>
+      <server:start name="web"/>
       <antcall target="run-web-profile-unit"/>
-      <server:stop name="web-profile"/>
+      <server:stop name="web"/>
    </target>
    
    <target name="tests-springdeployer" description="Tests with the full featured spring deployer">

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2008-11-10 16:18:15 UTC (rev 80745)
+++ trunk/testsuite/imports/server-config.xml	2008-11-10 18:08:46 UTC (rev 80746)
@@ -782,7 +782,7 @@
     	   <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
       </server>
 
-      <server name="web-profile" host="${node0}" serverUrl="${node0.jndi.http.url}">
+      <server name="web" host="${node0}" serverUrl="${node0.jndi.http.url}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
@@ -1028,38 +1028,6 @@
 	    </create-config>
     </sequential>
    </macrodef>
-	
-   <!-- A macro for creating the web profile -->
-   <macrodef name="create-web-profile-config"
-	      description="Create the web configuration">
-	   <attribute name="conf"/>
-   	<sequential>
-	    <create-config baseconf="default" newconf="@{conf}"
-	      newconf-src="web-profile">
-	      <patternset>
-            <include name="conf/**"/>
-            <include name="deploy/hsqldb-ds.xml"/>
-            <include name="deploy/jca-jboss-beans.xml"/>
-            <include name="deploy/jboss-local-jdbc.rar"/>
-            <include name="deploy/jbossweb.sar/**"/>
-            <include name="deploy/jboss-xa-jdbc.rar"/>
-            <include name="deploy/jmx-console.war/**"/>
-            <include name="deploy/http-invoker.sar/**"/>
-            <include name="deploy/ROOT.war/**"/>
-            <include name="deploy/security/**"/>
-            <include name="deploy/transaction-jboss-beans.xml"/>
-            <include name="deployers/alias-deployers-jboss-beans.xml"/>            
-            <include name="deployers/ejb3.deployer/**"/>            
-            <include name="deployers/jboss-jca.deployer/**"/>            
-            <include name="deployers/jboss-aop-jboss5.deployer/**"/>            
-            <include name="deployers/jbossweb.deployer/**"/>            
-            <include name="deployers/metadata-deployer-jboss-beans.xml"/>            
-            <include name="deployers/security-deployer-jboss-beans.xml"/>            
-            <include name="lib/**"/>
-	      </patternset>
-	    </create-config>
-    </sequential>
-   </macrodef>
    
    <!-- A macro for creating a user transaction sticky config -->
    <macrodef name="create-ustxsticky-config"




More information about the jboss-cvs-commits mailing list