You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2003/08/24 07:36:36 UTC
cvs commit: incubator-geronimo/modules/web maven.xml project.xml
jdillon 2003/08/23 22:36:36
Modified: modules/web maven.xml project.xml
Log:
o Fixed description
o Fixed issue GERONIMO-13 (modules/web/maven.xml broken) by Ralph Apel
Revision Changes Path
1.2 +3 -40 incubator-geronimo/modules/web/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 18 Aug 2003 13:30:40 -0000 1.1
+++ maven.xml 24 Aug 2003 05:36:36 -0000 1.2
@@ -3,48 +3,11 @@
<!-- $Revision$ $Date$ -->
<project default="default"
- xmlns:j="jelly:web"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven">
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant">
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
</preGoal>
-
- <preGoal name="java:compile">
- <!--
- <j:set var="maven.javacc.compile.src" value="target/gen-src"/>
- <ant:path id="maven.javacc.compile.src.set" location="${maven.javacc.compile.src}"/>
- <maven:addPath id="maven.compile.src.set" refid="maven.javacc.compile.src.set"/>
-
- <ant:mkdir dir="${maven.javacc.compile.src}/geronimo/persistence/ejb/ejbql"/>
- <ant:jjtree target="src/java/geronimo/persistence/ejb/ejbql/EJBQL20Parser.jjt"
- outputdirectory="${maven.javacc.compile.src}/geronimo/persistence/ejb/ejbql"
- javacchome="${maven.repo.local}/javacc/jars" />
- <ant:javacc target="${maven.javacc.compile.src}/geronimo/persistence/ejb/ejbql/EJBQL20Parser.jj"
- javacchome="${maven.repo.local}/javacc/jars"/>
- -->
- </preGoal>
-
- <!-- ============================== -->
- <!-- Helpers to run Apache Geronimo -->
- <!-- ============================== -->
-
- <!-- jason: need to fix this -->
-
- <goal name="run" description="Runs the Geronimo Server using the current build">
-
- <ant:path id="test.classpath">
- <ant:pathelement path="target/test-classes"/>
- <ant:pathelement path="src/conf/"/>
- <ant:pathelement path="${maven.build.dest}"/>
- <ant:path refid="maven.dependency.classpath"/>
- </ant:path>
-
- <ant:java classname="org.apache.geronimo.Main" fork="yes">
- <ant:classpath refid="test.classpath"/>
- </ant:java>
-
- </goal>
</project>
1.3 +3 -3 incubator-geronimo/modules/web/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 20 Aug 2003 05:37:03 -0000 1.2
+++ project.xml 24 Aug 2003 05:36:36 -0000 1.3
@@ -12,8 +12,8 @@
<name>Geronimo :: Web</name>
<id>geronimo-web</id>
- <shortDescription>Geronimo Web J2EE Container</shortDescription>
- <description>Geronimo Web J2EE Container</description>
+ <shortDescription>Geronimo Web Container</shortDescription>
+ <description>Geronimo Web Container</description>
<url>http://incubator.apache.org/projects/geronimo/web/</url>
<siteDirectory>/www/incubator.apache.org/projects/geronimo/web</siteDirectory>
<distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/web</distributionDirectory>