jvanzyl 2002/07/07 10:44:44
Modified: src/plugins/cactus build.xml
src/plugins/j2ee build.xml
src/plugins/java plugin.properties
src/plugins/pdf plugin.jelly
src/plugins/reactor-generator build.xml
src/plugins/struts build.xml
Log:
o Moving lib.repo references to maven.repo.local.
Revision Changes Path
1.2 +4 -4 jakarta-turbine-maven/src/plugins/cactus/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/cactus/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 28 Jun 2002 03:22:53 -0000 1.1
+++ build.xml 7 Jul 2002 17:44:43 -0000 1.2
@@ -10,19 +10,19 @@
name="create-classpath"
classname="org.apache.maven.ant.CreateClasspath">
<classpath>
- <pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="${maven.repo.local}/maven.jar"/>
</classpath>
</taskdef>
<create-classpath
listFile="${maven.home}/plugins/core/jars.list"
reference="pre-maven-classpath"
- baseDir="${lib.repo}"
+ baseDir="${maven.repo.local}"
/>
<path id="maven-classpath">
<path refid="pre-maven-classpath"/>
- <pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="${maven.repo.local}/maven.jar"/>
</path>
<!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
@@ -282,7 +282,7 @@
warfile="${maven.out.test.dir}/test.war"
webxml="${maven.conf.test.dir}/web.xml">
- <lib dir="${lib.repo}">
+ <lib dir="${maven.repo.local}">
<patternset refid="maven.dependency.set"/>
<exclude name="servlet*.jar"/>
</lib>
1.2 +5 -5 jakarta-turbine-maven/src/plugins/j2ee/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/j2ee/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 28 Jun 2002 03:26:53 -0000 1.1
+++ build.xml 7 Jul 2002 17:44:43 -0000 1.2
@@ -10,19 +10,19 @@
name="create-classpath"
classname="org.apache.maven.ant.CreateClasspath">
<classpath>
- <pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="${maven.repo.local}/maven.jar"/>
</classpath>
</taskdef>
<create-classpath
listFile="${maven.home}/plugins/core/jars.list"
reference="pre-maven-classpath"
- baseDir="${lib.repo}"
+ baseDir="${maven.repo.local}"
/>
<path id="maven-classpath">
<path refid="pre-maven-classpath"/>
- <pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="${maven.repo.local}/maven.jar"/>
</path>
<!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
@@ -201,7 +201,7 @@
<war warfile="${maven.build.dir}/${maven.j2ee.war.name}.war"
webxml="${maven.j2ee.war.webxml}">
<fileset dir="${maven.j2ee.war.content}"/>
- <lib dir="${lib.repo}">
+ <lib dir="${maven.repo.local}">
<patternset refid="maven.dependency.set" />
<include name="${maven.j2ee.war.lib.includes}" />
<exclude name="${maven.j2ee.war.lib.excludes}" />
@@ -582,7 +582,7 @@
name="server-started-check"
classname="org.apache.maven.ant.ServerStartedCheckTask">
<classpath>
- <pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="${maven.repo.local}/maven.jar"/>
</classpath>
</taskdef>
<server-started-check propertyName="maven.appserver.started"
1.2 +0 -1 jakarta-turbine-maven/src/plugins/java/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/java/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 6 Jul 2002 04:49:10 -0000 1.1
+++ plugin.properties 7 Jul 2002 17:44:43 -0000 1.2
@@ -26,7 +26,6 @@
maven.gen.docs = ${maven.build.dir}/generated-xdocs
maven.repo.remote = http://jakarta.apache.org/turbine/jars/
-maven.repo.local = ${lib.repo}
maven.jarResources.basedir=${basedir}
#
1.5 +8 -8 jakarta-turbine-maven/src/plugins/pdf/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/pdf/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 5 Jul 2002 21:48:19 -0000 1.4
+++ plugin.jelly 7 Jul 2002 17:44:43 -0000 1.5
@@ -13,9 +13,9 @@
<java classname="org.apache.xalan.xslt.Process" fork="yes">
<classpath>
- <pathelement location="${lib.repo}/xercesImpl-2.0.0.jar"/>
- <pathelement location="${lib.repo}/xmlParserAPIs-2.0.0.jar"/>
- <pathelement location="${lib.repo}/xalan-2.1.0.jar"/>
+ <pathelement location="${maven.repo.local}/xercesImpl-2.0.0.jar"/>
+ <pathelement location="${maven.repo.local}/xmlParserAPIs-2.0.0.jar"/>
+ <pathelement location="${maven.repo.local}/xalan-2.1.0.jar"/>
</classpath>
<arg value="-in"/>
<!-- FIXME: Using ${maven.docs.src} here causes the build to fail because
@@ -42,11 +42,11 @@
<java classname="org.apache.fop.apps.Fop" fork="yes">
<classpath>
- <pathelement location="${lib.repo}/fop-0.20.3.jar"/>
- <pathelement location="${lib.repo}/batik.jar"/>
- <pathelement location="${lib.repo}/logkit-1.0.jar"/>
- <pathelement location="${lib.repo}/avalon-framework-4.0.jar"/>
- <pathelement location="${lib.repo}/xercesImpl-2.0.0.jar"/>
+ <pathelement location="${maven.repo.local}/fop-0.20.3.jar"/>
+ <pathelement location="${maven.repo.local}/batik.jar"/>
+ <pathelement location="${maven.repo.local}/logkit-1.0.jar"/>
+ <pathelement location="${maven.repo.local}/avalon-framework-4.0.jar"/>
+ <pathelement location="${maven.repo.local}/xercesImpl-2.0.0.jar"/>
</classpath>
<arg line="-fo ${maven.docs.dest}/project.fo -pdf
${maven.docs.dest}/project.pdf"/>
</java>
1.2 +3 -3 jakarta-turbine-maven/src/plugins/reactor-generator/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/reactor-generator/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 28 Jun 2002 03:19:44 -0000 1.1
+++ build.xml 7 Jul 2002 17:44:43 -0000 1.2
@@ -10,19 +10,19 @@
name="create-classpath"
classname="org.apache.maven.ant.CreateClasspath">
<classpath>
- <pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="${maven.repo.local}/maven.jar"/>
</classpath>
</taskdef>
<create-classpath
listFile="${maven.home}/plugins/core/jars.list"
reference="pre-maven-classpath"
- baseDir="${lib.repo}"
+ baseDir="${maven.repo.local}"
/>
<path id="maven-classpath">
<path refid="pre-maven-classpath"/>
- <pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="${maven.repo.local}/maven.jar"/>
</path>
<!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
1.2 +3 -3 jakarta-turbine-maven/src/plugins/struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/struts/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 28 Jun 2002 03:31:23 -0000 1.1
+++ build.xml 7 Jul 2002 17:44:43 -0000 1.2
@@ -10,19 +10,19 @@
name="create-classpath"
classname="org.apache.maven.ant.CreateClasspath">
<classpath>
- <pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="${maven.repo.local}/maven.jar"/>
</classpath>
</taskdef>
<create-classpath
listFile="${maven.home}/plugins/core/jars.list"
reference="pre-maven-classpath"
- baseDir="${lib.repo}"
+ baseDir="${maven.repo.local}"
/>
<path id="maven-classpath">
<path refid="pre-maven-classpath"/>
- <pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="${maven.repo.local}/maven.jar"/>
</path>
<!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
