svn commit: r585583 - in /maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact: DuplicateArtifactsConsumer.java LocationArtifactsCon
Author: joakime
Date: Wed Oct 17 10:23:04 2007
New Revision: 585583
URL: http://svn.apache.org/viewvc?rev=585583view=rev
Log:
Upgrading bidirlayout usage to RepoContent usage to eliminate bugs around
missing content from bad layout routines.
Modified:
maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactsConsumer.java
maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java
Modified:
maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactsConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactsConsumer.java?rev=585583r1=585582r2=585583view=diff
==
---
maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactsConsumer.java
(original)
+++
maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactsConsumer.java
Wed Oct 17 10:23:04 2007
@@ -32,16 +32,15 @@
import
org.apache.maven.archiva.database.constraints.ArtifactsByChecksumConstraint;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.RepositoryProblem;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.maven.archiva.repository.ManagedRepositoryContent;
+import org.apache.maven.archiva.repository.RepositoryContentFactory;
+import org.apache.maven.archiva.repository.RepositoryException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -85,9 +84,9 @@
/**
* @plexus.requirement
*/
-private BidirectionalRepositoryLayoutFactory layoutFactory;
+private RepositoryContentFactory repositoryFactory;
-private List includes = new ArrayList();
+private ListString includes = new ArrayListString();
public String getId()
{
@@ -114,7 +113,7 @@
/* do nothing */
}
-public List getIncludedTypes()
+public ListString getIncludedTypes()
{
return null;
}
@@ -124,7 +123,7 @@
{
String checksumSha1 = artifact.getModel().getChecksumSHA1();
-List results = null;
+ListArchivaArtifact results = null;
try
{
results = dao.getArtifactDAO().queryArtifacts( new
ArtifactsByChecksumConstraint(
@@ -150,11 +149,8 @@
return;
}
-Iterator it = results.iterator();
-while ( it.hasNext() )
+for ( ArchivaArtifact dupArtifact : results )
{
-ArchivaArtifact dupArtifact = (ArchivaArtifact) it.next();
-
if ( dupArtifact.equals( artifact ) )
{
// Skip reference to itself.
@@ -190,10 +186,11 @@
{
try
{
-BidirectionalRepositoryLayout layout = layoutFactory.getLayout(
artifact );
-return layout.toPath( artifact );
+String repoId = artifact.getModel().getRepositoryId();
+ManagedRepositoryContent repo =
repositoryFactory.getManagedRepositoryContent( repoId );
+return repo.toPath( artifact );
}
-catch ( LayoutException e )
+catch ( RepositoryException e )
{
getLogger().warn( Unable to calculate path for artifact: +
artifact );
return ;
Modified:
maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java?rev=585583r1=585582r2=585583view=diff
==
---
maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java
(original)
+++
svn commit: r585587 - /maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java
Author: joakime Date: Wed Oct 17 10:29:17 2007 New Revision: 585587 URL: http://svn.apache.org/viewvc?rev=585587view=rev Log: Removing unused imports. Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java?rev=585587r1=585586r2=585587view=diff == --- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java (original) +++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java Wed Oct 17 10:29:17 2007 @@ -24,16 +24,12 @@ import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration; import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArtifactReference; import org.apache.maven.archiva.policies.CachedFailuresPolicy; import org.apache.maven.archiva.policies.ChecksumPolicy; import org.apache.maven.archiva.policies.ReleasesPolicy; import org.apache.maven.archiva.policies.SnapshotsPolicy; import org.apache.maven.archiva.policies.urlcache.UrlFailureCache; import org.apache.maven.archiva.repository.ManagedRepositoryContent; -import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout; -import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory; import org.apache.maven.wagon.Wagon; import org.codehaus.plexus.PlexusTestCase; import org.easymock.MockControl;
svn commit: r585265 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/settings/ maven-embedder/src/main/java/org/apache/maven/embedder/ maven-embedder/src/test/java/org/apache/ma
Author: hboutemy
Date: Tue Oct 16 14:26:43 2007
New Revision: 585265
URL: http://svn.apache.org/viewvc?rev=585265view=rev
Log:
[MNG-2254] support XML file encoding when reading/writing settings and pom files
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=585265r1=585264r2=585265view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Tue Oct 16 14:26:43 2007
@@ -26,14 +26,15 @@
import org.apache.maven.settings.validation.SettingsValidator;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
import org.codehaus.plexus.util.interpolation.PropertiesBasedValueSource;
import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
+import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.List;
@@ -49,7 +50,7 @@
private SettingsValidator validator;
/** @since 2.1 */
-public Settings buildSettings( MavenExecutionRequest request )
+public Settings buildSettings( MavenExecutionRequest request )
throws IOException, XmlPullParserException
{
File userSettingsFile = request.getUserSettingsFile();
@@ -148,11 +149,11 @@
Settings settings = null;
-FileReader reader = null;
+Reader reader = null;
try
{
-reader = new FileReader( settingsFile );
+reader = ReaderFactory.newXmlReader( settingsFile );
SettingsXpp3Reader modelReader = new SettingsXpp3Reader();
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=585265r1=585264r2=585265view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Tue Oct 16 14:26:43 2007
@@ -78,15 +78,16 @@
import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.output.Format;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.net.URL;
@@ -211,7 +212,7 @@
public Model readModel( File file )
throws XmlPullParserException, IOException
{
- Reader reader = new FileReader( file );
+Reader reader = ReaderFactory.newXmlReader( file );
try
{
@@ -252,8 +253,6 @@
Settings settings )
throws IOException
{
-Writer fileWriter = new FileWriter( file );
-
SettingsValidator settingsValidator = new DefaultSettingsValidator();
SettingsValidationResult validationResult =
settingsValidator.validate(
svn commit: r585257 - in /maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata: AbstractRepositoryMetadata.java DefaultRepositoryMetadataManager.java
Author: hboutemy
Date: Tue Oct 16 13:33:42 2007
New Revision: 585257
URL: http://svn.apache.org/viewvc?rev=585257view=rev
Log:
[MNG-2254] support XML file encoding when reading/writing repository metadata
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java?rev=585257r1=585256r2=585257view=diff
==
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
Tue Oct 16 13:33:42 2007
@@ -25,11 +25,11 @@
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
@@ -93,7 +93,7 @@
try
{
-reader = new FileReader( metadataFile );
+reader = ReaderFactory.newXmlReader( metadataFile );
metadata = mappingReader.read( reader, false );
}
@@ -131,7 +131,7 @@
try
{
metadataFile.getParentFile().mkdirs();
-writer = new FileWriter( metadataFile );
+writer = WriterFactory.newXmlWriter( metadataFile );
MetadataXpp3Writer mappingWriter = new MetadataXpp3Writer();
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=585257r1=585256r2=585257view=diff
==
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Tue Oct 16 13:33:42 2007
@@ -28,11 +28,11 @@
import org.apache.maven.wagon.TransferFailedException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
import java.util.Date;
@@ -269,14 +269,14 @@
{
Metadata result;
-Reader fileReader = null;
+Reader reader = null;
try
{
-fileReader = new FileReader( mappingFile );
+reader = ReaderFactory.newXmlReader( mappingFile );
MetadataXpp3Reader mappingReader = new MetadataXpp3Reader();
-result = mappingReader.read( fileReader, false );
+result = mappingReader.read( reader, false );
}
catch ( FileNotFoundException e )
{
@@ -294,7 +294,7 @@
}
finally
{
-IOUtil.close( fileReader );
+IOUtil.close( reader );
}
return result;
}
svn commit: r585259 - in /maven/components/branches/maven-2.0.x: ./ maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/
Author: hboutemy
Date: Tue Oct 16 13:40:07 2007
New Revision: 585259
URL: http://svn.apache.org/viewvc?rev=585259view=rev
Log:
[MNG-2254] support XML file encoding when reading/writing repository metadata
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/branches/maven-2.0.x/pom.xml
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java?rev=585259r1=585258r2=585259view=diff
==
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
Tue Oct 16 13:40:07 2007
@@ -25,11 +25,11 @@
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
@@ -93,7 +93,7 @@
try
{
-reader = new FileReader( metadataFile );
+reader = ReaderFactory.newXmlReader( metadataFile );
metadata = mappingReader.read( reader, false );
}
@@ -131,7 +131,7 @@
try
{
metadataFile.getParentFile().mkdirs();
-writer = new FileWriter( metadataFile );
+writer = WriterFactory.newXmlWriter( metadataFile );
MetadataXpp3Writer mappingWriter = new MetadataXpp3Writer();
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=585259r1=585258r2=585259view=diff
==
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Tue Oct 16 13:40:07 2007
@@ -28,11 +28,11 @@
import org.apache.maven.wagon.TransferFailedException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
import java.util.Date;
@@ -269,14 +269,14 @@
{
Metadata result;
-Reader fileReader = null;
+Reader reader = null;
try
{
-fileReader = new FileReader( mappingFile );
+reader = ReaderFactory.newXmlReader( mappingFile );
MetadataXpp3Reader mappingReader = new MetadataXpp3Reader();
-result = mappingReader.read( fileReader, false );
+result = mappingReader.read( reader, false );
}
catch ( FileNotFoundException e )
{
@@ -294,7 +294,7 @@
}
finally
{
-IOUtil.close( fileReader );
+IOUtil.close( reader );
}
return result;
}
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=585259r1=585258r2=585259view=diff
==
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Tue Oct 16 13:40:07 2007
@@ -86,7 +86,6 @@
/goals
svn commit: r585268 - in /maven/components/branches/maven-2.0.x: bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/ maven-core/src/main/java/org/apache/maven/plugin/version/ m
Author: hboutemy
Date: Tue Oct 16 14:43:07 2007
New Revision: 585268
URL: http://svn.apache.org/viewvc?rev=585268view=rev
Log:
[MNG-2254] support XML file encoding when reading/writing settings and pom files
Modified:
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/RepositoryMetadata.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
maven/components/branches/maven-2.0.x/maven-plugin-registry/src/main/java/org/apache/maven/plugin/registry/DefaultPluginRegistryBuilder.java
maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Modified:
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/RepositoryMetadata.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/RepositoryMetadata.java?rev=585268r1=585267r2=585268view=diff
==
---
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/RepositoryMetadata.java
(original)
+++
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/RepositoryMetadata.java
Tue Oct 16 14:43:07 2007
@@ -23,8 +23,9 @@
import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.text.DateFormat;
import java.text.ParseException;
@@ -177,13 +178,13 @@
}
return baseVersion;
}
-
+
public long getLastUpdatedUtc()
{
TimeZone timezone = TimeZone.getTimeZone( UTC );
DateFormat fmt = new SimpleDateFormat( MMddHHmmss );
fmt.setTimeZone( timezone );
-
+
try
{
return fmt.parse( lastUpdated ).getTime();
@@ -345,7 +346,7 @@
public void write( File file )
throws IOException
{
-PrintWriter w = new PrintWriter( new FileWriter( file ) );
+PrintWriter w = new PrintWriter( new OutputStreamWriter( new
FileOutputStream( file ), UTF-8 ) );
try
{
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?rev=585268r1=585267r2=585268view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Tue Oct 16 14:43:07 2007
@@ -48,11 +48,12 @@
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
+import java.io.Writer;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -599,12 +600,12 @@
// only rewrite the user-level registry if one existed before, or if
we've created user-level data here.
if ( extractedUserRegistry != null )
{
-FileWriter fWriter = null;
+Writer fWriter = null;
try
{
pluginRegistryFile.getParentFile().mkdirs();
-fWriter = new FileWriter( pluginRegistryFile );
+fWriter = WriterFactory.newXmlWriter( pluginRegistryFile );
PluginRegistryXpp3Writer writer = new
PluginRegistryXpp3Writer();
Modified:
maven/components/branches/maven-2.0.x/maven-plugin-registry/src/main/java/org/apache/maven/plugin/registry/DefaultPluginRegistryBuilder.java
URL:
svn commit: r585469 - in /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc: packA/ packB/ packC/ packD/ packE/ packF/ packG/ test/ test/packA/ test/packB/ test/packC/ test/p
Author: vsiveton Date: Wed Oct 17 05:54:38 2007 New Revision: 585469 URL: http://svn.apache.org/viewvc?rev=585469view=rev Log: o moved test resources to their associated package Added: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packA/ - copied from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packA/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packB/ - copied from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packB/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packC/ - copied from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packC/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packD/ - copied from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packD/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packE/ - copied from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packE/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packF/ - copied from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packF/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packG/ - copied from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packG/ Removed: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packA/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packB/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packC/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packD/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packE/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packF/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/packG/
svn commit: r585471 - in /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test: packA/ packB/ packC/ packD/ packE/ packF/ packG/a/ packG/b/
Author: vsiveton Date: Wed Oct 17 05:56:17 2007 New Revision: 585471 URL: http://svn.apache.org/viewvc?rev=585471view=rev Log: o fixed license header Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packA/Aone.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packB/Bone.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packC/Cone.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packD/OuterClass.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packD/VarName.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packE/TweedleDee.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packE/TweedleDum.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packF/f1.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packG/a/InterfaceWithStaticClass.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packG/b/Test.java Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packA/Aone.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packA/Aone.java?rev=585471r1=585470r2=585471view=diff == --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packA/Aone.java (original) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packA/Aone.java Wed Oct 17 05:56:17 2007 @@ -1,19 +1,21 @@ /* -* 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. -*/ + * 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. + */ // // Comment // Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packB/Bone.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packB/Bone.java?rev=585471r1=585470r2=585471view=diff == --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packB/Bone.java (original) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/resources/javasrc/test/packB/Bone.java Wed Oct 17 05:56:17 2007 @@ -1,19 +1,21 @@ /* -* 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. -*/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license
svn commit: r585486 - in /maven/sandbox/trunk/jxr: forrestdoc/forrestdoc/src/resources/javadoc/javadoc-v04draft.dtd maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/doc/javadoc-v0
Author: vsiveton Date: Wed Oct 17 06:22:11 2007 New Revision: 585486 URL: http://svn.apache.org/viewvc?rev=585486view=rev Log: o moved the Javadoc DTD Added: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/doc/javadoc-v04draft.dtd - copied unchanged from r584305, maven/sandbox/trunk/jxr/forrestdoc/forrestdoc/src/resources/javadoc/javadoc-v04draft.dtd Removed: maven/sandbox/trunk/jxr/forrestdoc/forrestdoc/src/resources/javadoc/javadoc-v04draft.dtd
svn commit: r585484 - /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/doc/
Author: vsiveton Date: Wed Oct 17 06:20:31 2007 New Revision: 585484 URL: http://svn.apache.org/viewvc?rev=585484view=rev Log: o added doc package Added: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/doc/
svn commit: r585489 - in /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java: pom.xml src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java src/test/java/org/apache/maven/jxr/java/doc/ src/test/jav
Author: vsiveton
Date: Wed Oct 17 06:33:15 2007
New Revision: 585489
URL: http://svn.apache.org/viewvc?rev=585489view=rev
Log:
o fixed XMLDoclet to generated the XML from a user option
o added test case which call javadoc tool
o updated javadoc and added maven-javadoc-plugin in pom
Added:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java
(with props)
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml?rev=585489r1=585488r2=585489view=diff
==
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml Wed Oct 17
06:33:15 2007
@@ -95,4 +95,19 @@
antlrArtifactIdantlrall/antlrArtifactId
antlrVersion2.7.4/antlrVersion
/properties
+
+ reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-javadoc-plugin/artifactId
+configuration
+ links
+linkhttp://java.sun.com/j2se/1.4.2/docs/api/link
+
linkhttp://java.sun.com/j2se/1.4.2/docs/tooldocs/javadoc/doclet//link
+ /links
+/configuration
+ /plugin
+/plugins
+ /reporting
/project
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java?rev=585489r1=585488r2=585489view=diff
==
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
(original)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
Wed Oct 17 06:33:15 2007
@@ -20,16 +20,19 @@
*/
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Enumeration;
import java.util.Vector;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.apache.log4j.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -37,6 +40,7 @@
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.ConstructorDoc;
import com.sun.javadoc.Doc;
+import com.sun.javadoc.DocErrorReporter;
import com.sun.javadoc.Doclet;
import com.sun.javadoc.ExecutableMemberDoc;
import com.sun.javadoc.FieldDoc;
@@ -57,9 +61,10 @@
public class XMLDoclet
extends Doclet
{
-
-/** Logger for this class */
-private static final Logger log = Logger.getLogger( XMLDoclet.class );
+/**
+ * The specified DTD for the generated Javadoc XML.
+ */
+public static final String XMLDOCLET_DTD = javadoc-v04draft.dtd;
private String xmlns = jvx;
@@ -69,15 +74,19 @@
private TransformerHandler handler = null;
-private String targetFileName = simple.xml;
-
private Attributes emptyAtts = new AttributesImpl();
-public XMLDoclet( RootDoc root )
+/**
+ * Default constructor
+ *
+ * @param root of the Javadoc structure information
+ * @param outputXML the XML file generated by this doclet.
+ * @throws Exception if any
+ */
+protected XMLDoclet( RootDoc root, String outputXML )
throws Exception
{
-
-SAXTransformerFactory tFactory = (SAXTransformerFactory)
SAXTransformerFactory.newInstance();
+SAXTransformerFactory tFactory = (SAXTransformerFactory)
TransformerFactory.newInstance();
if ( !( tFactory.getFeature( javax.xml.transform.sax.SAXSource.FEATURE
) tFactory
.getFeature( javax.xml.transform.stream.StreamResult.FEATURE ) ) )
{
@@ -85,9 +94,13 @@
throw new Exception( The supplied TrAX transformer library is
inadeguate.
+ Please upgrade to the latest version. );
}
+if ( outputXML == null )
+{
+throw new IllegalArgumentException( outputXML could not be null
);
+}
-File writer = new File( targetFileName );
-StreamResult result = new StreamResult( writer );
+File outputXMLFile = new File( outputXML );
+
svn commit: r585491 - /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java
Author: vsiveton Date: Wed Oct 17 06:34:19 2007 New Revision: 585491 URL: http://svn.apache.org/viewvc?rev=585491view=rev Log: o removed unused import Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java?rev=585491r1=585490r2=585491view=diff == --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java (original) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java Wed Oct 17 06:34:19 2007 @@ -25,7 +25,6 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Copy; import org.apache.tools.ant.types.FileSet; -import org.codehaus.plexus.util.FileUtils; import junit.framework.TestCase;
svn commit: r585493 - /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
Author: vsiveton
Date: Wed Oct 17 06:35:37 2007
New Revision: 585493
URL: http://svn.apache.org/viewvc?rev=585493view=rev
Log:
o fixed generated XML according the DTD
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java?rev=585493r1=585492r2=585493view=diff
==
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
(original)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
Wed Oct 17 06:35:37 2007
@@ -330,7 +330,7 @@
{
extensibility = final;
}
-atts.addAttribute( xmlns, localName, extensiblity, String,
extensibility );
+atts.addAttribute( xmlns, localName, extensibility, String,
extensibility );
String access = package;
if ( classDoc.isPublic() )
{
@@ -766,7 +766,7 @@
{
extensibility = final;
}
-atts.addAttribute( xmlns, localName, extensiblity, String,
extensibility );
+atts.addAttribute( xmlns, localName, extensibility, String,
extensibility );
atts.addAttribute( xmlns, localName, native, String, +
methodDoc.isNative() );
atts.addAttribute( xmlns, localName, synthetic, String, +
methodDoc.isSynthetic() );
svn commit: r585499 - /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
Author: vsiveton Date: Wed Oct 17 06:43:28 2007 New Revision: 585499 URL: http://svn.apache.org/viewvc?rev=585499view=rev Log: o removed xmlns according javadoc DTD Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java?rev=585499r1=585498r2=585499view=diff == --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java (original) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java Wed Oct 17 06:43:28 2007 @@ -66,7 +66,7 @@ */ public static final String XMLDOCLET_DTD = javadoc-v04draft.dtd; -private String xmlns = jvx; +private String xmlns = ; private String encodingFormat = ISO-8859-1;
svn commit: r585496 - /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/doc/javadoc-v04draft.dtd
Author: vsiveton Date: Wed Oct 17 06:38:59 2007 New Revision: 585496 URL: http://svn.apache.org/viewvc?rev=585496view=rev Log: o fixed DTD: innerclass needs extends_class element Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/doc/javadoc-v04draft.dtd Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/doc/javadoc-v04draft.dtd URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/doc/javadoc-v04draft.dtd?rev=585496r1=585495r2=585496view=diff == --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/doc/javadoc-v04draft.dtd (original) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/resources/org/apache/maven/jxr/java/doc/javadoc-v04draft.dtd Wed Oct 17 06:38:59 2007 @@ -15,7 +15,7 @@ limitations under the License. -- !-- === - + Apache JavaDoc DTD (version 0.4-draft) PURPOSE: @@ -24,41 +24,41 @@ JavaDoc documentation in an XML format, it will be easier for application developers working with XML to treat their java source documentation in the same way they treat any other XML document within their publication framework. - - This DTD should reflect the information contained within the RootDoc object - passed to the JavaDocXML Doclet by JavaDoc. The RootDoc object and the rest + + This DTD should reflect the information contained within the RootDoc object + passed to the JavaDocXML Doclet by JavaDoc. The RootDoc object and the rest of the javaDoc Doclet API is specified at - + http://java.sun.com/products/jdk/1.2/docs/tooldocs/javadoc/doclet/index.html - + The only information that appears to be difficult to derive from this DTD - that is easy to obtain from the RootDoc object is the information about - serialization. However, this information should be derivable by manually + that is easy to obtain from the RootDoc object is the information about + serialization. However, this information should be derivable by manually looking for the correct serialization methods and other related structures. - + TYPICAL INVOCATION: !DOCTYPE document PUBLIC -//APACHE//DTD JavaDoc Vx.yz//EN javadoc-vxyz.dtd - where - + where + x := major version y := minor version z := status identifier (optional) - -NOTES: - The authors would like to thank the Cocoon's mail list subscribers for + +NOTES: + The authors would like to thank the Cocoon's mail list subscribers for providing such great support and feedback for this DTD. - + FIXME: CHANGE HISTORY: 199909?? Original idea of XML doclet. (KM) 199910?? Initial version of this DTD. (KM) 19991129 Cleaned up DTD. (SM) - + -- !-- === -- @@ -104,8 +104,8 @@ !ELEMENT class (doc?, extends_class?, implements?, - field*, - constructor*, + field*, + constructor*, method*, innerclass*) !ATTLIST class @@ -114,12 +114,12 @@ %class.access; !ELEMENT extends_class (classref+) - + !ELEMENT innerclass (doc?, - extends?, + extends_class?, implements?, - field*, - constructor*, + field*, + constructor*, method*) !ATTLIST innerclass %name; @@ -128,11 +128,11 @@ %anonymous; %final; %static; - + !-- === -- !-- Interface -- !-- === -- - + !ELEMENT interface (doc?, extends_interface?, field*, @@ -140,7 +140,7 @@ !ATTLIST interface %name; %access; - + !ELEMENT extends_interface (interfaceref+) !-- === -- @@ -153,20 +153,20 @@ !ELEMENT classref EMPTY !ATTLIST classref %name; - + !ELEMENT interfaceref EMPTY !ATTLIST interfaceref %name; - + !ELEMENT methodref EMPTY !ATTLIST methodref %name; - + !ELEMENT packageref EMPTY !ATTLIST packageref %name; - + !ELEMENT primitive EMPTY !ATTLIST primitive type (void | boolean | int | long | byte | short | double | float | char) #REQUIRED - + !ELEMENT field (doc?, (classref | interfaceref |
svn commit: r585553 - in /maven/artifact/trunk/src: main/java/org/apache/maven/artifact/ main/java/org/apache/maven/artifact/repository/ test/java/org/apache/maven/artifact/repository/
Author: jdcasey
Date: Wed Oct 17 09:18:29 2007
New Revision: 585553
URL: http://svn.apache.org/viewvc?rev=585553view=rev
Log:
Adding methods to ArtifactRepositoryFactory to allow retrieval of
ArtifactRepositoryLayout by layoutId, and to allow creation of a new repository
instance without having to supply the layout instance (can use the layout id
instead).
Added:
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactoryTest.java
(with props)
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java?rev=585553r1=585552r2=585553view=diff
==
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
Wed Oct 17 09:18:29 2007
@@ -1,5 +1,9 @@
package org.apache.maven.artifact;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+
+import java.net.MalformedURLException;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -30,9 +34,19 @@
{
private final String repositoryId;
-public InvalidRepositoryException( String message, String repositoryId,
Throwable throwable )
+public InvalidRepositoryException( String message,
+ String repositoryId,
+ MalformedURLException cause )
+{
+super( message, cause );
+this.repositoryId = repositoryId;
+}
+
+protected InvalidRepositoryException( String message,
+ String repositoryId,
+ ComponentLookupException cause )
{
-super( message, throwable );
+super( message, cause );
this.repositoryId = repositoryId;
}
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java?rev=585553r1=585552r2=585553view=diff
==
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
Wed Oct 17 09:18:29 2007
@@ -19,15 +19,28 @@
* under the License.
*/
+import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.UnknownRepositoryLayoutException;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import java.io.File;
+
/**
* @author jdcasey
*/
public interface ArtifactRepositoryFactory
{
String ROLE = ArtifactRepositoryFactory.class.getName();
+
+String DEFAULT_LAYOUT_ID = default;
+
+String LOCAL_REPOSITORY_ID = local;
+
+ArtifactRepository createLocalRepository( File localRepositoryDirectory )
+throws InvalidRepositoryException;
+
+ArtifactRepositoryLayout getLayout( String layoutId )
+throws UnknownRepositoryLayoutException;
ArtifactRepository createDeploymentArtifactRepository( String id,
String url,
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?rev=585553r1=585552r2=585553view=diff
==
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Wed Oct 17 09:18:29 2007
@@ -19,11 +19,14 @@
* under the License.
*/
+import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.UnknownRepositoryLayoutException;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.collections.ActiveMap;
import
svn commit: r585558 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/io/ main/java/org/apache/maven/plugin/assembly/mojos/ main/mdo/ test/java/org/apache
Author: jdcasey
Date: Wed Oct 17 09:26:48 2007
New Revision: 585558
URL: http://svn.apache.org/viewvc?rev=585558view=rev
Log:
Adding ability to add hooks to handle arbitrary container descriptors, just
like the plexus components.xml file is handled now. Also, adding a skip flag to
allow fine-grained control over any particular execution using a property in
the POM (which can be set or overridden by profile).
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/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
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?rev=585558r1=585557r2=585558view=diff
==
---
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 Oct 17 09:26:48 2007
@@ -10,6 +10,7 @@
import org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.Component;
+import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig;
import org.apache.maven.plugin.assembly.model.DependencySet;
import org.apache.maven.plugin.assembly.model.FileItem;
import org.apache.maven.plugin.assembly.model.FileSet;
@@ -382,6 +383,14 @@
*/
protected void mergeComponentWithAssembly( Component component, Assembly
assembly )
{
+List containerHandlerDescriptors =
component.getContainerDescriptorHandlers();
+
+for ( Iterator it = containerHandlerDescriptors.iterator();
it.hasNext(); )
+{
+ContainerDescriptorHandlerConfig cfg =
(ContainerDescriptorHandlerConfig) it.next();
+assembly.addContainerDescriptorHandler( cfg );
+}
+
List dependencySetList = component.getDependencySets();
for ( Iterator it = dependencySetList.iterator(); it.hasNext(); )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=585558r1=585557r2=585558view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Wed Oct 17 09:26:48 2007
@@ -48,6 +48,15 @@
{
/**
+ * Flag allowing one or more executions of the assembly plugin to be
configured
+ * as skipped for a particular build. This makes the assembly plugin more
controllable
+ * from profiles.
+ *
+ * @parameter default-value=false
+ */
+private boolean skipAssembly;
+
+/**
* If this flag is set, everything up to the call to
Archiver.createArchive() will be executed.
*
* @parameter expression=${assembly.dryRun} default-value=false
@@ -266,6 +275,12 @@
public void execute()
throws MojoExecutionException, MojoFailureException
{
+if ( skipAssembly )
+{
+getLog().info( Assemblies have been skipped per configuration of
the skipAssembly parameter. );
+return;
+}
+
List assemblies;
try
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=585558r1=585557r2=585558view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Wed
Oct 17 09:26:48 2007
@@ -112,6 +112,20 @@
]]
/description
/field
+field
+ namecontainerDescriptorHandlers/name
+ version1.1.0/version
+ association
+typeContainerDescriptorHandlerConfig/type
+multiplicity*/multiplicity
svn commit: r585548 - in /maven/components/trunk/maven-project/src/test: java/org/apache/maven/project/MavenProjectTest.java resources/iso-8859-15-encoded-pom.xml resources/utf-8-encoded-pom.xml
Author: brianf
Date: Wed Oct 17 09:01:23 2007
New Revision: 585548
URL: http://svn.apache.org/viewvc?rev=585548view=rev
Log:
rolling back broken tests
Removed:
maven/components/trunk/maven-project/src/test/resources/iso-8859-15-encoded-pom.xml
maven/components/trunk/maven-project/src/test/resources/utf-8-encoded-pom.xml
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java?rev=585548r1=585547r2=585548view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Wed Oct 17 09:01:23 2007
@@ -156,30 +156,4 @@
MavenProject clonedProject = new MavenProject( projectToClone );
assertNotNull( clonedProject - distributionManagement,
clonedProject.getDistributionManagementArtifactRepository() );
}
-
-
- /**
-*
-* Maven uses FileReaders by default to read POMs.
-* @throws Exception
-*/
-public void testUTF8EncodedProject() throws Exception
-{
- File f = getFileForClasspathResource( utf-8-encoded-pom.xml );
- MavenProject utf8EncodedProject = getProject( f );
-
- assertEquals( öäüß, utf8EncodedProject.getDescription() );
-}
-
- /**
-* This test case will not fail, because 8bit encodings won't corrupt
the parser.
-* @throws Exception
-*/
-public void testISOEncodedProject() throws Exception
-{
- File f = getFileForClasspathResource(
iso-8859-15-encoded-pom.xml );
- MavenProject isoEncodedProject = getProject( f );
-
- assertEquals( öäüß, isoEncodedProject.getDescription() );
-}
}
svn commit: r585562 - /maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Author: joakime Date: Wed Oct 17 09:30:31 2007 New Revision: 585562 URL: http://svn.apache.org/viewvc?rev=585562view=rev Log: Changing name from Maven Archiva to Apache Archiva to match website. Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=585562r1=585561r2=585562view=diff == --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Wed Oct 17 09:30:31 2007 @@ -27,8 +27,8 @@ %@ page import=java.util.Calendar % html head - titleMaven Archiva :: -decorator:title default=Maven Archiva/ + titleApache Archiva \ +decorator:title default=Apache Archiva/ /title link rel=stylesheet href=c:url value=/css/maven-base.css/ type=text/css media=all/
svn commit: r585563 - in /maven/components/trunk/maven-embedder: pom.xml src/main/assembly/bin.xml
Author: jvanzyl Date: Wed Oct 17 09:32:51 2007 New Revision: 585563 URL: http://svn.apache.org/viewvc?rev=585563view=rev Log: o updating assembly and that we don't need the shaded jar anymore o keep JDOM in the distro for the time being Modified: maven/components/trunk/maven-embedder/pom.xml maven/components/trunk/maven-embedder/src/main/assembly/bin.xml Modified: maven/components/trunk/maven-embedder/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=585563r1=585562r2=585563view=diff == --- maven/components/trunk/maven-embedder/pom.xml (original) +++ maven/components/trunk/maven-embedder/pom.xml Wed Oct 17 09:32:51 2007 @@ -209,40 +209,6 @@ build plugins plugin -artifactIdshade-maven-plugin/artifactId -groupIdorg.codehaus.mojo/groupId -version1.0-alpha-12/version -executions - execution -phasepackage/phase -goals - goalshade/goal -/goals -configuration - !-- The IDEA folks don't want to put SNAPSHOT libs in their projects even though they are -- - finalNamemaven-embedder-std-2.1/finalName - createDependencyReducedPomfalse/createDependencyReducedPom - keepDependenciesWithProvidedScopetrue/keepDependenciesWithProvidedScope - transformers -transformer implementation=org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer/ - /transformers - relocations -relocation - patternorg.codehaus.plexus.util/pattern - excludes -excludeorg.codehaus.plexus.util.xml.Xpp3Dom/exclude -excludeorg.codehaus.plexus.util.xml.pull.*/exclude - /excludes -/relocation -relocation - patternorg.jdom/pattern -/relocation - /relocations -/configuration - /execution -/executions - /plugin - plugin artifactIdmaven-assembly-plugin/artifactId version2.2-beta-1/version executions Modified: maven/components/trunk/maven-embedder/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/assembly/bin.xml?rev=585563r1=585562r2=585563view=diff == --- maven/components/trunk/maven-embedder/src/main/assembly/bin.xml (original) +++ maven/components/trunk/maven-embedder/src/main/assembly/bin.xml Wed Oct 17 09:32:51 2007 @@ -43,7 +43,9 @@ excludeorg.apache.maven:maven-artifact/exclude excludeorg.apache.maven:maven-monitor/exclude excludeorg.apache.maven:maven-plugin-descriptor/exclude +!-- excludejdom:jdom/exclude +-- /excludes /dependencySet /dependencySets @@ -82,7 +84,7 @@ directorytarget/directory outputDirectorylib/outputDirectory includes -includemaven-embedder-std*.jar/include +includemaven-embedder-*.jar/include /includes /fileSet /fileSets
svn commit: r585564 - /maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/
Author: joakime
Date: Wed Oct 17 09:39:06 2007
New Revision: 585564
URL: http://svn.apache.org/viewvc?rev=585564view=rev
Log:
Setting deprecations on interfaces / classes not to use.
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/FilenameParts.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java?rev=585564r1=585563r2=585564view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java
Wed Oct 17 09:39:06 2007
@@ -22,6 +22,10 @@
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.maven.archiva.repository.ManagedRepositoryContent;
+import org.apache.maven.archiva.repository.RemoteRepositoryContent;
+import org.apache.maven.archiva.repository.RepositoryContentFactory;
+import org.apache.maven.archiva.repository.content.RepositoryRequest;
/**
* BidirectionalRepositoryLayout - Similar in scope to
ArtifactRepositoryLayout, but does
@@ -29,6 +33,8 @@
*
* @author a href=mailto:[EMAIL PROTECTED]Joakim Erdfelt/a
* @version $Id$
+ *
+ * @deprecated use [EMAIL PROTECTED] RepositoryContentFactory} instead.
*/
public interface BidirectionalRepositoryLayout
{
@@ -36,12 +42,16 @@
* Get the identifier for this layout.
*
* @return the identifier for this layout.
+ *
+ * @deprecated use [EMAIL PROTECTED] ManagedRepositoryContent#getId()} or
[EMAIL PROTECTED] RemoteRepositoryContent#getId()} instead.
*/
public String getId();
/**
* Given a repository relative path, return codetrue/code if the path
is valid
* according to the repository layout.
+ *
+ * @deprecated use [EMAIL PROTECTED]
RepositoryRequest#toArtifactReference(String)} instead.
*/
public boolean isValidPath( String path );
@@ -50,6 +60,8 @@
*
* @param artifact the artifact to use.
* @return the relative path to the artifact.
+ *
+ * @deprecated use [EMAIL PROTECTED]
ManagedRepositoryContent#toPath(ArchivaArtifact)} instead.
*/
public String toPath( ArchivaArtifact artifact );
@@ -58,6 +70,9 @@
*
* @param reference the artifact reference to use.
* @return the relative path to the artifact.
+ *
+ * @deprecated use [EMAIL PROTECTED]
ManagedRepositoryContent#toPath(ArtifactReference))} or
+ * [EMAIL PROTECTED]
RemoteRepositoryContent#toPath(ArtifactReference)} instead.
*/
public String toPath( ArtifactReference reference );
@@ -68,6 +83,9 @@
* @return the [EMAIL PROTECTED] ArchivaArtifact} representing the path.
(or null if path cannot be converted to
* an [EMAIL PROTECTED] ArchivaArtifact})
* @throws LayoutException if there was a problem converting the path to
an artifact.
+ *
+ * @deprecated use [EMAIL PROTECTED]
ManagedRepositoryContent#toArtifactReference(String))} or
+ * [EMAIL PROTECTED]
RemoteRepositoryContent#toArtifactReference(String)} instead.
*/
public ArchivaArtifact toArtifact( String path )
throws LayoutException;
@@ -79,6 +97,9 @@
* @return the [EMAIL PROTECTED] ArtifactReference} representing the path.
(or null if path cannot be converted to
* a [EMAIL PROTECTED] ArtifactReference})
* @throws LayoutException if there was a problem converting the path to
an artifact.
+ *
+ * @deprecated use [EMAIL PROTECTED]
svn commit: r585569 - in /maven/archiva/trunk/archiva-base/archiva-repository-layer/src: main/java/org/apache/maven/archiva/repository/project/ main/java/org/apache/maven/archiva/repository/project/re
Author: joakime
Date: Wed Oct 17 09:47:33 2007
New Revision: 585569
URL: http://svn.apache.org/viewvc?rev=585569view=rev
Log:
Updating from bidirlayout to RepoContent techniques.
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.java
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java?rev=585569r1=585568r2=585569view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java
Wed Oct 17 09:47:33 2007
@@ -23,13 +23,12 @@
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ConfigurationNames;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.repository.ManagedRepositoryContent;
+import org.apache.maven.archiva.repository.RepositoryContentFactory;
import org.apache.maven.archiva.repository.RepositoryException;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import
org.apache.maven.archiva.repository.project.resolvers.ManagedRepositoryProjectResolver;
import
org.apache.maven.archiva.repository.project.resolvers.NopProjectResolver;
import
org.apache.maven.archiva.repository.project.resolvers.ProjectModelResolverStack;
-import
org.apache.maven.archiva.repository.project.resolvers.ManagedRepositoryProjectResolver;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -53,11 +52,11 @@
* @plexus.requirement
*/
private ArchivaConfiguration archivaConfiguration;
-
+
/**
* @plexus.requirement
*/
-private BidirectionalRepositoryLayoutFactory layoutFactory;
+private RepositoryContentFactory repositoryFactory;
/**
* @plexus.requirement role-hint=model400
@@ -68,7 +67,7 @@
* @plexus.requirement role-hint=model300
*/
private ProjectModelReader project300Reader;
-
+
private ProjectModelResolverStack currentResolverStack = new
ProjectModelResolverStack();
public void afterConfigurationChange( Registry registry, String
propertyName, Object propertyValue )
@@ -99,24 +98,15 @@
private ManagedRepositoryProjectResolver toResolver(
ManagedRepositoryConfiguration repo )
throws RepositoryException
{
-try
-{
-BidirectionalRepositoryLayout layout = layoutFactory.getLayout(
repo.getLayout() );
-ProjectModelReader reader = project400Reader;
-
-if ( StringUtils.equals( legacy, repo.getLayout() ) )
-{
-reader = project300Reader;
-}
+ManagedRepositoryContent repoContent =
repositoryFactory.getManagedRepositoryContent( repo.getId() );
+ProjectModelReader reader = project400Reader;
-ManagedRepositoryProjectResolver resolver = new
ManagedRepositoryProjectResolver( repo, reader, layout );
-return resolver;
-}
-catch ( LayoutException e )
+if ( StringUtils.equals( legacy, repo.getLayout() ) )
{
-throw new RepositoryException(
-Unable to create RepositoryProjectResolver due to invalid
layout spec: + repo );
+reader = project300Reader;
}
+
+return new ManagedRepositoryProjectResolver( repoContent, reader );
}
private void update()
Modified:
svn commit: r585573 - /maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java
Author: joakime
Date: Wed Oct 17 09:54:27 2007
New Revision: 585573
URL: http://svn.apache.org/viewvc?rev=585573view=rev
Log:
Adding ability to create an ArchivaArtifact from an ArtifactReference.
Modified:
maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java
Modified:
maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java?rev=585573r1=585572r2=585573view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java
Wed Oct 17 09:54:27 2007
@@ -77,6 +77,11 @@
model.setSnapshot( VersionUtil.isSnapshot( model.getVersion() ) );
this.baseVersion = VersionUtil.getBaseVersion( model.getVersion() );
}
+
+public ArchivaArtifact( ArtifactReference ref )
+{
+this( ref.getGroupId(), ref.getArtifactId(), ref.getVersion(),
ref.getClassifier(), ref.getType() );
+}
public ArchivaArtifactModel getModel()
{
svn commit: r585576 - /maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
Author: joakime
Date: Wed Oct 17 10:01:25 2007
New Revision: 585576
URL: http://svn.apache.org/viewvc?rev=585576view=rev
Log:
Upgrading bidirlayout usage to RepoContent usage to eliminate bugs around
missing content from bad layout routines.
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java?rev=585576r1=585575r2=585576view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
Wed Oct 17 10:01:25 2007
@@ -29,8 +29,10 @@
import org.apache.maven.archiva.database.ArchivaDAO;
import org.apache.maven.archiva.database.ArchivaDatabaseException;
import org.apache.maven.archiva.model.ArchivaArtifact;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory;
+import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.maven.archiva.repository.ManagedRepositoryContent;
+import org.apache.maven.archiva.repository.RepositoryContentFactory;
+import org.apache.maven.archiva.repository.RepositoryException;
import org.apache.maven.archiva.repository.layout.LayoutException;
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
@@ -50,8 +52,8 @@
* @author a href=mailto:[EMAIL PROTECTED]Joakim Erdfelt/a
* @version $Id$
* @plexus.component
role=org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer
- * role-hint=update-db-artifact
- * instantiation-strategy=per-lookup
+ * role-hint=update-db-artifact
+ * instantiation-strategy=per-lookup
*/
public class ArtifactUpdateDatabaseConsumer
extends AbstractMonitoredConsumer
@@ -61,7 +63,7 @@
private static final String DB_ERROR = db-error;
-private static final String CHECKSUM_CALCULATION = null;
+private static final String CHECKSUM_CALCULATION = checksum-calc;
/**
* @plexus.configuration default-value=update-db-artifact
@@ -91,7 +93,7 @@
/**
* @plexus.requirement
*/
-private BidirectionalRepositoryLayoutFactory layoutFactory;
+private RepositoryContentFactory repositoryFactory;
/**
* @plexus.requirement role-hint=sha1
@@ -103,12 +105,10 @@
*/
private Digester digestMd5;
-private ManagedRepositoryConfiguration repository;
+private ManagedRepositoryContent repository;
private File repositoryDir;
-private BidirectionalRepositoryLayout layout;
-
private ListString includes = new ArrayListString();
public String getId()
@@ -136,19 +136,17 @@
return this.includes;
}
-public void beginScan( ManagedRepositoryConfiguration repository )
+public void beginScan( ManagedRepositoryConfiguration repo )
throws ConsumerException
{
-this.repository = repository;
-this.repositoryDir = new File( repository.getLocation() );
-
try
{
-this.layout = layoutFactory.getLayout( repository.getLayout() );
+this.repository = repositoryFactory.getManagedRepositoryContent(
repo.getId() );
+this.repositoryDir = new File( repository.getRepoRoot() );
}
-catch ( LayoutException e )
+catch(RepositoryException e)
{
-throw new ConsumerException( e.getMessage(), e );
+throw new ConsumerException( Unable to start
ArtifactUpdateDatabaseConsumer: + e.getMessage(), e );
}
}
@@ -214,7 +212,7 @@
{
try
{
-ArchivaArtifact artifact = layout.toArtifact( path );
+ArtifactReference artifact = repository.toArtifactReference( path
);
ArchivaArtifact liveArtifact =
dao.getArtifactDAO().createArtifact( artifact.getGroupId(),
artifact.getArtifactId(),
svn commit: r585579 - /maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
Author: joakime
Date: Wed Oct 17 10:14:25 2007
New Revision: 585579
URL: http://svn.apache.org/viewvc?rev=585579view=rev
Log:
Upgrading bidirlayout usage to RepoContent usage to eliminate bugs around
missing content from bad layout routines.
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java?rev=585579r1=585578r2=585579view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
Wed Oct 17 10:14:25 2007
@@ -31,7 +31,9 @@
import org.apache.maven.archiva.indexer.RepositoryIndexException;
import org.apache.maven.archiva.indexer.hashcodes.HashcodesRecord;
import org.apache.maven.archiva.model.ArchivaArtifact;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
+import org.apache.maven.archiva.repository.ManagedRepositoryContent;
+import org.apache.maven.archiva.repository.RepositoryContentFactory;
+import org.apache.maven.archiva.repository.RepositoryException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.registry.Registry;
@@ -73,9 +75,9 @@
private ArchivaConfiguration configuration;
/**
- * @plexus.requirement
role=org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout
+ * @plexus.requirement
*/
-private Map bidirectionalLayoutMap; // TODO: replace with new
bidir-repo-layout-factory
+private RepositoryContentFactory repositoryFactory;
/**
* @plexus.requirement role-hint=lucene
@@ -108,7 +110,7 @@
IndexedRepositoryDetails pnl = getIndexedRepositoryDetails( artifact );
-String artifactPath = pnl.layout.toPath( artifact );
+String artifactPath = pnl.repository.toPath( artifact );
record.setFilename( artifactPath );
try
@@ -184,23 +186,27 @@
{
ManagedRepositoryConfiguration repository = it.next();
-IndexedRepositoryDetails pnl = new IndexedRepositoryDetails();
-
-pnl.path = repository.getLocation();
-pnl.layout = (BidirectionalRepositoryLayout)
this.bidirectionalLayoutMap.get( repository.getLayout() );
-
-pnl.index = indexFactory.createHashcodeIndex( repository );
-
-this.repositoryMap.put( repository.getId(), pnl );
+try
+{
+IndexedRepositoryDetails pnl = new
IndexedRepositoryDetails();
+
+pnl.repository =
repositoryFactory.getManagedRepositoryContent( repository.getId() );
+
+pnl.index = indexFactory.createHashcodeIndex( repository );
+
+this.repositoryMap.put( repository.getId(), pnl );
+}
+catch ( RepositoryException e )
+{
+getLogger().error( Unable to load repository content
object: + e.getMessage(), e );
+}
}
}
}
class IndexedRepositoryDetails
{
-public String path;
-
-public BidirectionalRepositoryLayout layout;
+public ManagedRepositoryContent repository;
public RepositoryContentIndex index;
}
svn commit: r585617 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency: ./ extension/ extension/src/ extension/s
Author: jvanzyl Date: Wed Oct 17 11:14:40 2007 New Revision: 585617 URL: http://svn.apache.org/viewvc?rev=585617view=rev Log: o a test for using resources that plugins need from dependencies and not extensions. So the practice of using extensions for this purpose will not be allowed for 2.1 and we can actually deprecate this in 2.0.x. This is simply a bad practice, if a plugin needs something the plugin should specify that. Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/Readme.txt (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/it0129_rule_set.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/pom.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/src/assembly/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/src/assembly/assembly.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/pom.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/pom.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/src/main/java/org/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/src/main/java/org/apache/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/src/main/java/org/apache/maven/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/src/main/java/org/apache/maven/plugin/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/src/main/java/org/apache/maven/plugin/It0129Mojo.java (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-project/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-project/pom.xml (with props) Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/Readme.txt URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/Readme.txt?rev=585617view=auto == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/Readme.txt (added) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/Readme.txt Wed Oct 17 11:14:40 2007 @@ -0,0 +1,5 @@ +This test needs to build a JAR and then a plugin to use it. The root pom does that. The verifier then goes into test-project +and executes mvn verify to execute the plugin. I did this to make sure the verifier picked up the
svn commit: r585618 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests: MavenIT0114ExtensionThatProvidesResources.java MavenIT0129Resourc
Author: jvanzyl
Date: Wed Oct 17 11:20:57 2007
New Revision: 585618
URL: http://svn.apache.org/viewvc?rev=585618view=rev
Log:
o turn off the old crap way of using extensions for plugins and create a new
test for pulling resources from actual plugin dependencies.
we are now starting to limit extensions and start using these things properly.
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
- copied, changed from r585300,
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java?rev=585618r1=585617r2=585618view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
Wed Oct 17 11:20:57 2007
@@ -1,15 +1,22 @@
package org.apache.maven.integrationtests;
-import java.io.File;
-import java.util.List;
-import java.util.ArrayList;
-
+import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
public class MavenIT0114ExtensionThatProvidesResources
extends AbstractMavenIntegrationTestCase
{
+public MavenIT0114ExtensionThatProvidesResources()
+throws InvalidVersionSpecificationException
+{
+super( [,2.1-SNAPSHOT) );
+}
+
public void testit0114()
throws Exception
{
Copied:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
(from r585300,
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java?p2=maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.javap1=maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.javar1=585300r2=585618rev=585618view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
Wed Oct 17 11:20:57 2007
@@ -7,37 +7,37 @@
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
-public class MavenIT0114ExtensionThatProvidesResources
+public class MavenIT0129ResourceProvidedToAPluginAsAPluginDependency
extends AbstractMavenIntegrationTestCase
{
public void testit0114()
throws Exception
{
File testDir =
-ResourceExtractor.simpleExtractResources( getClass(),
/it0114-extensionThatProvidesResources );
+ResourceExtractor.simpleExtractResources( getClass(),
/it0129-extensionThatProvidesResources );
Verifier verifier;
-// Install the parent POM, extension and the plugin
+// Install the parent POM, extension and the plugin
verifier = new Verifier( testDir.getAbsolutePath() );
-verifier.deleteArtifact( org.apache.maven.its.it0114,
it0114-plugin-runner, 1.0, pom );
-verifier.deleteArtifact( org.apache.maven.its.it0114,
it0114-extension, 1.0, jar );
-verifier.deleteArtifact( org.apache.maven.its.it0114,
it0114-plugin, 1.0, jar );
-verifier.deleteArtifact( org.apache.maven.its.it0114,
svn commit: r585622 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Author: jvanzyl Date: Wed Oct 17 11:27:57 2007 New Revision: 585622 URL: http://svn.apache.org/viewvc?rev=585622view=rev Log: o adding IT for taking resources for a plugin from plugin dependencies declared in the POM Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=585622r1=585621r2=585622view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Wed Oct 17 11:27:57 2007 @@ -160,6 +160,7 @@ suite.addTestSuite( MavenIT0114ExtensionThatProvidesResources.class ); suite.addTestSuite( MavenIT0118AttachedArtifactsInReactor.class ); suite.addTestSuite( MavenITmng2254PomEncodingTest.class); +suite.addTestSuite( MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.class ); suite.addTestSuite( MavenITmng2045testJarDependenciesBrokenInReactorTest.class); //
svn commit: r585623 - in /maven/plugins/trunk/maven-changes-plugin/src: main/java/org/apache/maven/plugin/announcement/MailSender.java site/apt/examples/specifying-mail-sender.apt
Author: dennisl Date: Wed Oct 17 11:38:55 2007 New Revision: 585623 URL: http://svn.apache.org/viewvc?rev=585623view=rev Log: Set EOL style to native. Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/MailSender.java (props changed) maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/specifying-mail-sender.apt (props changed) Propchange: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/MailSender.java -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/specifying-mail-sender.apt -- svn:eol-style = native
svn commit: r585624 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
Author: jvanzyl
Date: Wed Oct 17 11:41:10 2007
New Revision: 585624
URL: http://svn.apache.org/viewvc?rev=585624view=rev
Log:
o fix test name
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java?rev=585624r1=585623r2=585624view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
Wed Oct 17 11:41:10 2007
@@ -10,7 +10,7 @@
public class MavenIT0129ResourceProvidedToAPluginAsAPluginDependency
extends AbstractMavenIntegrationTestCase
{
-public void testit0114()
+public void testit0129()
throws Exception
{
File testDir =
svn commit: r585625 - in /maven/plugins/trunk/maven-changes-plugin/src: main/java/org/apache/maven/plugin/announcement/ main/java/org/apache/maven/plugin/jira/ main/resources/ main/resources/org/apach
Author: dennisl
Date: Wed Oct 17 11:42:05 2007
New Revision: 585625
URL: http://svn.apache.org/viewvc?rev=585625view=rev
Log:
o Add subversion keywords.
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/MailSender.java
(props changed)
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
(contents, props changed)
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
(contents, props changed)
maven/plugins/trunk/maven-changes-plugin/src/main/resources/log4j.properties
(props changed)
maven/plugins/trunk/maven-changes-plugin/src/main/resources/org/apache/maven/plugin/announcement/announcement.vm
(props changed)
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/alternate-changes-xml-location.apt
(props changed)
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/smtp-authentication.apt
(props changed)
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/specifying-mail-sender.apt
(props changed)
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/using-a-custom-announcement-template.apt
(props changed)
maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt (props
changed)
maven/plugins/trunk/maven-changes-plugin/src/site/changes/sample-changes.xml
(props changed)
maven/plugins/trunk/maven-changes-plugin/src/site/fml/faq.fml (props
changed)
maven/plugins/trunk/maven-changes-plugin/src/test/resources/org/apache/maven/plugin/announcement/announcement.vm
(props changed)
Propchange:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/MailSender.java
--
svn:keywords = Date Id
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java?rev=585625r1=585624r2=585625view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
Wed Oct 17 11:42:05 2007
@@ -50,7 +50,7 @@
*
* @author [EMAIL PROTECTED]
* @author [EMAIL PROTECTED]
- * @version $Id: AbstractJiraDownloader.java 424727 2006-07-23 12:38:31 +
(sö, 23 jul 2006) fgiust $
+ * @version $Id$
*/
public abstract class AbstractJiraDownloader
{
Propchange:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
--
svn:keywords = Date Id
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java?rev=585625r1=585624r2=585625view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
Wed Oct 17 11:42:05 2007
@@ -30,7 +30,7 @@
* A helper class with common JIRA related functionality.
*
* @author Dennis Lundberg
- * @version $Id: JiraHelper.java 422265 2006-07-15 16:49:50 + (l�, 15
jul 2006) dennisl $
+ * @version $Id$
*/
public class JiraHelper
{
Propchange:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
--
svn:keywords = Date Id
Propchange:
maven/plugins/trunk/maven-changes-plugin/src/main/resources/log4j.properties
--
svn:keywords = Date Id
Propchange:
maven/plugins/trunk/maven-changes-plugin/src/main/resources/org/apache/maven/plugin/announcement/announcement.vm
--
svn:keywords = Date Id
Propchange:
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/alternate-changes-xml-location.apt
--
svn:keywords = Date Id
Propchange:
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/smtp-authentication.apt
--
svn commit: r585628 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: dennisl
Date: Wed Oct 17 11:52:08 2007
New Revision: 585628
URL: http://svn.apache.org/viewvc?rev=585628view=rev
Log:
o Add license.
o Bump maven-changes-plugin to 2.0-beta-3-SNAPSHOT in the reporting section.
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=585628r1=585627r2=585628view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Wed Oct 17 11:52:08 2007
@@ -1,5 +1,23 @@
-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;
+?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.
+--
+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;
parent
artifactIdmaven-plugins/artifactId
groupIdorg.apache.maven.plugins/groupId
@@ -277,7 +295,7 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-changes-plugin/artifactId
-version2.0-beta-2/version
+version2.0-beta-3-SNAPSHOT/version
configuration
xmlPath${basedir}/src/site/changes/sample-changes.xml/xmlPath
/configuration
svn commit: r585629 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
Author: jvanzyl
Date: Wed Oct 17 11:53:18 2007
New Revision: 585629
URL: http://svn.apache.org/viewvc?rev=585629view=rev
Log: (empty)
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java?rev=585629r1=585628r2=585629view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
Wed Oct 17 11:53:18 2007
@@ -14,7 +14,7 @@
throws Exception
{
File testDir =
-ResourceExtractor.simpleExtractResources( getClass(),
/it0129-extensionThatProvidesResources );
+ResourceExtractor.simpleExtractResources( getClass(),
/it0129-resourcesForAPluginProvidedAsAPluginDependency );
Verifier verifier;
@@ -31,8 +31,7 @@
verifier.resetStreams();
//now run the test
-testDir =
-ResourceExtractor.simpleExtractResources( getClass(),
/it0129-extensionThatProvidesResources/test-project );
+testDir = ResourceExtractor.simpleExtractResources( getClass(),
/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-project );
verifier = new Verifier( testDir.getAbsolutePath() );
cliOptions = new ArrayList();
verifier.executeGoal( verify );
svn commit: r585636 - in /maven/plugins/trunk/maven-toolchains-plugin: ./ src/site/ src/site/apt/ src/site/apt/index.apt src/site/apt/toolchains/ src/site/apt/toolchains/index.apt src/site/apt/toolcha
Author: mkleint
Date: Wed Oct 17 12:12:52 2007
New Revision: 585636
URL: http://svn.apache.org/viewvc?rev=585636view=rev
Log:
initial batc of documentation to toolchains-plugin
Added:
maven/plugins/trunk/maven-toolchains-plugin/src/site/
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/toolchains/
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/toolchains/index.apt
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/toolchains/jdk.apt
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-toolchains-plugin/src/site/site.xml
Modified:
maven/plugins/trunk/maven-toolchains-plugin/ (props changed)
Propchange: maven/plugins/trunk/maven-toolchains-plugin/
--
--- svn:ignore (added)
+++ svn:ignore Wed Oct 17 12:12:52 2007
@@ -0,0 +1,2 @@
+nbproject
+target
Added: maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/index.apt?rev=585636view=auto
==
--- maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/index.apt (added)
+++ maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/index.apt Wed Oct
17 12:12:52 2007
@@ -0,0 +1,43 @@
+~~ 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.
+
+ --
+ Introduction
+ --
+ Milos Kleint
+ --
+ Oct 2007
+ --
+
+Maven Toolchains Plugin
+
+The Toolchains Plugins allows to share configuration across plugins. For
example to make sure the plugins like compiler, surefire, javadoc, webstart
etc. all use the same JDK for execution.
+Similarly to maven-enforcer-plugin, it allows to control enviromental
constraints in the build.
+
+* Goals Overview
+
+ The Toolchains plugin has one goal:
+
+ *{{{toolchain-mojo.html}toolchain:toolchain}} The goal is typically to be
attached to the validate phase of default lifecycle.
+
+
+* Usage
+
+ Instructions on how to use the toolchains plugin can be found
{{{usage.html}here}}.
+
+
+
Added:
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/toolchains/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/toolchains/index.apt?rev=585636view=auto
==
---
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/toolchains/index.apt
(added)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/toolchains/index.apt
Wed Oct 17 12:12:52 2007
@@ -0,0 +1,35 @@
+~~ 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.
+
+ --
+ Standard Toolchains
+ --
+ Milos Kleint
+ --
+ Oct 2007
+ --
+
+Standard Toolchains
+
+ The following standard toolchains are included by default with Maven.
+
+
+ * {{{jdk.html}JDK}} - Defines the Java Development Kit location and
identification
+
+
+ []
+You may also create and use your own custom toolchains by following the
{{{http://maven.apache.org/}TBD}} instructions.
Added:
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/toolchains/jdk.apt
URL:
svn commit: r585691 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: dennisl
Date: Wed Oct 17 13:52:48 2007
New Revision: 585691
URL: http://svn.apache.org/viewvc?rev=585691view=rev
Log:
[maven-release-plugin] prepare release maven-changes-plugin-2.0-beta-3
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=585691r1=585690r2=585691view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Wed Oct 17 13:52:48 2007
@@ -27,7 +27,7 @@
artifactIdmaven-changes-plugin/artifactId
packagingmaven-plugin/packaging
nameMaven Changes Report Plugin/name
- version2.0-beta-3-SNAPSHOT/version
+ version2.0-beta-3/version
prerequisites
maven2.0.6/maven
/prerequisites
@@ -295,7 +295,7 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-changes-plugin/artifactId
-version2.0-beta-3-SNAPSHOT/version
+version2.0-beta-3/version
configuration
xmlPath${basedir}/src/site/changes/sample-changes.xml/xmlPath
/configuration
@@ -314,4 +314,10 @@
doxiaVersion1.0-alpha-9/doxiaVersion
doxiaSitetoolsVersion1.0-alpha-9/doxiaSitetoolsVersion
/properties
+
+ scm
+
connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.0-beta-3/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.0-beta-3/developerConnection
+
urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.0-beta-3/url
+ /scm
/project
svn commit: r585693 - in /maven/plugins/tags/maven-changes-plugin-2.0-beta-3: ./ src/main/java/org/apache/maven/plugin/announcement/ src/main/java/org/apache/maven/plugin/jira/ src/main/resources/ src
Author: dennisl Date: Wed Oct 17 13:53:17 2007 New Revision: 585693 URL: http://svn.apache.org/viewvc?rev=585693view=rev Log: [maven-scm] copy for tag maven-changes-plugin-2.0-beta-3 Added: maven/plugins/tags/maven-changes-plugin-2.0-beta-3/ - copied from r585623, maven/plugins/trunk/maven-changes-plugin/ maven/plugins/tags/maven-changes-plugin-2.0-beta-3/pom.xml - copied unchanged from r585691, maven/plugins/trunk/maven-changes-plugin/pom.xml maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/main/java/org/apache/maven/plugin/announcement/MailSender.java - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/MailSender.java maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/main/resources/log4j.properties - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/main/resources/log4j.properties maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/main/resources/org/apache/maven/plugin/announcement/announcement.vm - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/main/resources/org/apache/maven/plugin/announcement/announcement.vm maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/site/apt/examples/alternate-changes-xml-location.apt - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/alternate-changes-xml-location.apt maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/site/apt/examples/smtp-authentication.apt - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/smtp-authentication.apt maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/site/apt/examples/specifying-mail-sender.apt - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/specifying-mail-sender.apt maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/site/apt/examples/using-a-custom-announcement-template.apt - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/using-a-custom-announcement-template.apt maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/site/apt/index.apt - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/site/changes/sample-changes.xml - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/site/changes/sample-changes.xml maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/site/fml/faq.fml - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/site/fml/faq.fml maven/plugins/tags/maven-changes-plugin-2.0-beta-3/src/test/resources/org/apache/maven/plugin/announcement/announcement.vm - copied unchanged from r585625, maven/plugins/trunk/maven-changes-plugin/src/test/resources/org/apache/maven/plugin/announcement/announcement.vm
svn commit: r585694 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: dennisl Date: Wed Oct 17 13:53:22 2007 New Revision: 585694 URL: http://svn.apache.org/viewvc?rev=585694view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=585694r1=585693r2=585694view=diff == --- maven/plugins/trunk/maven-changes-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/pom.xml Wed Oct 17 13:53:22 2007 @@ -27,7 +27,7 @@ artifactIdmaven-changes-plugin/artifactId packagingmaven-plugin/packaging nameMaven Changes Report Plugin/name - version2.0-beta-3/version + version2.0-beta-4-SNAPSHOT/version prerequisites maven2.0.6/maven /prerequisites @@ -314,10 +314,4 @@ doxiaVersion1.0-alpha-9/doxiaVersion doxiaSitetoolsVersion1.0-alpha-9/doxiaSitetoolsVersion /properties - - scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.0-beta-3/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.0-beta-3/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.0-beta-3/url - /scm /project
svn commit: r585699 - in /maven/components/trunk: maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java maven-project/src/main/java/org/apache/maven/profiles/build/Def
Author: jdcasey
Date: Wed Oct 17 14:01:50 2007
New Revision: 585699
URL: http://svn.apache.org/viewvc?rev=585699view=rev
Log:
Fixing it0022
Modified:
maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
Modified:
maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java?rev=585699r1=585698r2=585699view=diff
==
---
maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
(original)
+++
maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
Wed Oct 17 14:01:50 2007
@@ -44,10 +44,14 @@
{
File profilesXml = new File( basedir, PROFILES_XML_FILE );
+getLogger().debug( Checking for external profiles in: +
profilesXml.getAbsolutePath() );
+
ProfilesRoot profilesRoot = null;
if ( profilesXml.exists() )
{
+getLogger().debug( reading: + profilesXml.getAbsolutePath() );
+
ProfilesXpp3Reader reader = new ProfilesXpp3Reader();
Reader profileReader = null;
try
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java?rev=585699r1=585698r2=585699view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
Wed Oct 17 14:01:50 2007
@@ -38,6 +38,8 @@
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -49,7 +51,7 @@
import java.util.List;
public class DefaultProfileAdvisor
-implements ProfileAdvisor, Contextualizable
+implements ProfileAdvisor, LogEnabled, Contextualizable
{
public static final String ROLE_HINT = default;
@@ -62,9 +64,12 @@
private PlexusContainer container;
+private Logger logger;
+
public List applyActivatedProfiles( Model model, File pomFile, List
explicitlyActiveIds, List explicitlyInactiveIds )
throws ProjectBuildingException
{
+logger.debug( Building profile manager for model: + model.getId() +
with pom file: + pomFile );
ProfileManager profileManager = buildProfileManager( model, pomFile,
explicitlyActiveIds, explicitlyInactiveIds );
return applyActivatedProfiles( model, pomFile, profileManager );
@@ -73,6 +78,7 @@
public List applyActivatedExternalProfiles( Model model, File projectDir,
ProfileManager externalProfileManager )
throws ProjectBuildingException
{
+logger.debug( Building profile manager for model: + model.getId() +
with external profile manager including profiles: +
externalProfileManager.getProfilesById() );
return applyActivatedProfiles( model, projectDir,
externalProfileManager );
}
@@ -134,11 +140,7 @@
if ( pomFile != null )
{
-File projectDir = pomFile.getParentFile();
-if ( projectDir != null )
-{
-loadExternalProjectProfiles( profileManager, model, projectDir
);
-}
+loadExternalProjectProfiles( profileManager, model, pomFile );
}
return profileManager;
@@ -251,6 +253,11 @@
throws ContextException
{
container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
+}
+
+public void enableLogging( Logger logger )
+{
+this.logger = logger;
}
}
svn commit: r585744 - in /maven/sandbox/trunk/jxr/maven-jxr: ./ maven-jxr-ant/ maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/ maven-jxr-ant/src/test/java/org/apache/maven/jxr/ant/doc/ maven
Author: vsiveton Date: Wed Oct 17 15:46:59 2007 New Revision: 585744 URL: http://svn.apache.org/viewvc?rev=585744view=rev Log: o moved DotTask class to new jxr-utils project o added jxr-utils as module in the parent o fixed ref Added: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/pom.xml (with props) maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java - copied, changed from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/DotTask.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/resources/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/resources/dot/ - copied from r585122, maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/test/resources/dot/ Removed: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/DotTask.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/test/java/org/apache/maven/jxr/ant/doc/DotTaskTest.java maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/test/resources/dot/ Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/pom.xml maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/GenerateHTMLDoc.java maven/sandbox/trunk/jxr/maven-jxr/pom.xml Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/pom.xml?rev=585744r1=585743r2=585744view=diff == --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/pom.xml (original) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/pom.xml Wed Oct 17 15:46:59 2007 @@ -50,6 +50,11 @@ artifactIdplexus-utils/artifactId version1.4.6/version /dependency +dependency + groupIdorg.apache.maven.jxr/groupId + artifactIdmaven-jxr-utils/artifactId + version3.0-SNAPSHOT/version +/dependency !-- XSLT task -- dependency Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/GenerateHTMLDoc.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/GenerateHTMLDoc.java?rev=585744r1=585743r2=585744view=diff == --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/GenerateHTMLDoc.java (original) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/GenerateHTMLDoc.java Wed Oct 17 15:46:59 2007 @@ -27,6 +27,7 @@ import java.io.LineNumberReader; import org.apache.maven.jxr.ant.doc.vizant.Vizant; +import org.apache.maven.jxr.util.DotTask; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.XSLTProcess; Added: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/pom.xml?rev=585744view=auto == --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/pom.xml (added) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/pom.xml Wed Oct 17 15:46:59 2007 @@ -0,0 +1,44 @@ +?xml version=1.0 encoding=UTF-8? + +!-- +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. +-- + +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 + + parent +groupIdorg.apache.maven.jxr/groupId +artifactIdmaven-jxr/artifactId +version3.0-SNAPSHOT/version +relativePath../pom.xml/relativePath + /parent + + artifactIdmaven-jxr-utils/artifactId + nameUtilities classes for source code documentation/name + + dependencies +dependency + groupIdant/groupId + artifactIdant/artifactId + version1.6.5/version +/dependency + /dependencies +/project Propchange:
svn commit: r585739 - in /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/java
Author: vsiveton Date: Wed Oct 17 15:32:59 2007 New Revision: 585739 URL: http://svn.apache.org/viewvc?rev=585739view=rev Log: o added structure for jxr-utils project Added: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/ (with props) maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/ Propchange: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/ -- --- svn:ignore (added) +++ svn:ignore Wed Oct 17 15:32:59 2007 @@ -0,0 +1,4 @@ +.classpath +.project +.settings +target
svn commit: r585746 - in /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src: main/java/org/apache/maven/jxr/util/DotTask.java test/java/org/apache/maven/jxr/util/DotTaskTest.java
Author: vsiveton
Date: Wed Oct 17 15:56:12 2007
New Revision: 585746
URL: http://svn.apache.org/viewvc?rev=585746view=rev
Log:
o fixed exception signature
o readd test due to 585744
Added:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java
(with props)
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java?rev=585746r1=585745r2=585746view=diff
==
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java
(original)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java
Wed Oct 17 15:56:12 2007
@@ -398,7 +398,7 @@
/**
* Signals that the dot executable is not present in the path
*/
-protected class DotNotPresentInPathBuildException
+public class DotNotPresentInPathBuildException
extends BuildException
{
/**
Added:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java?rev=585746view=auto
==
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java
(added)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java
Wed Oct 17 15:56:12 2007
@@ -0,0 +1,129 @@
+package org.apache.maven.jxr.util;
+
+/*
+ * 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.
+ */
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.jxr.util.DotTask.DotNotPresentInPathBuildException;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+
+/**
+ * @author a href=mailto:[EMAIL PROTECTED]Vincent Siveton/a
+ * @version $Id$
+ */
+public class DotTaskTest
+extends TestCase
+{
+/**
+ * Call Dot task
+ *
+ * @throws Exception if any.
+ */
+public void testDefaultExecute()
+throws Exception
+{
+final String basedir = new File( ).getAbsolutePath();
+
+File in = new File( basedir, src/test/resources/dot/target.dot );
+File out = new File( basedir, target/unit/dot-default/ );
+
+Project antProject = new Project();
+antProject.setBasedir( basedir );
+
+DotTask task = new DotTask();
+task.setProject( antProject );
+task.setIn( in );
+task.setDestDir( out );
+try
+{
+task.execute();
+assertTrue( DOT exists in the path, true );
+}
+catch ( DotNotPresentInPathBuildException e )
+{
+assertTrue( DOT doesnt exist in the path. Ignored test, true );
+return;
+}
+catch ( BuildException e )
+{
+if ( e.getMessage().indexOf( Execute failed ) != -1 )
+{
+assertTrue( Uncatch error: + e.getMessage(), false );
+}
+
+assertEquals( Error when calling dot., e.getMessage() );
+}
+
+// Generated files
+File generated = new File( out, target.dot.svg );
+assertTrue( generated.exists() );
+assertTrue( generated.length() 0 );
+}
+
+/**
+ * Call Dot task
+ *
+ * @throws Exception if any.
+ */
+public void testErrorExecute()
+throws Exception
+{
+final String basedir = new File( ).getAbsolutePath();
+
+File in = new File( basedir, src/test/resources/dot/graph.dot );
+File out = new File( basedir, target/unit/dot-default/ );
+
+Project antProject = new Project();
+antProject.setBasedir(
svn commit: r585751 - /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java
Author: vsiveton Date: Wed Oct 17 16:16:06 2007 New Revision: 585751 URL: http://svn.apache.org/viewvc?rev=585751view=rev Log: o improved test case Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java?rev=585751r1=585750r2=585751view=diff == --- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java (original) +++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java Wed Oct 17 16:16:06 2007 @@ -65,7 +65,7 @@ test.packG.a, test.packG.b }; -Main.execute( javadoc, XMLDoclet.class.getName(), args ); +assertEquals( Main.execute( javadoc, XMLDoclet.class.getName(), args ), 0 ); // Generated files assertTrue( outputXML.exists() );
svn commit: r585812 - in /maven/components/branches/maven-2.0.x/maven-project/src: main/java/org/apache/maven/project/inheritance/ test/java/org/apache/maven/project/inheritance/
Author: brianf
Date: Wed Oct 17 20:11:42 2007
New Revision: 585812
URL: http://svn.apache.org/viewvc?rev=585812view=rev
Log:
MNG-3244: fix site url inheritence, patch from James Dumay
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=585812r1=585811r2=585812view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Wed Oct 17 20:11:42 2007
@@ -432,7 +432,7 @@
site.setUrl( parentDistMgmt.getSite().getUrl() );
-if ( site.getUrl() != null )
+if ( site.getUrl() != null (site.getUrl().endsWith( /
)|| site.getUrl().endsWith( \\ )))
{
site.setUrl(
appendPath( site.getUrl(), child.getArtifactId(),
childPathAdjustment, appendPaths ) );
@@ -494,10 +494,30 @@
if ( appendPaths )
{
if ( pathAdjustment != null )
-uncleanPath += / + pathAdjustment;
+{
+if (uncleanPath.endsWith( / )|| uncleanPath.endsWith( \\ ))
+{
+uncleanPath += pathAdjustment;
+
+}
+else
+{
+uncleanPath += / + pathAdjustment;
+}
+}
if ( childPath != null )
-uncleanPath += / + childPath;
+{
+
+if (uncleanPath.endsWith( / )|| uncleanPath.endsWith( \\ ))
+{
+uncleanPath += childPath;
+}
+else
+{
+uncleanPath += / + childPath;
+}
+}
}
String cleanedPath = ;
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java?rev=585812r1=585811r2=585812view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Wed Oct 17 20:11:42 2007
@@ -53,6 +53,66 @@
{
private ModelInheritanceAssembler assembler = new
DefaultModelInheritanceAssembler();
+public void
testSiteUrlWithTrailingForwardSlashInParentHasArtifactIdAppendedInChild()
+{
+ Site site = new Site();
+ site.setName(docs);
+ site.setUrl(sftp://machine/path/to/site/;);
+
+ DistributionManagement distributionManagement = new
DistributionManagement();
+ distributionManagement.setSite(site);
+
+ Model parent = makeBaseModel( parent );
+ parent.setDistributionManagement(distributionManagement);
+
+ Model child = makeBaseModel( child );
+ child.setParent(parent.getParent());
+
+ assembler.assembleModelInheritance(child, parent);
+
+ assertEquals(site.getUrl()+ child,
child.getDistributionManagement().getSite().getUrl());
+}
+
+public void
testSiteUrlWithTrailingBackSlashInParentHasArtifactIdAppendedInChild()
+{
+ Site site = new Site();
+ site.setName(docs);
+ site.setUrl(file://machine\\path\\to\\site\\);
+
+ DistributionManagement distributionManagement = new
DistributionManagement();
+ distributionManagement.setSite(site);
+
+ Model parent = makeBaseModel( parent );
+ parent.setDistributionManagement(distributionManagement);
+
+ Model child = makeBaseModel( child );
+ child.setParent(parent.getParent());
+
+ assembler.assembleModelInheritance(child, parent);
+
+
svn commit: r585855 - /maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/ModelReader.java
Author: brett
Date: Wed Oct 17 21:11:41 2007
New Revision: 585855
URL: http://svn.apache.org/viewvc?rev=585855view=rev
Log:
ignore content in profiles - the bootstrap was choking on the core-it-executor
which it doesn't need to run
Modified:
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/ModelReader.java
Modified:
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/ModelReader.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/ModelReader.java?rev=585855r1=585854r2=585855view=diff
==
---
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/ModelReader.java
(original)
+++
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/ModelReader.java
Wed Oct 17 21:11:41 2007
@@ -48,6 +48,8 @@
private Resource currentResource;
+private boolean insideProfiles;
+
private boolean insideParent;
private boolean insideDependency;
@@ -118,10 +120,20 @@
public void startElement( String uri, String localName, String rawName,
Attributes attributes )
{
+// skip profile contents
+if ( insideProfiles )
+{
+return;
+}
+
if ( rawName.equals( parent ) )
{
insideParent = true;
}
+else if ( rawName.equals( profiles ) )
+{
+insideProfiles = true;
+}
else if ( rawName.equals( repository ) )
{
currentRepository = new Repository();
@@ -187,6 +199,12 @@
public void characters( char buffer[], int start, int length )
{
+// skip profile contents
+if ( insideProfiles )
+{
+return;
+}
+
bodyText.append( buffer, start, length );
}
@@ -198,6 +216,16 @@
public void endElement( String uri, String localName, String rawName )
throws SAXException
{
+if ( rawName.equals( profiles ) )
+{
+insideProfiles = false;
+}
+
+if ( insideProfiles )
+{
+return;
+}
+
// support both v3 extend and v4 parent
if ( rawName.equals( parent ) )
{
