[jboss-cvs] JBossAS SVN: r74354 - in trunk/server/src: main/org/jboss/deployment and 1 other directory.

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

Author: alesj
Date: 2008-06-10 09:19:18 -0400 (Tue, 10 Jun 2008)
New Revision: 74354

Modified:
   trunk/server/src/etc/deployers/metadata-deployer-beans.xml
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
Log:
Add persistence to metadata beans.
Adding configurable rootInClasspath flag in EARStructure.

Modified: trunk/server/src/etc/deployers/metadata-deployer-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/metadata-deployer-beans.xml	2008-06-10 13:11:41 UTC (rev 74353)
+++ trunk/server/src/etc/deployers/metadata-deployer-beans.xml	2008-06-10 13:19:18 UTC (rev 74354)
@@ -233,6 +233,15 @@
                <key>jboss-web_5_0.xsd</key>
                <value>org.jboss.metadata.web.jboss.JBoss50WebMetaData</value>
             </entry>
+            <!-- PersistenceMetaData -->
+            <entry>
+               <key>persistence_1_0.xsd</key>
+               <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+            </entry>
+            <entry>
+               <key>persistence</key>
+               <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+            </entry>
          </map>
       </property>
    </bean>

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2008-06-10 13:11:41 UTC (rev 74353)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2008-06-10 13:19:18 UTC (rev 74354)
@@ -71,8 +71,9 @@
    private VirtualFileFilter earLibFilter = DEFAULT_EAR_LIB_FILTER;
    /** The schema resolver used to determine which schema to use for application.xml/jboss-app.xml */
    private SchemaBindingResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+   /** The root in classpath flag */
+   private boolean includeEarRootInClasspath = true;
 
-
    /**
     * Set the relative order to 1000 by default
     */   
@@ -225,7 +226,7 @@
          }
 
          // Add the ear manifest locations?
-         super.addClassPath(root, file, false, true, context);
+         super.addClassPath(root, file, includeEarRootInClasspath, true, context);
 
          // TODO: need to scan for annotationss
          if( scan )
@@ -418,4 +419,9 @@
       }
       return metaFile;
    }
+
+   public void setIncludeEarRootInClasspath(boolean includeEarRootInClasspath)
+   {
+      this.includeEarRootInClasspath = includeEarRootInClasspath;
+   }
 }