[jboss-cvs] JBossAS SVN: r101922 - in trunk: server/src/main/java/org/jboss/web/deployers and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2010-03-04 18:46:06 -0500 (Thu, 04 Mar 2010)
New Revision: 101922

Modified:
   trunk/build/build.xml
   trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
Log:
- Trim down the web config. [might need a testsuite update]
- Make a JPA dependency optional.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-03-04 23:11:26 UTC (rev 101921)
+++ trunk/build/build.xml	2010-03-04 23:46:06 UTC (rev 101922)
@@ -298,54 +298,59 @@
     <copy todir="${install.jbossweb.conf}">
       <fileset dir="${install.default.conf}">
         <include name="**"/>
-    	<!-- Use default config instead
-        <exclude name="jboss-service.xml"/>
       </fileset>
-      <fileset dir="${project.root}/server/target/etc/conf/web">
-        <include name="jboss-service.xml"/>
-    	-->
-      </fileset>
     </copy>
     <copy todir="${install.jbossweb.deployers}">
       <fileset dir="${install.default.deployers}">
         <include name="alias-deployers-jboss-beans.xml"/>
         <include name="core-naming-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"/>
         <include name="jboss-threads.deployer/**"/>
         <include name="jboss-logging.deployer/**"/>
+        <exclude name="jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"/>
       </fileset>
     </copy>
+    <copy todir="${install.jbossweb.deployers}/jbossweb.deployer/META-INF">
+      <fileset dir="${tomcat.module.output}/resources/standalone">
+        <include name="war-deployers-jboss-beans.xml"/>
+      </fileset>
+    </copy>
     <copy todir="${install.jbossweb.deploy}">
       <fileset dir="${install.default.deploy}">
-        <include name="hsqldb-ds.xml"/>
-        <include name="jca-jboss-beans.xml"/>
       	<include name="jboss-logging.xml"/>
-        <include name="jboss-local-jdbc.rar"/>
         <include name="jbossweb.sar/**"/>
-        <include name="jboss-xa-jdbc.rar"/>
         <include name="jmx-console-activator-jboss-beans.xml"/>
-        <include name="http-invoker.sar/**"/>
         <include name="ROOT.war/**"/>
         <include name="security/**"/>
-        <include name="transaction-jboss-beans.xml"/>
         <include name="thread-pool-jboss-beans.xml"/>
         <include name="legacy-conf-service.xml"/>
-        <include name="naming-jboss-beans.xml"/>
-      	<!-- FIXME serlvets shouldn't be using the ejb3 user transaction -->
-        <include name="ejb3-container-jboss-beans.xml"/>
+        <exclude name="jbossweb.sar/jstl.jar"/>
+        <exclude name="jbossweb.sar/jsf-libs/**"/>
+        <exclude name="jbossweb.sar/META-INF/jboss-structure.xml"/>
+        <exclude name="jbossweb.sar/META-INF/jboss-beans.xml"/>
+        <exclude name="jbossweb.sar/server.xml"/>
+        <exclude name="jbossweb.sar/web.xml"/>
       </fileset>
-      <fileset dir="${project.root}/server/target/etc/conf/web">
-        <include name="jmx-invoker-service.xml"/>
-      </fileset>
       <fileset dir="${project.root}/profileservice/target/resources/">
         <include name="hdscanner-jboss-beans.xml"/>
       </fileset>
     </copy>
+    <copy todir="${install.jbossweb.deploy}/jbossweb.sar/META-INF">
+      <fileset dir="${tomcat.module.output}/resources">
+        <include name="jboss-structure.xml"/>
+      </fileset>
+      <fileset dir="${tomcat.module.output}/resources/standalone">
+        <include name="jboss-beans.xml"/>
+      </fileset>
+    </copy>
+    <copy todir="${install.jbossweb.deploy}/jbossweb.sar">
+      <fileset dir="${tomcat.module.output}/resources/standalone">
+        <include name="server.xml"/>
+        <include name="web.xml"/>
+      </fileset>
+    </copy>
 
     <!-- Build standard config manually -->
     <copy todir="${install.standard}">

Modified: trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java	2010-03-04 23:11:26 UTC (rev 101921)
+++ trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java	2010-03-04 23:46:06 UTC (rev 101922)
@@ -38,6 +38,7 @@
 import javax.management.ObjectName;
 
 import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.beans.metadata.api.model.InjectOption;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
 import org.jboss.deployers.spi.deployer.helpers.AttachmentLocator;
@@ -253,7 +254,7 @@
       this.defaultSecurityDomain = defaultSecurityDomain;
    }
 
-   @Inject
+   @Inject (option=InjectOption.OPTIONAL)
    public void setPersistenceUnitDependencyResolver(PersistenceUnitDependencyResolver resolver)
    {
       this.persistenceUnitDependencyResolver = resolver;