You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/03/02 12:10:32 UTC
cvs commit: maven-plugins/ear/src/plugin-test maven.xml project.xml
brett 2004/03/02 03:10:32
Modified: j2ee plugin.jelly project.xml
j2ee/xdocs changes.xml
ear/src/plugin-test maven.xml project.xml
Log:
PR: MPEAR-16
make test run offline
Revision Changes Path
1.11 +7 -0 maven-plugins/j2ee/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/j2ee/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 4 Aug 2003 06:43:51 -0000 1.10
+++ plugin.jelly 2 Mar 2004 11:10:32 -0000 1.11
@@ -39,4 +39,11 @@
</ant:warvalidator>
</goal>
+ <define:taglib uri="j2ee">
+ <define:tag name="resolver">
+ <j:new var="resolver" className="org.apache.maven.j2ee.J2EEEntityResolver" />
+ <j:set var="${var}" value="${resolver}" scope="parent" />
+ </define:tag>
+ </define:taglib>
+
</project>
1.28 +1 -1 maven-plugins/j2ee/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/j2ee/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- project.xml 10 Feb 2004 12:49:42 -0000 1.27
+++ project.xml 2 Mar 2004 11:10:32 -0000 1.28
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-j2ee-plugin</id>
<name>Maven J2EE Plugin</name>
- <currentVersion>1.3</currentVersion>
+ <currentVersion>1.4-SNAPSHOT</currentVersion>
<description/>
<shortDescription>J2EE tools</shortDescription>
<url>http://maven.apache.org/reference/plugins/j2ee/</url>
1.10 +6 -0 maven-plugins/j2ee/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/j2ee/xdocs/changes.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- changes.xml 5 Jan 2004 04:52:43 -0000 1.9
+++ changes.xml 2 Mar 2004 11:10:32 -0000 1.10
@@ -7,6 +7,12 @@
</properties>
<body>
+ <release version="1.4-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix">
+ Add tag to get a J2EE Entity Resolver for use in other plugins
+ </action>
+ </release>
+
<release version="1.3" date="2003-09-29">
<action dev="dion" type="update">
Upgrade to dom4j 1.4
1.4 +8 -3 maven-plugins/ear/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ear/src/plugin-test/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 20 Feb 2004 04:49:07 -0000 1.3
+++ maven.xml 2 Mar 2004 11:10:32 -0000 1.4
@@ -1,4 +1,4 @@
-<project xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns:x="jelly:xml">
+<project xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns:x="jelly:xml" xmlns:j2ee="j2ee">
<goal name="testPlugin" prereqs="test-ear">
<attainGoal name="clean"/>
@@ -36,7 +36,12 @@
<!-- check application.xml got a java module in it -->
<u:file var="appXml" name="${unzipDir}/META-INF/application.xml"/>
- <x:parse var="applicationDoc" xml="${appXml.toURL()}"/>
+ <j:new var="saxReader" className="org.dom4j.io.SAXReader" />
+ <j2ee:resolver var="resolver" />
+ ${saxReader.setEntityResolver(resolver)}
+<echo>${resolver}</echo>
+<echo>${saxReader.entityResolver}</echo>
+ <x:parse var="applicationDoc" xml="${appXml.toURL()}" SAXReader="${saxReader}" />
<x:set var="firstJavaModule" select="string($applicationDoc/application/module/java)"/>
<echo>output is ${a}</echo>
<j:if test="${firstJavaModule != 'commons-collections-2.1.jar'}">
@@ -46,4 +51,4 @@
</j:if>
</goal>
-</project>
\ No newline at end of file
+</project>
1.7 +7 -3 maven-plugins/ear/src/plugin-test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ear/src/plugin-test/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 20 Feb 2004 04:49:07 -0000 1.6
+++ project.xml 2 Mar 2004 11:10:32 -0000 1.7
@@ -56,9 +56,13 @@
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>20030211.142705</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
+ </dependency>
+ <!-- Needed for the entity resolver -->
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-j2ee-plugin</artifactId>
+ <version>1.3</version>
+ <type>plugin</type>
</dependency>
</dependencies>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org