PR: MPEAR-44

Move resolver tag from j2ee to ear.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@375525 13f79535-47bb-0310-9956-ffa450edef68

ear/src/plugin-test/project.properties

@@ -15,7 +15,6 @@
 # -------------------------------------------------------------------
 
 maven.deployable.component=${maven.final.name}.ear
-maven.j2ee.ear.appxml=${maven.conf.dir}/application.xml
 maven.ear.appxml.generate=true
 # note the override below is needed, as the ear plugin redefines the licenseFile in
 # it's own project.properties, and running plugin:test would otherwise fail

ear/src/plugin-test/simpleTest/maven.xml

@@ -19,7 +19,7 @@
          xmlns:u="jelly:util" 
          xmlns:x="jelly:xml"
          xmlns:assert="assert"
-         xmlns:j2ee="j2ee"
+         xmlns:ear="ear"
          default="testPlugin">
 
   <goal name="testPlugin" prereqs="ear,test-ear">
@@ -47,7 +47,7 @@
     <!-- check application.xml got a java module in it -->
     <u:file var="appXml" name="${unzipDir}/META-INF/application.xml"/>
     <j:new var="saxReader" className="org.dom4j.io.SAXReader" />
-    <j2ee:resolver var="resolver" />
+    <ear:resolver var="resolver" />
     ${saxReader.setEntityResolver(resolver)}
     <x:parse var="applicationDoc" xml="${appXml.toURL()}" SAXReader="${saxReader}" />
     <x:set var="firstJavaModule" select="string($applicationDoc/application/module/java)"/>

ear/src/plugin-test/simpleTest/project.properties

@@ -15,7 +15,6 @@
 # -------------------------------------------------------------------
 
 maven.deployable.component=${maven.final.name}.ear
-maven.j2ee.ear.appxml=${maven.conf.dir}/application.xml
 maven.ear.appxml.generate=true
 # note the override below is needed, as the ear plugin redefines the licenseFile in
 # it's own project.properties, and running plugin:test would otherwise fail

ear/src/plugin-test/simpleTest/project.xml

@@ -65,13 +65,6 @@ http://maven.apache.org/maven-v3_0_0.xsd">
       <artifactId>commons-jelly-tags-xml</artifactId>
       <version>1.1</version>
     </dependency>
-    <!-- Needed for the entity resolver -->
-    <dependency>
-      <groupId>maven</groupId>
-      <artifactId>maven-j2ee-plugin</artifactId>
-      <version>1.5.1</version>
-      <type>plugin</type>
-    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>src</sourceDirectory>