svn commit: r564180 - in /maven/doxia: doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/ doxia/t
Author: vsiveton
Date: Thu Aug 9 05:15:44 2007
New Revision: 564180
URL: http://svn.apache.org/viewvc?view=revrev=564180
Log:
DOXIA-133: default XML encoding (UTF-8) or XML encoding set in XML files is
ignored: inputEncoding is used instead
Submitted by: Herve Boutemy
Reviewed by: Vincent Siveton
o applied with modifications discussed on this issue
o added/updated javadoc
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractTextParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?view=diffrev=564180r1=564179r2=564180
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Thu Aug 9 05:15:44 2007
@@ -22,6 +22,7 @@
import org.apache.maven.doxia.Doxia;
import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.module.site.SiteModule;
@@ -53,10 +54,9 @@
* @since 1.0
* @plexus.component role-hint=default
*/
-public class
-DefaultSiteRenderer
-extends AbstractLogEnabled
-implements Renderer
+public class DefaultSiteRenderer
+extends AbstractLogEnabled
+implements Renderer
{
// --
// Requirements
@@ -92,6 +92,7 @@
// Renderer implementation
// --
+/** [EMAIL PROTECTED] */
public void render( Collection documents,
SiteRenderingContext siteRenderingContext,
File outputDirectory )
@@ -106,6 +107,7 @@
}
}
+/** [EMAIL PROTECTED] */
public Map locateDocumentFiles( SiteRenderingContext siteRenderingContext )
throws IOException, RendererException
{
@@ -278,6 +280,7 @@
}
}
+/** [EMAIL PROTECTED] */
public void renderDocument( Writer writer,
RenderingContext renderingContext,
SiteRenderingContext context )
@@ -285,16 +288,17 @@
{
SiteRendererSink sink = new SiteRendererSink( renderingContext );
-String fullPathDoc = new File( renderingContext.getBasedir(),
renderingContext.getInputName() ).getPath();
+File doc = new File( renderingContext.getBasedir(),
renderingContext.getInputName() );
try
{
Reader reader = null;
+Parser parser = doxia.getParser( renderingContext.getParserId() );
// DOXIA-111: the filter used here must be checked generally.
if ( renderingContext.getAttribute( velocity ) != null )
{
-String resource = new File( fullPathDoc ).getAbsolutePath();
+String resource = doc.getAbsolutePath();
try
{
@@ -322,7 +326,17 @@
}
else
{
-reader = new InputStreamReader( new FileInputStream(
fullPathDoc ), context.getInputEncoding() );
+switch ( parser.getType() )
+{
+case Parser.XML_TYPE:
+reader = ReaderFactory.newXmlReader( doc );
svn commit: r564257 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
Author: jdcasey
Date: Thu Aug 9 09:13:03 2007
New Revision: 564257
URL: http://svn.apache.org/viewvc?view=revrev=564257
Log:
Fixing an error message.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?view=diffrev=564257r1=564256r2=564257
==
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
Thu Aug 9 09:13:03 2007
@@ -34,12 +34,12 @@
* @plexus.requirement
*/
private RepositoryAssembler repositoryAssembler;
-
+
public RepositoryAssemblyPhase()
{
// used for plexus.
}
-
+
// introduced for testing.
public RepositoryAssemblyPhase( RepositoryAssembler repositoryAssembler )
{
@@ -50,7 +50,7 @@
throws ArchiveCreationException, AssemblyFormattingException
{
List repositoriesList = assembly.getRepositories();
-
+
File tempRoot = configSource.getTemporaryRootDirectory();
for ( Iterator i = repositoriesList.iterator(); i.hasNext(); )
@@ -70,20 +70,20 @@
}
catch ( RepositoryAssemblyException e )
{
-throw new ArchiveCreationException( Failed to assembly
repository: + e.getMessage(), e );
+throw new ArchiveCreationException( Failed to assemble
repository: + e.getMessage(), e );
}
String outputDirectory =
AssemblyFormatUtils.getOutputDirectory(
repository.getOutputDirectory(), configSource.getProject(),
configSource.getFinalName() );
-
+
AddDirectoryTask task = new AddDirectoryTask( repositoryDirectory
);
-
+
task.setDirectoryMode( TypeConversionUtils.modeToInt(
repository.getDirectoryMode(), getLogger() ) );
task.setFileMode( TypeConversionUtils.modeToInt(
repository.getFileMode(), getLogger() ) );
task.setUseDefaultExcludes( repository.isUseDefaultExcludes() );
task.setOutputDirectory( outputDirectory );
-
+
task.execute( archiver, configSource );
}
}
@@ -97,5 +97,5 @@
{
return new RepoInfoWrapper( repository );
}
-
+
}
svn commit: r564299 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project: DefaultMavenProjectBuilder.java build/model/DefaultModelLineageBuilder.java
Author: jdcasey
Date: Thu Aug 9 10:45:37 2007
New Revision: 564299
URL: http://svn.apache.org/viewvc?view=revrev=564299
Log:
Fixing a problem where parent POMs that are not found during model-lineage
discovery were not previously stubbed out, and caused the build to fail where
it didn't in 2.0.7
Modified:
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
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?view=diffrev=564299r1=564298r2=564299
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Thu Aug 9 10:45:37 2007
@@ -156,7 +156,7 @@
private ModelInheritanceAssembler modelInheritanceAssembler;
private ModelValidator validator;
-
+
// TODO: make it a component
private MavenXpp3Reader modelReader;
@@ -167,9 +167,9 @@
private ModelInterpolator modelInterpolator;
private ModelLineageBuilder modelLineageBuilder;
-
+
private ProfileAdvisor profileAdvisor;
-
+
private BuildContextManager buildContextManager;
private MavenTools mavenTools;
@@ -178,7 +178,7 @@
// I am making this available for use with a new method that takes a
// a monitor wagon monitor as a parameter so that tools can use the
// methods here and receive callbacks. MNG-1015
-//
+//
//Probably no longer relevant with wagonManager/wagonManager change -
joakime
// --
@@ -223,8 +223,8 @@
throws ProjectBuildingException
{
ProjectBuildCache projectBuildCache = ProjectBuildCache.read(
buildContextManager );
-
-MavenProject project = (MavenProject)
projectBuildCache.getCachedProject( artifact );
+
+MavenProject project = projectBuildCache.getCachedProject( artifact );
if ( project != null )
{
@@ -252,8 +252,8 @@
ProfileManager profileManager = new DefaultProfileManager( container );
return buildStandaloneSuperProject( localRepository, profileManager );
}
-
-public MavenProject buildStandaloneSuperProject( ArtifactRepository
localRepository, ProfileManager profileManager )
+
+public MavenProject buildStandaloneSuperProject( ArtifactRepository
localRepository, ProfileManager profileManager )
throws ProjectBuildingException
{
Model superModel = getSuperModel();
@@ -265,27 +265,27 @@
superModel.setVersion( STANDALONE_SUPERPOM_VERSION );
MavenProject project = new MavenProject( superModel );
-
+
ProjectBuildContext projectContext =
ProjectBuildContext.getProjectBuildContext( buildContextManager, true );
-
+
projectContext.setCurrentProject( project );
projectContext.store( buildContextManager );
-
+
String projectId = safeVersionlessKey( STANDALONE_SUPERPOM_GROUPID,
STANDALONE_SUPERPOM_ARTIFACTID );
-
+
project.setManagedVersionMap(createManagedVersionMap(projectId,
superModel.getDependencyManagement(), null));
List activeProfiles = profileAdvisor.applyActivatedProfiles(
superModel, null, profileManager.getExplicitlyActivatedIds(),
profileManager.getExplicitlyDeactivatedIds() );
List activeExternalProfiles =
profileAdvisor.applyActivatedExternalProfiles( superModel, null, profileManager
);
-
+
LinkedHashSet profiles = new LinkedHashSet();
-
-if ( activeProfiles != null !activeProfiles.isEmpty() )
+
+if ( ( activeProfiles != null ) !activeProfiles.isEmpty() )
{
profiles.addAll( activeProfiles );
}
-
-if ( activeExternalProfiles != null
!activeExternalProfiles.isEmpty() )
+
+if ( ( activeExternalProfiles != null )
!activeExternalProfiles.isEmpty() )
{
profiles.addAll( activeExternalProfiles );
}
@@ -408,7 +408,7 @@
{
Map map = null;
List deps;
-if ( dependencyManagement != null (deps =
dependencyManagement.getDependencies()) != null deps.size() 0)
+if ( ( dependencyManagement != null ) ( (deps =
dependencyManagement.getDependencies()) != null ) ( deps.size() 0 ))
{
map = new ManagedVersionMap( map );
@@ -436,7 +436,7 @@
// If the dependencyManagement
svn commit: r564301 - /maven/components/trunk/pom.xml
Author: jdcasey
Date: Thu Aug 9 10:45:56 2007
New Revision: 564301
URL: http://svn.apache.org/viewvc?view=revrev=564301
Log:
Setting up a deployment config for snapshots of maven.
Modified:
maven/components/trunk/pom.xml
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=diffrev=564301r1=564300r2=564301
==
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Thu Aug 9 10:45:56 2007
@@ -195,6 +195,10 @@
/dependencies
/dependencyManagement
distributionManagement
+snapshotRepository
+ idasf.snapshots/id
+ urlscp://people.apache.org/repo/m2-snapshot-repository/url
+/snapshotRepository
site
idapache.website/id
urlscp://people.apache.org/www/maven.apache.org/ref/${project.version}//url
@@ -290,4 +294,5 @@
/build
/profile
/profiles
+
/project
svn commit: r564306 - in /maven/components/trunk/maven-embedder: pom.xml src/main/assembly/repo.xml
Author: jdcasey
Date: Thu Aug 9 10:48:21 2007
New Revision: 564306
URL: http://svn.apache.org/viewvc?view=revrev=564306
Log:
Adding new assembly descritor to assemble a repository containing the
dependencies for maven (pre-shaded), and adding a profile to the POM to allow
us to trigger the creation of this new assembly. This is valuable for plugins
and other components that list one or more maven artifacts as dependencies, so
they can be built without rebuilding all of maven.
Added:
maven/components/trunk/maven-embedder/src/main/assembly/repo.xml (with
props)
Modified:
maven/components/trunk/maven-embedder/pom.xml
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?view=diffrev=564306r1=564305r2=564306
==
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Thu Aug 9 10:48:21 2007
@@ -79,16 +79,17 @@
plugin
artifactIdmaven-assembly-plugin/artifactId
version2.2-beta-1/version
-configuration
- descriptorsrc/main/assembly/bin.xml/descriptor
- finalNamemaven-${version}/finalName
-/configuration
executions
execution
+idcreate-distro/id
phasepackage/phase
goals
goalsingle/goal
/goals
+configuration
+ descriptorsrc/main/assembly/bin.xml/descriptor
+ finalNamemaven-${version}/finalName
+/configuration
/execution
/executions
/plugin
@@ -150,4 +151,31 @@
urlscp://people.apache.org/home/jvanzyl/public_html/embedder//url
/site
/distributionManagement
+
+ profiles
+profile
+ idmake-dependency-repo/id
+ build
+plugins
+ plugin
+artifactIdmaven-assembly-plugin/artifactId
+version2.2-beta-2-SNAPSHOT/version
+
+executions
+ execution
+idmake-dependency-repo/id
+phasepackage/phase
+goals
+ goalsingle/goal
+/goals
+configuration
+ descriptorsrc/main/assembly/repo.xml/descriptor
+/configuration
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+/profile
+ /profiles
/project
Added: maven/components/trunk/maven-embedder/src/main/assembly/repo.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/assembly/repo.xml?view=autorev=564306
==
--- maven/components/trunk/maven-embedder/src/main/assembly/repo.xml (added)
+++ maven/components/trunk/maven-embedder/src/main/assembly/repo.xml Thu Aug 9
10:48:21 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.
+--
+
+assembly
+ iddependency-repository/id
+ formats
+formattar.gz/format
+formattar.bz2/format
+formatzip/format
+ /formats
+ baseDirectoryrepository/baseDirectory
+ repositories
+repository
+ includeMetadatatrue/includeMetadata
+ scoperuntime/scope
+ outputDirectory//outputDirectory
+/repository
+ /repositories
+/assembly
Propchange: maven/components/trunk/maven-embedder/src/main/assembly/repo.xml
--
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/main/assembly/repo.xml
--
svn:keywords = Author Date Id Revision
svn commit: r564310 - /maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
Author: jdcasey
Date: Thu Aug 9 10:51:33 2007
New Revision: 564310
URL: http://svn.apache.org/viewvc?view=revrev=564310
Log:
fixing jdk 1.4 incompatibility.
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?view=diffrev=564310r1=564309r2=564310
==
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
Thu Aug 9 10:51:33 2007
@@ -69,7 +69,7 @@
throw new IllegalStateException( A logger instance is required.
);
}
-if ( mavenHome == null System.getProperty( maven.home ) == null )
+if ( ( mavenHome == null ) ( System.getProperty( maven.home ) ==
null ) )
{
throw new IllegalStateException( Maven application directory was
not
+ specified, and ${maven.home} is not provided in the system
@@ -137,7 +137,7 @@
{
List goals = request.getGoals();
-if ( goals != null !goals.isEmpty() )
+if ( ( goals != null ) !goals.isEmpty() )
{
cli.createArgument().setLine( StringUtils.join( goals.iterator(),
) );
}
@@ -375,7 +375,7 @@
}
}
-if ( mavenHome == null System.getenv( M2_HOME ) != null )
+if ( ( mavenHome == null ) ( System.getenv( M2_HOME ) != null
) )
{
mavenHome = new File( System.getenv( M2_HOME ) );
}
@@ -416,13 +416,13 @@
/**
* Wraps a path with quotes to handle paths with spaces. If no spaces are
found,
* the original string is returned.
- *
+ *
* @param path string to wrap if containing spaces
* @return quote wrapped string
*/
public String wrapStringWithQuotes( String path )
{
-if (path.contains( ))
+if ( path.indexOf( ) -1 )
{
return \ + path + \;
}
svn commit: r564380 - in /maven/shared/trunk/maven-invoker: ./ src/main/java/org/apache/maven/shared/invoker/ src/test/java/org/apache/maven/shared/invoker/
Author: jdcasey
Date: Thu Aug 9 14:00:15 2007
New Revision: 564380
URL: http://svn.apache.org/viewvc?view=revrev=564380
Log:
Adding activated profiles functionality.
Modified:
maven/shared/trunk/maven-invoker/pom.xml
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
Modified: maven/shared/trunk/maven-invoker/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?view=diffrev=564380r1=564379r2=564380
==
--- maven/shared/trunk/maven-invoker/pom.xml (original)
+++ maven/shared/trunk/maven-invoker/pom.xml Thu Aug 9 14:00:15 2007
@@ -83,4 +83,11 @@
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/developerConnection
urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/trunk/maven-invoker/url
/scm
+
+ distributionManagement
+snapshotRepository
+ idasf.snapshots/id
+
urlscp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository/url
+/snapshotRepository
+ /distributionManagement
/project
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java?view=diffrev=564380r1=564379r2=564380
==
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
Thu Aug 9 14:00:15 2007
@@ -28,6 +28,7 @@
private File userSettings;
private String globalChecksumPolicy;
private String pomFilename;
+private List profiles;
public InvocationRequest activateReactor( String[] includes, String[]
excludes )
{
@@ -245,6 +246,17 @@
public InvocationRequest setPomFileName( String pomFilename )
{
this.pomFilename = pomFilename;
+return this;
+}
+
+public List getProfiles()
+{
+return profiles;
+}
+
+public InvocationRequest setProfiles( List profiles )
+{
+this.profiles = profiles;
return this;
}
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java?view=diffrev=564380r1=564379r2=564380
==
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
Thu Aug 9 14:00:15 2007
@@ -37,15 +37,15 @@
boolean isDebug();
boolean isShowErrors();
-
+
boolean isShellEnvironmentInherited();
String getFailureBehavior();
-
+
File getLocalRepositoryDirectory( File defaultDirectory );
-
+
InputStream getInputStream( InputStream defaultStream );
-
+
InvocationOutputHandler getOutputHandler( InvocationOutputHandler
defaultHandler );
InvocationOutputHandler getErrorHandler( InvocationOutputHandler
defaultHandler );
@@ -61,11 +61,13 @@
Properties getProperties();
List getGoals();
-
+
File getUserSettingsFile();
-
+
String getGlobalChecksumPolicy();
+List getProfiles();
+
// --
// Reactor Failure Mode
// --
@@ -79,9 +81,9 @@
// --
// Artifactr repository policies
// --
-
+
static final String CHECKSUM_POLICY_FAIL = fail;
-
+
static final String CHECKSUM_POLICY_WARN = warn;
// --
@@ -97,15 +99,15 @@
InvocationRequest setShowErrors( boolean showErrors );
InvocationRequest setUpdateSnapshots( boolean updateSnapshots );
-
+
InvocationRequest setFailureBehavior( String failureBehavior );
InvocationRequest activateReactor( String[] includes, String[] excludes );
svn commit: r564391 - in /maven/plugins/branches/MWAR-97-2: ./ src/main/java/org/apache/maven/plugin/war/ src/main/java/org/apache/maven/plugin/war/packaging/ src/main/java/org/apache/maven/plugin/war
Author: snicoll
Date: Thu Aug 9 14:38:34 2007
New Revision: 564391
URL: http://svn.apache.org/viewvc?view=revrev=564391
Log:
- Added post packaging task framework to perform stuff once the webapp is
packaged
- The webapp structure is now saved at each run to improve performance
Added:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarPostPackagingTask.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java
Modified:
maven/plugins/branches/MWAR-97-2/pom.xml
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
Modified: maven/plugins/branches/MWAR-97-2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/pom.xml?view=diffrev=564391r1=564390r2=564391
==
--- maven/plugins/branches/MWAR-97-2/pom.xml (original)
+++ maven/plugins/branches/MWAR-97-2/pom.xml Thu Aug 9 14:38:34 2007
@@ -59,6 +59,11 @@
version2.0.1/version
/dependency
dependency
+ groupIdcom.thoughtworks.xstream/groupId
+ artifactIdxstream/artifactId
+ version1.2.2/version
+/dependency
+dependency
groupIdjunit/groupId
artifactIdjunit/artifactId
version3.8.1/version
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?view=diffrev=564391r1=564390r2=564391
==
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Thu Aug 9 14:38:34 2007
@@ -27,13 +27,16 @@
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.war.overlay.OverlayManager;
import org.apache.maven.plugin.war.packaging.OverlayPackagingTask;
+import
org.apache.maven.plugin.war.packaging.SaveWebappStructurePostPackagingTask;
import org.apache.maven.plugin.war.packaging.WarPackagingContext;
import org.apache.maven.plugin.war.packaging.WarPackagingTask;
+import org.apache.maven.plugin.war.packaging.WarPostPackagingTask;
import org.apache.maven.plugin.war.packaging.WarProjectPackagingTask;
import org.apache.maven.plugin.war.util.CompositeMap;
import org.apache.maven.plugin.war.util.PropertyUtils;
import org.apache.maven.plugin.war.util.ReflectionProperties;
import org.apache.maven.plugin.war.util.WebappStructure;
+import org.apache.maven.plugin.war.util.WebappStructureSerializer;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -150,11 +153,20 @@
/**
* The file containing the webapp structure cache.
*
- * @paramenter expression=${project.build.directory}/.webapp-cache.xml
+ * @parameter
expression=${project.build.directory}/war/work/webapp-cache.xml
* @required
* @since 2.1
*/
-private File webappStructure;
+private File cacheFile;
+
+/**
+ * Whether the cache should be used to save the status of the webapp
+ * accross multiple runs.
+ *
+ * @parameter expression=${useCache} default-value=true
+ * @since 2.1
+ */
+private boolean useCache = true;
/**
* To look up Archiver/UnArchiver implementations
@@ -222,6 +234,7 @@
private static final String[] EMPTY_STRING_ARRAY = {};
+private final WebappStructureSerializer webappStructureSerialier = new
WebappStructureSerializer();
/**
* Returns a string array of the excludes to be used
@@ -329,10 +342,14 @@
throws MojoExecutionException, MojoFailureException, IOException
{
-WebappStructure cache = new WebappStructure( null );
-if ( webappStructure != null webappStructure.exists() )
+WebappStructure cache;
+if ( useCache cacheFile.exists() )
+{
+cache = new WebappStructure( webappStructureSerialier.fromXml(
cacheFile ) );
+}
+else
{
-// TODO: LOAD the webapp structure thingy using xstream
+cache = new WebappStructure( null );
}
final long startTime = System.currentTimeMillis();
@@ -348,9 +365,18 @@
WarPackagingTask warPackagingTask = (WarPackagingTask) it.next();
warPackagingTask.performPackaging( context );
}
+
+// Post packaging
+
svn commit: r564406 - in /maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war: packaging/ArtifactsPackagingTask.java packaging/WarProjectPackagingTask.java util/WebappStructure.
Author: snicoll
Date: Thu Aug 9 15:22:21 2007
New Revision: 564406
URL: http://svn.apache.org/viewvc?view=revrev=564406
Log:
- Removed wrong warning message (war type is handled)
- Create the parent of the cache if necessary
- The cache is now read properly
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java?view=diffrev=564406r1=564405r2=564406
==
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
Thu Aug 9 15:22:21 2007
@@ -80,6 +80,10 @@
targetFileName = targetFileName.substring( 0,
targetFileName.lastIndexOf( '.' ) ) + .jar;
copyFile( id, context, artifact.getFile(), LIB_PATH +
targetFileName );
}
+else if ( war.equals( type ) )
+{
+// Nothing to do here, it is an overlay and it's
already handled
+}
else
{
context.getLog().debug(
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?view=diffrev=564406r1=564405r2=564406
==
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
Thu Aug 9 15:22:21 2007
@@ -54,6 +54,7 @@
throws MojoExecutionException, MojoFailureException
{
+context.getLog().info( Processing war project );
// Prepare the INF directories
File webinfDir = new File( context.getWebappDirectory(), WEB_INF_PATH
);
webinfDir.mkdirs();
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java?view=diffrev=564406r1=564405r2=564406
==
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
Thu Aug 9 15:22:21 2007
@@ -19,19 +19,18 @@
public class WebappStructure
{
-private final Map registeredFiles;
+private Map registeredFiles;
-private final transient PathSet allFiles;
+private transient PathSet allFiles = new PathSet();
-private final transient WebappStructure cache;
+private transient WebappStructure cache;
/**
* Creates a new empty instance.
*/
-private WebappStructure()
+public WebappStructure()
{
this.registeredFiles = new HashMap();
-this.allFiles = new PathSet();
this.cache = null;
}
@@ -43,7 +42,6 @@
public WebappStructure( WebappStructure cache )
{
this.registeredFiles = new HashMap();
-this.allFiles = new PathSet();
if ( cache == null )
{
this.cache = new WebappStructure();
@@ -209,6 +207,19 @@
{
getFullStructure().add( path );
getStructure( id ).add( path );
+}
+
+private Object readResolve()
+{
+// the full structure should be resolved so let's rebuild it
+this.allFiles = new PathSet();
+final Iterator it = registeredFiles.values().iterator();
+while ( it.hasNext() )
+{
+PathSet pathSet = (PathSet) it.next();
+this.allFiles.addAll( pathSet );
+}
+return this;
}
/**
Modified:
svn commit: r564413 - in /maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war: ./ overlay/ packaging/
Author: snicoll
Date: Thu Aug 9 15:50:23 2007
New Revision: 564413
URL: http://svn.apache.org/viewvc?view=revrev=564413
Log:
- Reviewed logging a bit
- Overlay manager now recognize current build properly
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarMojo.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?view=diffrev=564413r1=564412r2=564413
==
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Thu Aug 9 15:50:23 2007
@@ -310,8 +310,6 @@
public void buildExplodedWebapp( File webappDirectory )
throws MojoExecutionException, MojoFailureException
{
-getLog().info( Exploding webapp... );
-
webappDirectory.mkdirs();
try
@@ -320,7 +318,7 @@
}
catch ( IOException e )
{
-throw new MojoExecutionException( Could not explode webapp..., e
);
+throw new MojoExecutionException( Could not build webapp, e );
}
}
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java?view=diffrev=564413r1=564412r2=564413
==
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
Thu Aug 9 15:50:23 2007
@@ -35,6 +35,8 @@
public void execute()
throws MojoExecutionException, MojoFailureException
{
+getLog().info( Exploding webapp );
+
buildExplodedWebapp( getWebappDirectory() );
}
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java?view=diffrev=564413r1=564412r2=564413
==
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
Thu Aug 9 15:50:23 2007
@@ -34,7 +34,7 @@
public void execute()
throws MojoExecutionException, MojoFailureException
{
-getLog().info( Generating webapp in source directory... +
getWarSourceDirectory() );
+getLog().info( Generating webapp in source directory[ +
getWarSourceDirectory() + ] );
buildExplodedWebapp( getWarSourceDirectory() );
}
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarMojo.java?view=diffrev=564413r1=564412r2=564413
==
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarMojo.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/WarMojo.java
Thu Aug 9 15:50:23 2007
@@ -161,10 +161,9 @@
throws IOException, ArchiverException, ManifestException,
DependencyResolutionRequiredException,
MojoExecutionException, MojoFailureException
{
-buildExplodedWebapp( getWebappDirectory() );
+getLog().info( Packaging webapp );
-//generate war file
-getLog().info( Generating war + warFile.getAbsolutePath() );
+buildExplodedWebapp( getWebappDirectory() );
MavenArchiver archiver = new MavenArchiver();
Modified:
svn commit: r564419 - in /maven/site/trunk/src/site/resources/developers: maven-eclipse-codestyle.xml maven-idea-codestyle.xml
Author: brett Date: Thu Aug 9 16:17:47 2007 New Revision: 564419 URL: http://svn.apache.org/viewvc?view=revrev=564419 Log: updated code styles for the latest versions of the IDEs Modified: maven/site/trunk/src/site/resources/developers/maven-eclipse-codestyle.xml maven/site/trunk/src/site/resources/developers/maven-idea-codestyle.xml Modified: maven/site/trunk/src/site/resources/developers/maven-eclipse-codestyle.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/developers/maven-eclipse-codestyle.xml?view=diffrev=564419r1=564418r2=564419 == --- maven/site/trunk/src/site/resources/developers/maven-eclipse-codestyle.xml (original) +++ maven/site/trunk/src/site/resources/developers/maven-eclipse-codestyle.xml Thu Aug 9 16:17:47 2007 @@ -1,251 +1,264 @@ ?xml version=1.0 encoding=UTF-8? -profiles version=10 -profile name=Maven version=10 +profiles version=11 +profile kind=CodeFormatterProfile name=Maven version=11 +setting id=org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if value=insert/ +setting id=org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert value=insert/ +setting id=org.eclipse.jdt.core.formatter.brace_position_for_enum_constant value=next_line/ +setting id=org.eclipse.jdt.core.formatter.insert_space_before_semicolon value=do not insert/ setting id=org.eclipse.jdt.core.formatter.align_type_members_on_columns value=false/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression value=18/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant value=20/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call value=18/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation value=18/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression value=18/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_assignment value=20/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_binary_expression value=16/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_compact_if value=16/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_conditional_expression value=80/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_enum_constants value=48/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer value=20/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_multiple_fields value=16/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration value=18/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration value=18/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation value=2/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration value=36/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration value=36/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration value=36/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration value=36/ -setting id=org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration value=36/ -setting id=org.eclipse.jdt.core.formatter.blank_lines_after_imports value=1/ -setting id=org.eclipse.jdt.core.formatter.blank_lines_after_package value=1/ -setting id=org.eclipse.jdt.core.formatter.blank_lines_before_field value=1/ -setting id=org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration value=0/ -setting id=org.eclipse.jdt.core.formatter.blank_lines_before_imports value=1/ -setting id=org.eclipse.jdt.core.formatter.blank_lines_before_member_type value=1/ -setting id=org.eclipse.jdt.core.formatter.blank_lines_before_method value=1/ -setting id=org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk value=1/ -setting id=org.eclipse.jdt.core.formatter.blank_lines_before_package value=0/ +setting id=org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case value=do not insert/ +setting id=org.eclipse.jdt.core.formatter.comment.format_line_comments value=true/ +setting id=org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve value=1/ +setting id=org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference value=do not insert/ +setting id=org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch value=insert/ setting id=org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations value=1/ -setting id=org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration value=next_line/ -setting id=org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration
svn commit: r564423 - /maven/components/trunk/pom.xml
Author: jdcasey
Date: Thu Aug 9 16:35:28 2007
New Revision: 564423
URL: http://svn.apache.org/viewvc?view=revrev=564423
Log:
Removing snapshot repo.
Modified:
maven/components/trunk/pom.xml
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=diffrev=564423r1=564422r2=564423
==
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Thu Aug 9 16:35:28 2007
@@ -195,10 +195,6 @@
/dependencies
/dependencyManagement
distributionManagement
-snapshotRepository
- idasf.snapshots/id
- urlscp://people.apache.org/repo/m2-snapshot-repository/url
-/snapshotRepository
site
idapache.website/id
urlscp://people.apache.org/www/maven.apache.org/ref/${project.version}//url
svn commit: r564450 - /maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml
Author: brianf Date: Thu Aug 9 18:18:26 2007 New Revision: 564450 URL: http://svn.apache.org/viewvc?view=revrev=564450 Log: fixed version and bound plugin to test Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml?view=diffrev=564450r1=564449r2=564450 == --- maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml Thu Aug 9 18:18:26 2007 @@ -37,14 +37,20 @@ /dependencies !--This must be set so the correct version is used for the IT test-- build -pluginManagement plugins -plugin - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-dependency-plugin/artifactId - versiontest/version -/plugin - /plugins -/pluginManagement + plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-dependency-plugin/artifactId + executions + execution + idresolve/id + phasegenerate-sources/phase + goals +goalresolve/goal + /goals + /execution + /executions + /plugin +/plugins /build /project
