You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2002/12/31 08:28:18 UTC
cvs commit: jakarta-turbine-maven/xdocs navigation.xml changes.xml
jvanzyl 2002/12/30 23:28:18
Modified: . beta-8.txt build-bootstrap.properties
build-bootstrap.xml maven.xml project.properties
project.xml
src/bootstrap/org/apache/maven BootstrapTask.java
src/conf driver.properties log4j.properties
src/test log4j.properties
src/test/touchstone-build/src/conf log4j.properties
xdocs navigation.xml
Removed: src/java/org/apache/maven Maven.java
src/java/org/apache/maven/jelly BaseTagLibrary.java
src/java/org/apache/maven/verifier
LocalRepositoryVerifier.java
src/test/java/org/apache/maven/app PluginManagerTest.java
ProjectVerifierTest.java
src/test/java/org/apache/maven/jelly BaseTagLibraryTest.java
JellyPropsHandlerTest.java JellyUtilsTest.java
MavenExpressionFactoryTest.java
MavenJellyContextTest.java
src/test/java/org/apache/maven/jelly/tags
LazyAttainGoalTagTest.java
MavenJeezTagLibraryTest.java
src/test/java/org/apache/maven/jelly/tags/project
AddPathTagTest.java DependencyResolverTest.java
MavenTagLibraryTest.java MavenTagTest.java
ReactorTagTest.java SnapshotSignatureTest.java
src/test/java/org/apache/maven/project
ProjectInterpolationTest.java
xdocs changes.xml
Log:
Revision Changes Path
1.2 +2 -0 jakarta-turbine-maven/beta-8.txt
Index: beta-8.txt
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/beta-8.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beta-8.txt 12 Dec 2002 00:34:17 -0000 1.1
+++ beta-8.txt 31 Dec 2002 07:28:17 -0000 1.2
@@ -9,3 +9,5 @@
o Plugins will now work to generate project skeletons i.e. no project.xml need be present.
o Maven sample project generator
o Abstract tests are automatically exluded from test execution
+o all resource usage has been unified.
+o classworlds has replaced the use of forehead
\ No newline at end of file
1.4 +1 -1 jakarta-turbine-maven/build-bootstrap.properties
Index: build-bootstrap.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-bootstrap.properties 5 Aug 2002 17:16:32 -0000 1.3
+++ build-bootstrap.properties 31 Dec 2002 07:28:17 -0000 1.4
@@ -5,7 +5,7 @@
# bootstrap is offline or online - online by default . Pass this property
# as -o from the command prompt if you are offline
# ------------------------------------------------------------------------------
-maven.bootstrap.online=
+maven.bootstrap.online=-o
# ------------------------------------------------------------------------------
# The bootstrap classes consist of an Ant task front that:
1.183 +7 -34 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- build-bootstrap.xml 18 Dec 2002 15:08:52 -0000 1.182
+++ build-bootstrap.xml 31 Dec 2002 07:28:17 -0000 1.183
@@ -181,7 +181,8 @@
<fileset dir="src/plugins-build">
<include name="java/**"/>
<include name="test/**"/>
- <include name="clean/**"/>
+ <exclude name="**/maven.xml"/>
+ <exclude name="**/target/**"/>
</fileset>
</copy>
@@ -214,10 +215,12 @@
+------------------------------------------------------------------+
</echo>
- <exec executable="${maven.command}" failonerror="true">
+ <exec
+ executable="${maven.command}"
+ failonerror="true">
<arg value="${maven.bootstrap.online}"/>
<arg value="maven:plugins-build"/>
- <arg value="-e"/>
+ <arg value="-x"/>
</exec>
<echo>
@@ -239,40 +242,10 @@
<exclude name="**/target/maven-dependency-plugin*.jar"/>
<exclude name="**/target/maven-graph-plugin*.jar"/>
<exclude name="**/target/maven-jdiff-plugin*.jar"/>
- <exclude name="**/target/maven-transformer-plugin*.jar"/>
<exclude name="**/target/maven-xdoclet-plugin*.jar"/>
-<!--
- <include name="**/target/*activity*.jar"/>
- <include name="**/target/*ant*.jar"/>
- <include name="**/target/*changelog*.jar"/>
- <include name="**/target/*checkstyle*.jar"/>
- <include name="**/target/*clean*.jar"/>
- <include name="**/target/*clover*.jar"/>
- <include name="**/target/*deploy*.jar"/>
- <include name="**/target/*eclipse*.jar"/>
- <include name="**/target/*dist*.jar"/>
- <include name="**/target/*gump*.jar"/>
- <include name="**/target/*idea*.jar"/>
- <include name="**/target/*j2ee*.jar"/>
- <include name="**/target/*java*.jar"/>
- <include name="**/target/*javadoc*.jar"/>
- <include name="**/target/*jdepend*.jar"/>
- <include name="**/target/*junit*.jar"/>
- <include name="**/target/*jxr*.jar"/>
- <include name="**/target/*latex*.jar"/>
- <include name="**/target/*pom*.jar"/>
- <include name="**/target/*reactor*.jar"/>
- <include name="**/target/*site*.jar"/>
- <include name="**/target/*struts*.jar"/>
- <include name="**/target/*tasklist*.jar"/>
- <include name="**/target/*test*.jar"/>
- <include name="**/target/*xdoc*.jar"/>
- <include name="**/target/*war*.jar"/>
- <include name="**/target/*word2html*.jar"/>
--->
</fileset>
</copy>
-
+
<echo>
+------------------------------------------------------------------+
| |
1.68 +2 -0 jakarta-turbine-maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/maven.xml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- maven.xml 12 Dec 2002 11:37:33 -0000 1.67
+++ maven.xml 31 Dec 2002 07:28:17 -0000 1.68
@@ -383,8 +383,10 @@
</postGoal>
-->
+ <!--
<preGoal name="site:generate">
<attainGoal name="clover"/>
</preGoal>
+ -->
</project>
1.35 +3 -0 jakarta-turbine-maven/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.properties,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- project.properties 7 Dec 2002 02:19:08 -0000 1.34
+++ project.properties 31 Dec 2002 07:28:17 -0000 1.35
@@ -49,3 +49,6 @@
# and is available for use inside the POM.
pomProperty = value
+
+maven.build.dir = ${basedir}/target
+maven.gen.docs = ${maven.build.dir}/generated-xdocs
1.227 +36 -9 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- project.xml 31 Dec 2002 00:06:48 -0000 1.226
+++ project.xml 31 Dec 2002 07:28:17 -0000 1.227
@@ -412,15 +412,8 @@
</dependency>
<dependency>
- <id>junit</id>
- <version>3.8.1</version>
- <type>test</type>
- <url>http://junit.org/</url>
- </dependency>
-
- <dependency>
<id>werkz</id>
- <version>1.0-beta-4</version>
+ <version>1.0-beta-5</version>
<url>http://werkz.sourceforge.net/</url>
</dependency>
@@ -470,8 +463,14 @@
<dependency>
<id>forehead</id>
<version>1.0-beta-4</version>
- <url>http://forehead.sf.net/</url>
</dependency>
+
+ <!--
+ <dependency>
+ <id>classworlds</id>
+ <version>1.0-beta-3</version>
+ </dependency>
+ -->
<dependency>
<id>logkit</id>
@@ -506,6 +505,7 @@
fail with linkage errors if it's included and the junit tests are not
forked
-->
+
<dependency>
<id>xml-apis</id>
<version>1.0.b2</version>
@@ -577,6 +577,33 @@
<testName>testValue</testName>
<pomProperty>${pomProperty}</pomProperty>
</properties>
+
+ <reports>
+ <!--
+ |
+ | These should all be completely self contained. You should be able
+ | to generate each of them individually without needing the final
+ | xdoc transformation.
+ |
+ | Each report plugin with it's POM and plugin.jelly logic should
+ | contain everything needed to produced the report.
+ |
+ -->
+
+ <!--
+ <report>jdepend</report>
+ <report>checkstyle</report>
+ <report>changelog</report>
+ -->
+ <report>maven-file-activity-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <!--
+ <report>javadoc</report>
+ <report>jxr</report>
+ <report>junit-report</report>
+ <report>tasklist</report>
+ -->
+ </reports>
</project>
1.12 +10 -6 jakarta-turbine-maven/src/bootstrap/org/apache/maven/BootstrapTask.java
Index: BootstrapTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bootstrap/org/apache/maven/BootstrapTask.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BootstrapTask.java 18 Dec 2002 17:11:01 -0000 1.11
+++ BootstrapTask.java 31 Dec 2002 07:28:17 -0000 1.12
@@ -55,18 +55,22 @@
*
* ====================================================================
*/
+import java.io.File;
+
+import java.net.URL;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.ArrayList;
+
import org.apache.maven.util.HttpUtils;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.PatternSet;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Get a list of resources from a website.
*
@@ -324,7 +328,7 @@
setFiles(list);
// if offline is not set, download dependencies
- if (!"-o".equals(getOnline()))
+ if ( "-o".equals(getOnline()) == false )
{
downloadDependencies();
}
1.4 +0 -6 jakarta-turbine-maven/src/conf/driver.properties
Index: driver.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/conf/driver.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- driver.properties 11 Dec 2002 22:28:43 -0000 1.3
+++ driver.properties 31 Dec 2002 07:28:17 -0000 1.4
@@ -39,12 +39,6 @@
maven.repo.remote.enabled = true
# -------------------------------------------------------------------
-# M A V E N U P D A T E S I T E A N D S E L F U P D A T I N G
-# -------------------------------------------------------------------
-# This needs to be changed before prime time.
-maven.updateSite = http://www.apache.org/~jvanzyl/maven/update
-
-# -------------------------------------------------------------------
# M A V E N D I S T R I B U T I O N S
# -------------------------------------------------------------------
maven.distBuildDirectory = ${basedir}/target
1.15 +2 -2 jakarta-turbine-maven/src/conf/log4j.properties
Index: log4j.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/conf/log4j.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- log4j.properties 2 Dec 2002 01:17:49 -0000 1.14
+++ log4j.properties 31 Dec 2002 07:28:17 -0000 1.15
@@ -7,7 +7,7 @@
# ------------------------------------------------------------------------
# R O O T C A T E G O R Y
# ------------------------------------------------------------------------
-log4j.rootCategory = DEBUG, default
+log4j.rootCategory = INFO, default
log4j.appender.default = org.apache.log4j.FileAppender
log4j.appender.default.file = maven.log
log4j.appender.default.layout = org.apache.log4j.PatternLayout
@@ -25,7 +25,7 @@
# ------------------------------------------------------------------------
# M A V E N
# ------------------------------------------------------------------------
-log4j.category.org.apache.maven.Maven=INFO,maven
+log4j.category.org.apache.maven.MavenSession=INFO,maven
log4j.appender.maven=org.apache.log4j.ConsoleAppender
log4j.appender.maven.layout=org.apache.log4j.PatternLayout
log4j.appender.maven.layout.ConversionPattern=%m%n
1.7 +1 -1 jakarta-turbine-maven/src/test/log4j.properties
Index: log4j.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/log4j.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- log4j.properties 5 Dec 2002 02:30:17 -0000 1.6
+++ log4j.properties 31 Dec 2002 07:28:17 -0000 1.7
@@ -55,7 +55,7 @@
# ------------------------------------------------------------------------
# M A V E N B E A N
# ------------------------------------------------------------------------
-log4j.category.org.apache.maven.Maven = ${log.level}, maven
+log4j.category.org.apache.maven.MavenSession = ${log.level}, maven
log4j.appender.maven = org.apache.log4j.FileAppender
log4j.appender.maven.file = log.maven
log4j.appender.maven.layout = org.apache.log4j.PatternLayout
1.2 +1 -1 jakarta-turbine-maven/src/test/touchstone-build/src/conf/log4j.properties
Index: log4j.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/touchstone-build/src/conf/log4j.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j.properties 7 Dec 2002 23:12:11 -0000 1.1
+++ log4j.properties 31 Dec 2002 07:28:18 -0000 1.2
@@ -25,7 +25,7 @@
# ------------------------------------------------------------------------
# M A V E N
# ------------------------------------------------------------------------
-log4j.category.org.apache.maven.Maven=INFO,maven
+log4j.category.org.apache.maven.MavenSession=INFO,maven
log4j.appender.maven=org.apache.log4j.ConsoleAppender
log4j.appender.maven.layout=org.apache.log4j.PatternLayout
log4j.appender.maven.layout.ConversionPattern=%m%n
1.8 +0 -11 jakarta-turbine-maven/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 1 Oct 2002 15:58:39 -0000 1.7
+++ navigation.xml 31 Dec 2002 07:28:18 -0000 1.8
@@ -4,17 +4,6 @@
<title>Maven</title>
<body>
- <links>
- <item name="Turbine" href="http://jakarta.apache.org/turbine/"/>
- <item name="Turbine-2" href="http://jakarta.apache.org/turbine/turbine-2/"/>
- <item name="Turbine-3" href="http://jakarta.apache.org/turbine/turbine-3/"/>
- <item name="Torque" href="http://jakarta.apache.org/turbine/torque/"/>
- <item name="Fulcrum" href="http://jakarta.apache.org/turbine/fulcrum/"/>
- <item name="TDK" href="http://jakarta.apache.org/turbine/tdk/"/>
- <item name="Stratum" href="http://jakarta.apache.org/turbine/stratum/"/>
- <item name="Maven" href="http://jakarta.apache.org/turbine/maven/"/>
- <item name="JCS" href="http://jakarta.apache.org/turbine/jcs/"/>
- </links>
<menu name="Overview">
<item name="Goals" href="/goals.html"/>
<item name="Features" href="/features.html"/>