[jira] Closed: (MAVEN-1298) Repostory.splitSCMConnection() is broken for non-cvs scm
Message: The following issue has been closed. Resolver: dion gillard Date: Sat, 29 May 2004 1:03 AM Fixed. Repository class changed. RepositoryTest updated and reinstated to build. - View the issue: http://jira.codehaus.org/browse/MAVEN-1298 Here is an overview of the issue: - Key: MAVEN-1298 Summary: Repostory.splitSCMConnection() is broken for non-cvs scm Type: Bug Status: Closed Priority: Major Resolution: FIXED Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven Components: core Fix Fors: 1.0 Versions: 1.0-rc3 Assignee: Reporter: Jason Dillon Created: Fri, 28 May 2004 5:37 PM Updated: Sat, 29 May 2004 1:03 AM Description: Basically if this MUST have 6 tokens, but the docs suggest a min of 2, no max: The format of this element is as follows: scm:: This behavior changed from rc2 ro rc3, now I get exceptions all over the place with my perforce connection: scm|perforce|perforce:1666|//depot/... Not sure there is much more I can add to get up to the required six tokens, nor am I sure what those tokens should be. What gives? - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/xdocs changes.xml
dion2004/05/28 21:48:26 Modified:xdocsTag: MAVEN-1_0-BRANCH changes.xml Log: Fix for MAVEN-1298. Revision ChangesPath No revision No revision 1.14.4.21 +5 -0 maven/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/maven/xdocs/changes.xml,v retrieving revision 1.14.4.20 retrieving revision 1.14.4.21 diff -u -r1.14.4.20 -r1.14.4.21 --- changes.xml 13 May 2004 10:15:56 - 1.14.4.20 +++ changes.xml 29 May 2004 04:48:26 - 1.14.4.21 @@ -24,6 +24,11 @@ Vincent Massol + + +Repository element was broken for non-cvs connections + + Introduce a backwards compatibility option maven.property.inheritance, which disables the functionality when set to false. Parent project properties are now correctly loaded from extended project.xml files. This was implemented previously, but the properties were not being passed through to the final goal attainment context. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven project.xml
dion2004/05/28 21:46:28
Modified:src/test/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
RepositoryTest.java
src/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
Repository.java
.Tag: MAVEN-1_0-BRANCH project.xml
Log:
Fix for MAVEN-1298.
Revision ChangesPath
No revision
No revision
1.1.10.2 +12 -2 maven/src/test/java/org/apache/maven/project/RepositoryTest.java
Index: RepositoryTest.java
===
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/project/RepositoryTest.java,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.2
diff -u -r1.1.10.1 -r1.1.10.2
--- RepositoryTest.java 2 Mar 2004 05:38:55 - 1.1.10.1
+++ RepositoryTest.java 29 May 2004 04:46:28 - 1.1.10.2
@@ -72,7 +72,7 @@
public void testSetGetConnection() throws Exception
{
// JUnitDoclet begin method setConnection getConnection
-java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß", "0123456789",
"012345678901234567890", "\n", null};
+java.lang.String[] tests = {"", "a", "A", "ä", "ß", "0123456789",
"012345678901234567890", null};
for ( int i = 0; i < tests.length; i++ )
{
@@ -85,7 +85,7 @@
public void testSetGetUrl() throws Exception
{
// JUnitDoclet begin method setUrl getUrl
-java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß", "0123456789",
"012345678901234567890", "\n", null};
+java.lang.String[] tests = {"", "a", "A", "ä", "ß", "0123456789",
"012345678901234567890", null};
for ( int i = 0; i < tests.length; i++ )
{
@@ -108,6 +108,16 @@
}
+public void testSplitScmConnection()
+{
+repository.setConnection("scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:module");
+String[] tokens = Repository.splitSCMConnection(repository.getConnection());
+assertEquals("Wrong number of tokens split", 6, tokens.length);
+repository.setConnection("scm|svn|http://svn.apache.org/repos";);
+tokens = Repository.splitSCMConnection(repository.getConnection());
+assertEquals("Wrong number of tokens split", 3, tokens.length);
+}
+
/**
* JUnitDoclet moves marker to this method, if there is not match
* for them in the regenerated code and if the marker is not empty.
No revision
No revision
1.18.4.4 +7 -8 maven/src/java/org/apache/maven/project/Repository.java
Index: Repository.java
===
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Repository.java,v
retrieving revision 1.18.4.3
retrieving revision 1.18.4.4
diff -u -r1.18.4.3 -r1.18.4.4
--- Repository.java 29 Apr 2004 04:38:42 - 1.18.4.3
+++ Repository.java 29 May 2004 04:46:28 - 1.18.4.4
@@ -234,15 +234,14 @@
EnhancedStringTokenizer tok = new EnhancedStringTokenizer(connection,
delimiter);
String[] tokens = tokenizerToArray(tok);
-
-if (tokens.length < 6)
-{
-throw new IllegalArgumentException("repository connection string
contains less than six tokens");
-}
-if (tokens.length > 6)
+// for a valid repository, it should be scm: at least
+if (tokens.length >= 1 && tokens[1].equals("cvs"))
{
-throw new IllegalArgumentException("repository connection string
contains more than six tokens");
+if (tokens.length != 6)
+{
+throw new IllegalArgumentException("cvs repository connection
string doesn't contain six tokens");
+}
}
return tokens;
}
No revision
No revision
1.317.4.26 +0 -1 maven/project.xml
Index: project.xml
===
RCS file: /home/cvs/maven/project.xml,v
retrieving revision 1.317.4.25
retrieving revision 1.317.4.26
diff -u -r1.317.4.25 -r1.317.4.26
--- project.xml 20 May 2004 15:34:53 - 1.317.4.25
+++ project.xml 29 May 2004 04:46:28 - 1.317.4.26
@@ -738,7 +738,6 @@
-**/RepositoryTest.java
**/JAXPTest.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build] Sat May 29 00:07:00 EDT 2004
Performing an update of maven-components ... Updates occured, build required ... P maven-core/bootstrap.plugins P maven-core/project.xml --- Building mboot ... --- --- Maven MBoot --- Installing mboot in /home/users/jvanzyl/mboot ... --- Installing MBoot dependencies ... --- --- Install the parent pom for all maven-component artifacts ... --- Installing POM in /home/users/jvanzyl/maven-repo-local/maven/poms/maven-component-2.0-SNAPSHOT.pom --- Building maven-model ... --- Generating java in src/main/java from maven.mdo Generating xpp3 unmarshaller in src/main/java from maven.mdo Generating xpp3 marshaller in src/main/java from maven.mdo Building project in /home/users/jvanzyl/m2/maven-components/maven-model Using the following for your maven.repo.local: /home/users/jvanzyl/maven-repo-local Building tests in /home/users/jvanzyl/m2/maven-components/maven-model Running tests in /home/users/jvanzyl/m2/maven-components/maven-model --- T E S T S --- [surefire] Running org.codehaus.surefire.battery.DirectoryBattery [surefire] Tests run: 0, Failures: 0, Errors: 0, Time elapsed: 0 sec Building jars (maven-model-2.0-SNAPSHOT.jar) in /home/users/jvanzyl/m2/maven-components/maven-model/target Installing maven-model-2.0-SNAPSHOT.jar in /home/users/jvanzyl/maven-repo-local/maven/jars Installing POM in /home/users/jvanzyl/maven-repo-local/maven/poms/maven-model-2.0-SNAPSHOT.pom Generating xml schema in . from maven.mdo Generating xdoc in ./xdocs from maven.mdo --- Building maven-project ... --- Building project in /home/users/jvanzyl/m2/maven-components/maven-project Using the following for your maven.repo.local: /home/users/jvanzyl/maven-repo-local Building tests in /home/users/jvanzyl/m2/maven-components/maven-project Running tests in /home/users/jvanzyl/m2/maven-components/maven-project --- T E S T S --- [surefire] Running org.codehaus.surefire.battery.DirectoryBattery [surefire] Tests run: 0, Failures: 0, Errors: 0, Time elapsed: 0 sec [surefire] Running org.apache.maven.artifact.collector.DefaultArtifactCollectorTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.626 sec Created temporary local repository: ./target/temp-repo-local [INFO] Trying to download: /maven-test/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Actual md5 : 32ea5bb371496cf7c574232886d117cf [INFO] Expected md5: a5c3b5cd0605bb7331d1846cdc14b13b [INFO] md5 is valid: false [INFO] Trying to download: /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] IO error occred while transfering /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Trying to download: /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-2 [INFO] Actual md5 : d3b07384d113edec49eaa6238ad5ff00 [INFO] Expected md5: null [INFO] md5 is valid: false [INFO] Trying to download: /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] IO error occred while transfering /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Trying to download: /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-2 [INFO] IO error occred while transfering /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-2 [surefire] Running org.apache.maven.artifact.downloader.DefaultArtifactDownloaderTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.11 sec [surefire] Running org.apache.maven.artifact.resolver.DefaultArtifactResolverTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.064 sec [INFO] Trying to download: /snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar from file://./target/test-classes/remote-repo-1 [INFO] Actual md5 : 2c18e486683a3db1e645ad8523223b72 [INFO] Expected md5: null [INFO] md5 is valid: false [surefire] Running org.apache.maven.ar
cvs commit: maven-components/maven-core bootstrap.plugins project.xml
jvanzyl 2004/05/28 20:23:21 Modified:maven-core bootstrap.plugins project.xml Log: o add goodies for plugin plugin Revision ChangesPath 1.7 +1 -0 maven-components/maven-core/bootstrap.plugins Index: bootstrap.plugins === RCS file: /home/cvs/maven-components/maven-core/bootstrap.plugins,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bootstrap.plugins 20 May 2004 17:09:30 - 1.6 +++ bootstrap.plugins 29 May 2004 03:23:21 - 1.7 @@ -1,5 +1,6 @@ maven-clean-plugin maven-compiler-plugin maven-jar-plugin +maven-plugin-plugin maven-resources-plugin maven-surefire-plugin 1.13 +5 -0 maven-components/maven-core/project.xml Index: project.xml === RCS file: /home/cvs/maven-components/maven-core/project.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- project.xml 20 May 2004 17:09:30 - 1.12 +++ project.xml 29 May 2004 03:23:21 - 1.13 @@ -105,6 +105,11 @@ wagon-http 0.9-SNAPSHOT + + qdox + qdox + 1.2 + junit - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-plugins/maven-plugin-plugin - Imported sources
jvanzyl 2004/05/28 20:21:30 Log: Status: Vendor Tag: ASF Release Tags: INIT N maven-components/maven-plugins/maven-plugin-plugin/project.xml N maven-components/maven-plugins/maven-plugin-plugin/.cvsignore N maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractPluginMojo.java N maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGenerator.java No conflicts created by this import - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/generator PluginDescriptorGenerator.java
jvanzyl 2004/05/28 20:20:33
Modified:maven-plugin/src/main/java/org/apache/maven/plugin/generator
PluginDescriptorGenerator.java
Log:
o make sure dir exists
Revision ChangesPath
1.7 +8 -1
maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/generator/PluginDescriptorGenerator.java
Index: PluginDescriptorGenerator.java
===
RCS file:
/home/cvs/maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/generator/PluginDescriptorGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PluginDescriptorGenerator.java27 May 2004 17:14:41 - 1.6
+++ PluginDescriptorGenerator.java29 May 2004 03:20:33 - 1.7
@@ -22,7 +22,14 @@
protected void writePluginArtifact( PluginDescriptor pluginDescriptor, String
destinationDirectory, Xpp3Dom pomDom )
throws Exception
{
-FileWriter writer = new FileWriter( new File( destinationDirectory,
"plugin.xml" ) );
+File f = new File( destinationDirectory, "plugin.xml" );
+
+if ( !f.getParentFile().exists() )
+{
+f.getParentFile().mkdirs();
+}
+
+FileWriter writer = new FileWriter( f );
XMLWriter w = new PrettyPrintXMLWriter( writer );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build] Fri May 28 23:07:00 EDT 2004
Performing an update of maven-components ... Updates occured, build required ... P maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java --- Building mboot ... --- --- Maven MBoot --- Installing mboot in /home/users/jvanzyl/mboot ... --- Installing MBoot dependencies ... --- --- Install the parent pom for all maven-component artifacts ... --- Installing POM in /home/users/jvanzyl/maven-repo-local/maven/poms/maven-component-2.0-SNAPSHOT.pom --- Building maven-model ... --- Generating java in src/main/java from maven.mdo Generating xpp3 unmarshaller in src/main/java from maven.mdo Generating xpp3 marshaller in src/main/java from maven.mdo Building project in /home/users/jvanzyl/m2/maven-components/maven-model Using the following for your maven.repo.local: /home/users/jvanzyl/maven-repo-local Building tests in /home/users/jvanzyl/m2/maven-components/maven-model Running tests in /home/users/jvanzyl/m2/maven-components/maven-model --- T E S T S --- [surefire] Running org.codehaus.surefire.battery.DirectoryBattery [surefire] Tests run: 0, Failures: 0, Errors: 0, Time elapsed: 0 sec Building jars (maven-model-2.0-SNAPSHOT.jar) in /home/users/jvanzyl/m2/maven-components/maven-model/target Installing maven-model-2.0-SNAPSHOT.jar in /home/users/jvanzyl/maven-repo-local/maven/jars Installing POM in /home/users/jvanzyl/maven-repo-local/maven/poms/maven-model-2.0-SNAPSHOT.pom Generating xml schema in . from maven.mdo Generating xdoc in ./xdocs from maven.mdo --- Building maven-project ... --- Building project in /home/users/jvanzyl/m2/maven-components/maven-project Using the following for your maven.repo.local: /home/users/jvanzyl/maven-repo-local Building tests in /home/users/jvanzyl/m2/maven-components/maven-project Running tests in /home/users/jvanzyl/m2/maven-components/maven-project --- T E S T S --- [surefire] Running org.codehaus.surefire.battery.DirectoryBattery [surefire] Tests run: 0, Failures: 0, Errors: 0, Time elapsed: 0 sec [surefire] Running org.apache.maven.artifact.collector.DefaultArtifactCollectorTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.609 sec Created temporary local repository: ./target/temp-repo-local [INFO] Trying to download: /maven-test/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Actual md5 : 32ea5bb371496cf7c574232886d117cf [INFO] Expected md5: a5c3b5cd0605bb7331d1846cdc14b13b [INFO] md5 is valid: false [INFO] Trying to download: /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] IO error occred while transfering /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Trying to download: /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-2 [INFO] Actual md5 : d3b07384d113edec49eaa6238ad5ff00 [INFO] Expected md5: null [INFO] md5 is valid: false [INFO] Trying to download: /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] IO error occred while transfering /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Trying to download: /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-2 [INFO] IO error occred while transfering /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-2 [surefire] Running org.apache.maven.artifact.downloader.DefaultArtifactDownloaderTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.107 sec [surefire] Running org.apache.maven.artifact.resolver.DefaultArtifactResolverTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.062 sec [INFO] Trying to download: /snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar from file://./target/test-classes/remote-repo-1 [INFO] Actual md5 : 2c18e486683a3db1e645ad8523223b72 [INFO] Expected md5: null [INFO] md5 is valid: false [surefire]
[jira] Closed: (MNG-8) Enhance ognl parsing
Message: The following issue has been closed. Resolver: Jason van Zyl Date: Fri, 28 May 2004 10:49 PM It is now possible to have expressions like: #maven.build.dest/META-INF/maven - View the issue: http://jira.codehaus.org/browse/MNG-8 Here is an overview of the issue: - Key: MNG-8 Summary: Enhance ognl parsing Type: Bug Status: Closed Priority: Major Resolution: FIXED Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: m2 Assignee: Reporter: Trygve Laugstol Created: Fri, 23 Apr 2004 8:32 PM Updated: Fri, 28 May 2004 10:49 PM Description: Given a parameter declaration like this outputDirectory #maven.build.dest + "/apidocs" I would expect the outputDirectory variable to be set to: "target/apidocs" but instead it becomes: "maven.build.dest + "/apidocs"" - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/plugin OgnlProjectValueExtractor.java
jvanzyl 2004/05/28 19:49:41
Modified:maven-core/src/main/java/org/apache/maven/plugin
OgnlProjectValueExtractor.java
Log:
o allow path expressions and handle them properly
Revision ChangesPath
1.3 +13 -2
maven-components/maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java
Index: OgnlProjectValueExtractor.java
===
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OgnlProjectValueExtractor.java29 May 2004 02:44:50 - 1.2
+++ OgnlProjectValueExtractor.java29 May 2004 02:49:41 - 1.3
@@ -53,7 +53,18 @@
{
expression = expression.substring( 1 );
-value = project.getProperty( expression );
+int pathSeparator = expression.indexOf( "/" );
+
+if ( pathSeparator > 0 )
+{
+value = project.getProperty( expression.substring( 0, pathSeparator
) )
++ expression.substring( pathSeparator );
+}
+else
+{
+value = project.getProperty( expression );
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/plugin OgnlProjectValueExtractorTest.java
jvanzyl 2004/05/28 19:48:28
Added: maven-core/src/test/java/org/apache/maven/plugin
OgnlProjectValueExtractorTest.java
Log:
o test for the ognl project value extractor
Revision ChangesPath
1.1
maven-components/maven-core/src/test/java/org/apache/maven/plugin/OgnlProjectValueExtractorTest.java
Index: OgnlProjectValueExtractorTest.java
===
package org.apache.maven.plugin;
import junit.framework.TestCase;
import org.apache.maven.project.MavenProject;
import java.util.Properties;
import java.util.HashMap;
import java.util.Map;
/**
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
* @version $Id: OgnlProjectValueExtractorTest.java,v 1.1 2004/05/29 02:48:28
jvanzyl Exp $
*/
public class OgnlProjectValueExtractorTest
extends TestCase
{
private MavenProject project;
protected void setUp()
{
project = new MavenProject();
Map properties = new HashMap();
properties.put( "maven.build.dest", "target/classes" );
project.setProperties( properties );
}
public void testPropertyValueExtraction()
{
Object value = OgnlProjectValueExtractor.evaluate( "#maven.build.dest",
project );
assertEquals( "target/classes", value );
}
public void testPathExtractionWithAnEmbeddedProperty()
{
Object value = OgnlProjectValueExtractor.evaluate(
"#maven.build.dest/META-INF/maven", project );
assertEquals( "target/classes/META-INF/maven", value );
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/plugin OgnlProjectValueExtractor.java
jvanzyl 2004/05/28 19:44:50
Modified:maven-core/src/main/java/org/apache/maven/plugin
OgnlProjectValueExtractor.java
Log:
o fix logic, only pass back basedir value when it is explicity asked for.
Revision ChangesPath
1.2 +2 -2
maven-components/maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java
Index: OgnlProjectValueExtractor.java
===
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OgnlProjectValueExtractor.java20 May 2004 17:09:30 - 1.1
+++ OgnlProjectValueExtractor.java29 May 2004 02:44:50 - 1.2
@@ -45,7 +45,7 @@
// do nothing
}
}
-else if ( expression.startsWith( "#basedir" ) )
+else if ( expression.equals( "#basedir" ) )
{
value = project.getFile().getParentFile().getAbsolutePath();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MAVEN-1300) Add update support to maven-jar-plugin
Message: A new issue has been created in JIRA. - View the issue: http://jira.codehaus.org/browse/MAVEN-1300 Here is an overview of the issue: - Key: MAVEN-1300 Summary: Add update support to maven-jar-plugin Type: New Feature Status: Unassigned Priority: Trivial Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven Components: core Versions: 1.0-rc3 Assignee: Reporter: Jason Dillon Created: Fri, 28 May 2004 6:37 PM Updated: Fri, 28 May 2004 6:37 PM Description: Add the ability the set the update attribute on the ant:jar task. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MAVEN-1298) Repostory.splitSCMConnection() is broken for non-cvs scm
The following comment has been added to this issue: Author: Jason Dillon Created: Fri, 28 May 2004 6:22 PM Body: This also breaks the maven-changelog-plugin... for scm:perforce anyways. Also, the maven-changelog-plugin does not know about changing the delimiter. - View this comment: http://jira.codehaus.org/browse/MAVEN-1298?page=comments#action_20168 - View the issue: http://jira.codehaus.org/browse/MAVEN-1298 Here is an overview of the issue: - Key: MAVEN-1298 Summary: Repostory.splitSCMConnection() is broken for non-cvs scm Type: Bug Status: Unassigned Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven Components: core Versions: 1.0-rc3 Assignee: Reporter: Jason Dillon Created: Fri, 28 May 2004 5:37 PM Updated: Fri, 28 May 2004 6:22 PM Description: Basically if this MUST have 6 tokens, but the docs suggest a min of 2, no max: The format of this element is as follows: scm:: This behavior changed from rc2 ro rc3, now I get exceptions all over the place with my perforce connection: scm|perforce|perforce:1666|//depot/... Not sure there is much more I can add to get up to the required six tokens, nor am I sure what those tokens should be. What gives? - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MAVEN-1299) maven-plugin-plugin not updated in rc3 release
Message: A new issue has been created in JIRA. - View the issue: http://jira.codehaus.org/browse/MAVEN-1299 Here is an overview of the issue: - Key: MAVEN-1299 Summary: maven-plugin-plugin not updated in rc3 release Type: Bug Status: Unassigned Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven Components: plugin manager Versions: 1.0-rc3 Assignee: Reporter: Jason Dillon Created: Fri, 28 May 2004 5:39 PM Updated: Fri, 28 May 2004 5:39 PM Description: The version of the maven-plugin-plugin was not updated as the release notes suggest for rc3: Install and uninstall plugin jelly tags for managing plugins on the fly. Issue: MAVEN-1219. Ships with the latest maven standard plugin releases. It is still v1.3. Also, the online docs show 1.4. Again, what gives? - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MAVEN-1298) Repostory.splitSCMConnection() is broken for non-cvs scm
Message: A new issue has been created in JIRA. - View the issue: http://jira.codehaus.org/browse/MAVEN-1298 Here is an overview of the issue: - Key: MAVEN-1298 Summary: Repostory.splitSCMConnection() is broken for non-cvs scm Type: Bug Status: Unassigned Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven Components: core Versions: 1.0-rc3 Assignee: Reporter: Jason Dillon Created: Fri, 28 May 2004 5:37 PM Updated: Fri, 28 May 2004 5:37 PM Description: Basically if this MUST have 6 tokens, but the docs suggest a min of 2, no max: The format of this element is as follows: scm:: This behavior changed from rc2 ro rc3, now I get exceptions all over the place with my perforce connection: scm|perforce|perforce:1666|//depot/... Not sure there is much more I can add to get up to the required six tokens, nor am I sure what those tokens should be. What gives? - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MPXDOC-91) bundled css files contain no filter tokens for ui property values
The following comment has been added to this issue: Author: David Weinkauf Created: Fri, 28 May 2004 4:25 PM Body: As a user, I would like the ability to set the xdoc style properties against the default maven theme and not be relegated to using the 'classic' theme which is obviously inferior. Also, as far as I can see, the xDoc Plugin site makes no mention of the fact that the style properties only work within the 'classic' theme. In other words, the website gives the false impression that these properties work with the default style. Just a suggestion... Thanks! - View this comment: http://jira.codehaus.org/browse/MPXDOC-91?page=comments#action_20167 - View the issue: http://jira.codehaus.org/browse/MPXDOC-91 Here is an overview of the issue: - Key: MPXDOC-91 Summary: bundled css files contain no filter tokens for ui property values Type: Bug Status: Closed Priority: Major Resolution: FIXED Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven-xdoc-plugin Fix Fors: 1.7 Assignee: Brett Porter Reporter: David Weinkauf Created: Fri, 26 Mar 2004 12:37 PM Updated: Fri, 28 May 2004 4:25 PM Environment: linux Description: the maven-base.css, maven-theme.css and print.css files currently in CVS and distributed with the latest version (1.6) appear to not have any filter tokens for the properties set in ui.properties and, as a result, any user-defined xdoc ui properties are not set in the CSS files. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build] Fri May 28 13:07:00 EDT 2004
Performing an update of maven-components ... Updates occured, build required ... P maven-plugins/maven-resources-plugin/project.xml --- Building mboot ... --- --- Maven MBoot --- Installing mboot in /home/users/jvanzyl/mboot ... --- Installing MBoot dependencies ... --- --- Install the parent pom for all maven-component artifacts ... --- Installing POM in /home/users/jvanzyl/maven-repo-local/maven/poms/maven-component-2.0-SNAPSHOT.pom --- Building maven-model ... --- Generating java in src/main/java from maven.mdo Generating xpp3 unmarshaller in src/main/java from maven.mdo Generating xpp3 marshaller in src/main/java from maven.mdo Building project in /home/users/jvanzyl/m2/maven-components/maven-model Using the following for your maven.repo.local: /home/users/jvanzyl/maven-repo-local Building tests in /home/users/jvanzyl/m2/maven-components/maven-model Running tests in /home/users/jvanzyl/m2/maven-components/maven-model --- T E S T S --- [surefire] Running org.codehaus.surefire.battery.DirectoryBattery [surefire] Tests run: 0, Failures: 0, Errors: 0, Time elapsed: 0 sec Building jars (maven-model-2.0-SNAPSHOT.jar) in /home/users/jvanzyl/m2/maven-components/maven-model/target Installing maven-model-2.0-SNAPSHOT.jar in /home/users/jvanzyl/maven-repo-local/maven/jars Installing POM in /home/users/jvanzyl/maven-repo-local/maven/poms/maven-model-2.0-SNAPSHOT.pom Generating xml schema in . from maven.mdo Generating xdoc in ./xdocs from maven.mdo --- Building maven-project ... --- Building project in /home/users/jvanzyl/m2/maven-components/maven-project Using the following for your maven.repo.local: /home/users/jvanzyl/maven-repo-local Building tests in /home/users/jvanzyl/m2/maven-components/maven-project Running tests in /home/users/jvanzyl/m2/maven-components/maven-project --- T E S T S --- [surefire] Running org.codehaus.surefire.battery.DirectoryBattery [surefire] Tests run: 0, Failures: 0, Errors: 0, Time elapsed: 0 sec [surefire] Running org.apache.maven.artifact.collector.DefaultArtifactCollectorTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.621 sec Created temporary local repository: ./target/temp-repo-local [INFO] Trying to download: /maven-test/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Actual md5 : 32ea5bb371496cf7c574232886d117cf [INFO] Expected md5: a5c3b5cd0605bb7331d1846cdc14b13b [INFO] md5 is valid: false [INFO] Trying to download: /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] IO error occred while transfering /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Trying to download: /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-2 [INFO] Actual md5 : d3b07384d113edec49eaa6238ad5ff00 [INFO] Expected md5: null [INFO] md5 is valid: false [INFO] Trying to download: /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] IO error occred while transfering /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Trying to download: /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-2 [INFO] IO error occred while transfering /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-2 [surefire] Running org.apache.maven.artifact.downloader.DefaultArtifactDownloaderTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.111 sec [surefire] Running org.apache.maven.artifact.resolver.DefaultArtifactResolverTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.064 sec [INFO] Trying to download: /snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar from file://./target/test-classes/remote-repo-1 [INFO] Actual md5 : 2c18e486683a3db1e645ad8523223b72 [INFO] Expected md5: null [INFO] md5 is valid: false [surefire] Running org.apache.maven.artifa
Re: cvs commit: maven-jelly-tags/xdocs changes.xml
Fixed... sorry about that. Emmanuel Venisse wrote: There a lock on this module for src and xdocs directories. Could you reslove it? Thanks. Emmanuel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-plugins/maven-resources-plugin/src/test/java/org/apache/maven/plugin ResourcesPluginTest.java
brett 2004/05/28 09:52:04
Modified:maven-plugins/maven-resources-plugin project.xml
Added:
maven-plugins/maven-resources-plugin/src/test/java/org/apache/maven/plugin
ResourcesPluginTest.java
Log:
add failing plugin test for something that should be in the default excludes
for resources. Test omitted from project.xml at present.
Revision ChangesPath
1.7 +7 -0
maven-components/maven-plugins/maven-resources-plugin/project.xml
Index: project.xml
===
RCS file:
/home/cvs/maven-components/maven-plugins/maven-resources-plugin/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 28 May 2004 12:07:43 - 1.6
+++ project.xml 28 May 2004 16:52:04 - 1.7
@@ -28,4 +28,11 @@
2.0-SNAPSHOT
+
+
+
+**/ResourcesPluginTest.java
+
+
+
1.1
maven-components/maven-plugins/maven-resources-plugin/src/test/java/org/apache/maven/plugin/ResourcesPluginTest.java
Index: ResourcesPluginTest.java
===
package org.apache.maven.plugin;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.PluginTestCase;
import org.apache.maven.plugin.ResourcesPlugin;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.embed.Embedder;
import java.io.File;
import java.io.FileWriter;
import java.io.PrintWriter;
import java.util.Collections;
import java.util.Map;
import java.util.HashMap;
/**
* @author mailto:[EMAIL PROTECTED]">Brett Porter
* @version $Id: ResourcesPluginTest.java,v 1.1 2004/05/28 16:52:04 brett Exp $
*/
public class ResourcesPluginTest
extends PluginTestCase
{
private static final String TEST_DIRECTORY = "target/tests/test-data";
private static final String OUTPUT_DIRECTORY = "target/tests/output";
public ResourcesPluginTest( String s )
{
super( s );
}
protected void setupPlugin()
throws Exception
{
plugin = new ResourcesPlugin();
// have to mkdir CVS as it can't be in CVS!
File f = new File( basedir, TEST_DIRECTORY + "/CVS" );
f.mkdirs();
f = new File( f, "Root" );
PrintWriter w = new PrintWriter( new FileWriter( f ) );
w.println( ":local:/cvs/root" );
w.close();
w = new PrintWriter( new FileWriter( new File( basedir, TEST_DIRECTORY +
"/test.txt" ) ) );
w.println( "test data" );
w.close();
// make sure the things in the output directory we test aren't there
f = new File( basedir, OUTPUT_DIRECTORY + "/CVS/Root" );
f.delete();
f.getParentFile().delete();
f = new File( basedir, OUTPUT_DIRECTORY + "/test.txt" );
f.delete();
f.getParentFile().delete();
}
protected Map getTestParameters()
throws Exception
{
Embedder embedder = new Embedder();
embedder.setClassLoader( Thread.currentThread().getContextClassLoader() );
embedder.start();
MavenProjectBuilder builder = (MavenProjectBuilder) embedder.lookup(
MavenProjectBuilder.ROLE );
// TODO: here it would be much nicer to just use resources from some test
project.xml file for
// testing the standard resources elements
// MavenProject project = builder.build( new File( basedir, "project.xml" )
);
Map parameters = new HashMap();
File directory = new File( basedir, TEST_DIRECTORY );
assertEquals( "sanity check name of directory " + directory, "test-data",
directory.getName() );
File f = new File( directory, "CVS/Root" );
assertTrue( "sanity check creation of CVS file " + f, f.exists() );
f = new File( directory, "test.txt" );
assertTrue( "sanity check creation of file " + f, f.exists() );
Resource r = new Resource();
r.setDirectory( TEST_DIRECTORY );
parameters.put( "resources", Collections.singletonList( r ) );
f = new File( basedir, OUTPUT_DIRECTORY );
assertFalse( "sanity check no output directory" + f, f.exists() );
parameters.put( "outputDirectory", OUTPUT_DIRECTORY );
return parameters;
}
protected void validatePluginExecution()
throws Exception
{
File f = new File( basedir + "/" + OUTPUT_DIRECTORY, "CVS/Root" );
assertFalse( "check no creation of CVS file " + f, f.exists() );
assertFalse( "check no creation of CVS directory " + f,
f.getParentFile().exists() );
cvs commit: maven-components/maven-plugins/maven-resources-plugin/src/test/java/org/apache/maven/plugin - New directory
brett 2004/05/28 09:50:20 maven-components/maven-plugins/maven-resources-plugin/src/test/java/org/apache/maven/plugin - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-plugins/maven-resources-plugin/src/test/java/org/apache/maven - New directory
brett 2004/05/28 09:48:09 maven-components/maven-plugins/maven-resources-plugin/src/test/java/org/apache/maven - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-plugins/maven-resources-plugin/src/test/java/org/apache - New directory
brett 2004/05/28 09:47:47 maven-components/maven-plugins/maven-resources-plugin/src/test/java/org/apache - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-plugins/maven-resources-plugin/src/test/java/org - New directory
brett 2004/05/28 09:47:34 maven-components/maven-plugins/maven-resources-plugin/src/test/java/org - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-plugins/maven-resources-plugin/src/test/java - New directory
brett 2004/05/28 09:47:04 maven-components/maven-plugins/maven-resources-plugin/src/test/java - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-plugins/maven-resources-plugin/src/test - New directory
brett 2004/05/28 09:46:49 maven-components/maven-plugins/maven-resources-plugin/src/test - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven-jelly-tags/xdocs changes.xml
There a lock on this module for src and xdocs directories. Could you reslove it? Thanks. Emmanuel - Original Message - From: "Brett Porter" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Friday, May 28, 2004 3:01 AM Subject: FW: cvs commit: maven-jelly-tags/xdocs changes.xml > since the mail alias isn't set up... > > ok, so maven-jelly-tags cvs module is now independant. Development on it > should be done on HEAD. > > Cheers, > Brett > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MAVEN-1297) The clean goal should ignore missing subproject dependencies
The following comment has been added to this issue: Author: dion gillard Created: Fri, 28 May 2004 10:09 AM Body: Often in a multiproject environment a 'master build' project with no subproject dependencies is created. - View this comment: http://jira.codehaus.org/browse/MAVEN-1297?page=comments#action_20162 - View the issue: http://jira.codehaus.org/browse/MAVEN-1297 Here is an overview of the issue: - Key: MAVEN-1297 Summary: The clean goal should ignore missing subproject dependencies Type: Bug Status: Unassigned Priority: Minor Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven Components: core Assignee: Reporter: Jim Crossley Created: Fri, 28 May 2004 9:57 AM Updated: Fri, 28 May 2004 10:09 AM Description: For a multiproject style project in which the subprojects are interdependent, e.g. an ear subproject depends on an ejb and a war subproject, it is impossible to attain the clean goal at the root of the project without first installing each subproject. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MAVEN-1297) The clean goal should ignore missing subproject dependencies
Message: A new issue has been created in JIRA. - View the issue: http://jira.codehaus.org/browse/MAVEN-1297 Here is an overview of the issue: - Key: MAVEN-1297 Summary: The clean goal should ignore missing subproject dependencies Type: Bug Status: Unassigned Priority: Minor Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven Components: core Assignee: Reporter: Jim Crossley Created: Fri, 28 May 2004 9:57 AM Updated: Fri, 28 May 2004 9:57 AM Description: For a multiproject style project in which the subprojects are interdependent, e.g. an ear subproject depends on an ejb and a war subproject, it is impossible to attain the clean goal at the root of the project without first installing each subproject. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
ant vs m1 vs m2
Howdy, Just for anyone interested in following the dev of m2: ant: real0m3.678s user0m2.270s sys 0m0.140s m1: real0m5.600s user0m4.180s sys 0m0.080s m2: real0m2.468s user0m0.910s sys 0m0.000s This is for the most simple of builds with one source file. Just really an illustration of initialization time. The minimal m2 POM: http://www.codehaus.org/~jvanzyl/project2.xml The minimal ant build.xml: http://www.codehaus.org/~jvanzyl/build.xml This is also m2 with no optimization attempted yet. -- jvz. Jason van Zyl [EMAIL PROTECTED] http://maven.apache.org happiness is like a butterfly: the more you chase it, the more it will elude you, but if you turn your attention to other things, it will come and sit softly on your shoulder ... -- Thoreau - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build] Fri May 28 09:07:00 EDT 2004
Performing an update of maven-components ... Updates occured, build required ... P maven-mboot/src/bash/pluggy P maven-plugins/maven-clean-plugin/project.xml P maven-plugins/maven-compiler-plugin/project.xml P maven-plugins/maven-jar-plugin/project.xml P maven-plugins/maven-resources-plugin/project.xml P maven-plugins/maven-surefire-plugin/project.xml --- Building mboot ... --- --- Maven MBoot --- Installing mboot in /home/users/jvanzyl/mboot ... --- Installing MBoot dependencies ... --- --- Install the parent pom for all maven-component artifacts ... --- Installing POM in /home/users/jvanzyl/maven-repo-local/maven/poms/maven-component-2.0-SNAPSHOT.pom --- Building maven-model ... --- Generating java in src/main/java from maven.mdo Generating xpp3 unmarshaller in src/main/java from maven.mdo Generating xpp3 marshaller in src/main/java from maven.mdo Building project in /home/users/jvanzyl/m2/maven-components/maven-model Using the following for your maven.repo.local: /home/users/jvanzyl/maven-repo-local Building tests in /home/users/jvanzyl/m2/maven-components/maven-model Running tests in /home/users/jvanzyl/m2/maven-components/maven-model --- T E S T S --- [surefire] Running org.codehaus.surefire.battery.DirectoryBattery [surefire] Tests run: 0, Failures: 0, Errors: 0, Time elapsed: 0 sec Building jars (maven-model-2.0-SNAPSHOT.jar) in /home/users/jvanzyl/m2/maven-components/maven-model/target Installing maven-model-2.0-SNAPSHOT.jar in /home/users/jvanzyl/maven-repo-local/maven/jars Installing POM in /home/users/jvanzyl/maven-repo-local/maven/poms/maven-model-2.0-SNAPSHOT.pom Generating xml schema in . from maven.mdo Generating xdoc in ./xdocs from maven.mdo --- Building maven-project ... --- Building project in /home/users/jvanzyl/m2/maven-components/maven-project Using the following for your maven.repo.local: /home/users/jvanzyl/maven-repo-local Building tests in /home/users/jvanzyl/m2/maven-components/maven-project Running tests in /home/users/jvanzyl/m2/maven-components/maven-project --- T E S T S --- [surefire] Running org.codehaus.surefire.battery.DirectoryBattery [surefire] Tests run: 0, Failures: 0, Errors: 0, Time elapsed: 0 sec [surefire] Running org.apache.maven.artifact.collector.DefaultArtifactCollectorTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.614 sec Created temporary local repository: ./target/temp-repo-local [INFO] Trying to download: /maven-test/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Actual md5 : 32ea5bb371496cf7c574232886d117cf [INFO] Expected md5: a5c3b5cd0605bb7331d1846cdc14b13b [INFO] md5 is valid: false [INFO] Trying to download: /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] IO error occred while transfering /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Trying to download: /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-2 [INFO] Actual md5 : d3b07384d113edec49eaa6238ad5ff00 [INFO] Expected md5: null [INFO] md5 is valid: false [INFO] Trying to download: /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] IO error occred while transfering /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Trying to download: /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-2 [INFO] IO error occred while transfering /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-2 [surefire] Running org.apache.maven.artifact.downloader.DefaultArtifactDownloaderTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.11 sec [surefire] Running org.apache.maven.artifact.resolver.DefaultArtifactResolverTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.065 sec [INFO] Trying to download: /snapshot-test/jars/maven-snapsh
RE: cvs commit: maven-components/maven-core/src/main/java/org/apa che/maven DefaultMavenCore.java
On Fri, 2004-05-28 at 08:43, Jason van Zyl wrote: > On Fri, 2004-05-28 at 08:21, Maczka Michal wrote: > > > For plexus components we can use Plexus logging mechanism and/or Monitors. > > What might be difficult to deal with are Mojos (Maven Pojos) > > They are supposed to be really simple classes which are independent of > > Plexus or Maven > > and have (almost) no external dependencies. > > It will be bad to bind them to some logging framework or some API which > > defines contract for Monitors, but I don't see other way > > at the moment except AOP :( > > I think having a monitor is fine, but one of the nice things about the > request/response is that any output intended for users can be collected > and the output defferred until the operation of the plugin/mojo is > complete and request populated. For example in the compiler plugin you ^^^ I meant response there. > could collect all compilation errors and corresponding sources files and > they come back in a CompileError object. You don't have to spit any > messages out to the user in the plugin itself, that information can be > extracted and maven itself can toss the information out. But I still > think a monitor is fine, right now the plugins depend on code which > totals 7-8k, I'm not too concerned about that and addinga monitor in > maven-plugin is not going to cause a great deal of impact. > > > > > Michal > > > > - > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > For additional commands, e-mail: [EMAIL PROTECTED] -- jvz. Jason van Zyl [EMAIL PROTECTED] http://maven.apache.org happiness is like a butterfly: the more you chase it, the more it will elude you, but if you turn your attention to other things, it will come and sit softly on your shoulder ... -- Thoreau - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven-components/maven-core/src/main/java/org/apache/maven DefaultMavenCore.java
On Fri, 2004-05-28 at 08:11, Emmanuel Venisse wrote:
> Yes for the moment, I think we don't have a log strategy. Jason?
The use of a simple monitor and/or a strategy to extract message
information from the response and let the client system take care of
sending messages to the user, whether that be the console or some GUI
dialog box.
> Emmanuel
>
> - Original Message -
> From: "Brett Porter" <[EMAIL PROTECTED]>
> To: "Maven Developers List" <[EMAIL PROTECTED]>
> Sent: Friday, May 28, 2004 2:02 PM
> Subject: Re: cvs commit:
> maven-components/maven-core/src/main/java/org/apache/maven
> DefaultMavenCore.java
>
>
> > Are we really still using System.out in the new code? I thought there
> > would be some monitors for this.
> >
> > [EMAIL PROTECTED] wrote:
> >
> > >evenisse2004/05/28 04:59:56
> > >
> > > Modified:maven-core/src/main/java/org/apache/maven
> > >DefaultMavenCore.java
> > > Log:
> > > Add some trace processing for reactor.
> > >
> > > Revision ChangesPath
> > > 1.8 +9 -0
> maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.
> java
> > >
> > > Index: DefaultMavenCore.java
> > > ===
> > > RCS file:
> /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/Default
> MavenCore.java,v
> > > retrieving revision 1.7
> > > retrieving revision 1.8
> > > diff -u -r1.7 -r1.8
> > > --- DefaultMavenCore.java 28 May 2004 11:32:09 - 1.7
> > > +++ DefaultMavenCore.java 28 May 2004 11:59:56 - 1.8
> > > @@ -107,6 +107,8 @@
> > > throws ReactorException, GoalNotFoundException
> > > {
> > > List projects = new ArrayList();
> > > +
> > > +System.out.println( "Starting the reactor..." );
> > >
> > > try
> > > {
> > > @@ -122,6 +124,13 @@
> > > catch ( Exception e )
> > > {
> > > throw new ReactorException( "Error processing projects for
> the reactor: ", e );
> > > +}
> > > +
> > > +System.out.println( "Our processing order:" );
> > > +for ( Iterator iterator = projects.iterator();
> iterator.hasNext(); )
> > > +{
> > > +MavenProject project = (MavenProject) iterator.next();
> > > +System.out.println( project.getName() );
> > > }
> > >
> > > String[] goalsList = StringUtils.split( goals, "," );
> > >
> > >
> > >
> > >
> > >-
> > >To unsubscribe, e-mail: [EMAIL PROTECTED]
> > >For additional commands, e-mail: [EMAIL PROTECTED]
> > >
> > >.
> > >
> > >
> > >
> >
> >
> > -
> > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > For additional commands, e-mail: [EMAIL PROTECTED]
> >
> >
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
--
jvz.
Jason van Zyl
[EMAIL PROTECTED]
http://maven.apache.org
happiness is like a butterfly: the more you chase it, the more it will
elude you, but if you turn your attention to other things, it will come
and sit softly on your shoulder ...
-- Thoreau
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: maven-components/maven-core/src/main/java/org/apa che/maven DefaultMavenCore.java
On Fri, 2004-05-28 at 08:21, Maczka Michal wrote: > For plexus components we can use Plexus logging mechanism and/or Monitors. > What might be difficult to deal with are Mojos (Maven Pojos) > They are supposed to be really simple classes which are independent of > Plexus or Maven > and have (almost) no external dependencies. > It will be bad to bind them to some logging framework or some API which > defines contract for Monitors, but I don't see other way > at the moment except AOP :( I think having a monitor is fine, but one of the nice things about the request/response is that any output intended for users can be collected and the output defferred until the operation of the plugin/mojo is complete and request populated. For example in the compiler plugin you could collect all compilation errors and corresponding sources files and they come back in a CompileError object. You don't have to spit any messages out to the user in the plugin itself, that information can be extracted and maven itself can toss the information out. But I still think a monitor is fine, right now the plugins depend on code which totals 7-8k, I'm not too concerned about that and addinga monitor in maven-plugin is not going to cause a great deal of impact. > > Michal > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] -- jvz. Jason van Zyl [EMAIL PROTECTED] http://maven.apache.org happiness is like a butterfly: the more you chase it, the more it will elude you, but if you turn your attention to other things, it will come and sit softly on your shoulder ... -- Thoreau - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: maven-components/maven-core/src/main/java/org/apa che/maven DefaultMavenCore.java
> -Original Message- > From: Emmanuel Venisse [mailto:[EMAIL PROTECTED] > Sent: Friday, May 28, 2004 2:12 PM > To: Maven Developers List; [EMAIL PROTECTED] > Subject: Re: cvs commit: > maven-components/maven-core/src/main/java/org/apache/maven > DefaultMavenCore.java > > > Yes for the moment, I think we don't have a log strategy. Jason? > > Emmanuel > > - Original Message - > From: "Brett Porter" <[EMAIL PROTECTED]> > > Are we really still using System.out in the new code? I > thought there > > would be some monitors for this. I think we don't have yet the global strategy. This is something which we must think of but is not really needed to have working version of m2 alpha1. And this is what we are slowly but surly approaching. For plexus components we can use Plexus logging mechanism and/or Monitors. What might be difficult to deal with are Mojos (Maven Pojos) They are supposed to be really simple classes which are independent of Plexus or Maven and have (almost) no external dependencies. It will be bad to bind them to some logging framework or some API which defines contract for Monitors, but I don't see other way at the moment except AOP :( Michal - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-mboot/src/bash pluggy
evenisse2004/05/28 05:19:41
Modified:maven-mboot/src/bash pluggy
Log:
Add pom to usage.
Revision ChangesPath
1.4 +2 -2 maven-components/maven-mboot/src/bash/pluggy
Index: pluggy
===
RCS file: /home/cvs/maven-components/maven-mboot/src/bash/pluggy,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pluggy27 May 2004 20:04:02 - 1.3
+++ pluggy28 May 2004 12:19:41 - 1.4
@@ -4,9 +4,9 @@
usage ()
{
- echo "usage: `basename $0` --mode=descriptor|xdoc --source=
--destination=" >&2
+ echo "usage: `basename $0` --mode=descriptor|xdoc --source=
--destination= --pom=" >&2
echo "" >&2
- echo " (ex: `basename $0` --mode=descriptor --source=src/main/java
--destination=target)" >&2
+ echo " (ex: `basename $0` --mode=descriptor --source=src/main/java
--destination=target --pom=project.xml)" >&2
exit 1
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build] Fri May 28 08:07:00 EDT 2004
Performing an update of maven-components ... Updates occured, build required ... P maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java P maven-core/src/main/java/org/apache/maven/Maven.java P maven-core/src/main/java/org/apache/maven/MavenCli.java P maven-core/src/main/java/org/apache/maven/MavenCore.java --- Building mboot ... --- --- Maven MBoot --- Installing mboot in /home/users/jvanzyl/mboot ... --- Installing MBoot dependencies ... --- --- Install the parent pom for all maven-component artifacts ... --- Installing POM in /home/users/jvanzyl/maven-repo-local/maven/poms/maven-component-2.0-SNAPSHOT.pom --- Building maven-model ... --- Generating java in src/main/java from maven.mdo Generating xpp3 unmarshaller in src/main/java from maven.mdo Generating xpp3 marshaller in src/main/java from maven.mdo Building project in /home/users/jvanzyl/m2/maven-components/maven-model Using the following for your maven.repo.local: /home/users/jvanzyl/maven-repo-local Building tests in /home/users/jvanzyl/m2/maven-components/maven-model Running tests in /home/users/jvanzyl/m2/maven-components/maven-model --- T E S T S --- [surefire] Running org.codehaus.surefire.battery.DirectoryBattery [surefire] Tests run: 0, Failures: 0, Errors: 0, Time elapsed: 0 sec Building jars (maven-model-2.0-SNAPSHOT.jar) in /home/users/jvanzyl/m2/maven-components/maven-model/target Installing maven-model-2.0-SNAPSHOT.jar in /home/users/jvanzyl/maven-repo-local/maven/jars Installing POM in /home/users/jvanzyl/maven-repo-local/maven/poms/maven-model-2.0-SNAPSHOT.pom Generating xml schema in . from maven.mdo Generating xdoc in ./xdocs from maven.mdo --- Building maven-project ... --- Building project in /home/users/jvanzyl/m2/maven-components/maven-project Using the following for your maven.repo.local: /home/users/jvanzyl/maven-repo-local Building tests in /home/users/jvanzyl/m2/maven-components/maven-project Running tests in /home/users/jvanzyl/m2/maven-components/maven-project --- T E S T S --- [surefire] Running org.codehaus.surefire.battery.DirectoryBattery [surefire] Tests run: 0, Failures: 0, Errors: 0, Time elapsed: 0 sec [surefire] Running org.apache.maven.artifact.collector.DefaultArtifactCollectorTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.617 sec Created temporary local repository: ./target/temp-repo-local [INFO] Trying to download: /maven-test/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Actual md5 : 32ea5bb371496cf7c574232886d117cf [INFO] Expected md5: a5c3b5cd0605bb7331d1846cdc14b13b [INFO] md5 is valid: false [INFO] Trying to download: /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] IO error occred while transfering /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Trying to download: /maven-test/jars/maven-test-z-1.0.jar from file://./target/test-classes/remote-repo-2 [INFO] Actual md5 : d3b07384d113edec49eaa6238ad5ff00 [INFO] Expected md5: null [INFO] md5 is valid: false [INFO] Trying to download: /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] IO error occred while transfering /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-1 [INFO] Trying to download: /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-2 [INFO] IO error occred while transfering /bizzare/jars/maven-test-b-1.0.jar from file://./target/test-classes/remote-repo-2 [surefire] Running org.apache.maven.artifact.downloader.DefaultArtifactDownloaderTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.159 sec [surefire] Running org.apache.maven.artifact.resolver.DefaultArtifactResolverTest [surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.065 sec [INFO] Trying to download: /snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar from file:
cvs commit: maven-components/maven-plugins/maven-surefire-plugin project.xml
evenisse2004/05/28 05:07:43 Modified:maven-plugins/maven-clean-plugin project.xml maven-plugins/maven-compiler-plugin project.xml maven-plugins/maven-jar-plugin project.xml maven-plugins/maven-resources-plugin project.xml maven-plugins/maven-surefire-plugin project.xml Log: Fix plugins name. Revision ChangesPath 1.4 +1 -1 maven-components/maven-plugins/maven-clean-plugin/project.xml Index: project.xml === RCS file: /home/cvs/maven-components/maven-plugins/maven-clean-plugin/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 25 May 2004 20:08:27 - 1.3 +++ project.xml 28 May 2004 12:07:42 - 1.4 @@ -8,7 +8,7 @@ maven-clean-plugin maven-clean-plugin - Maven + Maven Clean Plugin 1.0-SNAPSHOT 2001 org.apache.maven 1.6 +1 -1 maven-components/maven-plugins/maven-compiler-plugin/project.xml Index: project.xml === RCS file: /home/cvs/maven-components/maven-plugins/maven-compiler-plugin/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 25 May 2004 20:08:27 - 1.5 +++ project.xml 28 May 2004 12:07:42 - 1.6 @@ -8,7 +8,7 @@ maven-compiler-plugin maven-compiler-plugin - Maven + Maven Compiler Plugin 1.0-SNAPSHOT 2001 org.apache.maven 1.5 +1 -1 maven-components/maven-plugins/maven-jar-plugin/project.xml Index: project.xml === RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 25 May 2004 20:08:28 - 1.4 +++ project.xml 28 May 2004 12:07:42 - 1.5 @@ -8,7 +8,7 @@ maven maven-jar-plugin - Maven + Maven Jar Plugin 1.0-SNAPSHOT org.apache.maven 1.6 +1 -1 maven-components/maven-plugins/maven-resources-plugin/project.xml Index: project.xml === RCS file: /home/cvs/maven-components/maven-plugins/maven-resources-plugin/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 25 May 2004 20:08:28 - 1.5 +++ project.xml 28 May 2004 12:07:43 - 1.6 @@ -8,7 +8,7 @@ maven maven-resources-plugin - Maven + Maven Resources Plugin 1.0-SNAPSHOT org.apache.maven 1.6 +1 -1 maven-components/maven-plugins/maven-surefire-plugin/project.xml Index: project.xml === RCS file: /home/cvs/maven-components/maven-plugins/maven-surefire-plugin/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 25 May 2004 20:08:28 - 1.5 +++ project.xml 28 May 2004 12:07:43 - 1.6 @@ -8,7 +8,7 @@ maven maven-surefire-plugin - Maven + Maven Surefire Plugin 1.0-SNAPSHOT org.apache.maven - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven-components/maven-core/src/main/java/org/apache/maven DefaultMavenCore.java
Yes for the moment, I think we don't have a log strategy. Jason?
Emmanuel
- Original Message -
From: "Brett Porter" <[EMAIL PROTECTED]>
To: "Maven Developers List" <[EMAIL PROTECTED]>
Sent: Friday, May 28, 2004 2:02 PM
Subject: Re: cvs commit:
maven-components/maven-core/src/main/java/org/apache/maven
DefaultMavenCore.java
> Are we really still using System.out in the new code? I thought there
> would be some monitors for this.
>
> [EMAIL PROTECTED] wrote:
>
> >evenisse2004/05/28 04:59:56
> >
> > Modified:maven-core/src/main/java/org/apache/maven
> >DefaultMavenCore.java
> > Log:
> > Add some trace processing for reactor.
> >
> > Revision ChangesPath
> > 1.8 +9 -0
maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.
java
> >
> > Index: DefaultMavenCore.java
> > ===
> > RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/Default
MavenCore.java,v
> > retrieving revision 1.7
> > retrieving revision 1.8
> > diff -u -r1.7 -r1.8
> > --- DefaultMavenCore.java 28 May 2004 11:32:09 - 1.7
> > +++ DefaultMavenCore.java 28 May 2004 11:59:56 - 1.8
> > @@ -107,6 +107,8 @@
> > throws ReactorException, GoalNotFoundException
> > {
> > List projects = new ArrayList();
> > +
> > +System.out.println( "Starting the reactor..." );
> >
> > try
> > {
> > @@ -122,6 +124,13 @@
> > catch ( Exception e )
> > {
> > throw new ReactorException( "Error processing projects for
the reactor: ", e );
> > +}
> > +
> > +System.out.println( "Our processing order:" );
> > +for ( Iterator iterator = projects.iterator();
iterator.hasNext(); )
> > +{
> > +MavenProject project = (MavenProject) iterator.next();
> > +System.out.println( project.getName() );
> > }
> >
> > String[] goalsList = StringUtils.split( goals, "," );
> >
> >
> >
> >
> >-
> >To unsubscribe, e-mail: [EMAIL PROTECTED]
> >For additional commands, e-mail: [EMAIL PROTECTED]
> >
> >.
> >
> >
> >
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven-components/maven-core/src/main/java/org/apache/maven DefaultMavenCore.java
Are we really still using System.out in the new code? I thought there
would be some monitors for this.
[EMAIL PROTECTED] wrote:
evenisse2004/05/28 04:59:56
Modified:maven-core/src/main/java/org/apache/maven
DefaultMavenCore.java
Log:
Add some trace processing for reactor.
Revision ChangesPath
1.8 +9 -0 maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java
Index: DefaultMavenCore.java
===
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultMavenCore.java 28 May 2004 11:32:09 - 1.7
+++ DefaultMavenCore.java 28 May 2004 11:59:56 - 1.8
@@ -107,6 +107,8 @@
throws ReactorException, GoalNotFoundException
{
List projects = new ArrayList();
+
+System.out.println( "Starting the reactor..." );
try
{
@@ -122,6 +124,13 @@
catch ( Exception e )
{
throw new ReactorException( "Error processing projects for the reactor: ", e );
+}
+
+System.out.println( "Our processing order:" );
+for ( Iterator iterator = projects.iterator(); iterator.hasNext(); )
+{
+MavenProject project = (MavenProject) iterator.next();
+System.out.println( project.getName() );
}
String[] goalsList = StringUtils.split( goals, "," );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven DefaultMavenCore.java
evenisse2004/05/28 04:59:56
Modified:maven-core/src/main/java/org/apache/maven
DefaultMavenCore.java
Log:
Add some trace processing for reactor.
Revision ChangesPath
1.8 +9 -0
maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java
Index: DefaultMavenCore.java
===
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultMavenCore.java 28 May 2004 11:32:09 - 1.7
+++ DefaultMavenCore.java 28 May 2004 11:59:56 - 1.8
@@ -107,6 +107,8 @@
throws ReactorException, GoalNotFoundException
{
List projects = new ArrayList();
+
+System.out.println( "Starting the reactor..." );
try
{
@@ -122,6 +124,13 @@
catch ( Exception e )
{
throw new ReactorException( "Error processing projects for the reactor:
", e );
+}
+
+System.out.println( "Our processing order:" );
+for ( Iterator iterator = projects.iterator(); iterator.hasNext(); )
+{
+MavenProject project = (MavenProject) iterator.next();
+System.out.println( project.getName() );
}
String[] goalsList = StringUtils.split( goals, "," );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven DefaultMavenCore.java Maven.java MavenCli.java MavenCore.java
evenisse2004/05/28 04:32:09
Modified:maven-core/src/main/java/org/apache/maven
DefaultMavenCore.java Maven.java MavenCli.java
MavenCore.java
Log:
Add the possibility to define includes and excludes project for the reactor
processing with maven.reactor.includes and maven.reactor.excludes properties.
Revision ChangesPath
1.7 +9 -3
maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java
Index: DefaultMavenCore.java
===
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultMavenCore.java 20 May 2004 17:09:30 - 1.6
+++ DefaultMavenCore.java 28 May 2004 11:32:09 - 1.7
@@ -34,6 +34,7 @@
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.ArrayList;
@@ -102,14 +103,14 @@
// Reactor execution
// --
-public void executeReactor( String goal )
+public void executeReactor( String goals, String includes, String excludes )
throws ReactorException, GoalNotFoundException
{
List projects = new ArrayList();
try
{
-List files = FileUtils.getFiles( new File( System.getProperty(
"user.dir" ) ), "**/project.xml,**/project2.xml", "project.xml,project2.xml" );
+List files = FileUtils.getFiles( new File( System.getProperty(
"user.dir" ) ), includes, excludes );
for ( Iterator iterator = files.iterator(); iterator.hasNext(); )
{
@@ -122,10 +123,15 @@
{
throw new ReactorException( "Error processing projects for the reactor:
", e );
}
+
+String[] goalsList = StringUtils.split( goals, "," );
for ( Iterator iterator = projects.iterator(); iterator.hasNext(); )
{
-execute( (MavenProject) iterator.next(), goal );
+for ( int i=0; i
[jira] Closed: (MPJCOVERAGE-8) jcoverage report generation fails when no java source present
Message: The following issue has been closed. Resolver: Emmanuel Venisse Date: Fri, 28 May 2004 6:27 AM Done. - View the issue: http://jira.codehaus.org/browse/MPJCOVERAGE-8 Here is an overview of the issue: - Key: MPJCOVERAGE-8 Summary: jcoverage report generation fails when no java source present Type: Bug Status: Closed Priority: Major Resolution: FIXED Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven-jcoverage-plugin Fix Fors: 1.0.5 Assignee: Emmanuel Venisse Reporter: Ryan Sonnek Created: Thu, 20 May 2004 9:56 PM Updated: Fri, 28 May 2004 6:27 AM Environment: maven-1.0-rc3, WinXP Description: if no java source is present for a project, generating the jcoverage report fails with an error. this problem is very similar to a bug filed (and fixed) for the clover plugin. MPCLOVER-17 - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/jcoverage/xdocs changes.xml
evenisse2004/05/28 03:27:27
Modified:jcoverage plugin.jelly
jcoverage/xdocs changes.xml
Log:
MPJCOVERAGE-8. Fixed report generation fails when no java source present.
Revision ChangesPath
1.13 +60 -53maven-plugins/jcoverage/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/jcoverage/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 27 May 2004 01:14:12 - 1.12
+++ plugin.jelly 28 May 2004 10:27:27 - 1.13
@@ -159,60 +159,67 @@
description="Generate HTML test coverage reports with JCoverage"
prereqs="jcoverage:on,test:test">
-
-
-
- ${sourceDir}
-
-
-Copying ${size(sourceDirList)} source directories into one for
jcoverage
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
- jcoverage reports have been generated.
- The HTML report is
${maven.build.coverage.dir}/index.html
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${pom.getPluginContext('maven-test-plugin').setVariable('maven.junit.fork',
oldfork)}
-
- ${pom.getPluginContext('maven-test-plugin').setVariable('maven.build.dest',
oldBuildDest)}
-
-
- ${ex}
-
-
+
+ ${sourceDir}
+
+
+Copying ${size(sourceDirList)} source directories into one for
jcoverage
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ jcoverage reports have been generated.
+ The HTML report is
${maven.build.coverage.dir}/index.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
${pom.getPluginContext('maven-test-plugin').setVariable('maven.junit.fork', oldfork)}
+
+
${pom.getPluginContext('maven-test-plugin').setVariable('maven.build.dest',
oldBuildDest)}
+
+
+ ${ex}
+
+
+
+
+No tests to run JCoverage on.
+
+
1.16 +1 -0 maven-plugins/jcoverage/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/maven-plugins/jcoverage/xdocs/changes.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- changes.xml 27 May 2004 01:14:12 - 1.15
+++ changes.xml 28 May 2004 10:27:27 - 1.16
@@ -25,6 +25,7 @@
+ Fixed report
generation fails when no java source present.
Handle multiple source
directories correctly
Copy all of maven.build.dest, excluding the
class files, into the instrumentation directory, as some people hook into the
resources copying themselves without adding them to the POM
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MPJNLP-9) Missing initialization in jnlp:generate-keystore goal
Message: The following issue has been closed. Resolver: Emmanuel Venisse Date: Fri, 28 May 2004 6:12 AM Done. - View the issue: http://jira.codehaus.org/browse/MPJNLP-9 Here is an overview of the issue: - Key: MPJNLP-9 Summary: Missing initialization in jnlp:generate-keystore goal Type: Bug Status: Closed Priority: Major Resolution: FIXED Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven-jnlp-plugin Fix Fors: 1.4 Versions: 1.3 Assignee: Emmanuel Venisse Reporter: Frederic Gedin Created: Thu, 27 May 2004 8:19 AM Updated: Fri, 28 May 2004 6:12 AM Environment: Linux Description: The jnlp:generate-jnlp goal starts with a set of lines which initialize the variables needed to build the jnlp actifacts. The same lines are neither present nor invoked in the jnlp:generate-keystore goal. This make the goal seem to work but the result cannot be used later with the jnlp:generate-jnlp goal. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MAVEN-1273) HttpClient spits out errors when HTTP BASIC authenticated remote repos are configured
The following comment has been added to this issue: Author: Andreas Peschka Created: Fri, 28 May 2004 6:05 AM Body: I had the same Problem! I fixed it by changing one line code in org.apache.maven.util.HttpUtils: Line 244 (CVS from 28.05.04) String encoding = Base64.encode(up.getBytes(), true); to String encoding = Base64.encode(up.getBytes(), false); Hope it helps! - View this comment: http://jira.codehaus.org/browse/MAVEN-1273?page=comments#action_20157 - View the issue: http://jira.codehaus.org/browse/MAVEN-1273 Here is an overview of the issue: - Key: MAVEN-1273 Summary: HttpClient spits out errors when HTTP BASIC authenticated remote repos are configured Type: Bug Status: Unassigned Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven Components: core Assignee: Reporter: Rafal Krzewski Created: Fri, 7 May 2004 7:09 AM Updated: Fri, 28 May 2004 6:05 AM Description: For a while now I am getting error messages like these: Getting URL: http://user:[EMAIL PROTECTED]/maven/objectledge/jars/ledge-components-SNAPSHOT.jar Error retrieving artifact from [http://user:[EMAIL PROTECTED]/maven/objectledge/jars/ledge-components-SNAPSHOT.jar]: java.lang.IllegalArgumentException: Illegal character(s) in message header value: Basic GFzc3dvcmQ= HttpClient upgrade needed? - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/jnlp/xdocs changes.xml
evenisse2004/05/28 03:12:31
Modified:jnlp plugin.jelly
jnlp/xdocs changes.xml
Log:
MPJNLP-9. Add jnlp:init goal for jnlp:generate-keystore goal.
Revision ChangesPath
1.26 +10 -5 maven-plugins/jnlp/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/jnlp/plugin.jelly,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- plugin.jelly 28 May 2004 09:53:24 - 1.25
+++ plugin.jelly 28 May 2004 10:12:31 - 1.26
@@ -41,9 +41,15 @@
description="Generate JNLP file and sign all jars"
prereqs="jnlp:generate-jnlp"/>
+
+
+
+
+ prereqs="jar:jar, jnlp:init">
Creating ${maven.jnlp.dir}/${pom.artifactId}.jnlp ...
@@ -54,8 +60,6 @@
-
-
@@ -385,8 +389,9 @@
-
+ description="Generate a keystore file"
+ prereqs="jnlp:init">
+
+ Initialize correctly
jnlp:generate-keystore goal.
Added Support for JarDiff.
Added maven.jnlp.signjar.storetype
property.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MPJNLP-8) Add Support for JarDiff
Message: The following issue has been closed. Resolver: Emmanuel Venisse Date: Fri, 28 May 2004 5:54 AM Applied. Thanks. - View the issue: http://jira.codehaus.org/browse/MPJNLP-8 Here is an overview of the issue: - Key: MPJNLP-8 Summary: Add Support for JarDiff Type: New Feature Status: Closed Priority: Major Resolution: FIXED Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven-jnlp-plugin Fix Fors: 1.4 Versions: 1.3 Assignee: Emmanuel Venisse Reporter: Pelle Braendgaard Created: Thu, 20 May 2004 2:00 PM Updated: Fri, 28 May 2004 5:54 AM Description: Sun's JNLP Download Servlet has a neat feature for doing jar diffs, where they only give you the differences between various versions of a jar file. This can improve the download speeds immensely between updates. The current of the jnlp plugin supports the versions.xml file which is used by the download servlet to map the jar files to specific version numbers. However it is currently handled indirectly. Currently the jnlp file has the following for a dependency: which is incorrect. It should have the following: which allows the download servlet to find the jar file using the version.xml file. The version.xml file also is incorrect (all be it it works with the above incorrect jnlp). Currently it generates the following: dom4j-1.4.jar 1.4 dom4j-1.4.jar What it should generate is the following: dom4j.jar 1.4 dom4j-1.4.jar This now leads us to the problem with autogenerating a version.xml file. This file needs to contain all the previous versions of each dependency. This could get very complex. Thankfully there is a way around this. It is to use a naming based versioning scheme. Sun in their wisdom decided to invent a new one. However it is fairly easy to modify the current jnlp plugin to support it. What happens is that we need to rename dom4-1.4.jar to dom4__V1.4.jar. Now when we deploy our updated app we just leave the old jar files where they are and the JNLP Download Servlet can calculate diffs based on it. I've included diffs for doing it. All you need to do is place the following property in your project.properties: maven.jnlp.jardiff=true I will attach the diff file in the comments to this entry. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/jnlp/xdocs changes.xml properties.xml
evenisse2004/05/28 02:53:24
Modified:jnlp plugin.jelly plugin.properties project.xml
jnlp/xdocs changes.xml properties.xml
Log:
MPJNLP-8. Added Support for JarDiff.
Revision ChangesPath
1.25 +35 -2 maven-plugins/jnlp/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/jnlp/plugin.jelly,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- plugin.jelly 4 Mar 2004 18:36:13 - 1.24
+++ plugin.jelly 28 May 2004 09:53:24 - 1.25
@@ -128,6 +128,9 @@
+
+
+
@@ -138,6 +141,9 @@
+
+
+
@@ -159,6 +165,9 @@
+
+
+
@@ -169,6 +178,9 @@
+
+
+
@@ -299,20 +311,39 @@
Found a store...signing jars
Signing jar files ...
+
+
+
+
+
+Not Using JarDiff ...
+
+
+
+
+
+
+
+
+
+
+
@@ -321,6 +352,7 @@
jar="${maven.jnlp.tmpdir}/${lib.file.name}"
signedjar="${maven.jnlp.dir}/${lib.file.name}"
alias="${maven.jnlp.signjar.alias}"
+ storetype="${maven.jnlp.signjar.storetype}"
storepass="${maven.jnlp.signjar.storepass}"
keystore="${maven.jnlp.signjar.store}"/>
@@ -359,6 +391,7 @@
1.6 +2 -1 maven-plugins/jnlp/plugin.properties
Index: plugin.properties
===
RCS file: /home/cvs/maven-plugins/jnlp/plugin.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.properties 4 Mar 2004 18:36:13 - 1.5
+++ plugin.properties 28 May 2004 09:53:24 - 1.6
@@ -30,6 +30,7 @@
## maven.jnlp.description.short=${pom.shortDescription}
##maven.jnlp.offline.allowed=true
##maven.jnlp.permission=all or j2ee
+##maven.jnlp.jardiff=true
maven.jnlp.j2se.version=1.4
maven.jnlp.j2se.heapsize.initial=32m
@@ -44,7 +45,7 @@
##maven.jnlp.signjar.store
##maven.jnlp.signjar.storepass
## maven.jnlp.signjar.alias=${pom.artifactId}
-
+maven.jnlp.signjar.storetype=jks
maven.jnlp.signjar.validity=720
##maven.jnlp.signjar.dname.cn //Common name
##maven.jnlp.signjar.dname.ou //Organization unit
1.21 +1 -1 maven-plugins/jnlp/project.xml
Index: project.xml
===
RCS file: /home/cvs/maven-plugins/jnlp/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 2 May 2004 14:16:25 - 1.20
+++ project.xml 28 May 2004 09:53:24 - 1.21
@@ -23,7 +23,7 @@
3
maven-jnlp-plugin
Maven JNLP Plug-in
- 1.3
+ 1.4-SNAPSHOT
JNLP Plugin for Maven
http://maven.apache.org/reference/plugins/jnlp/
/www/maven.apache.org/reference/plugins/jnlp/
1.15 +4 -0 maven-plugins/jnlp/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/maven-plugins/jnlp/xdocs/changes.xml,v
retrieving revision 1.14
retriev
