[jboss-cvs] JBossAS SVN: r102078 - in trunk: tomcat/src/assembly and 2 other directories.

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

Author: remy.maucherat at jboss.com
Date: 2010-03-08 14:45:27 -0500 (Mon, 08 Mar 2010)
New Revision: 102078

Added:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DummyPersistenceUnitDependencyResolver.java
Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
   trunk/tomcat/src/assembly/jboss-web-deployer.xml
   trunk/tomcat/src/assembly/jboss-web-service.xml
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
   trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
Log:
- Use a dummy class rather than an optional dependency on JPA.

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-08 19:08:12 UTC (rev 102077)
+++ trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java	2010-03-08 19:45:27 UTC (rev 102078)
@@ -38,7 +38,6 @@
 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;
@@ -254,7 +253,7 @@
       this.defaultSecurityDomain = defaultSecurityDomain;
    }
 
-   @Inject (option=InjectOption.OPTIONAL)
+   @Inject
    public void setPersistenceUnitDependencyResolver(PersistenceUnitDependencyResolver resolver)
    {
       this.persistenceUnitDependencyResolver = resolver;

Modified: trunk/tomcat/src/assembly/jboss-web-deployer.xml
===================================================================
--- trunk/tomcat/src/assembly/jboss-web-deployer.xml	2010-03-08 19:08:12 UTC (rev 102077)
+++ trunk/tomcat/src/assembly/jboss-web-deployer.xml	2010-03-08 19:45:27 UTC (rev 102078)
@@ -12,6 +12,7 @@
         <include>org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.class</include>
         <include>org/jboss/web/tomcat/service/deployers/ClusteringDependencyDeployer.class</include>
         <include>org/jboss/web/tomcat/service/deployers/DeployerConfig.class</include>
+        <include>org/jboss/web/tomcat/service/deployers/DummyPersistenceUnitDependencyResolver.class</include>
         <include>org/jboss/web/tomcat/service/deployers/TomcatDeployer.class</include>
         <include>org/jboss/web/tomcat/service/deployers/TomcatDeployer$ENCLoader.class</include>
         <include>org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.class</include>

Modified: trunk/tomcat/src/assembly/jboss-web-service.xml
===================================================================
--- trunk/tomcat/src/assembly/jboss-web-service.xml	2010-03-08 19:08:12 UTC (rev 102077)
+++ trunk/tomcat/src/assembly/jboss-web-service.xml	2010-03-08 19:45:27 UTC (rev 102078)
@@ -21,6 +21,7 @@
         <exclude>org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.class</exclude>
         <exclude>org/jboss/web/tomcat/service/deployers/ClusteringDependencyDeployer.class</exclude>
         <exclude>org/jboss/web/tomcat/service/deployers/DeployerConfig.class</exclude>
+        <exclude>org/jboss/web/tomcat/service/deployers/DummyPersistenceUnitDependencyResolver.class</exclude>
         <exclude>org/jboss/web/tomcat/service/deployers/TomcatDeployer.class</exclude>
         <exclude>org/jboss/web/tomcat/service/deployers/TomcatDeployer$ENCLoader.class</exclude>
         <exclude>org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.class</exclude>

Added: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DummyPersistenceUnitDependencyResolver.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DummyPersistenceUnitDependencyResolver.java	                        (rev 0)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DummyPersistenceUnitDependencyResolver.java	2010-03-08 19:45:27 UTC (rev 102078)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.web.tomcat.service.deployers;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
+
+public class DummyPersistenceUnitDependencyResolver implements PersistenceUnitDependencyResolver
+{
+   public String createBeanName(DeploymentUnit arg0, String arg1)
+   {
+      return null;
+   }
+   public String resolvePersistenceUnitSupplier(DeploymentUnit arg0,
+         String arg1)
+   {
+      return null;
+   }
+}
+

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2010-03-08 19:08:12 UTC (rev 102077)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2010-03-08 19:45:27 UTC (rev 102078)
@@ -30,6 +30,7 @@
 
 import javax.management.ObjectName;
 
+import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.metadata.web.jboss.JBoss50WebMetaData;
@@ -498,4 +499,5 @@
       // if (server != null)
       // server.unregisterMBean(OBJECT_NAME);
    }
+   
 }

Modified: trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml	2010-03-08 19:08:12 UTC (rev 102077)
+++ trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml	2010-03-08 19:45:27 UTC (rev 102078)
@@ -56,6 +56,9 @@
       <property name="filteredPackages">javax.servlet</property>      
    </bean>
         
+   <bean name="PersistenceUnitDependencyResolver" 
+        class="org.jboss.web.tomcat.service.deployers.DummyPersistenceUnitDependencyResolver"/>
+
    <!-- The WebMetaData to service mbean deployer -->
    <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
       <install bean="ManagedDeploymentCreator" method="addAttachmentType">