jvanzyl 2004/01/16 09:47:06
Modified: maven-core project.properties project.xml
maven-core/src/java/org/apache/maven/jelly
JellyPropsHandler.java
maven-mboot build
maven-mboot/src/bash maven.functions
maven-mboot/src/main Bootstrapper.java TestRunnerBooter.java
maven-model-xpp3 project.xml
maven-project project.xml
Removed: maven-core/src/test/java/org/apache/maven JAXPTest.java
Log:
o pushing in some tweaks for trygvis
Revision Changes Path
1.2 +0 -8 maven-components/maven-core/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-core/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 8 Jan 2004 04:29:09 -0000 1.1
+++ project.properties 16 Jan 2004 17:47:06 -0000 1.2
@@ -2,11 +2,6 @@
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
-maven.final.name = maven
-maven.build.dir = ${basedir}/target
-maven.gen.docs = ${maven.build.dir}/generated-xdocs
-maven.jar.manifest = manifest.mf
-
# -------------------------------------------------------------------
# T E S T I N G
# -------------------------------------------------------------------
@@ -37,9 +32,6 @@
# Display the date on the Maven web site
maven.xdoc.date = left
maven.xdoc.date.format = dd MMMM yyyy HH:mm z
-
-# Display the maven version the web site is documenting
-#maven.xdoc.version = ${pom.currentVersion}
#------------------------------------------------------------------
# M U L T I P R O J E C T - A L L P L U G I N G S
1.4 +7 -18 maven-components/maven-core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 10 Jan 2004 23:09:09 -0000 1.3
+++ project.xml 16 Jan 2004 17:47:06 -0000 1.4
@@ -2,10 +2,11 @@
<project>
<pomVersion>3</pomVersion>
+ <id>maven-core</id>
<groupId>maven</groupId>
<artifactId>maven-core</artifactId>
<name>Maven</name>
- <currentVersion>1.1-SNAPSHOT</currentVersion>
+ <currentVersion>2.0-SNAPSHOT</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
@@ -34,30 +35,24 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0-alpha-2</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>maven</groupId>
- <artifactId>maven-model-tools</artifactId>
- <version>2.0-alpha-3</version>
+ <artifactId>maven-model-xpp3</artifactId>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0-alpha-2</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Plexus -->
<dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0-beta-1</version>
- </dependency>
-
- <dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.2a</version>
@@ -66,7 +61,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.13</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
@@ -79,12 +74,6 @@
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
<version>0.3</version>
- </dependency>
-
- <dependency>
- <groupId>commons-graph</groupId>
- <artifactId>commons-graph</artifactId>
- <version>0.8.1</version>
</dependency>
<!-- Jelly -->
1.2 +6 -34
maven-components/maven-core/src/java/org/apache/maven/jelly/JellyPropsHandler.java
Index: JellyPropsHandler.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/JellyPropsHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JellyPropsHandler.java 8 Jan 2004 04:29:12 -0000 1.1
+++ JellyPropsHandler.java 16 Jan 2004 17:47:06 -0000 1.2
@@ -62,46 +62,21 @@
import java.util.Hashtable;
import java.util.Iterator;
-/**
- * Implementation of a Commons Grant <code>propsHandler</code> to resolve
- * through Jelly's context.
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Bob McWhirter</a>
- * @author <a href="mailto:[EMAIL PROTECTED]">Stephen Haberman</a>
- */
public class JellyPropsHandler
extends DefaultPropsHandler
{
- /** The JellyContext. */
private JellyContext context;
- /**
- * Simple constructor with the context to be used.
- *
- * @param context The context to be used.
- */
public JellyPropsHandler( JellyContext context )
{
this.context = context;
}
- /**
- * Set an ant property.
- *
- * @param name The property name.
- * @param value The property value.
- */
public void setProperty( String name, String value )
{
context.setVariable( name, value );
}
- /**
- * Retrieve an ant property.
- *
- * @param name The property name.
- * @return The property value.
- */
public String getProperty( String name )
{
if ( name == null )
@@ -121,25 +96,22 @@
}
}
- /**
- * Retrieve all ant properties.
- *
- * @return A <code>Hashtable</code> of all properties.
- */
public Hashtable getProperties()
{
- Hashtable h = new Hashtable();
+ Hashtable table = new Hashtable();
+
for ( Iterator i = this.context.getVariableNames(); i.hasNext(); )
{
String name = (String) i.next();
+
Object value = this.context.getVariable( name );
+
if ( value != null )
{
- h.put( name, value.toString() );
+ table.put( name, value.toString() );
}
}
- return h;
+ return table;
}
-
}
1.5 +1 -1 maven-components/maven-mboot/build
Index: build
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/build,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build 14 Jan 2004 10:54:51 -0000 1.4
+++ build 16 Jan 2004 17:47:06 -0000 1.5
@@ -20,7 +20,7 @@
repoLocal=`cygpath -pu "$repoLocal"`
fi
-compile
".:$repoLocal/junit/jars/junit-3.8.1.jar:$repoLocal/maven/jars/surefire-runner-1.0.jar:$repoLocal/plexus/jars/plexus-utils-1.0-beta-1.jar"
target/classes src/main
+compile
.:$repoLocal/junit/jars/junit-3.8.1.jar:$repoLocal/maven/jars/surefire-runner-1.0.jar:$repoLocal/plexus/jars/plexus-utils-1.0-beta-1.jar
target/classes src/main
isCommandSuccessful $? "Failed compiling Maven bootstrapper classes!"
1.10 +4 -24 maven-components/maven-mboot/src/bash/maven.functions
Index: maven.functions
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/src/bash/maven.functions,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven.functions 14 Jan 2004 11:06:03 -0000 1.9
+++ maven.functions 16 Jan 2004 17:47:06 -0000 1.10
@@ -20,7 +20,7 @@
{
# $1 == classpath
# $2 == Main class
- # $3 == Main args
+ # $3 == Mail args
if $cygwin; then
CP=`cygpath -pw "$1"`
@@ -33,20 +33,7 @@
runTests()
{
- # $1 == classpath
- # $2 == home args
- # $3 == repo local
- # $4 == dependencies file
- # $5 == includes file
- # $6 == excludes file
-
- if $cygwin; then
- CP=`cygpath -pw "$1"`
- else
- CP=$1
- fi
-
- "${JAVACMD}" -classpath "$CP" TestRunnerBooter "$2" "$3" $4 $5 $6
+# TO DO
}
compile()
@@ -153,8 +140,6 @@
fi
- echo "Building tests in `pwd`"
-
repoLocal=`cat bootstrap.repo`
if $cygwin = true; then
@@ -171,9 +156,7 @@
copyResources
- echo "Running tests in `pwd`"
-
- runTests
".:${MBOOT_HOME}/classes:$repoLocal/junit/jars/junit-3.8.1.jar:$repoLocal/maven/jars/surefire-runner-1.0.jar:$repoLocal/plexus/jars/plexus-utils-1.0-beta-1.jar"
"$home" "$repoLocal" bootstrap.libs bootstrap.tests.includes bootstrap.tests.excludes
+ runTests
if [ "$2" = "default" ]
then
@@ -182,8 +165,6 @@
jarName=$2
fi
- echo "Building jars (${jarName}) in `pwd`/target"
-
buildJar $buildDest target/${jarName}
if [ -z $3 ]
@@ -192,8 +173,7 @@
rm -f bootstrap.libs > /dev/null 2>&1
rm -f bootstrap.resources > /dev/null 2>&1
rm -f bootstrap.repo > /dev/null 2>&1
- rm -f bootstrap.tests.includes > /dev/null 2>&1
- rm -f bootstrap.tests.excludes > /dev/null 2>&1
+ rm -f bootstrap.test > /dev/null 2>&1
fi
)
}
1.9 +5 -126 maven-components/maven-mboot/src/main/Bootstrapper.java
Index: Bootstrapper.java
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/src/main/Bootstrapper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Bootstrapper.java 14 Jan 2004 10:59:44 -0000 1.8
+++ Bootstrapper.java 16 Jan 2004 17:47:06 -0000 1.9
@@ -8,13 +8,17 @@
import javax.xml.parsers.SAXParserFactory;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileWriter;
+import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
public class Bootstrapper
{
@@ -22,8 +26,6 @@
private BootstrapPomParser bootstrapPomParser;
private List dependencies;
-
- private UnitTests unitTests;
private List resources;
@@ -75,62 +77,6 @@
writeFile( "bootstrap.classpath", classPath.toString() );
writeFile( "bootstrap.libs", libs.toString() );
-
- unitTests = bootstrapPomParser.getUnitTests();
-
- StringBuffer tests = new StringBuffer();
-
- tests.append(unitTests.getDirectory());
-
- tests.append("@");
-
- int size = unitTests.getIncludes().size();
-
- // If there are no includes specified then we want it all.
- if ( size == 0 )
- {
- tests.append( "'*'" );
- }
-
- for ( int j = 0; j < size; j++ )
- {
- String include = (String) unitTests.getIncludes().get( j );
-
- tests.append( include );
-
- if ( j != size - 1 )
- {
- tests.append( "," );
- }
- }
-
- tests.append( "\n" );
-
- writeFile( "bootstrap.tests.includes", tests.toString() );
-
- tests = new StringBuffer();
-
- tests.append(unitTests.getDirectory());
-
- tests.append("@");
-
- size = unitTests.getExcludes().size();
-
- for ( int j = 0; j < size; j++ )
- {
- String exclude = (String) unitTests.getExcludes().get( j );
-
- tests.append( exclude );
-
- if ( j != size - 1 )
- {
- tests.append( "," );
- }
- }
-
- tests.append( "\n" );
-
- writeFile( "bootstrap.tests.excludes", tests.toString() );
resources = bootstrapPomParser.getResources();
@@ -155,7 +101,7 @@
res.append( "@" );
- size = r.getIncludes().size();
+ int size = r.getIncludes().size();
// If there are no includes specified then we want it all.
if ( size == 0 )
@@ -207,8 +153,6 @@
extends DefaultHandler
{
private List dependencies = new ArrayList();
-
- private UnitTests unitTests;
private List resources = new ArrayList();
@@ -232,11 +176,6 @@
{
return dependencies;
}
-
- public UnitTests getUnitTests()
- {
- return unitTests;
- }
public List getResources()
{
@@ -269,13 +208,8 @@
{
return;
}
- else if ( rawName.equals( "unitTestSourceDirectory" ) )
- {
- unitTests = new UnitTests();
- }
else if ( rawName.equals( "unitTest" ) )
{
- unitTests = new UnitTests();
insideUnitTest = true;
}
else if ( rawName.equals( "dependency" ) )
@@ -318,10 +252,6 @@
resources.addAll( p.getResources() );
}
- else if ( rawName.equals( "unitTestSourceDirectory" ) )
- {
- unitTests.setDirectory(getBodyText());
- }
else if ( rawName.equals( "unitTest" ) )
{
insideUnitTest = false;
@@ -366,17 +296,6 @@
}
}
- else if ( insideUnitTest )
- {
- if ( rawName.equals( "include" ) )
- {
- unitTests.addInclude( getBodyText() );
- }
- else if ( rawName.equals( "exclude" ) )
- {
- unitTests.addExclude( getBodyText() );
- }
- }
else if ( insideResource )
{
if ( rawName.equals( "directory" ) )
@@ -573,46 +492,6 @@
}
return false;
- }
- }
-
- public static class UnitTests
- implements Serializable
- {
- private String directory;
-
- private List includes = new ArrayList();
-
- private List excludes = new ArrayList();
-
- public void addInclude( String pattern )
- {
- this.includes.add( pattern );
- }
-
- public void addExclude( String pattern )
- {
- this.excludes.add( pattern );
- }
-
- public List getIncludes()
- {
- return this.includes;
- }
-
- public List getExcludes()
- {
- return this.excludes;
- }
-
- public void setDirectory( String directory )
- {
- this.directory = directory;
- }
-
- public String getDirectory()
- {
- return this.directory;
}
}
1.3 +3 -32 maven-components/maven-mboot/src/main/TestRunnerBooter.java
Index: TestRunnerBooter.java
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/src/main/TestRunnerBooter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestRunnerBooter.java 14 Jan 2004 10:54:52 -0000 1.2
+++ TestRunnerBooter.java 16 Jan 2004 17:47:06 -0000 1.3
@@ -2,14 +2,11 @@
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.StringUtils;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.StringTokenizer;
public class TestRunnerBooter
{
@@ -37,40 +34,15 @@
File dependenciesFile = new File(args[2]);
- List dependencies = new ArrayList();
- BufferedReader buf = new BufferedReader(new FileReader(dependenciesFile));
- String line;
- while ((line = buf.readLine()) != null)
- {
- dependencies.add(line);
- }
- buf.close();
-
processDependencies( dependencies, classLoader );
File includesFile = new File(args[3]);
- List includes = new ArrayList();
- buf = new BufferedReader(new FileReader(includesFile));
- line = buf.readLine();
- String includesStr = line.substring(line.indexOf("@")+1);
- StringTokenizer st = new StringTokenizer( includesStr, "," );
- while ( st.hasMoreTokens() )
- {
- includes.add( st.nextToken().trim() );
- }
- buf.close();
File excludesFile = new File(args[4]);
+
+ List includes = new ArrayList();
+
List excludes = new ArrayList();
- buf = new BufferedReader(new FileReader(excludesFile));
- line = buf.readLine();
- String excludesStr = line.substring(line.indexOf("@")+1);
- st = new StringTokenizer( excludesStr, "," );
- while ( st.hasMoreTokens() )
- {
- excludes.add( st.nextToken().trim() );
- }
- buf.close();
String[] tests = collectTests( basedir,
includes,
@@ -92,7 +64,6 @@
}
private void processDependencies(List dependencies, IsolatedClassLoader
classLoader)
- throws Exception
{
for (Iterator i=dependencies.iterator(); i.hasNext(); )
{
1.11 +1 -1 maven-components/maven-model-xpp3/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-model-xpp3/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 15 Jan 2004 21:00:30 -0000 1.10
+++ project.xml 16 Jan 2004 17:47:06 -0000 1.11
@@ -40,7 +40,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.13</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
1.11 +3 -21 maven-components/maven-project/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 15 Jan 2004 20:55:55 -0000 1.10
+++ project.xml 16 Jan 2004 17:47:06 -0000 1.11
@@ -46,21 +46,15 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.13</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<!-- Component Testing -->
<dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0-beta-1</version>
- </dependency>
-
- <dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>0.2</version>
+ <version>0.3</version>
</dependency>
<dependency>
@@ -74,19 +68,7 @@
<artifactId>xpp3</artifactId>
<version>1.1.2a</version>
</dependency>
-
- <dependency>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
- <version>1.1.2.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-graph</groupId>
- <artifactId>commons-graph</artifactId>
- <version>0.8.1</version>
- </dependency>
-
+
</dependencies>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
