svn commit: r762718 - in /maven/doxia/doxia/trunk/doxia-modules: doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/ doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/ dox
Author: ltheussl
Date: Tue Apr 7 11:58:36 2009
New Revision: 762718
URL: http://svn.apache.org/viewvc?rev=762718view=rev
Log:
Improve test coverage
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptUtilsTest.java
(with props)
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
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-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java?rev=762718r1=762717r2=762718view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Tue Apr 7 11:58:36 2009
@@ -1759,7 +1759,7 @@
public ListBreak( int indent, String firstLine )
throws AptParseException
{
-super( AptParser.LIST_BREAK, indent );
+super( AptParser.LIST_BREAK, indent, firstLine );
}
/** {...@inheritdoc} */
@@ -2674,7 +2674,7 @@
public HorizontalRule( int indent, String firstLine )
throws AptParseException
{
-super( HORIZONTAL_RULE, indent );
+super( HORIZONTAL_RULE, indent, firstLine );
}
/** {...@inheritdoc} */
@@ -2699,7 +2699,7 @@
public PageBreak( int indent, String firstLine )
throws AptParseException
{
-super( PG_BREAK, indent );
+super( PG_BREAK, indent, firstLine );
}
/** {...@inheritdoc} */
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java?rev=762718r1=762717r2=762718view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
Tue Apr 7 11:58:36 2009
@@ -667,21 +667,19 @@
/** {...@inheritdoc} */
public void tableCell_()
{
-tableCell_( false );
+endTableCell();
}
/** {...@inheritdoc} */
public void tableHeaderCell_()
{
-tableCell_( true );
+endTableCell();
}
/**
* Ends a table cell.
- *
- * @param headerRow If this cell is part of a header row.
*/
-private void tableCell_( boolean headerRow )
+private void endTableCell()
{
buffer.append( TABLE_CELL_SEPARATOR_MARKUP );
cellCount++;
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptUtilsTest.java?rev=762718view=auto
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptUtilsTest.java
(added)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptUtilsTest.java
Tue Apr 7 11:58:36 2009
@@ -0,0 +1,162 @@
+package org.apache.maven.doxia.module.apt;
+
+/*
+ * 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,
svn commit: r762690 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java test/java/org/apache/maven/doxia/sink/AbstractXmlSinkTest.java
Author: ltheussl
Date: Tue Apr 7 11:11:22 2009
New Revision: 762690
URL: http://svn.apache.org/viewvc?rev=762690view=rev
Log:
Throw same Exception in end and start tag
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractXmlSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java?rev=762690r1=762689r2=762690view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java
Tue Apr 7 11:11:22 2009
@@ -145,6 +145,11 @@
*/
protected void writeEndTag( Tag t )
{
+if ( t == null )
+{
+throw new IllegalArgumentException( A tag is required );
+}
+
StringBuffer sb = new StringBuffer();
sb.append( LESS_THAN );
sb.append( SLASH );
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractXmlSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractXmlSinkTest.java?rev=762690r1=762689r2=762690view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractXmlSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractXmlSinkTest.java
Tue Apr 7 11:11:22 2009
@@ -54,6 +54,28 @@
instance.writeSimpleTag( t );
assertEquals( ns:a /, instance.getText() );
+
+assertEquals( ns, instance.getNameSpace() );
+
+try
+{
+instance.writeStartTag( null );
+fail( null tag should fail! );
+}
+catch ( IllegalArgumentException e )
+{
+assertNotNull( e );
+}
+
+try
+{
+instance.writeEndTag( null );
+fail( null tag should fail! );
+}
+catch ( IllegalArgumentException e )
+{
+assertNotNull( e );
+}
}
/**
@@ -128,6 +150,5 @@
{
buffer.append( text );
}
-
}
}
svn commit: r763057 - /maven/site/trunk/src/site/xdoc/index.xml.vm
Author: brett Date: Wed Apr 8 00:41:24 2009 New Revision: 763057 URL: http://svn.apache.org/viewvc?rev=763057view=rev Log: remove apachecon banner until US shows up Modified: maven/site/trunk/src/site/xdoc/index.xml.vm Modified: maven/site/trunk/src/site/xdoc/index.xml.vm URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/index.xml.vm?rev=763057r1=763056r2=763057view=diff == --- maven/site/trunk/src/site/xdoc/index.xml.vm (original) +++ maven/site/trunk/src/site/xdoc/index.xml.vm Wed Apr 8 00:41:24 2009 @@ -61,8 +61,8 @@ /span /p - !-- TODO: we should use the SSI instead, but two things prevent it: a) the SSI's aren't working on apache.org yet so I can't test it; b) SSI's get eliminated from xdoc. For some reason even inside CDATA they are escaped. -- - iframe src=http://www.apache.org/ads/bannerbar.html; style=margin-left: -13px; margin-top: -3px; padding: 0 frameborder=0 scrolling=no width=247 height=88/iframe + !-- TODO: we should use the SSI instead, but two things prevent it: a) the SSI's aren't working on apache.org yet so I can't test it; b) SSI's get eliminated from xdoc. For some reason even inside CDATA they are escaped. + iframe src=http://www.apache.org/ads/bannerbar.html; style=margin-left: -13px; margin-top: -3px; padding: 0 frameborder=0 scrolling=no width=247 height=88/iframe -- h5Looking for Artifacts?/h5 pa href=http://repository.sonatype.org;Search Central/a and other Public Repositories./p
svn commit: r762577 - /maven/components/trunk/build-mercury.xml
Author: ogusakov
Date: Tue Apr 7 00:22:50 2009
New Revision: 762577
URL: http://svn.apache.org/viewvc?rev=762577view=rev
Log:
flipped back the debug mode
Modified:
maven/components/trunk/build-mercury.xml
Modified: maven/components/trunk/build-mercury.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build-mercury.xml?rev=762577r1=762576r2=762577view=diff
==
--- maven/components/trunk/build-mercury.xml (original)
+++ maven/components/trunk/build-mercury.xml Tue Apr 7 00:22:50 2009
@@ -303,12 +303,14 @@
arg value=install/
arg value=-Dmaven.repo.local=${maven.repo.local}/
arg value=-Dsurefire.useFile=${surefire.useFile}/
- !-- debug-the-bootstrap --
+!-- debug-the-bootstrap
+
jvmarg value=-Xdebug/
jvmarg value=-Xnoagent/
jvmarg value=-Djava.compiler=NONE/
jvmarg
value=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000/
- !-- /debug-the-bootstrap --
+/debug-the-bootstrap
+--
/java
/target
svn commit: r762578 - /maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
Author: ogusakov
Date: Tue Apr 7 00:23:54 2009
New Revision: 762578
URL: http://svn.apache.org/viewvc?rev=762578view=rev
Log:
[MERCURY-108] - removed the thread leak
Modified:
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
Modified:
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=762578r1=762577r2=762578view=diff
==
---
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
(original)
+++
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
Tue Apr 7 00:23:54 2009
@@ -99,9 +99,7 @@
// TODO - replace with known Transport's protocols. Should be similar to
RepositoryReader/Writer registration
private static final String[] _protocols = new String[] { http, https,
dav, webdav };
-// TODO replace with Transport
-DefaultRetriever _transport;
-
+private HashSetServer _servers;
//
---
RemoteRepository _repo;
@@ -160,19 +158,10 @@
else
_localRepos = localRepos;
-try
-{
-// TODO 2008-07-29 og: here I should analyze Server protocol
-// and come with appropriate Transport implementation
-_transport = new DefaultRetriever();
-HashSetServer servers = new HashSetServer( 1 );
-servers.add( repo.getServer() );
-_transport.setServers( servers );
-}
-catch ( HttpClientException e )
-{
-throw new RepositoryException( e );
-}
+// TODO 2008-07-29 og: here I should analyze Server protocol
+// and come with appropriate Transport implementation
+_servers = new HashSetServer( 1 );
+_servers.add( repo.getServer() );
}
//
---
@@ -424,7 +413,18 @@
drr.addBinding( pomBinding );
}
-RetrievalResponse resp = _transport.retrieve( drr );
+DefaultRetriever transport;
+try
+{
+transport = new DefaultRetriever();
+}
+catch ( HttpClientException e )
+{
+throw new RepositoryException( e );
+}
+transport.setServers( _servers );
+RetrievalResponse resp = transport.retrieve( drr );
+transport.stop();
if ( resp.hasExceptions() )
{
@@ -531,6 +531,8 @@
RetrievalResponse response = retriever.retrieve( request );
+retriever.stop();
+
if ( response.hasExceptions() )
{
// record all bugs on the first artifact as jetty transport does
not
@@ -1065,7 +1067,10 @@
DefaultRetrievalRequest request = new DefaultRetrievalRequest();
request.addBinding( binding );
-RetrievalResponse response = _transport.retrieve( request );
+DefaultRetriever transport = new DefaultRetriever();
+transport.setServers( _servers );
+RetrievalResponse response = transport.retrieve( request );
+transport.stop();
if ( response.hasExceptions() )
{
@@ -1084,6 +1089,10 @@
{
throw new MetadataReaderException( e );
}
+catch ( HttpClientException e )
+{
+throw new MetadataReaderException(e);
+}
finally
{
if ( fis != null )
@@ -1104,8 +1113,8 @@
public void close()
{
-if( _transport != null )
-_transport.stop();
+//if( _transport != null )
+//_transport.stop();
}
public String[] getProtocols()
svn commit: r762576 - in /maven/components/trunk: ./ maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/ maven-repository/src/main/java/org/apache/maven/repository/
Author: ogusakov
Date: Tue Apr 7 00:18:23 2009
New Revision: 762576
URL: http://svn.apache.org/viewvc?rev=762576view=rev
Log:
working on MercuryRepositorySystem - oprimized Adapter
Modified:
maven/components/trunk/build-mercury.xml
maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryAdaptor.java
maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
Modified: maven/components/trunk/build-mercury.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build-mercury.xml?rev=762576r1=762575r2=762576view=diff
==
--- maven/components/trunk/build-mercury.xml (original)
+++ maven/components/trunk/build-mercury.xml Tue Apr 7 00:18:23 2009
@@ -67,9 +67,13 @@
property name=maven.repo.central
value=http://repository.sonatype.org/content/groups/public/
!--
property name=maven.repo.central value=http://repo1.maven.org/maven2/
+property name=maven.repo.update.policy value=daily/
+property name=maven.repo.update.policy value=always/
--
property name=maven.repo.update.policy value=daily/
-
+
+property name=maven.repo.system value=don.t/
+
condition property=do.not.clean.local.repo
not
isset property=clean.local.repo/
@@ -89,6 +93,52 @@
mkdir dir=${maven.repo.local}/
/target
+ target name=flip-default-repository unless=do.not.flip.repository
+
+replace dir=${basedir}/maven-repository/src/main/java
+ include name=**/LegacyRepositorySystem.java/
+ replacefilter token='@Component( role = RepositorySystem.class, hint =
default )'
+ value='@Component( role = RepositorySystem.class, hint =
${legacy-hint} )'/
+ replacefilter token='@Component( role = RepositorySystem.class, hint =
legacy )'
+ value='@Component( role = RepositorySystem.class, hint =
${legacy-hint} )'/
+/replace
+
+replace dir=${basedir}/maven-repository-mercury/src/main/java
+ include name=**/MercuryRepositorySystem.java/
+ replacefilter token='@Component( role = RepositorySystem.class, hint =
mercury )'
+ value='@Component( role = RepositorySystem.class, hint =
${mercury-hint} )'/
+ replacefilter token='@Component( role = RepositorySystem.class, hint =
default )'
+ value='@Component( role = RepositorySystem.class, hint =
${mercury-hint} )'/
+/replace
+
+echomaven.repo.system is ${maven.repo.system}, flip:
legacy-hint=${legacy-hint}, mercury-hint=${mercury-hint}/echo
+
+ /target
+
+ target name=flip-default-repository-system description=flips repository
system impl
+
+condition property=legacy-hint value=default
+ equals arg1=${maven.repo.system} arg2=legacy/
+/condition
+condition property=mercury-hint value=mercury
+ equals arg1=${maven.repo.system} arg2=legacy/
+/condition
+
+condition property=legacy-hint value=legacy
+ equals arg1=${maven.repo.system} arg2=mercury/
+/condition
+condition property=mercury-hint value=default
+ equals arg1=${maven.repo.system} arg2=mercury/
+/condition
+
+condition property=do.not.flip.repository value=default
+ equals arg1=${maven.repo.system} arg2=don.t/
+/condition
+
+ antcall target=flip-default-repository/
+
+ /target
+
target name=pull depends=init,clean-local-repo unless=skip.pull
property name=verbose value=false/
!-- Pull the dependencies that Maven needs to build --
@@ -219,7 +269,7 @@
modello file=maven-compat/src/main/mdo/metadata.mdo/
/target
- target name=compile-boot depends=generate-sources description=compiles
the bootstrap sources
+ target name=compile-boot
depends=generate-sources,flip-default-repository-system description=compiles
the bootstrap sources
path id=sources
dirset dir=.
@@ -253,6 +303,12 @@
arg value=install/
arg value=-Dmaven.repo.local=${maven.repo.local}/
arg value=-Dsurefire.useFile=${surefire.useFile}/
+ !-- debug-the-bootstrap --
+ jvmarg value=-Xdebug/
+ jvmarg value=-Xnoagent/
+ jvmarg value=-Djava.compiler=NONE/
+ jvmarg
value=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000/
+ !-- /debug-the-bootstrap --
/java
/target
Modified:
maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryAdaptor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryAdaptor.java?rev=762576r1=762575r2=762576view=diff
svn commit: r762643 - in /maven/plugins/trunk/maven-ejb-plugin/src/site: apt/examples/ejb-client-dependency.apt apt/examples/generating-ejb-client.apt apt/index.apt fml/faq.fml
Author: dennisl
Date: Tue Apr 7 07:44:31 2009
New Revision: 762643
URL: http://svn.apache.org/viewvc?rev=762643view=rev
Log:
o Minor site improvements.
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt?rev=762643r1=762642r2=762643view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
Tue Apr 7 07:44:31 2009
@@ -3,7 +3,7 @@
--
Pete Marvin King
--
- 2008-07-07
+ 2009-04-07
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -30,7 +30,7 @@
Using the ejb-client as a dependency
The EJB Plugin is capable of generating another artifact aside from the
primary one which is EJB. To choose the EJB client
- as the dependency just specify the type as ejb-client.
+ as the dependency just specify the type as ejb-client.
* Normal way of adding an EJB dependency
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt?rev=762643r1=762642r2=762643view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
Tue Apr 7 07:44:31 2009
@@ -5,7 +5,7 @@
snic...@apache.org
Pete Marvin King
--
- 2008-07-07
+ 2009-04-07
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -32,9 +32,9 @@
Generating an EJB client
Normally a thick-client application would only need the stubs and utility
classes of the EJB project.
- The EJB Plugin is capable of generating an EJB jar for client use.
+ The EJB Plugin is capable of generating an EJB JAR for client use.
- To generate the ejb-client jar, you need to set generateClient to
true in the plugin's configuration:
+ To generate the ejb-client JAR, you need to set generateClient to
true in the plugin's configuration:
++
[...]
Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt?rev=762643r1=762642r2=762643view=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt Tue Apr 7
07:44:31 2009
@@ -5,7 +5,7 @@
snic...@apache.org
Pete Marvin King
--
- 2008-07-07
+ 2009-04-07
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -35,7 +35,7 @@
* Goals Overview
- {{{ejb-mojo.html}ejb:ejb}} - used by Maven for projects with ejb package
type.
+ {{{ejb-mojo.html}ejb:ejb}} - used by Maven for projects with ejb
package type.
* Usage
Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml?rev=762643r1=762642r2=762643view=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml Tue Apr 7
07:44:31 2009
@@ -22,7 +22,7 @@
faqs id=FAQ title=Frequently Asked Questions
part id=General
faq id=How can I specify a Class-Path: entry in the manifest of an EJB
jar?
- questionHow can I specify a Class-Path: entry in the manifest of an
EJB jar?/question
+ questionHow can I specify a Class-Path: entry in the manifest of an
EJB JAR?/question
answer
p
You just have to configure it:
@@ -56,7 +56,7 @@
questionHow does the classifier affect artifacts in my EJB
project?/question
answer
pWhen used, the copy of the artifact in your project will have the
classifier appended to its
- filename. This can be used to differentiate duplicate artifacts./p
+ filename. This can be used to differentiate multiple artifacts./p
/answer
/faq
/part
svn commit: r762722 - /maven/repository-tools/trunk/src/bin/crontab.txt
Author: brianf Date: Tue Apr 7 12:00:11 2009 New Revision: 762722 URL: http://svn.apache.org/viewvc?rev=762722view=rev Log: run twice a day Modified: maven/repository-tools/trunk/src/bin/crontab.txt Modified: maven/repository-tools/trunk/src/bin/crontab.txt URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/crontab.txt?rev=762722r1=762721r2=762722view=diff == --- maven/repository-tools/trunk/src/bin/crontab.txt (original) +++ maven/repository-tools/trunk/src/bin/crontab.txt Tue Apr 7 12:00:11 2009 @@ -7,7 +7,7 @@ # sync rewrite rules to m1 repo at ibiblio 51 19 * * * cd $HOME/bin; ./synchronize-rewrite-rules-to-ibiblio.sh $HOME/bin/synchronize.properties # sync m2 repos -16 17 * * * cd $HOME/bin/; ./synchronize-inbound.sh +16 7/17 * * * cd $HOME/bin/; ./synchronize-inbound.sh # sync central to cica.es mirror 30 21 * * * cd $HOME/bin; ./synchronize-central-to-cica.sh $HOME/bin/synchronize.properties # sync central to repo.exist.com mirror
svn commit: r762723 - /maven/repository-tools/trunk/src/bin/crontab.txt
Author: brianf Date: Tue Apr 7 12:01:11 2009 New Revision: 762723 URL: http://svn.apache.org/viewvc?rev=762723view=rev Log: run twice a day Modified: maven/repository-tools/trunk/src/bin/crontab.txt Modified: maven/repository-tools/trunk/src/bin/crontab.txt URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/crontab.txt?rev=762723r1=762722r2=762723view=diff == --- maven/repository-tools/trunk/src/bin/crontab.txt (original) +++ maven/repository-tools/trunk/src/bin/crontab.txt Tue Apr 7 12:01:11 2009 @@ -7,7 +7,7 @@ # sync rewrite rules to m1 repo at ibiblio 51 19 * * * cd $HOME/bin; ./synchronize-rewrite-rules-to-ibiblio.sh $HOME/bin/synchronize.properties # sync m2 repos -16 7/17 * * * cd $HOME/bin/; ./synchronize-inbound.sh +16 7,17 * * * cd $HOME/bin/; ./synchronize-inbound.sh # sync central to cica.es mirror 30 21 * * * cd $HOME/bin; ./synchronize-central-to-cica.sh $HOME/bin/synchronize.properties # sync central to repo.exist.com mirror
svn commit: r762717 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
Author: brianf Date: Tue Apr 7 11:57:14 2009 New Revision: 762717 URL: http://svn.apache.org/viewvc?rev=762717view=rev Log: MAVENUPLOAD-2398 com.adenki Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=762717r1=762716r2=762717view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Tue Apr 7 11:57:14 2009 @@ -7,6 +7,7 @@ br.com.caelum.tubaina,mavens...@web.sourceforge.net:/home/groups/t/tu/tubaina/htdocs/maven,rsync_ssh,Luiz Real,luiz.r...@caelum.com.br,, ca.grimoire,rsync://alchemy.grimoire.ca/m2/releases,rsync,Owen Jacobson,owen.jacob...@grimoire.ca,, ch.qos.logback,rsync://pixie.qos.ch/mvnrepo,rsync,Ceki Gulcu,c...@qos.ch,, +com.adenki,mavens...@web.sourceforge.net:/home/groups/s/sm/smppapi/htdocs/maven-repo,rsync_ssh,Oran Kelly,or...@users.sourceforge.net,, com.adobe.blazeds,mavens...@web.sourceforge.net:/home/groups/e/en/enunciate/persistent/m2,rsync_ssh,Ryan Heaton,r...@webcohesion.com,, com.agical.rmock,mavens...@web.sourceforge.net:/home/groups/r/rm/rmock/htdocs/repository,rsync_ssh,Daniel brolund,daniel.brol...@agical.com,, com.agilejava.blammo,mavens...@web.sourceforge.net:/home/groups/b/bl/blammo/htdocs/repository,rsync_ssh,Wilfred Springer,wilf...@agilejava.com,,
svn commit: r762767 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/profiles/ test/java/org/apache/maven/project/ test/resources-project-builder/profile-default-deactivation
Author: sisbell
Date: Tue Apr 7 13:28:02 2009
New Revision: 762767
URL: http://svn.apache.org/viewvc?rev=762767view=rev
Log:
[MNG-3545] overridden if profile is activebyDefault. Fixed and added unit test.
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-default-deactivation/
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=762767r1=762766r2=762767view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
Tue Apr 7 13:28:02 2009
@@ -50,7 +50,7 @@
private static final ProfileMatcher defaultMatcher = new DefaultMatcher();
private static final ListProfileMatcher matchers =
-(ListProfileMatcher) Collections.unmodifiableList( Arrays.asList(
new DefaultMatcher(), new PropertyMatcher(), new FileMatcher() ) );
+(ListProfileMatcher) Collections.unmodifiableList( Arrays.asList(
new PropertyMatcher(), new FileMatcher() ) );
/**
* the properties passed to the profile manager are the props that
@@ -207,7 +207,7 @@
{
projectProfiles.addAll(
externalProfileManager.getActiveProfiles() );
}
-
+
ProfileManager profileManager = new DefaultProfileManager(
container, profileActivationContext );
profileManager.addProfiles( model.getProfiles() );
projectProfiles.addAll( profileManager.getActiveProfiles() );
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=762767r1=762766r2=762767view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Tue Apr 7 13:28:02 2009
@@ -1284,6 +1284,16 @@
assertEquals( CHILD, pom.getValue( properties/interpolated ) );
}
+/* MNG-3545 */
+public void testProfileDefaultActivation()
+throws Exception
+{
+PomTestWrapper pom = buildPom( profile-default-deactivation ,
profile4);
+assertEquals(1, pom.getMavenProject().getActiveProfiles().size() );
+assertEquals(1, ( (List?) pom.getValue( build/plugins )).size() );
+assertEquals(2.1, pom.getValue( build/plugins[1]/version ));
+}
+
/* FIXME: MNG-1995
public void testBooleanInterpolation()
throws Exception
@@ -1297,7 +1307,6 @@
throws Exception
{
PomTestWrapper pom = buildPom( build-extension-inheritance/sub );
-System.out.println(pom.getDomainModel().asString());
assertEquals(3, ( (List?) pom.getValue( build/extensions )).size()
);
assertEquals(b, pom.getValue( build/extensions[1]/artifactId ) );
assertEquals(a, pom.getValue( build/extensions[2]/artifactId ) );
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml?rev=762767view=auto
==
---
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml
Tue Apr 7 13:28:02 2009
@@ -0,0 +1,35 @@
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+ groupIdorg.apache.maven.its.mng3545/groupId
+ artifactIdtest-artifact/artifactId
+ version1.0-SNAPSHOT/version
+ profiles
+profile
+ idprofile1/id
+ activation
+activeByDefaulttrue/activeByDefault
+ /activation
svn commit: r762779 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java maven-project/src/test/java/org/apache/maven/project/PomC
Author: sisbell
Date: Tue Apr 7 13:57:19 2009
New Revision: 762779
URL: http://svn.apache.org/viewvc?rev=762779view=rev
Log:
[MNG-4106] Interpolation does not use properties from dominant settings
profile if other profile defines same property.
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java?rev=762779r1=762778r2=762779view=diff
==
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
Tue Apr 7 13:57:19 2009
@@ -81,12 +81,21 @@
public static PomClassicDomainModel
mergeProfilesIntoModel(CollectionProfile profiles, PomClassicDomainModel
domainModel) throws IOException
{
ListModel profileModels = new ArrayListModel();
-
+ListModel externalProfileModels = new ArrayListModel();
+
for(Profile profile : profiles)
{
-profileModels.add( attachProfileNodesToModel(profile) );
+ if(pom.equals(profile.getSource()))
+ {
+ profileModels.add( attachProfileNodesToModel(profile)
);
+ }
+ else
+ {
+
externalProfileModels.add(attachProfileNodesToModel(profile));
+ }
}
-Collections.reverse( profileModels );
+profileModels.addAll(externalProfileModels);//external takes precedence
+ // Collections.reverse( profileModels );
Model model = domainModel.getModel();
profileModels.add( 0, model );
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=762779r1=762778r2=762779view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Tue Apr 7 13:57:19 2009
@@ -1242,16 +1242,16 @@
}
/* MNG-2309*/
-/*
+
public void testProfileInjectionOrder()
throws Exception
{
PomTestWrapper pom =
buildPom( profile-injection-order, pom-a, pom-b, pom-e,
pom-c, pom-d );
-System.out.println(pom.getDomainModel().asString());
+//System.out.println(pom.getDomainModel().asString());
assertEquals( e, pom.getValue( properties[1]/pomProperty ) );
}
-*/
+
public void testPropertiesInheritance()
throws Exception
{
svn commit: r762820 - in /maven/mercury/trunk: mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/ mercury-m
Author: ogusakov
Date: Tue Apr 7 15:29:44 2009
New Revision: 762820
URL: http://svn.apache.org/viewvc?rev=762820view=rev
Log:
[MERCURY-109] - allowed optional circular dependencies
Added:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java
(with props)
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java
(with props)
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/Configurable.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/Messages.properties
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/Util.java
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/Configurable.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/Configurable.java?rev=762820r1=762819r2=762820view=diff
==
---
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/Configurable.java
(original)
+++
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/Configurable.java
Tue Apr 7 15:29:44 2009
@@ -18,9 +18,11 @@
*/
package org.apache.maven.mercury.artifact.api;
+import java.util.Map;
+
/**
* provides a way to configure an object instance, if that object supports the
idea
- *
+ *
* @author Oleg Gusakov
* @version $Id$
*/
@@ -29,9 +31,10 @@
/**
* configure this instance
- *
+ *
* @param name of the configurable property
* @param val configuration value
*/
-public void setOption( String name, String val );
+public void setOption( String name, String val )
+throws ConfigurationException;
}
Added:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java?rev=762820view=auto
==
---
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java
(added)
+++
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java
Tue Apr 7 15:29:44 2009
@@ -0,0 +1,26 @@
+package org.apache.maven.mercury.artifact.api;
+
+public class ConfigurationException
+extends Exception
+{
+
+public ConfigurationException()
+{
+}
+
+public ConfigurationException( String message )
+{
+super( message );
+}
+
+public ConfigurationException( Throwable cause )
+{
+super( cause );
+}
+
+public ConfigurationException( String message, Throwable cause )
+{
+super( message, cause );
+}
+
+}
Propchange:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java
--
svn:eol-style = native
Propchange:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java
--
svn:keywords = Author Date Id Revision
Added:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java?rev=762820view=auto
==
---
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java
(added)
+++
svn commit: r762850 - in /maven/mercury/trunk: mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/ mercury-m
Author: ogusakov
Date: Tue Apr 7 16:59:09 2009
New Revision: 762850
URL: http://svn.apache.org/viewvc?rev=762850view=rev
Log:
[MERCURY-109] - altered generic configuration mechanism to allow passing in
objects, not just strings
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/Configurable.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/Util.java
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/Configurable.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/Configurable.java?rev=762850r1=762849r2=762850view=diff
==
---
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/Configurable.java
(original)
+++
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/Configurable.java
Tue Apr 7 16:59:09 2009
@@ -18,8 +18,6 @@
*/
package org.apache.maven.mercury.artifact.api;
-import java.util.Map;
-
/**
* provides a way to configure an object instance, if that object supports the
idea
*
@@ -35,6 +33,6 @@
* @param name of the configurable property
* @param val configuration value
*/
-public void setOption( String name, String val )
+public void setOption( String name, Object val )
throws ConfigurationException;
}
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java?rev=762850r1=762849r2=762850view=diff
==
---
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java
(original)
+++
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java
Tue Apr 7 16:59:09 2009
@@ -30,13 +30,13 @@
*/
public class ConfigurationUtil
{
-public static void configure( Configurable impl, MapString,String config
)
+public static void configure( Configurable impl, MapString,Object config
)
throws ConfigurationException
{
if( impl == null || config == null )
return;
-for( Map.EntryString, String e : config.entrySet() )
+for( Map.EntryString, Object e : config.entrySet() )
impl.setOption( e.getKey(), e.getValue() );
}
}
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java?rev=762850r1=762849r2=762850view=diff
==
---
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java
(original)
+++
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java
Tue Apr 7 16:59:09 2009
@@ -259,11 +259,11 @@
return false;
}
-public void setOption( String name, String val )
+public void setOption( String name, Object val )
{
if ( SYSTEM_PARAMETER_OSGI_VERSION.equals( name ) )
{
-_osgiVersion = Boolean.parseBoolean( System.getProperty( val,
SYSTEM_PARAMETER_OSGI_VERSION_DEFAULT ) );
+_osgiVersion = Boolean.parseBoolean( System.getProperty(
(String)val, SYSTEM_PARAMETER_OSGI_VERSION_DEFAULT ) );
}
}
Modified:
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java?rev=762850r1=762849r2=762850view=diff
svn commit: r762892 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/processor/ maven-project/src/test/java/org/apache/maven/project/ maven-project/src/test/r
Author: sisbell
Date: Tue Apr 7 18:27:37 2009
New Revision: 762892
URL: http://svn.apache.org/viewvc?rev=762892view=rev
Log:
[MNG-2174] plugin management dependencies.
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java?rev=762892r1=762891r2=762892view=diff
==
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
Tue Apr 7 18:27:37 2009
@@ -95,7 +95,6 @@
}
}
profileModels.addAll(externalProfileModels);//external takes precedence
- // Collections.reverse( profileModels );
Model model = domainModel.getModel();
profileModels.add( 0, model );
@@ -118,11 +117,23 @@
}
DependencyManagement depMng = model.getDependencyManagement();
-model.setDependencyManagement( depMng );
Model target = processModelsForInheritance(profileModels, processors);
-//TODO: Merge
-target.getBuild().setPluginManagement( mng );
+
+PluginsManagementProcessor pmp = new PluginsManagementProcessor();
+if( mng != null )
+{
+ if(target.getBuild().getPluginManagement() != null)
+ {
+ pmp.process(null, mng.getPlugins(),
target.getBuild().getPluginManagement().getPlugins(), false);
+ }
+ else
+ {
+ target.getBuild().setPluginManagement( mng );
+ }
+}
+
+//TODO: Merge Dependency Management
target.setDependencyManagement( depMng );
PomClassicDomainModel targetModel = convertToDomainModel( target,
domainModel.isMostSpecialized());
@@ -578,13 +589,25 @@
b.setDirectory( base.getDirectory() );
b.setFilters( new ArrayListString(base.getFilters()) );
b.setFinalName( base.getFinalName() );
-b.setPluginManagement( base.getPluginManagement() );
+b.setPluginManagement(
copyPluginManagement(base.getPluginManagement()) );
b.setPlugins( copyPlugins(base.getPlugins()) );
b.setResources( new ArrayListResource(base.getResources()) );
b.setTestResources( new ArrayListResource(base.getTestResources())
);
return b;
}
+private static PluginManagement copyPluginManagement(PluginManagement mng)
+{
+ if(mng == null)
+ {
+ return null;
+ }
+
+ PluginManagement pm = new PluginManagement();
+ pm.setPlugins(copyPlugins(mng.getPlugins()));
+ return pm;
+}
+
private static ListPlugin copyPlugins(ListPlugin plugins)
{
ListPlugin ps = new ArrayListPlugin();
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java?rev=762892r1=762891r2=762892view=diff
==
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java
Tue Apr 7 18:27:37 2009
@@ -20,29 +20,14 @@
*/
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
-import org.apache.maven.model.BuildBase;
-import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import
svn commit: r762902 - /maven/mercury/trunk/pom.xml
Author: ogusakov Date: Tue Apr 7 18:49:56 2009 New Revision: 762902 URL: http://svn.apache.org/viewvc?rev=762902view=rev Log: experimental commit to run ITs Modified: maven/mercury/trunk/pom.xml Modified: maven/mercury/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/pom.xml?rev=762902r1=762901r2=762902view=diff == --- maven/mercury/trunk/pom.xml (original) +++ maven/mercury/trunk/pom.xml Tue Apr 7 18:49:56 2009 @@ -65,6 +65,7 @@ modulemercury-logging/module modulemercury-plexus/module modulemercury-wagon/module +modulemercury-it/module /modules properties
svn commit: r762905 - /maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
Author: ogusakov
Date: Tue Apr 7 19:06:02 2009
New Revision: 762905
URL: http://svn.apache.org/viewvc?rev=762905view=rev
Log:
added some comments
Modified:
maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
Modified:
maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java?rev=762905r1=762904r2=762905view=diff
==
---
maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
(original)
+++
maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
Tue Apr 7 19:06:02 2009
@@ -25,7 +25,7 @@
public interface DependencyProcessor
{
-
+/** dummy processor to create M2 repositories when metadata processing is
not required */
public static final DependencyProcessor NULL_PROCESSOR = new
DependencyProcessor()
{
public ListArtifactMetadata getDependencies( ArtifactMetadata bmd,
MetadataReader mdReader,
@@ -37,6 +37,8 @@
};
// TODO: shouldn't sysProps be changed to Properties because of
System.getProperties() API?
+// Oleg: sysProp may help to experiment with Objects, different from
Strings, so I'd
+// stay with the Map until this is stable enough
public ListArtifactMetadata getDependencies( ArtifactMetadata bmd,
MetadataReader mdReader,
MapString, String
env, Map?, ? sysProps )
throws MetadataReaderException, DependencyProcessorException;
svn commit: r762924 - /maven/mercury/trunk/pom.xml
Author: ogusakov Date: Tue Apr 7 19:47:08 2009 New Revision: 762924 URL: http://svn.apache.org/viewvc?rev=762924view=rev Log: ITs pass under osx and xp, remove IT module to start the release Modified: maven/mercury/trunk/pom.xml Modified: maven/mercury/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/pom.xml?rev=762924r1=762923r2=762924view=diff == --- maven/mercury/trunk/pom.xml (original) +++ maven/mercury/trunk/pom.xml Tue Apr 7 19:47:08 2009 @@ -65,7 +65,10 @@ modulemercury-logging/module modulemercury-plexus/module modulemercury-wagon/module +!-- modulemercury-it/module +-- + /modules properties
svn commit: r762941 - in /maven/mercury/trunk: ./ mercury-artifact/ mercury-crypto/ mercury-crypto/mercury-crypto-api/ mercury-crypto/mercury-crypto-basic/ mercury-event/ mercury-external/ mercury-log
Author: ogusakov Date: Tue Apr 7 20:31:32 2009 New Revision: 762941 URL: http://svn.apache.org/viewvc?rev=762941view=rev Log: [maven-release-plugin] prepare release mercury-1.0-alpha-6 Modified: maven/mercury/trunk/mercury-artifact/pom.xml maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml maven/mercury/trunk/mercury-crypto/pom.xml maven/mercury/trunk/mercury-event/pom.xml maven/mercury/trunk/mercury-external/pom.xml maven/mercury/trunk/mercury-logging/pom.xml maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml maven/mercury/trunk/mercury-md/pom.xml maven/mercury/trunk/mercury-plexus/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-map/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml maven/mercury/trunk/mercury-repo/pom.xml maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml maven/mercury/trunk/mercury-transport/pom.xml maven/mercury/trunk/mercury-util/pom.xml maven/mercury/trunk/mercury-wagon/pom.xml maven/mercury/trunk/pom.xml Modified: maven/mercury/trunk/mercury-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/pom.xml?rev=762941r1=762940r2=762941view=diff == --- maven/mercury/trunk/mercury-artifact/pom.xml (original) +++ maven/mercury/trunk/mercury-artifact/pom.xml Tue Apr 7 20:31:32 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6-SNAPSHOT/version +version1.0-alpha-6/version /parent artifactIdmercury-artifact/artifactId Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml?rev=762941r1=762940r2=762941view=diff == --- maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml Tue Apr 7 20:31:32 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury-crypto/artifactId -version1.0-alpha-6-SNAPSHOT/version +version1.0-alpha-6/version /parent artifactIdmercury-crypto-api/artifactId Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml?rev=762941r1=762940r2=762941view=diff == --- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml Tue Apr 7 20:31:32 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury-crypto/artifactId -version1.0-alpha-6-SNAPSHOT/version +version1.0-alpha-6/version /parent artifactIdmercury-crypto-basic/artifactId Modified: maven/mercury/trunk/mercury-crypto/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/pom.xml?rev=762941r1=762940r2=762941view=diff == --- maven/mercury/trunk/mercury-crypto/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/pom.xml Tue Apr 7 20:31:32 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6-SNAPSHOT/version +version1.0-alpha-6/version /parent artifactIdmercury-crypto/artifactId Modified: maven/mercury/trunk/mercury-event/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/pom.xml?rev=762941r1=762940r2=762941view=diff == --- maven/mercury/trunk/mercury-event/pom.xml (original) +++ maven/mercury/trunk/mercury-event/pom.xml Tue Apr 7 20:31:32 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6-SNAPSHOT/version +version1.0-alpha-6/version /parent artifactIdmercury-event/artifactId Modified: maven/mercury/trunk/mercury-external/pom.xml URL:
svn commit: r762944 - in /maven/mercury/tags/mercury-1.0-alpha-6: ./ mercury-ant-tasks/ mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ mercury-ant-tasks/src/main/resources/org/apa
Author: ogusakov Date: Tue Apr 7 20:33:28 2009 New Revision: 762944 URL: http://svn.apache.org/viewvc?rev=762944view=rev Log: [maven-release-plugin] copy for tag mercury-1.0-alpha-6 Added: maven/mercury/tags/mercury-1.0-alpha-6/ - copied from r751109, maven/mercury/trunk/ maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/pom.xml - copied unchanged from r760310, maven/mercury/trunk/mercury-ant-tasks/pom.xml maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java - copied unchanged from r762494, maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java - copied unchanged from r751167, maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java - copied unchanged from r751975, maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java - copied unchanged from r751167, maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/Messages.properties - copied unchanged from r752745, maven/mercury/trunk/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/Messages.properties maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/pom.xml - copied unchanged from r762941, maven/mercury/trunk/mercury-artifact/pom.xml maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/ArtifactMetadata.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/ArtifactMetadata.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java - copied unchanged from r761097, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java - copied unchanged from r754463, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Messages.properties - copied unchanged from r751975, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Messages.properties maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/MetadataTreeNode.java - copied unchanged from r758797, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/MetadataTreeNode.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/QualityRange.java - copied unchanged from r751975, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/QualityRange.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessor.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessor.java
svn commit: r762946 - /maven/mercury/tags/mercury-1.0-alpha-6/
Author: ogusakov Date: Tue Apr 7 20:36:19 2009 New Revision: 762946 URL: http://svn.apache.org/viewvc?rev=762946view=rev Log: rolling back Removed: maven/mercury/tags/mercury-1.0-alpha-6/
svn commit: r762945 - in /maven/mercury/trunk: ./ mercury-artifact/ mercury-crypto/ mercury-crypto/mercury-crypto-api/ mercury-crypto/mercury-crypto-basic/ mercury-event/ mercury-external/ mercury-log
Author: ogusakov Date: Tue Apr 7 20:34:00 2009 New Revision: 762945 URL: http://svn.apache.org/viewvc?rev=762945view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/mercury/trunk/mercury-artifact/pom.xml maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml maven/mercury/trunk/mercury-crypto/pom.xml maven/mercury/trunk/mercury-event/pom.xml maven/mercury/trunk/mercury-external/pom.xml maven/mercury/trunk/mercury-logging/pom.xml maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml maven/mercury/trunk/mercury-md/pom.xml maven/mercury/trunk/mercury-plexus/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-map/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml maven/mercury/trunk/mercury-repo/pom.xml maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml maven/mercury/trunk/mercury-transport/pom.xml maven/mercury/trunk/mercury-util/pom.xml maven/mercury/trunk/mercury-wagon/pom.xml maven/mercury/trunk/pom.xml Modified: maven/mercury/trunk/mercury-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/pom.xml?rev=762945r1=762944r2=762945view=diff == --- maven/mercury/trunk/mercury-artifact/pom.xml (original) +++ maven/mercury/trunk/mercury-artifact/pom.xml Tue Apr 7 20:34:00 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6/version +version1.0-alpha-7-SNAPSHOT/version /parent artifactIdmercury-artifact/artifactId Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml?rev=762945r1=762944r2=762945view=diff == --- maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml Tue Apr 7 20:34:00 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury-crypto/artifactId -version1.0-alpha-6/version +version1.0-alpha-7-SNAPSHOT/version /parent artifactIdmercury-crypto-api/artifactId Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml?rev=762945r1=762944r2=762945view=diff == --- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml Tue Apr 7 20:34:00 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury-crypto/artifactId -version1.0-alpha-6/version +version1.0-alpha-7-SNAPSHOT/version /parent artifactIdmercury-crypto-basic/artifactId Modified: maven/mercury/trunk/mercury-crypto/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/pom.xml?rev=762945r1=762944r2=762945view=diff == --- maven/mercury/trunk/mercury-crypto/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/pom.xml Tue Apr 7 20:34:00 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6/version +version1.0-alpha-7-SNAPSHOT/version /parent artifactIdmercury-crypto/artifactId Modified: maven/mercury/trunk/mercury-event/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/pom.xml?rev=762945r1=762944r2=762945view=diff == --- maven/mercury/trunk/mercury-event/pom.xml (original) +++ maven/mercury/trunk/mercury-event/pom.xml Tue Apr 7 20:34:00 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6/version +version1.0-alpha-7-SNAPSHOT/version /parent artifactIdmercury-event/artifactId Modified: maven/mercury/trunk/mercury-external/pom.xml URL:
svn commit: r762960 - in /maven/mercury/trunk: ./ mercury-artifact/ mercury-crypto/ mercury-crypto/mercury-crypto-api/ mercury-crypto/mercury-crypto-basic/ mercury-event/ mercury-external/ mercury-log
Author: ogusakov Date: Tue Apr 7 20:59:37 2009 New Revision: 762960 URL: http://svn.apache.org/viewvc?rev=762960view=rev Log: [maven-release-plugin] prepare release mercury-1.0-alpha-6 Modified: maven/mercury/trunk/mercury-artifact/pom.xml maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml maven/mercury/trunk/mercury-crypto/pom.xml maven/mercury/trunk/mercury-event/pom.xml maven/mercury/trunk/mercury-external/pom.xml maven/mercury/trunk/mercury-logging/pom.xml maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml maven/mercury/trunk/mercury-md/pom.xml maven/mercury/trunk/mercury-plexus/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-map/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml maven/mercury/trunk/mercury-repo/pom.xml maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml maven/mercury/trunk/mercury-transport/pom.xml maven/mercury/trunk/mercury-util/pom.xml maven/mercury/trunk/mercury-wagon/pom.xml maven/mercury/trunk/pom.xml Modified: maven/mercury/trunk/mercury-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/pom.xml?rev=762960r1=762959r2=762960view=diff == --- maven/mercury/trunk/mercury-artifact/pom.xml (original) +++ maven/mercury/trunk/mercury-artifact/pom.xml Tue Apr 7 20:59:37 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6-SNAPSHOT/version +version1.0-alpha-6/version /parent artifactIdmercury-artifact/artifactId Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml?rev=762960r1=762959r2=762960view=diff == --- maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml Tue Apr 7 20:59:37 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury-crypto/artifactId -version1.0-alpha-6-SNAPSHOT/version +version1.0-alpha-6/version /parent artifactIdmercury-crypto-api/artifactId Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml?rev=762960r1=762959r2=762960view=diff == --- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml Tue Apr 7 20:59:37 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury-crypto/artifactId -version1.0-alpha-6-SNAPSHOT/version +version1.0-alpha-6/version /parent artifactIdmercury-crypto-basic/artifactId Modified: maven/mercury/trunk/mercury-crypto/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/pom.xml?rev=762960r1=762959r2=762960view=diff == --- maven/mercury/trunk/mercury-crypto/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/pom.xml Tue Apr 7 20:59:37 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6-SNAPSHOT/version +version1.0-alpha-6/version /parent artifactIdmercury-crypto/artifactId Modified: maven/mercury/trunk/mercury-event/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/pom.xml?rev=762960r1=762959r2=762960view=diff == --- maven/mercury/trunk/mercury-event/pom.xml (original) +++ maven/mercury/trunk/mercury-event/pom.xml Tue Apr 7 20:59:37 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6-SNAPSHOT/version +version1.0-alpha-6/version /parent artifactIdmercury-event/artifactId Modified: maven/mercury/trunk/mercury-external/pom.xml URL:
svn commit: r762959 - in /maven/mercury/trunk: ./ mercury-artifact/ mercury-crypto/ mercury-crypto/mercury-crypto-api/ mercury-crypto/mercury-crypto-basic/ mercury-event/ mercury-external/ mercury-log
Author: ogusakov Date: Tue Apr 7 20:53:57 2009 New Revision: 762959 URL: http://svn.apache.org/viewvc?rev=762959view=rev Log: rolling back the release Modified: maven/mercury/trunk/mercury-artifact/pom.xml maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml maven/mercury/trunk/mercury-crypto/pom.xml maven/mercury/trunk/mercury-event/pom.xml maven/mercury/trunk/mercury-external/pom.xml maven/mercury/trunk/mercury-logging/pom.xml maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml maven/mercury/trunk/mercury-md/pom.xml maven/mercury/trunk/mercury-plexus/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-map/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml maven/mercury/trunk/mercury-repo/pom.xml maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml maven/mercury/trunk/mercury-transport/pom.xml maven/mercury/trunk/mercury-util/pom.xml maven/mercury/trunk/mercury-wagon/pom.xml maven/mercury/trunk/pom.xml maven/mercury/trunk/release.notes.txt Modified: maven/mercury/trunk/mercury-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/pom.xml?rev=762959r1=762958r2=762959view=diff == --- maven/mercury/trunk/mercury-artifact/pom.xml (original) +++ maven/mercury/trunk/mercury-artifact/pom.xml Tue Apr 7 20:53:57 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-7-SNAPSHOT/version +version1.0-alpha-6-SNAPSHOT/version /parent artifactIdmercury-artifact/artifactId Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml?rev=762959r1=762958r2=762959view=diff == --- maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml Tue Apr 7 20:53:57 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury-crypto/artifactId -version1.0-alpha-7-SNAPSHOT/version +version1.0-alpha-6-SNAPSHOT/version /parent artifactIdmercury-crypto-api/artifactId Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml?rev=762959r1=762958r2=762959view=diff == --- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml Tue Apr 7 20:53:57 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury-crypto/artifactId -version1.0-alpha-7-SNAPSHOT/version +version1.0-alpha-6-SNAPSHOT/version /parent artifactIdmercury-crypto-basic/artifactId Modified: maven/mercury/trunk/mercury-crypto/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/pom.xml?rev=762959r1=762958r2=762959view=diff == --- maven/mercury/trunk/mercury-crypto/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/pom.xml Tue Apr 7 20:53:57 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-7-SNAPSHOT/version +version1.0-alpha-6-SNAPSHOT/version /parent artifactIdmercury-crypto/artifactId Modified: maven/mercury/trunk/mercury-event/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/pom.xml?rev=762959r1=762958r2=762959view=diff == --- maven/mercury/trunk/mercury-event/pom.xml (original) +++ maven/mercury/trunk/mercury-event/pom.xml Tue Apr 7 20:53:57 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-7-SNAPSHOT/version +version1.0-alpha-6-SNAPSHOT/version /parent artifactIdmercury-event/artifactId Modified: maven/mercury/trunk/mercury-external/pom.xml URL:
svn commit: r762964 - in /maven/mercury/trunk: ./ mercury-artifact/ mercury-crypto/ mercury-crypto/mercury-crypto-api/ mercury-crypto/mercury-crypto-basic/ mercury-event/ mercury-external/ mercury-log
Author: ogusakov Date: Tue Apr 7 21:01:43 2009 New Revision: 762964 URL: http://svn.apache.org/viewvc?rev=762964view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/mercury/trunk/mercury-artifact/pom.xml maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml maven/mercury/trunk/mercury-crypto/pom.xml maven/mercury/trunk/mercury-event/pom.xml maven/mercury/trunk/mercury-external/pom.xml maven/mercury/trunk/mercury-logging/pom.xml maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml maven/mercury/trunk/mercury-md/pom.xml maven/mercury/trunk/mercury-plexus/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-local-map/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml maven/mercury/trunk/mercury-repo/pom.xml maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml maven/mercury/trunk/mercury-transport/pom.xml maven/mercury/trunk/mercury-util/pom.xml maven/mercury/trunk/mercury-wagon/pom.xml maven/mercury/trunk/pom.xml Modified: maven/mercury/trunk/mercury-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/pom.xml?rev=762964r1=762963r2=762964view=diff == --- maven/mercury/trunk/mercury-artifact/pom.xml (original) +++ maven/mercury/trunk/mercury-artifact/pom.xml Tue Apr 7 21:01:43 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6/version +version1.0-alpha-7-SNAPSHOT/version /parent artifactIdmercury-artifact/artifactId Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml?rev=762964r1=762963r2=762964view=diff == --- maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml Tue Apr 7 21:01:43 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury-crypto/artifactId -version1.0-alpha-6/version +version1.0-alpha-7-SNAPSHOT/version /parent artifactIdmercury-crypto-api/artifactId Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml?rev=762964r1=762963r2=762964view=diff == --- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml Tue Apr 7 21:01:43 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury-crypto/artifactId -version1.0-alpha-6/version +version1.0-alpha-7-SNAPSHOT/version /parent artifactIdmercury-crypto-basic/artifactId Modified: maven/mercury/trunk/mercury-crypto/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/pom.xml?rev=762964r1=762963r2=762964view=diff == --- maven/mercury/trunk/mercury-crypto/pom.xml (original) +++ maven/mercury/trunk/mercury-crypto/pom.xml Tue Apr 7 21:01:43 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6/version +version1.0-alpha-7-SNAPSHOT/version /parent artifactIdmercury-crypto/artifactId Modified: maven/mercury/trunk/mercury-event/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/pom.xml?rev=762964r1=762963r2=762964view=diff == --- maven/mercury/trunk/mercury-event/pom.xml (original) +++ maven/mercury/trunk/mercury-event/pom.xml Tue Apr 7 21:01:43 2009 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.mercury/groupId artifactIdmercury/artifactId -version1.0-alpha-6/version +version1.0-alpha-7-SNAPSHOT/version /parent artifactIdmercury-event/artifactId Modified: maven/mercury/trunk/mercury-external/pom.xml URL:
svn commit: r762963 - in /maven/mercury/tags/mercury-1.0-alpha-6: ./ mercury-ant-tasks/ mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ mercury-ant-tasks/src/main/resources/org/apa
Author: ogusakov Date: Tue Apr 7 21:01:07 2009 New Revision: 762963 URL: http://svn.apache.org/viewvc?rev=762963view=rev Log: [maven-release-plugin] copy for tag mercury-1.0-alpha-6 Added: maven/mercury/tags/mercury-1.0-alpha-6/ - copied from r751109, maven/mercury/trunk/ maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/pom.xml - copied unchanged from r760310, maven/mercury/trunk/mercury-ant-tasks/pom.xml maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java - copied unchanged from r762494, maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java - copied unchanged from r751167, maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java - copied unchanged from r751975, maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java - copied unchanged from r751167, maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/Messages.properties - copied unchanged from r752745, maven/mercury/trunk/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/Messages.properties maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/pom.xml - copied unchanged from r762960, maven/mercury/trunk/mercury-artifact/pom.xml maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/ArtifactMetadata.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/ArtifactMetadata.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java - copied unchanged from r761097, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java - copied unchanged from r754463, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Messages.properties - copied unchanged from r751975, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Messages.properties maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/MetadataTreeNode.java - copied unchanged from r758797, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/MetadataTreeNode.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/QualityRange.java - copied unchanged from r751975, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/QualityRange.java maven/mercury/tags/mercury-1.0-alpha-6/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessor.java - copied unchanged from r751167, maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessor.java
svn commit: r763009 - /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
Author: ogusakov
Date: Tue Apr 7 22:28:00 2009
New Revision: 763009
URL: http://svn.apache.org/viewvc?rev=763009view=rev
Log:
added a getter to ScopeArtifactFilter to enable interrogation
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java?rev=763009r1=763008r2=763009view=diff
==
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
Tue Apr 7 22:28:00 2009
@@ -39,9 +39,13 @@
private final boolean providedScope;
private final boolean systemScope;
+
+private final String scope;
public ScopeArtifactFilter( String scope )
{
+this.scope = scope;
+
if ( Artifact.SCOPE_COMPILE.equals( scope ) )
{
systemScope = true;
@@ -111,4 +115,9 @@
return true;
}
}
+
+public String getScope()
+{
+return scope;
+}
}
svn commit: r763103 - in /maven/components/trunk: maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/ maven-repository/src/main/java/org/apache/maven/repository/
Author: ogusakov
Date: Wed Apr 8 04:45:36 2009
New Revision: 763103
URL: http://svn.apache.org/viewvc?rev=763103view=rev
Log:
intermediate commit to revert lagacy repo system to default status
Modified:
maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryAdaptor.java
maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
Modified:
maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryAdaptor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryAdaptor.java?rev=763103r1=763102r2=763103view=diff
==
---
maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryAdaptor.java
(original)
+++
maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryAdaptor.java
Wed Apr 8 04:45:36 2009
@@ -27,13 +27,18 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.artifact.MetadataTreeNode;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.repository.api.Repository;
@@ -61,11 +66,12 @@
{
if ( localRepository == null Util.isEmpty( remoteRepositories ) )
return null;
-
+
int nRepos =
( localRepository == null ? 0 : 1 ) + ( Util.isEmpty(
remoteRepositories ) ? 0 : remoteRepositories.size() );
-ListRepository res = new ArrayListRepository( nRepos );
+MapString, Repository repos = new LinkedHashMapString,
Repository(nRepos);
+
if ( localRepository != null )
{
@@ -88,7 +94,7 @@
{
throw new IllegalArgumentException( e );
}
-res.add( lr );
+repos.put( url, lr );
}
if ( !Util.isEmpty( remoteRepositories ) )
@@ -114,10 +120,17 @@
_repos.put( url, rr );
}
-res.add( rr );
+repos.put( url, rr );
}
}
+ListRepository res = new ArrayListRepository( repos.size() );
+
+for( EntryString, Repository e : repos.entrySet() )
+res.add( e.getValue() );
+
+//System.out.println(Converted +nRepos+ - +res.size());
+//
return res;
}
@@ -154,6 +167,10 @@
ma.setScope( a.getScope() );
ma.setFile( a.getFile() );
+
+ma.setResolved( true );
+
+ma.setResolvedVersion( a.getVersion() );
return ma;
}
@@ -245,4 +262,45 @@
}
}
+/**
+ * @param reqArtifact
+ * @param isPlugin
+ * @param filter
+ * @return
+ */
+public static ArtifactScopeEnum extractScope( Artifact reqArtifact,
boolean isPlugin, ArtifactFilter filter )
+{
+String scopeStr = reqArtifact.getScope();
//org.apache.maven.mercury.artifact.Artifact.SCOPE_COMPILE;
+
+if( filter != null )
+{
+if( ScopeArtifactFilter.class.isAssignableFrom( filter.getClass()
) )
+scopeStr = ((ScopeArtifactFilter)filter).getScope();
+}
+
+if( org.apache.maven.plugins:maven-remote-resources-plugin.equals(
+
reqArtifact.getGroupId()+:+reqArtifact.getArtifactId()
+ )
+) scopeStr = null;
+
+//else if( isPlugin )
+//scopeStr =
org.apache.maven.mercury.artifact.Artifact.SCOPE_RUNTIME;
+
+if( scopeStr != null )
+{
+if(
org.apache.maven.mercury.artifact.Artifact.SCOPE_COMPILE.equals( scopeStr ) )
+return ArtifactScopeEnum.compile;
+else if(
org.apache.maven.mercury.artifact.Artifact.SCOPE_TEST.equals( scopeStr ) )
+return ArtifactScopeEnum.test;
+else if(
