svn commit: r566059 - /maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
Author: oching
Date: Wed Aug 15 01:22:08 2007
New Revision: 566059
URL: http://svn.apache.org/viewvc?view=revrev=566059
Log:
Moved searcher.close() in DefaultCrossRepositorySearch.searchAll(...) inside
finally block.
Modified:
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
Modified:
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java?view=diffrev=566059r1=566058r2=566059
==
---
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
Wed Aug 15 01:22:08 2007
@@ -190,10 +190,12 @@
Searchable searchables[] = new Searchable[searchableList.size()];
searchableList.toArray( searchables );
+MultiSearcher searcher = null;
+
try
{
// Create a multi-searcher for looking up the information.
-MultiSearcher searcher = new MultiSearcher( searchables );
+searcher = new MultiSearcher( searchables );
// Perform the search.
Hits hits = searcher.search( specificQuery );
@@ -238,11 +240,21 @@
}
}
-searcher.close();
}
catch ( IOException e )
{
getLogger().error( Unable to setup multi-search: +
e.getMessage(), e );
+}
+finally
+{
+try
+{
+searcher.close();
+}
+catch ( IOException ie )
+{
+getLogger().error( Unable to close index searcher: +
ie.getMessage(), ie );
+}
}
return results;
svn commit: r566068 - /maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
Author: oching
Date: Wed Aug 15 01:47:14 2007
New Revision: 566068
URL: http://svn.apache.org/viewvc?view=revrev=566068
Log:
[MRM-374] and [MRM-407]
- Added hack for the webwork checkbox bug (when default value is true) in
ConfigureRepositoryAction
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java?view=diffrev=566068r1=566067r2=566068
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
Wed Aug 15 01:47:14 2007
@@ -85,6 +85,9 @@
getLogger().info( .add() );
this.mode = add;
+this.repository.setReleases( true );
+this.repository.setIndexed( true );
+
return INPUT;
}
@@ -211,6 +214,8 @@
if ( id == null )
{
this.repository = new AdminRepositoryConfiguration();
+this.repository.setReleases( false );
+this.repository.setIndexed( false );
}
RepositoryConfiguration repoconfig =
archivaConfiguration.getConfiguration().findRepositoryById( id );
svn commit: r566071 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test: java/org/apache/maven/doxia/module/fml/FmlParserTest.java resources/faq.fml resources/test.fml
Author: ltheussl
Date: Wed Aug 15 01:55:44 2007
New Revision: 566071
URL: http://svn.apache.org/viewvc?view=revrev=566071
Log:
Use new test classes for FmlParserTest
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/test.fml
(with props)
Removed:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/faq.fml
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java?view=diffrev=566071r1=566070r2=566071
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
Wed Aug 15 01:55:44 2007
@@ -20,7 +20,7 @@
*/
import org.apache.maven.doxia.module.fml.FmlParser;
-import org.apache.maven.doxia.parser.AbstractParserTestCase;
+import org.apache.maven.doxia.parser.AbstractParserTest;
import org.apache.maven.doxia.parser.Parser;
/**
@@ -28,17 +28,19 @@
* @version $Id$
*/
public class FmlParserTest
-extends AbstractParserTestCase
+extends AbstractParserTest
{
/** [EMAIL PROTECTED] */
-protected Parser getParser()
+protected Parser createParser()
{
return new FmlParser();
}
/** [EMAIL PROTECTED] */
-protected String getDocument()
+protected String outputExtension()
{
-return src/test/resources/faq.fml;
+return fml;
}
+
+
}
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/test.fml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/test.fml?view=autorev=566071
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/test.fml
(added)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/test.fml
Wed Aug 15 01:55:44 2007
@@ -0,0 +1,766 @@
+?xml version=1.0 encoding=ISO-8859-1?
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--
+
+!-- TODO [later]: faqs need some sorting --
+faqs title=Frequently Asked Questions
+
+ part id=general
+titleGeneral/title
+
+faq id=maven-definition
+ questionWhat does Maven mean?/question
+ answerpA maven (yi.=meyvn) is an experienced or knowledgeable
person, such as an expert or freak./p/answer
+/faq
+
+ /part
+ part id=help
+titleWhere Can I Get Help?/title
+
+faq id=where-get-help
+ questionWhere do I get help on Maven?/question
+ answer
+p
+ For help getting started, or basic use of Maven, refer to the
documentation
+ that can be found from the left navigation of this site.
+/p
+p
+ If these documents, and the other questions in this FAQ don't help
you with your problem, the
+ a href=mail-lists.htmlMaven User List/a is a good source for
help.
+ Lots of problems have already been discussed there, so please search
the mailing list archive
+ before posting a question or a new idea.
+ Most of the Maven developers are subscribed to the Maven User List,
so there is no need to post
+ to the Maven Developers list unless you want to discuss making a
change to Maven itself.
+/p
+p
+ Maven developers meet via IRC: a
href=irc://irc.codehaus.org#mavenirc.codehaus.org/a,
+ channel code#maven/code.
+ But please don't ask for solutions to Maven problems there, as
+ Maven user problems should be discussed at the mailing list
+ for several good reasons (e.g. mail archive, more subscribers) and
+ usually you get a quick answer on the mailing list. But feel free to
svn commit: r566129 - /maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
Author: ltheussl Date: Wed Aug 15 05:47:15 2007 New Revision: 566129 URL: http://svn.apache.org/viewvc?view=revrev=566129 Log: Fix wrong element Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java?view=diffrev=566129r1=566128r2=566129 == --- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java Wed Aug 15 05:47:15 2007 @@ -349,7 +349,7 @@ sink.text( Right-aligned ); sink.lineBreak(); sink.text( cell 1,3 ); -sink.table_(); +sink.tableCell_(); sink.tableRow_(); sink.tableRow();
svn commit: r566131 - /maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
Author: ltheussl
Date: Wed Aug 15 05:48:03 2007
New Revision: 566131
URL: http://svn.apache.org/viewvc?view=revrev=566131
Log:
Flush test sink in each block
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java?view=diffrev=566131r1=566130r2=566131
==
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
Wed Aug 15 05:48:03 2007
@@ -78,6 +78,7 @@
sink.title();
sink.text( title );
sink.title_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong title!,
@@ -96,6 +97,7 @@
sink.author();
sink.text( author );
sink.author_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong author!,
@@ -113,6 +115,7 @@
sink.date();
sink.text( date );
sink.date_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong date!,
@@ -128,6 +131,7 @@
{
sink.head();
sink.head_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong head!, expected, noNewLine( getHeadBlock() ) );
@@ -142,6 +146,7 @@
{
sink.body();
sink.body_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong body!, expected, noNewLine( getBodyBlock() ) );
@@ -160,6 +165,7 @@
sink.sectionTitle();
sink.text( title );
sink.sectionTitle_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong sectionTitle!,
@@ -181,6 +187,7 @@
sink.text( title );
sink.sectionTitle1_();
sink.section1_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong section1 block!,
@@ -202,6 +209,7 @@
sink.text( title );
sink.sectionTitle2_();
sink.section2_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong section2 block!,
@@ -223,6 +231,7 @@
sink.text( title );
sink.sectionTitle3_();
sink.section3_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong section3 block!,
@@ -244,6 +253,7 @@
sink.text( title );
sink.sectionTitle4_();
sink.section4_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong section4 block!,
@@ -265,6 +275,7 @@
sink.text( title );
sink.sectionTitle5_();
sink.section5_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong section5 block!,
@@ -285,6 +296,7 @@
sink.text( item );
sink.listItem_();
sink.list_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong list!,
@@ -307,6 +319,7 @@
sink.text( item );
sink.numberedListItem_();
sink.numberedList_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong numbered list!,
@@ -335,6 +348,7 @@
sink.definition_();
sink.definitionListItem_();
sink.definitionList_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong definition list!, expected,
@@ -358,7 +372,7 @@
sink.text( caption );
sink.figureCaption_();
sink.figure_();
-
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong figure!, expected,
@@ -391,7 +405,7 @@
sink.text( caption );
sink.tableCaption_();
sink.table_();
-
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong table!, expected,
@@ -409,6 +423,7 @@
sink.paragraph();
sink.text( text );
sink.paragraph_();
+sink.flush();
String expected = noNewLine( writer.toString() );
assertEquals( Wrong paragraph!,
@@ -427,6 +442,7 @@
sink.verbatim( true );
sink.text( text );
sink.verbatim_();
+sink.flush();
svn commit: r566139 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex: pom.xml src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java src/test/java/org/apache/maven/doxia/module
Author: ltheussl
Date: Wed Aug 15 06:09:17 2007
New Revision: 566139
URL: http://svn.apache.org/viewvc?view=revrev=566139
Log:
Use new test classes, make testing independent of apt-module. Avoid constructor
throwing Exception.
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml?view=diffrev=566139r1=566138r2=566139
==
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml Wed Aug 15
06:09:17 2007
@@ -8,13 +8,4 @@
artifactIddoxia-module-latex/artifactId
nameDoxia :: Latex Module/name
descriptionA Doxia module for LaTeX source documents./description
-
- dependencies
-dependency
- groupIdorg.apache.maven.doxia/groupId
- artifactIddoxia-module-apt/artifactId
- version${projectVersion}/version
- scopetest/scope
-/dependency
- /dependencies
/project
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java?view=diffrev=566139r1=566138r2=566139
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
Wed Aug 15 06:09:17 2007
@@ -76,16 +76,13 @@
// --
public LatexSink( Writer out )
-throws IOException
{
-this( out, IOUtil.toString( getDefaultSinkCommands() ),
IOUtil.toString( getDefaultPreamble() ) );
+this( out, defaultSinkCommands(), defaultPreamble() );
}
public LatexSink( Writer out, String sinkCommands, String preamble )
{
-this.out = new LineBreaker( out );
-this.sinkCommands = sinkCommands;
-this.preamble = preamble;
+this( out, sinkCommands, preamble, false );
}
public LatexSink( Writer out, String sinkCommands, String preamble,
boolean fragmentDocument )
@@ -166,7 +163,7 @@
markup( getDocumentEnd() );
}
-out.flush();
+flush();
}
// --
@@ -518,6 +515,7 @@
public void sectionTitle_()
{
+// TODO: closing bracket?
markup( } + EOL + EOL );
}
@@ -844,4 +842,37 @@
{
return LatexSink.class.getResource( default_preamble.tex
).openStream();
}
+
+public static String defaultSinkCommands()
+{
+String commands = ;
+
+try
+{
+commands = IOUtil.toString( getDefaultSinkCommands() );
+}
+catch ( IOException ioe )
+{
+// TODO: log
+}
+
+return commands;
+}
+
+public static String defaultPreamble()
+{
+String preamble = ;
+
+try
+{
+preamble = IOUtil.toString( getDefaultPreamble() );
+}
+catch ( IOException ioe )
+{
+// TODO: log
+}
+
+return preamble;
+}
+
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java?view=diffrev=566139r1=566138r2=566139
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
Wed Aug 15 06:09:17 2007
@@ -19,46 +19,209 @@
* under the License.
*/
+import java.io.Writer;
+
import org.apache.maven.doxia.module.latex.LatexSink;
-import org.apache.maven.doxia.module.apt.AptParser;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.AbstractSinkTestCase;
+import org.apache.maven.doxia.sink.AbstractSinkTest;
import
svn commit: r566060 - in /maven/plugins/trunk/maven-enforcer-plugin/src: it/pom.xml main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java main/java/org/apache/maven/plugin/enforcer/Req
Author: jvanzyl Date: Wed Aug 15 01:23:39 2007 New Revision: 566060 URL: http://svn.apache.org/viewvc?view=revrev=566060 Log: o used the same pattern as the other rules so we now have requirePluginVersions Added: maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java - copied, changed from r566029, maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java Removed: maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java Modified: maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml Modified: maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml?view=diffrev=566060r1=566059r2=566060 == --- maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml (original) +++ maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml Wed Aug 15 01:23:39 2007 @@ -73,8 +73,7 @@ excludeorg.apache.maven/exclude /excludes /bannedDependencies-- - pluginVersionsDefined - /pluginVersionsDefined + requirePluginVersions/ /rules /configuration goals Copied: maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java (from r566029, maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java?view=diffrev=566060p1=maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.javar1=566029p2=maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.javar2=566060 == --- maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java (original) +++ maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java Wed Aug 15 01:23:39 2007 @@ -560,7 +560,6 @@ * * @param groupId * @param artifactId - * @param classifier * @param version * @return * @throws ArtifactResolutionException
svn commit: r566134 - in /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver: DefaultArtifactResolver.java MultipleArtifactsNotFoundException.java
Author: carlos
Date: Wed Aug 15 05:54:19 2007
New Revision: 566134
URL: http://svn.apache.org/viewvc?view=revrev=566134
Log:
Add resolved artifacts to MutipleArtifactsNotFoundException
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?view=diffrev=566134r1=566133r2=566134
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Wed Aug 15 05:54:19 2007
@@ -285,6 +285,7 @@
localRepository,
remoteRepositories, source, filter,
listeners );
+List resolvedArtifacts = new ArrayList();
List missingArtifacts = new ArrayList();
for ( Iterator i =
artifactResolutionResult.getArtifactResolutionNodes().iterator(); i.hasNext(); )
{
@@ -292,6 +293,7 @@
try
{
resolve( node.getArtifact(), node.getRemoteRepositories(),
localRepository );
+resolvedArtifacts.add( node.getArtifact() );
}
catch ( ArtifactNotFoundException anfe )
{
@@ -303,7 +305,8 @@
if ( missingArtifacts.size() 0 )
{
-throw new MultipleArtifactsNotFoundException( originatingArtifact,
missingArtifacts, remoteRepositories );
+throw new MultipleArtifactsNotFoundException( originatingArtifact,
resolvedArtifacts, missingArtifacts,
+ remoteRepositories );
}
return artifactResolutionResult;
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java?view=diffrev=566134r1=566133r2=566134
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
Wed Aug 15 05:54:19 2007
@@ -19,22 +19,59 @@
* under the License.
*/
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.Artifact;
+/**
+ * Exception caused when one or more artifacts can not be resolved because
they are not found in the
+ * local or remote repositories.
+ */
public class MultipleArtifactsNotFoundException
extends ArtifactResolutionException
{
+private final List resolvedArtifacts;
private final List missingArtifacts;
-public MultipleArtifactsNotFoundException( Artifact originatingArtifact,
List artifacts, List remoteRepositories )
+/**
+ * @deprecated use [EMAIL PROTECTED]
#MultipleArtifactsNotFoundException(Artifact, List, List, List)}
+ */
+public MultipleArtifactsNotFoundException( Artifact originatingArtifact,
List missingArtifacts, List remoteRepositories )
{
-super( constructMessage( artifacts ), originatingArtifact,
remoteRepositories );
-this.missingArtifacts = artifacts;
+this( originatingArtifact, new ArrayList(), missingArtifacts,
remoteRepositories );
+}
+
+/**
+ * Create an instance of the exception with allrequired information.
+ *
+ * @param originatingArtifact the artifact that was being resolved
+ * @param resolvedArtifacts artifacts that could be resolved
+ * @param missingArtifacts artifacts that could not be resolved
+ * @param remoteRepositories remote repositories where the missing
artifacts were not found
+ */
+public MultipleArtifactsNotFoundException( Artifact originatingArtifact,
List resolvedArtifacts,
+ List missingArtifacts, List
remoteRepositories )
+{
+super( constructMessage( missingArtifacts ), originatingArtifact,
remoteRepositories );
+this.resolvedArtifacts = resolvedArtifacts;
+this.missingArtifacts = missingArtifacts;
+}
+
+/**
+
svn commit: r566135 - /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Author: carlos
Date: Wed Aug 15 05:55:09 2007
New Revision: 566135
URL: http://svn.apache.org/viewvc?view=revrev=566135
Log:
Add a check for null files in system dependencies
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?view=diffrev=566135r1=566134r2=566135
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Wed Aug 15 05:55:09 2007
@@ -89,6 +89,12 @@
{
File systemFile = artifact.getFile();
+if ( systemFile == null )
+{
+throw new ArtifactNotFoundException(
+System artifact: + artifact + has no file
attached, artifact );
+}
+
if ( !systemFile.exists() )
{
throw new ArtifactNotFoundException(
svn commit: r566136 - in /maven/doxia/doxia/trunk/doxia-modules: doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java doxia-module-xhtml/src/main/java/org/apache/maven/doxi
Author: ltheussl
Date: Wed Aug 15 05:55:39 2007
New Revision: 566136
URL: http://svn.apache.org/viewvc?view=revrev=566136
Log:
Fix wrong markup
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java?view=diffrev=566136r1=566135r2=566136
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
Wed Aug 15 05:55:39 2007
@@ -599,7 +599,7 @@
*/
public void figure()
{
-markup( String.valueOf( SPACE ) + Tag.IMG );
+markup( String.valueOf( LESS_THAN ) + Tag.IMG );
}
/** [EMAIL PROTECTED] */
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?view=diffrev=566136r1=566135r2=566136
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Wed Aug 15 05:55:39 2007
@@ -912,13 +912,13 @@
/** [EMAIL PROTECTED] */
public void figure_()
{
-write( String.valueOf( LESS_THAN ) + String.valueOf( SLASH ) +
String.valueOf( GREATER_THAN ) );
+write( String.valueOf( SPACE ) + String.valueOf( SLASH ) +
String.valueOf( GREATER_THAN ) );
}
/** [EMAIL PROTECTED] */
public void figureCaption()
{
-write( String.valueOf( LESS_THAN ) + Attribute.ALT + String.valueOf(
EQUAL ) + String.valueOf( QUOTE ) );
+write( String.valueOf( SPACE ) + Attribute.ALT + String.valueOf( EQUAL
) + String.valueOf( QUOTE ) );
}
/** [EMAIL PROTECTED] */
svn commit: r566176 - /maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
Author: brianf
Date: Wed Aug 15 07:10:35 2007
New Revision: 566176
URL: http://svn.apache.org/viewvc?view=revrev=566176
Log:
fixed class name.
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java?view=diffrev=566176r1=566175r2=566176
==
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
Wed Aug 15 07:10:35 2007
@@ -76,7 +76,7 @@
* This rule will enforce that all plugins specified in the
* poms have a version declared.
*/
-public class PluginVersionsDefined
+public class RequirePluginVersions
implements EnforcerRule
{
svn commit: r566205 - /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Author: jdcasey
Date: Wed Aug 15 07:51:59 2007
New Revision: 566205
URL: http://svn.apache.org/viewvc?view=revrev=566205
Log:
Changing internal setBaseVersion(..) calls to setBaseVersionInternal(..) to
prevent side effects with extending implementations that disallow setting
versions directly (as in maven-project).
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?view=diffrev=566205r1=566204r2=566205
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Wed Aug 15 07:51:59 2007
@@ -187,7 +187,7 @@
public void setVersion( String version )
{
this.version = version;
-this.setBaseVersion( version );
+this.setBaseVersionInternal( version );
this.versionRange = null;
}
@@ -361,13 +361,18 @@
{
throw new NullPointerException( version was null for +
groupId + : + artifactId );
}
-setBaseVersion( version );
+setBaseVersionInternal( version );
}
return baseVersion;
}
public void setBaseVersion( String baseVersion )
{
+setBaseVersionInternal( baseVersion );
+}
+
+protected void setBaseVersionInternal( String baseVersion )
+{
Matcher m = VERSION_FILE_PATTERN.matcher( baseVersion );
if ( m.matches() )
{
@@ -495,7 +500,7 @@
public void selectVersion( String version )
{
this.version = version;
-setBaseVersion( version );
+setBaseVersionInternal( version );
}
public void setGroupId( String groupId )
svn commit: r566218 - /maven/trunks/
Author: jdcasey Date: Wed Aug 15 08:27:22 2007 New Revision: 566218 URL: http://svn.apache.org/viewvc?view=revrev=566218 Log: Adding maven-artifact to externals. Modified: maven/trunks/ (props changed) Propchange: maven/trunks/ -- --- svn:externals (original) +++ svn:externals Wed Aug 15 08:27:22 2007 @@ -1,3 +1,4 @@ +maven-artifact https://svn.apache.org/repos/asf/maven/maven-artifact archetype https://svn.apache.org/repos/asf/maven/archetype/trunk components https://svn.apache.org/repos/asf/maven/components/trunk core-integration-testing https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk
svn commit: r566347 - in /maven/maven-artifact/src: main/java/org/apache/maven/artifact/DefaultArtifact.java test/java/org/apache/maven/artifact/DefaultArtifactTest.java
Author: jdcasey
Date: Wed Aug 15 14:25:51 2007
New Revision: 566347
URL: http://svn.apache.org/viewvc?view=revrev=566347
Log:
Merging 565901 and 566205 from trunk of maven/components, to fix the
isSnapshot() state-change problem.
Modified:
maven/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
Modified:
maven/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL:
http://svn.apache.org/viewvc/maven/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?view=diffrev=566347r1=566346r2=566347
==
---
maven/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
(original)
+++
maven/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Wed Aug 15 14:25:51 2007
@@ -187,7 +187,7 @@
public void setVersion( String version )
{
this.version = version;
-this.baseVersion = version;
+this.setBaseVersionInternal( version );
this.versionRange = null;
}
@@ -283,7 +283,7 @@
}
appendArtifactTypeClassifierString( sb );
sb.append( : );
-if ( version != null || baseVersion != null )
+if ( getBaseVersion() != null )
{
sb.append( getBaseVersion() );
}
@@ -357,19 +357,31 @@
{
if ( baseVersion == null )
{
-baseVersion = version;
-
if ( version == null )
{
throw new NullPointerException( version was null for +
groupId + : + artifactId );
}
+setBaseVersionInternal( version );
}
return baseVersion;
}
public void setBaseVersion( String baseVersion )
{
-this.baseVersion = baseVersion;
+setBaseVersionInternal( baseVersion );
+}
+
+protected void setBaseVersionInternal( String baseVersion )
+{
+Matcher m = VERSION_FILE_PATTERN.matcher( baseVersion );
+if ( m.matches() )
+{
+this.baseVersion = m.group( 1 ) + - + SNAPSHOT_VERSION;
+}
+else
+{
+this.baseVersion = baseVersion;
+}
}
public int compareTo( Object o )
@@ -488,7 +500,7 @@
public void selectVersion( String version )
{
this.version = version;
-this.baseVersion = version;
+setBaseVersionInternal( version );
}
public void setGroupId( String groupId )
@@ -503,18 +515,9 @@
public boolean isSnapshot()
{
-if ( version != null || baseVersion != null )
+if ( getBaseVersion() != null )
{
-Matcher m = VERSION_FILE_PATTERN.matcher( getBaseVersion() );
-if ( m.matches() )
-{
-setBaseVersion( m.group( 1 ) + - + SNAPSHOT_VERSION );
-return true;
-}
-else
-{
-return getBaseVersion().endsWith( SNAPSHOT_VERSION ) ||
getBaseVersion().equals( LATEST_VERSION );
-}
+return getBaseVersion().endsWith( SNAPSHOT_VERSION ) ||
getBaseVersion().equals( LATEST_VERSION );
}
else
{
Modified:
maven/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java?view=diffrev=566347r1=566346r2=566347
==
---
maven/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
(original)
+++
maven/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
Wed Aug 15 14:25:51 2007
@@ -19,20 +19,27 @@
* under the License.
*/
-import junit.framework.TestCase;
import org.apache.maven.artifact.handler.ArtifactHandlerMock;
import org.apache.maven.artifact.versioning.VersionRange;
+import junit.framework.TestCase;
+
public class DefaultArtifactTest
extends TestCase
{
private DefaultArtifact artifact;
+private DefaultArtifact snapshotArtifact;
+
private String groupId = groupid, artifactId = artifactId, version =
1.0, scope = scope, type = type,
classifier = classifier;
+private String snapshotSpecVersion = 1.0-SNAPSHOT;
+private String snapshotResolvedVersion = 1.0-20070606.010101-1;
+
private VersionRange versionRange;
+private VersionRange snapshotVersionRange;
private ArtifactHandlerMock artifactHandler;
@@ -43,6 +50,19 @@
artifactHandler = new ArtifactHandlerMock();
versionRange = VersionRange.createFromVersion( version );
artifact = new DefaultArtifact( groupId, artifactId, versionRange,
scope, type, classifier, artifactHandler );
+
+
svn commit: r566397 - in /maven/shared/trunk/maven-common-artifact-filters/src: main/java/org/apache/maven/shared/artifact/filter/ test/java/org/apache/maven/shared/artifact/filter/
Author: jdcasey
Date: Wed Aug 15 16:24:53 2007
New Revision: 566397
URL: http://svn.apache.org/viewvc?view=revrev=566397
Log:
[MASSEMBLY-223] Fixed problem where patterns = first are not used. Applied
patch and wrote unit test to verify.
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternArtifactFilterTCK.java
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternExcludesArtifactFilterTest.java
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilterTest.java
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java?view=diffrev=566397r1=566396r2=566397
==
---
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
(original)
+++
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
Wed Aug 15 16:24:53 2007
@@ -164,6 +164,7 @@
private boolean matchAgainst( String value, List patterns, boolean
regionMatch )
{
+ boolean match = false;
for ( Iterator i = patterns.iterator(); i.hasNext(); )
{
// TODO: what about wildcards? Just specifying groups? versions?
@@ -180,7 +181,7 @@
if ( value.indexOf( pattern ) -1 )
{
patternsTriggered.add( pattern );
-return true;
+match = true;
}
}
else
@@ -188,7 +189,7 @@
if ( value.equals( pattern ) )
{
patternsTriggered.add( pattern );
-return true;
+match = true;
}
}
@@ -212,18 +213,17 @@
idxes[j] = value.indexOf( subPattern, lastIdx );
-if ( idxes[j] 0 )
+if ( idxes[j] = 0 )
{
-return false;
+ patternsTriggered.add( pattern );
+match = true;
}
-}
-
-patternsTriggered.add( pattern );
-return true;
+}
+
}
}
-return false;
+return match;
}
public void reportMissedCriteria( Logger logger )
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternArtifactFilterTCK.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternArtifactFilterTCK.java?view=diffrev=566397r1=566396r2=566397
==
---
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternArtifactFilterTCK.java
(original)
+++
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternArtifactFilterTCK.java
Wed Aug 15 16:24:53 2007
@@ -39,6 +39,39 @@
protected abstract ArtifactFilter createFilter( List patterns, boolean
actTransitively );
+public void testShouldTriggerBothPatternsWithWildcards( boolean reverse )
+{
+String groupId1 = group;
+String artifactId1 = artifact;
+
+String groupId2 = group2;
+String artifactId2 = artifact2;
+
+ArtifactMockAndControl mac1 = new ArtifactMockAndControl( groupId1,
artifactId1 );
+ArtifactMockAndControl mac2 = new ArtifactMockAndControl( groupId2,
artifactId2 );
+
+mockManager.replayAll();
+
+List patterns = new ArrayList();
+patterns.add( groupId1 + : + artifactId1 + :* );
+patterns.add( groupId2 + : + artifactId2 + :* );
+
+ArtifactFilter filter = createFilter( patterns );
+
+if ( reverse )
+{
+assertFalse( filter.include( mac1.artifact ) );
+assertFalse( filter.include( mac2.artifact ) );
+}
+else
+{
+assertTrue( filter.include( mac1.artifact ) );
+assertTrue( filter.include( mac2.artifact ) );
+}
+
+mockManager.verifyAll();
+}
+
public void
svn commit: r566413 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java test/java/org/apache/maven/plugin/assembly/io/DefaultA
Author: jdcasey
Date: Wed Aug 15 16:49:16 2007
New Revision: 566413
URL: http://svn.apache.org/viewvc?view=revrev=566413
Log:
[MASSEMBLY-184] Modified assembly descriptor loading process to inject
component descriptors ahead of interpolation, so they too are interpolated.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java?view=diffrev=566413r1=566412r2=566413
==
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
Wed Aug 15 16:49:16 2007
@@ -265,6 +265,8 @@
AssemblyXpp3Reader r = new AssemblyXpp3Reader();
assembly = r.read( reader );
+mergeComponentsWithMainAssembly( assembly, configSource );
+
assembly = new AssemblyInterpolator().interpolate( assembly,
project, context );
}
catch ( IOException e )
@@ -288,8 +290,6 @@
{
includeSiteInAssembly( assembly, configSource );
}
-
-mergeComponentsWithMainAssembly( assembly, configSource );
return assembly;
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java?view=diffrev=566413r1=566412r2=566413
==
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
Wed Aug 15 16:49:16 2007
@@ -659,6 +659,74 @@
mockManager.verifyAll();
}
+public void
testReadAssembly_ShouldReadAssemblyWithComponentInterpolationWithoutSiteDirInclusionOrAssemblyInterpolation()
+ throws IOException, AssemblyReadException,
InvalidAssemblerConfigurationException
+{
+ File componentsFile = fileManager.createTempFile();
+
+ File basedir = componentsFile.getParentFile();
+ String componentsFilename = componentsFile.getName();
+
+ Component component = new Component();
+
+ FileSet fs = new FileSet();
+ fs.setDirectory(${groupId}-dir);
+
+ component.addFileSet(fs);
+
+ FileWriter fw = null;
+
+ try {
+ fw = new FileWriter(componentsFile);
+ new ComponentXpp3Writer().write(fw, component);
+ } finally {
+ IOUtil.close(fw);
+ }
+
+ Assembly assembly = new Assembly();
+ assembly.setId(test);
+
+ assembly.addComponentDescriptor(componentsFilename);
+
+ StringWriter sw = new StringWriter();
+ AssemblyXpp3Writer assemblyWriter = new AssemblyXpp3Writer();
+
+ assemblyWriter.write(sw, assembly);
+
+ StringReader sr = new StringReader(sw.toString());
+
+ configSource.getBasedir();
+ configSourceControl.setReturnValue(basedir,
MockControl.ONE_OR_MORE);
+
+ Model model = new Model();
+ model.setGroupId(group);
+ model.setArtifactId(artifact);
+ model.setVersion(version);
+
+ MavenProject project = new MavenProject(model);
+
+ configSource.getProject();
+ configSourceControl.setReturnValue(project);
+
+ configSource.isSiteIncluded();
+ configSourceControl.setReturnValue(false);
+
+ mockManager.replayAll();
+
+ Assembly result = new DefaultAssemblyReader().readAssembly(sr,
+ testLocation, configSource);
+
+ assertEquals(assembly.getId(), result.getId());
+
+ List fileSets = result.getFileSets();
+
+ assertEquals(1, fileSets.size());
+
+ assertEquals(group-dir, ((FileSet)
fileSets.get(0)).getDirectory());
+
+ mockManager.verifyAll();
+ }
+
public void
