cvs commit: maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover DefaultArtifactDiscoverer.java LegacyArtifactDiscoverer.java
jdcasey 2005/03/22 22:58:47
Modified:
sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover
DefaultArtifactDiscoverer.java
LegacyArtifactDiscoverer.java
Log:
o Added more filters on the excludes.
Revision ChangesPath
1.2 +47 -36
maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/DefaultArtifactDiscoverer.java
Index: DefaultArtifactDiscoverer.java
===
RCS file:
/home/cvs/maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/DefaultArtifactDiscoverer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultArtifactDiscoverer.java23 Mar 2005 04:53:30 - 1.1
+++ DefaultArtifactDiscoverer.java23 Mar 2005 06:58:47 - 1.2
@@ -13,21 +13,19 @@
import java.util.ArrayList;
import java.util.List;
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- *
+/*
+ *
Copyright 2001-2004 The
+ * Apache Software Foundation.
+ *
+ * Licensed 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.
*/
/**
@@ -39,13 +37,24 @@
private ArtifactConstructionSupport artifactConstructionSupport = new
ArtifactConstructionSupport();
-public List discoverArtifacts( File repositoryBase, Reporter reporter )
throws Exception
+public List discoverArtifacts( File repositoryBase, Reporter reporter )
+throws Exception
{
List artifacts = new ArrayList();
DirectoryScanner scanner = new DirectoryScanner();
scanner.setBasedir( repositoryBase );
-scanner.setExcludes( new String[] { **/*.pom, **/*.md5 } );
+scanner.setExcludes( new String[] {
+bin/**,
+reports/**,
+.maven/**,
+**/*.pom,
+**/*.md5,
+**/*snapshot-version,
+*/website/**,
+*/licenses/**,
+**/.htaccess,
+**/REPOSITORY-V*.txt } );
scanner.scan();
@@ -56,8 +65,8 @@
String path = artifactPaths[i];
Artifact artifact = buildArtifact( repositoryBase, path,
reporter );
-
-if(artifact != null)
+
+if ( artifact != null )
{
artifacts.add( artifact );
}
@@ -66,38 +75,40 @@
return artifacts;
}
-private Artifact buildArtifact( File repositoryBase, String path,
Reporter reporter ) throws Exception
+private Artifact buildArtifact( File repositoryBase, String path,
Reporter reporter )
+throws Exception
{
Artifact result = null;
-
-int lastDot = path.lastIndexOf('.');
-
-if(lastDot 0)
+
+int lastDot = path.lastIndexOf( '.' );
+
+if ( lastDot 0 )
{
-reporter.error( Found potential artifact file with invalid
name. Path: \' + path + \' doesn't seem to contain a file extension. );
+reporter.error( Found potential artifact file with invalid
name. Path: \' + path
++ \' doesn't seem to contain a file extension. );
}
else
{
-String pomPath = path.substring(0, lastDot) + .pom;
-
-File pomFile = new File(repositoryBase, pomPath);
-
cvs commit: maven-components/maven-artifact/src/main/resources/META-INF/plexus components.xml
brett 2005/03/22 23:41:39
Modified:maven-artifact/src/main/java/org/apache/maven/artifact/installer
DefaultArtifactInstaller.java
maven-artifact/src/main/java/org/apache/maven/artifact/manager
DefaultWagonManager.java
maven-artifact/src/main/java/org/apache/maven/artifact/resolver
DefaultArtifactResolver.java
maven-artifact/src/main/java/org/apache/maven/artifact
AbstractArtifactComponent.java
maven-artifact/src/main/resources/META-INF/plexus
components.xml
Log:
o a little refactoring
o hook in snapshot transformation, though it isn't used
Revision ChangesPath
1.6 +1 -1
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
Index: DefaultArtifactInstaller.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultArtifactInstaller.java 23 Mar 2005 03:40:12 - 1.5
+++ DefaultArtifactInstaller.java 23 Mar 2005 07:41:39 - 1.6
@@ -52,7 +52,7 @@
{
try
{
-setLocalRepositoryPath( artifact, localRepository );
+artifact.setPath( getLocalRepositoryArtifactPath(
localRepository, artifact ) );
if ( !artifact.getFile().getParentFile().exists() )
{
1.17 +2 -2
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Index: DefaultWagonManager.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultWagonManager.java 23 Mar 2005 03:40:12 - 1.16
+++ DefaultWagonManager.java 23 Mar 2005 07:41:39 - 1.17
@@ -86,7 +86,7 @@
wagon.connect( repository, getProxy( repository.getProtocol() ) );
-wagon.put( source, path( artifact, repository ) );
+wagon.put( source, getRemoteRepositoryArtifactPath( artifact,
repository ) );
wagon.disconnect();
@@ -155,7 +155,7 @@
wagon.connect( repository, getProxy(
repository.getProtocol() ) );
-String remotePath = path( artifact, repository );
+String remotePath = getRemoteRepositoryArtifactPath(
artifact, repository );
wagon.get( remotePath, temp );
1.24 +2 -2
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Index: DefaultArtifactResolver.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DefaultArtifactResolver.java 23 Mar 2005 07:23:23 - 1.23
+++ DefaultArtifactResolver.java 23 Mar 2005 07:41:39 - 1.24
@@ -77,7 +77,7 @@
logger.debug( Resolving: + artifact.getId() + from:\n +
{localRepository: + localRepository +
}\n + {remoteRepositories: +
remoteRepositories + } );
-setLocalRepositoryPath( artifact, localRepository );
+artifact.setPath( getLocalRepositoryArtifactPath(
localRepository, artifact ) );
if ( artifact.exists() )
{
@@ -294,7 +294,7 @@
try
{
-setLocalRepositoryPath( artifact, localRepository );
+artifact.setPath( getLocalRepositoryArtifactPath(
localRepository, artifact ) );
}
catch ( ArtifactPathFormatException e )
{
1.8 +12 -11
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/AbstractArtifactComponent.java
Index: AbstractArtifactComponent.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/AbstractArtifactComponent.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractArtifactComponent.java23 Mar 2005 07:23:23 - 1.7
+++ AbstractArtifactComponent.java23 Mar 2005 07:41:39 - 1.8
@@ -21,8 +21,10 @@
import
[maven2 build - SUCCESS] Wed Mar 23 02:07:00 EST 2005
Distribution: http://www.codehaus.org/~maven/m2/m2-20050323.020700.tar.gz Log: http://www.codehaus.org/~maven/m2-build-logs/m2-build-log-20050323.020700.txt
cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact AbstractArtifactComponent.java
brett 2005/03/22 23:43:38
Modified:maven-artifact/src/main/java/org/apache/maven/artifact/installer
DefaultArtifactInstaller.java
maven-artifact/src/main/java/org/apache/maven/artifact/resolver
DefaultArtifactResolver.java
maven-artifact/src/main/java/org/apache/maven/artifact
AbstractArtifactComponent.java
Log:
make method signatures consistent
Revision ChangesPath
1.7 +1 -1
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
Index: DefaultArtifactInstaller.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultArtifactInstaller.java 23 Mar 2005 07:41:39 - 1.6
+++ DefaultArtifactInstaller.java 23 Mar 2005 07:43:38 - 1.7
@@ -52,7 +52,7 @@
{
try
{
-artifact.setPath( getLocalRepositoryArtifactPath(
localRepository, artifact ) );
+artifact.setPath( getLocalRepositoryArtifactPath( artifact,
localRepository ) );
if ( !artifact.getFile().getParentFile().exists() )
{
1.25 +2 -2
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Index: DefaultArtifactResolver.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultArtifactResolver.java 23 Mar 2005 07:41:39 - 1.24
+++ DefaultArtifactResolver.java 23 Mar 2005 07:43:38 - 1.25
@@ -77,7 +77,7 @@
logger.debug( Resolving: + artifact.getId() + from:\n +
{localRepository: + localRepository +
}\n + {remoteRepositories: +
remoteRepositories + } );
-artifact.setPath( getLocalRepositoryArtifactPath(
localRepository, artifact ) );
+artifact.setPath( getLocalRepositoryArtifactPath( artifact,
localRepository ) );
if ( artifact.exists() )
{
@@ -294,7 +294,7 @@
try
{
-artifact.setPath( getLocalRepositoryArtifactPath(
localRepository, artifact ) );
+artifact.setPath( getLocalRepositoryArtifactPath( artifact,
localRepository ) );
}
catch ( ArtifactPathFormatException e )
{
1.9 +1 -1
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/AbstractArtifactComponent.java
Index: AbstractArtifactComponent.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/AbstractArtifactComponent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractArtifactComponent.java23 Mar 2005 07:41:39 - 1.8
+++ AbstractArtifactComponent.java23 Mar 2005 07:43:38 - 1.9
@@ -52,7 +52,7 @@
return remoteRepository.pathOf( artifact );
}
-protected String getLocalRepositoryArtifactPath( ArtifactRepository
localRepository, Artifact artifact )
+protected String getLocalRepositoryArtifactPath( Artifact artifact,
ArtifactRepository localRepository )
throws ArtifactPathFormatException
{
for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
[jira] Updated: (MNG-171) honour plugin declaration order for ordering of mojos in phases
[ http://jira.codehaus.org/browse/MNG-171?page=history ] Brett Porter updated MNG-171: - Fix Version: (was: 1.0-alpha-1) 1.0-alpha-2 this can wait honour plugin declaration order for ordering of mojos in phases --- Key: MNG-171 URL: http://jira.codehaus.org/browse/MNG-171 Project: m2 Type: Bug Components: maven-core Reporter: Brett Porter Assignee: Brett Porter Fix For: 1.0-alpha-2 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira
[jira] Updated: (MNG-154) let type handlers define the lifecycle
[ http://jira.codehaus.org/browse/MNG-154?page=history ] Brett Porter updated MNG-154: - Fix Version: (was: 1.0-alpha-1) 1.0-alpha-2 Environment: Description: - remove goal definitions from the configuration of the phases - allow type handlers to configure additional goals (eg plugin:descriptor for any project of type plugin) was: - remove goal definitions from the configuration of the phases - allow type handlers to configure additional goals (eg plugin:descriptor for any project of type plugin) this can wait let type handlers define the lifecycle -- Key: MNG-154 URL: http://jira.codehaus.org/browse/MNG-154 Project: m2 Type: Task Components: maven-core Reporter: Brett Porter Assignee: Brett Porter Fix For: 1.0-alpha-2 - remove goal definitions from the configuration of the phases - allow type handlers to configure additional goals (eg plugin:descriptor for any project of type plugin) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira
Re: SNAPSHOT design
Vincent Massol wrote: Cool. At first reading the systematic use of snapshot timestamp and the juggling of format between local and remote repos seemed too much of magic to me. I now understand this may be the only solution for clock issues. This is all pretty well hidden - the user should just specify SNAPSHOT in their dependencies and it will just work. I think a version.txt file may be required not only for snapshots but also for proper release versions so that the user can specify a dependency that is greater than a certain number (ex: 1.7+ or 1.7). Is it the plan to have another file for it? Wouldn't it be better to merge the 2 files into one? I'd imagine that they would be treated like SNAPSHOTs if implemented as they are also unresolved versions - but I don't want to go too far down that track yet. To be honest, I'm not entirely certain we should implement this in the short term. It's dangerous when versioning is not done right. What we're better to do is make it easier to globally change a dependency version which is what dependencyManagement is about so you can have careful control of the dependency version in play. Cheers, Brett
Re: SNAPSHOT design
Rafal Krzewski wrote: Brett Porter wrote: http://docs.codehaus.org/pages/viewpage.action?pageId=22585 I'm now moving on to implement this. Cool. Two important things come to my mind after reading - my apologies in advance if they're obvious to others: - consistency of snapshot identifiers across primary and secondary artifacts produced in a single run, so that they may be correlated by clients correctly. absolutely - but thanks for point it out. I'll make sure it is explicitly listed. - the ability to push build number from a CI system to maven so that CI metadata stay consistent with the repository. definitely possible, though I don't want to add the hooks now until we get to the point where it is needed, to be able to keep it simple. Thanks, Brett R.
Re: SNAPSHOT design
The use case that I've encountered several times is the following: - One of my projects needs to use a given plugin with a version higher than X because it depends on features introduced or bugs corrected in version X. I suspect this is more often a plugin issue than general dependency problem. In m2, plugins are declared in the POM and are never used as normal dependencies - and you must generally declare the version of the plugin you want. This is imperative to making builds reproducible. For those where it is discovered (there are open issues to actually implement it for alpha-2), they would be resolved in the POM at release time. I suspect that your problem would be solved with this in your company wide POM: pluginManagement plugins plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-checkstyle-plugin/artifactId version2.5/version /plugin /plugins /pluginManagement Everyone using that current version (everything not released), would be getting that version of checkstyle, and you'd have one file to update when that changed. Also, I'd love to be able to depend on the last released version of a given dependency. That'll allow my continuous build to automatically find out if there's a compatibility issue with the latest released dependencies, a la Gump. Maybe this is a feature of Continuum but still it impacts the layout of the remote repository. In general, you could use SNAPSHOTs (which is what gump does). I guess to only get the latest releases, you'd have to have a repository containing only releases (which is how Apache separates them now) - but the current design didn't cover marking a release as the latest SNAPSHOT (which was briefly noted at the end in a different context). I'll add this, because I hadn't considered this specific (admittedly unusual!) use case. This also ties in to the extra note that I specifically excluded until later - that branches don't really fit the current model. This is an issue frequently occurring in gump where a project must maintain two streams. I guess this is not really a must-have for the first alpha or beta of m2 but I think it makes sense to have it in before a final m2. Thanks - I'm sure there'll be plenty more feedback after the first release. I look forward to it :) - Brett
[jira] Updated: (MNG-140) refactor maven-artifact
[ http://jira.codehaus.org/browse/MNG-140?page=history ] Brett Porter updated MNG-140: - Fix Version: 1.0-alpha-2 Environment: Description: currently, there are a few inconsistencies in the way the artifact resolution is implemented. ArtifactRepository objects are created from the project builder. It makes more sense that the artifact resolver actually factory these on behalf of the builder - currently setting any additional parameters on them requires it be in the project, or that the project builder has knowledge of wagon. It is also uncertain if the wagon manager is required at all and may be able to be folded into the artifact resolver. was: currently, there are a few inconsistencies in the way the artifact resolution is implemented. ArtifactRepository objects are created from the project builder. It makes more sense that the artifact resolver actually factory these on behalf of the builder - currently setting any additional parameters on them requires it be in the project, or that the project builder has knowledge of wagon. It is also uncertain if the wagon manager is required at all and may be able to be folded into the artifact resolver. Summary: refactor maven-artifact (was: refactor ArtifactResolver and ArtifactRepository) there are plenty of places to clean up in maven-artifact before it can be a public API. - scope handlers - improve use of type handlers vs artifact factory - any artifact stuff in maven-core should be called MavenArtifactFoo instead of DefaultArtifactFoo - ArtifactMetadataSource vs ArtifactMetadata - treatment of POMs as artifacts vs metadata refactor maven-artifact --- Key: MNG-140 URL: http://jira.codehaus.org/browse/MNG-140 Project: m2 Type: Improvement Components: design Reporter: Brett Porter Assignee: Brett Porter Priority: Minor Fix For: 1.0-alpha-2 currently, there are a few inconsistencies in the way the artifact resolution is implemented. ArtifactRepository objects are created from the project builder. It makes more sense that the artifact resolver actually factory these on behalf of the builder - currently setting any additional parameters on them requires it be in the project, or that the project builder has knowledge of wagon. It is also uncertain if the wagon manager is required at all and may be able to be folded into the artifact resolver. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira
cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact Artifact.java DefaultArtifact.java
brett 2005/03/23 06:55:15
Modified:
maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager
DefaultArtifactHandlerManager.java
maven-artifact/src/main/java/org/apache/maven/artifact/installer
DefaultArtifactInstaller.java
maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout
AbstractArtifactRepositoryLayout.java
ArtifactRepositoryLayout.java
DefaultRepositoryLayout.java
LegacyRepositoryLayout.java
maven-artifact/src/main/java/org/apache/maven/artifact/repository
ArtifactRepository.java
maven-artifact/src/main/java/org/apache/maven/artifact/transform
SnapshotTransformation.java
maven-artifact/src/main/java/org/apache/maven/artifact
Artifact.java DefaultArtifact.java
Added: maven-artifact/src/main/java/org/apache/maven/artifact/metadata
AbstractArtifactMetadata.java ArtifactMetadata.java
SnapshotArtifactMetadata.java
Log:
add artifact metadata on installation of snapshot in a local repository
Revision ChangesPath
1.10 +1 -2
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
Index: DefaultArtifactHandlerManager.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultArtifactHandlerManager.java23 Mar 2005 08:42:56 -
1.9
+++ DefaultArtifactHandlerManager.java23 Mar 2005 14:55:15 -
1.10
@@ -82,7 +82,6 @@
// TODO: perform transformation
}
-String artifactPath = localRepository.getBasedir() + / +
localRepository.pathOf( artifact );
-return artifactPath;
+return localRepository.getBasedir() + / + localRepository.pathOf(
artifact );
}
}
\ No newline at end of file
1.9 +9 -0
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
Index: DefaultArtifactInstaller.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultArtifactInstaller.java 23 Mar 2005 08:42:56 - 1.8
+++ DefaultArtifactInstaller.java 23 Mar 2005 14:55:15 - 1.9
@@ -19,6 +19,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import
org.apache.maven.artifact.handler.manager.ArtifactHandlerNotFoundException;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import
org.apache.maven.artifact.repository.layout.ArtifactPathFormatException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -26,6 +27,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Iterator;
public class DefaultArtifactInstaller
extends AbstractLogEnabled
@@ -65,6 +67,13 @@
getLogger().info( Installing + source.getPath() + to +
artifact.getPath() );
FileUtils.copyFile( source, artifact.getFile() );
+
+// must be after the artifact is installed
+for ( Iterator i = artifact.getMetadataList().iterator();
i.hasNext(); )
+{
+ArtifactMetadata metadata = (ArtifactMetadata) i.next();
+metadata.storeInLocalRepository( localRepository );
+}
}
catch ( IOException e )
{
1.1
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java
Index: AbstractArtifactMetadata.java
===
package org.apache.maven.artifact.metadata;
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed 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,
cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform ArtifactTransformation.java SnapshotTransformation.java
brett 2005/03/23 07:03:39
Modified:
maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager
DefaultArtifactHandlerManager.java
maven-artifact/src/main/java/org/apache/maven/artifact/manager
DefaultWagonManager.java
maven-artifact/src/main/java/org/apache/maven/artifact/transform
ArtifactTransformation.java
SnapshotTransformation.java
Log:
scaffolding for remote transformation
Revision ChangesPath
1.11 +1 -2
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
Index: DefaultArtifactHandlerManager.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultArtifactHandlerManager.java23 Mar 2005 14:55:15 -
1.10
+++ DefaultArtifactHandlerManager.java23 Mar 2005 15:03:39 -
1.11
@@ -66,7 +66,7 @@
for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
{
ArtifactTransformation transform = (ArtifactTransformation)
i.next();
-// TODO: perform transformation
+artifact = transform.transformRemoteArtifact( artifact,
remoteRepository );
}
return remoteRepository.pathOf( artifact );
@@ -79,7 +79,6 @@
{
ArtifactTransformation transform = (ArtifactTransformation)
i.next();
artifact = transform.transformLocalArtifact( artifact,
localRepository );
-// TODO: perform transformation
}
return localRepository.getBasedir() + / + localRepository.pathOf(
artifact );
1.19 +1 -0
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Index: DefaultWagonManager.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultWagonManager.java 23 Mar 2005 08:42:57 - 1.18
+++ DefaultWagonManager.java 23 Mar 2005 15:03:39 - 1.19
@@ -158,6 +158,7 @@
wagon.connect( repository, getProxy(
repository.getProtocol() ) );
+// TODO: should we avoid doing the transforms on this every
time, and instead transform outside the loop?
String remotePath =
artifactHandlerManager.getRemoteRepositoryArtifactPath( artifact, repository );
wagon.get( remotePath, temp );
1.3 +9 -0
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
Index: ArtifactTransformation.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArtifactTransformation.java 23 Mar 2005 08:42:57 - 1.2
+++ ArtifactTransformation.java 23 Mar 2005 15:03:39 - 1.3
@@ -36,4 +36,13 @@
* @return The transformed Artifact
*/
Artifact transformLocalArtifact( Artifact artifact, ArtifactRepository
localRepository );
+
+/**
+ * Take in a artifact and return the transformed artifact for locating
in the remote repository. If no
+ * transformation has occured the original artifact is returned.
+ *
+ * @param artifact Artifact to be transformed.
+ * @return The transformed Artifact
+ */
+Artifact transformRemoteArtifact( Artifact artifact, ArtifactRepository
remoteRepository );
}
\ No newline at end of file
1.4 +16 -2
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Index: SnapshotTransformation.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SnapshotTransformation.java 23 Mar 2005 14:55:15 - 1.3
+++ SnapshotTransformation.java 23 Mar 2005 15:03:39 - 1.4
@@ -30,7 +30,7 @@
public class SnapshotTransformation
implements ArtifactTransformation
{
-/*
+/* TODO: use and
[maven2 build - SUCCESS] Wed Mar 23 10:07:00 EST 2005
Distribution: http://www.codehaus.org/~maven/m2/m2-20050323.100700.tar.gz Log: http://www.codehaus.org/~maven/m2-build-logs/m2-build-log-20050323.100700.txt
cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager DefaultArtifactHandlerManager.java
brett 2005/03/23 07:10:38
Modified:
maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager
DefaultArtifactHandlerManager.java
Log:
add notes on current limitations
Revision ChangesPath
1.12 +3 -0
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
Index: DefaultArtifactHandlerManager.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultArtifactHandlerManager.java23 Mar 2005 15:03:39 -
1.11
+++ DefaultArtifactHandlerManager.java23 Mar 2005 15:10:38 -
1.12
@@ -63,6 +63,9 @@
public String getRemoteRepositoryArtifactPath( Artifact artifact,
ArtifactRepository remoteRepository )
throws ArtifactPathFormatException
{
+// TODO: note that these are currrently assuming only PUT
operations, not GET operations
+// TODO: note also that these add metadata to the artifacts, so it
is assumed this is only called once per artifact - needs to be fixed
+
for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
{
ArtifactTransformation transform = (ArtifactTransformation)
i.next();
RE: SNAPSHOT design
-Original Message- From: Brett Porter [mailto:[EMAIL PROTECTED] Sent: Wednesday, March 23, 2005 1:47 PM To: Maven 2 Developers List Subject: Re: SNAPSHOT design Maczka Michal wrote: Is the symetry between local and remote repositories no longer a desgin goal? Isn't it possible to find a solution, which will enable at any moment in time to turn any local repository into a remote repository without any extra effort? To some extent, they are intentionally different, as the act of deployment is the promotion of a successful build up the ladder to release, where the local is your own build which is not in any way shared with anyone else as the work is not committed. If they were meant to be the same, there'd just be a deploy goal - no install. As for the actual differences, the reason for not using the same snapshot-version file was listed in the document - its timestamp is used to check whether to consult the remote repository again. The other more important one is to avoid the cost of filling up your disk with timestamped snapshots on install, which in turn means building tools to clean them out. I used this technique for a while, and I disliked it intensely. I'd prefer the same snapshot be overridden. This was ofen very useful feature for m1. I can't think of any decent use cases - please elaborate. The only time I used it was to use a fresh repo, and add the old one to my remote list to pull them across again one by one. But it was more related to development on maven rather than any normal use. I have seen quite often the situtation when one person in the compoany started to experiment with maven1 and after some minutes (when internet connection to ibiblio is slow it can ealsy take 30+ minutes) he has finally populated his local repository with artifacts which are needed to use maven plugins and by his project. Then it was very convient to just share his local repo with other collegues. But I am not sure if this is that important for snapshot artifcts. The additional files are markup - they don't stop it behaving as it should. If you request a SNAPSHOT, it will fall back to the file. If I remeber we had workable solution for that for m2. If you figure it out, let me know. I think it will be just enough to have also timestamped files in local repo and after sucessfully delivering newer artifact to first switch local pointer form old snapshot to new one and then delete the old artifact for saving diskspace (this could be optional). This will also remove the issue that old snapshots are currently deleted before the attempt to fetch the replacement is made. At the the moment in the case of the sitution when download or validation is failing you actually would have a missing dependency and can be left in void. This can be also importand when you will want to fetch both primary and secondary artifacts during the same transaction and only switch to newer snapshot if all artifacts were upgraded sucessfully. I am not sure if this is relevant remark here: prior to the release process you should have all artifacts and metadata locally and you should not be required to hit any remote repository. It means for example that if you would use convert-snapshots function of release plugin no transfer from remote repo should be required as you will fetch duplicates. Why some magic strings, which are concatenating timestamp and build number together are used? It's convenient to be able to reference it as an entire version string. It's not magic - I used a delimiter of - where you used a delimiter of \nbuild: . Would not it be better to directly use a properties file with for example the following (and possibly more) fields: timestamp: 20040101.100011 build: 10 deployer: brett profile: qa This is a version tracker that is meant to remain small. The many more fields you are alluding to probably all relate to auditing which I don't believe should be incorporated in this file as it will require history. For now, the username on the server is just as useful as putting it in here. Is this solution uniform with another places in maven where pointer files are needed (I mean e.g the strategy how the latest released plugin or another artifact is going to be discovered)? it applies equally to all artifacts - plugins, jars, etc. This I know. I asked if this is already aligned with for example the strategy for getting the latest release (not the snapshot) If I remember when we introduced the idea of pointer files they were also covering that use case. In m2 you need it for example to automatically download missing plugins (the name of the plugin was guessed from the name of the goal). I don't know if this feature is still preserved but the version was simply hardcoded. Michal
[jira] Reopened: (MNG-197) repository conversion tool
[ http://jira.codehaus.org/browse/MNG-197?page=history ] John Casey reopened MNG-197: wow, was that too soon to speak. It's almost akin to saying Well, it compiles, it must work. Alright, will not re-resolve until I get a successful run on the repo itself, including any distribution artifacts that conform to legal repo usage/naming. We will NOT be accommodating those projects who chose to abuse the old repo conventions. If this policy should be changed, let me know. repository conversion tool -- Key: MNG-197 URL: http://jira.codehaus.org/browse/MNG-197 Project: m2 Type: New Feature Components: repository-tools Reporter: Brett Porter Assignee: John Casey Fix For: 1.0-alpha-1 Time Spent: 13 hours Remaining: 0 minutes we need a way to covert repository/ibiblio-v1 into a new layout, as specified by: http://docs.codehaus.org/pages/viewpage.action?pageId=22230 It should be able to process files on the way with pluggable processors/validators and produce a small report. Basic validators: - check for a missing POM - check for an invalid format POM - check for missing/incorrect MD5, and create These would also need to be able to run on an existing repository as part of the same tool without doing a conversion. Other validators will be filed separately, but are probably not needed for v1. The repository converter will also need to ensure that it can convert v3 poms to v4. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira
[jira] Assigned: (MNG-62) Integration tests need to be made immune to changes in the repository layout
[ http://jira.codehaus.org/browse/MNG-62?page=history ] John Casey reassigned MNG-62: - Assign To: John Casey Integration tests need to be made immune to changes in the repository layout Key: MNG-62 URL: http://jira.codehaus.org/browse/MNG-62 Project: m2 Type: Task Reporter: Jason van Zyl Assignee: John Casey As soon as we change the repository layout the integration tests are going to be punched unless we make them independent of the repository layout. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira
[jira] Work logged: (MNG-119) sort out snapshot handling
[ http://jira.codehaus.org/browse/MNG-119?page=worklog#action_31283 ] Brett Porter logged work on MNG-119: Time Worked: 1 hour, 30 minutes Time Spent: 12600 (was: 7200) Remaining Estimate: 30600 (was: 36000) setup transformations and refactor some artifact code sort out snapshot handling -- Key: MNG-119 URL: http://jira.codehaus.org/browse/MNG-119 Project: m2 Type: Task Components: maven-core, maven-artifact Reporter: Brett Porter Assignee: Brett Porter Priority: Blocker Fix For: 1.0-alpha-1 Original Estimate: 12 hours Time Spent: 3 hours, 30 minutes Remaining: 8 hours, 30 minutes how snapshots will be downloaded, uploaded and handled is currently uncertain. This needs to be resolved urgently as we have frequent odd errors locally because an old snapshot is present, and it shouldn't be necessary to blow away a local repo so often. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira
Re: SNAPSHOT design
Maczka Michal wrote: I have seen quite often the situtation when one person in the compoany started to experiment with maven1 and after some minutes (when internet connection to ibiblio is slow it can ealsy take 30+ minutes) he has finally populated his local repository with artifacts which are needed to use maven plugins and by his project. Then it was very convient to just share his local repo with other collegues. tar works well too. This isn't something we want to be encouraging - every time they make a development build of a SNAPSHOT it would be pushed out to all their colleagues... I think it will be just enough to have also timestamped files in local repo and after sucessfully delivering newer artifact to first switch local pointer form old snapshot to new one and then delete the old artifact for saving diskspace (this could be optional). This feels even more like magic than my solution. Watch as I make your files disappear! :) However, this still doesn't cover the use cases of having the ability to check the remote repo for updates only on a periodic basis, because you'll not know whether it is a local or remote artifact. This will also remove the issue that old snapshots are currently deleted before the attempt to fetch the replacement is made. I don't know what you mean here. Are you sure you are talking about m2? This can be also importand when you will want to fetch both primary and secondary artifacts during the same transaction and only switch to newer snapshot if all artifacts were upgraded sucessfully. There is only one pom between them, and the snapshot version is associated with that, so they will need to be resolved together. Since we aren't properly handling any derived artifacts until alpha-2, it isn't in the design, but following from Vincent's mail yesterday, I'll add it to the not yet tackled list. I am not sure if this is relevant remark here: prior to the release process you should have all artifacts and metadata locally and you should not be required to hit any remote repository. It means for example that if you would use convert-snapshots function of release plugin no transfer from remote repo should be required as you will fetch duplicates. I'm not sure why this has any special handling. If you are assuming that everything is already present, then just don't declare @requiresDependencyResolution on the mojo. Personally, I think it should so it can build from a clean environment, and you're going to trust the user to know what they are getting, and not test, then release after some other builds have been promoted and not test later. I asked if this is already aligned with for example the strategy for getting the latest release (not the snapshot) If I remember when we introduced the idea of pointer files they were also covering that use case. In m2 you need it for example to automatically download missing plugins (the name of the plugin was guessed from the name of the goal). I don't know if this feature is still preserved but the version was simply hardcoded. Read my reply to Vincent's mail. - Brett
cvs commit: maven-components/maven-artifact/src/main/resources/META-INF/plexus components.xml
brett 2005/03/23 21:18:41
Modified:maven-artifact/src/main/java/org/apache/maven/artifact/deployer
DefaultArtifactDeployer.java
maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager
ArtifactHandlerManager.java
DefaultArtifactHandlerManager.java
maven-artifact/src/main/java/org/apache/maven/artifact/installer
DefaultArtifactInstaller.java
maven-artifact/src/main/java/org/apache/maven/artifact/manager
DefaultWagonManager.java
maven-artifact/src/main/java/org/apache/maven/artifact/resolver
DefaultArtifactResolver.java
maven-artifact/src/main/resources/META-INF/plexus
components.xml
Log:
correct placement of transformations
Revision ChangesPath
1.5 +5 -3
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
Index: DefaultArtifactDeployer.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultArtifactDeployer.java 24 Mar 2005 05:01:05 - 1.4
+++ DefaultArtifactDeployer.java 24 Mar 2005 05:18:40 - 1.5
@@ -23,10 +23,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import java.io.File;
+import java.util.List;
-/**
- * @todo snapshot notions need to be dealt with in one place.
- */
public class DefaultArtifactDeployer
implements ArtifactDeployer
{
@@ -34,6 +32,8 @@
private ArtifactHandlerManager artifactHandlerManager;
+private List artifactTransformations;
+
public void deploy( String basedir, Artifact artifact,
ArtifactRepository deploymentRepository )
throws ArtifactDeploymentException
{
@@ -54,6 +54,8 @@
public void deploy( File source, Artifact artifact, ArtifactRepository
deploymentRepository )
throws ArtifactDeploymentException
{
+// TODO: perform transformations
+
try
{
wagonManager.putArtifact( source, artifact, deploymentRepository
);
1.6 +1 -10
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java
Index: ArtifactHandlerManager.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ArtifactHandlerManager.java 23 Mar 2005 08:42:56 - 1.5
+++ ArtifactHandlerManager.java 24 Mar 2005 05:18:40 - 1.6
@@ -16,10 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import
org.apache.maven.artifact.repository.layout.ArtifactPathFormatException;
/**
* @author a href=mailto:[EMAIL PROTECTED]Jason van Zyl/a
@@ -31,10 +28,4 @@
ArtifactHandler getArtifactHandler( String type )
throws ArtifactHandlerNotFoundException;
-
-String getLocalRepositoryArtifactPath( Artifact artifact,
ArtifactRepository localRepository )
-throws ArtifactPathFormatException;
-
-String getRemoteRepositoryArtifactPath( Artifact artifact,
ArtifactRepository remoteRepository )
-throws ArtifactPathFormatException;
}
\ No newline at end of file
1.13 +1 -36
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
Index: DefaultArtifactHandlerManager.java
===
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultArtifactHandlerManager.java23 Mar 2005 15:10:38 -
1.12
+++ DefaultArtifactHandlerManager.java24 Mar 2005 05:18:40 -
1.13
@@ -16,15 +16,9 @@
* limitations under the License.
*/
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import
org.apache.maven.artifact.repository.layout.ArtifactPathFormatException;
import
[jira] Commented: (MPPDF-30) The first row of table is not rendered
[ http://jira.codehaus.org/browse/MPPDF-30?page=comments#action_31289 ] Lukas Theussl commented on MPPDF-30: You are not missing something, the same issue affects the pdf version of the maven documentation (http://maven.apache.org/maven.pdf): every table is missing its first row! (check for instance p12 of maven.pdf). I tracked down the problem to line 206 of fo-tables.xslt: xsl:apply-templates select=tr[position()!=1][count(*)!=count(th)] and resolved it by removing the [position()!=1] part: xsl:apply-templates select=tr[count(*)!=count(th)] Now my tables show up correctly in the pdf output. However, I don't know what the purpose of that test was and if I am not breaking something else by removing it. The first row of table is not rendered -- Key: MPPDF-30 URL: http://jira.codehaus.org/browse/MPPDF-30 Project: maven-pdf-plugin Type: Bug Versions: 2.2 Environment: maven-pdf-plugin-2.2.1 Reporter: Cservenak, Tamas Assignee: Arnaud HERITIER I'm not sure is this FOP or maven-pdf issue... sory for bothering if this is not the right place... In XDOC defined tables like: table trtdQuote:/td/tr tr td There's a common misconception that stateless session beans cannot hold state. They are stateless because they do not hold state between method invocations ion behalf of any single client/i. They are free to maintain internal state - for example, to cache resources and data used on behalf of iall/i the clients they serve. /td /tr trtd ibRod Johnson/b, J2EE Design and Development, Wroxbooks/i /td/tr /table the first row (the Quote) is not rendered. This applies to all tables Am i missing something? -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r158833 - maven/maven-1/plugins/trunk/pdf/xdocs/goals.xml
Author: aheritier Date: Wed Mar 23 13:24:12 2005 New Revision: 158833 URL: http://svn.apache.org/viewcvs?view=revrev=158833 Log: Indent with 2 spaces Modified: maven/maven-1/plugins/trunk/pdf/xdocs/goals.xml Modified: maven/maven-1/plugins/trunk/pdf/xdocs/goals.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/xdocs/goals.xml?view=diffr1=158832r2=158833 == --- maven/maven-1/plugins/trunk/pdf/xdocs/goals.xml (original) +++ maven/maven-1/plugins/trunk/pdf/xdocs/goals.xml Wed Mar 23 13:24:12 2005 @@ -16,49 +16,49 @@ * limitations under the License. */ -- - document -properties -titleMaven Ant Plug-in Goals/title -author email=[EMAIL PROTECTED]dIon Gillard/author -/properties -body -section name=Goals -table -tr -thGoal/th -thDescription/th -/tr -tr -tdfo/td -td + properties +titleMaven PDF Plug-in Goals/title +author email=[EMAIL PROTECTED]dIon Gillard/author +author email=[EMAIL PROTECTED]Arnaud Heritier/author + /properties + body +section name=Goals + table +tr + thGoal/th + thDescription/th +/tr +tr + tdfo/td + td This simply pre-requisites the codefo:fo/code goal. /td -/tr -tr -tdfo:fo/td -td +/tr +tr + tdfo:fo/td + td Generates an fo xml document from the codenavigation.xml/code file supplied as part of the documentation. Please note that as yet, no sanity check is done to make sure this file exists. /td -/tr -tr -tdpdf/td -td +/tr +tr + tdpdf/td + td This is the default goal of the plugin and simply pre-requisites the codepdf:pdf/code goal. /td -/tr -tr -tdpdf:pdf/td -td +/tr +tr + tdpdf:pdf/td + td Generates a PDF document containing all project documentation. The PDF is generated from the .fo file generated in the codefo:fo/code goal. /td -/tr -/table -/section -/body +/tr + /table +/section + /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r158834 - maven/maven-1/plugins/trunk/pdf/project.xml
Author: aheritier
Date: Wed Mar 23 13:26:47 2005
New Revision: 158834
URL: http://svn.apache.org/viewcvs?view=revrev=158834
Log:
begin to work on the next release
Modified:
maven/maven-1/plugins/trunk/pdf/project.xml
Modified: maven/maven-1/plugins/trunk/pdf/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/project.xml?view=diffr1=158833r2=158834
==
--- maven/maven-1/plugins/trunk/pdf/project.xml (original)
+++ maven/maven-1/plugins/trunk/pdf/project.xml Wed Mar 23 13:26:47 2005
@@ -1,5 +1,4 @@
?xml version=1.0 encoding=UTF-8?
-
!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -17,12 +16,11 @@
* limitations under the License.
*/
--
-
project
extend${basedir}/../plugin-parent/project.xml/extend
artifactIdmaven-pdf-plugin/artifactId
nameMaven PDF Plug-in/name
- currentVersion2.2.1/currentVersion
+ currentVersion2.2.2-SNAPSHOT/currentVersion
descriptionPDF Documentation generator/description
shortDescriptionGenerator of project documentation in PDF
Format./shortDescription
urlhttp://maven.apache.org/reference/plugins/pdf//url
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r158836 - maven/maven-1/plugins/trunk/pdf/src/plugin-test/maven.xml
Author: aheritier
Date: Wed Mar 23 13:38:16 2005
New Revision: 158836
URL: http://svn.apache.org/viewcvs?view=revrev=158836
Log:
Fix : copy users documentation from each subproject to build the pdf
Modified:
maven/maven-1/plugins/trunk/pdf/src/plugin-test/maven.xml
Modified: maven/maven-1/plugins/trunk/pdf/src/plugin-test/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/src/plugin-test/maven.xml?view=diffr1=158835r2=158836
==
--- maven/maven-1/plugins/trunk/pdf/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/pdf/src/plugin-test/maven.xml Wed Mar 23
13:38:16 2005
@@ -32,6 +32,15 @@
/ant:fileset
/ant:copy
/j:forEach
+!-- We copy the generated files to use them in the pdf --
+j:forEach var=reactorProject items=${multiprojects}
+ j:set var=fromDir
value=${reactorProject.context.getVariable('maven.docs.src')}/
+ ant:copy
todir=${maven.build.dir}/pdf/${maven.multiproject.aggregateDir}${reactorProject.artifactId}
+ant:fileset dir=${fromDir} force=true
+ ant:include name=**/*.*/
+/ant:fileset
+ /ant:copy
+/j:forEach
attainGoal name=pdf/
assert:assertFileExists file=${maven.docs.dest}/${pom.artifactId}.pdf/
/goal
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r158841 - in maven/maven-1/plugins/trunk/pdf: src/plugin-resources/fo-tables.xslt xdocs/changes.xml
Author: aheritier Date: Wed Mar 23 14:08:50 2005 New Revision: 158841 URL: http://svn.apache.org/viewcvs?view=revrev=158841 Log: MPPDF-30 : The first row of table is not rendered. Modified: maven/maven-1/plugins/trunk/pdf/src/plugin-resources/fo-tables.xslt maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml Modified: maven/maven-1/plugins/trunk/pdf/src/plugin-resources/fo-tables.xslt URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/src/plugin-resources/fo-tables.xslt?view=diffr1=158840r2=158841 == --- maven/maven-1/plugins/trunk/pdf/src/plugin-resources/fo-tables.xslt (original) +++ maven/maven-1/plugins/trunk/pdf/src/plugin-resources/fo-tables.xslt Wed Mar 23 14:08:50 2005 @@ -203,7 +203,7 @@ /fo:table-footer !-- Process any tbody/tr or tr records -- fo:table-body -xsl:apply-templates select=tr[position()!=1][count(*)!=count(th)] +xsl:apply-templates select=tr[count(*)!=count(th)] xsl:with-param name=spacerSpanColumns select=$spacerSpanColumns/ /xsl:apply-templates /fo:table-body Modified: maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml?view=diffr1=158840r2=158841 == --- maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml (original) +++ maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml Wed Mar 23 14:08:50 2005 @@ -1,5 +1,4 @@ ?xml version=1.0 encoding=UTF-8? - !-- /* * Copyright 2001-2004 The Apache Software Foundation. @@ -17,13 +16,15 @@ * limitations under the License. */ -- - document properties titleChanges/title author email=[EMAIL PROTECTED]dIon Gillard/author /properties body +release version=2.2.2 date=In SVN + action dev=aheritier type=fix issue=MPPDF-30 due-to=Lukas TheusslThe first row of table is not rendered./action +/release release version=2.2.1 date=2004-10-30 action dev=aheritier type=fix issue=MPPDF-21The content of style tag was printed on the PDF file./action action dev=aheritier type=fix issue=MPPDF-16 due-to=Archimedes TrajanoJDK 5.0 incompatibility. XSLT is now called from Jelly./action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r158842 - maven/maven-1/plugins/trunk/pdf/src/plugin-test/xdocs/navigation.xml
Author: aheritier
Date: Wed Mar 23 14:09:11 2005
New Revision: 158842
URL: http://svn.apache.org/viewcvs?view=revrev=158842
Log:
Fix indent
Modified:
maven/maven-1/plugins/trunk/pdf/src/plugin-test/xdocs/navigation.xml
Modified: maven/maven-1/plugins/trunk/pdf/src/plugin-test/xdocs/navigation.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/src/plugin-test/xdocs/navigation.xml?view=diffr1=158841r2=158842
==
--- maven/maven-1/plugins/trunk/pdf/src/plugin-test/xdocs/navigation.xml
(original)
+++ maven/maven-1/plugins/trunk/pdf/src/plugin-test/xdocs/navigation.xml Wed
Mar 23 14:09:11 2005
@@ -21,14 +21,14 @@
links/
menu name=Overview
#if ($overviewPageCreate == true )
- item name=${overviewPageLinkTitle}
href=${overviewPageLink}.html/
+item name=${overviewPageLinkTitle} href=${overviewPageLink}.html/
#end
/menu
menu name=Sub-Projects
#foreach ($reactorProject in $multiprojects)
- item name=$reactorProject.name
href=/${aggregateDir}${reactorProject.artifactId}/index.html/
- item name=$reactorProject.name test
href=/${aggregateDir}${reactorProject.artifactId}/test.html/
+item name=$reactorProject.name
href=/${aggregateDir}${reactorProject.artifactId}/index.html/
+item name=$reactorProject.name test
href=/${aggregateDir}${reactorProject.artifactId}/test.html/
#end
-/menu
+/menu
/body
/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MPPDF-30) The first row of table is not rendered
[ http://jira.codehaus.org/browse/MPPDF-30?page=history ] Arnaud HERITIER closed MPPDF-30: Fix Version: 2.2.2 Resolution: Fixed Fixed, you can download it with : maven plugin:download -Dmaven.repo.remote=http://cvs.apache.org/repository -DgroupId=maven -DartifactId=maven-pdf-plugin -Dversion=SNAPSHOT The first row of table is not rendered -- Key: MPPDF-30 URL: http://jira.codehaus.org/browse/MPPDF-30 Project: maven-pdf-plugin Type: Bug Versions: 2.2 Environment: maven-pdf-plugin-2.2.1 Reporter: Cservenak, Tamas Assignee: Arnaud HERITIER Fix For: 2.2.2 I'm not sure is this FOP or maven-pdf issue... sory for bothering if this is not the right place... In XDOC defined tables like: table trtdQuote:/td/tr tr td There's a common misconception that stateless session beans cannot hold state. They are stateless because they do not hold state between method invocations ion behalf of any single client/i. They are free to maintain internal state - for example, to cache resources and data used on behalf of iall/i the clients they serve. /td /tr trtd ibRod Johnson/b, J2EE Design and Development, Wroxbooks/i /td/tr /table the first row (the Quote) is not rendered. This applies to all tables Am i missing something? -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Reopened: (MPPDF-16) Maven PDF fails
[ http://jira.codehaus.org/browse/MPPDF-16?page=history ] Arnaud HERITIER reopened MPPDF-16: -- reopen to change fixed release Maven PDF fails --- Key: MPPDF-16 URL: http://jira.codehaus.org/browse/MPPDF-16 Project: maven-pdf-plugin Type: Bug Versions: 2.0, 2.2, 2.1 Environment: Maven 1.0, Linux. Reporter: bflorat Assignee: Arnaud HERITIER Priority: Blocker Fix For: 2.2.1 Attachments: pdf.patch maven pdf __ __ | \/ |__ _Apache__ ___ | |\/| / _` \ V / -_) ' \ ~ intelligent projects ~ |_| |_\__,_|\_/\___|_||_| v. 1.0 Plugin cache will be regenerated build:start: xdoc:init: pdf:init: pdf:prepare: [copy] Copying 14 files to /data/projects/jajuk/maven_rep/target/pdf fo:fo: [echo] Generating /data/projects/jajuk/maven_rep/target/docs/project.fo ... [style] Processing /data/projects/jajuk/maven_rep/xdocs/navigation.xml to /data/projects/jajuk/maven_rep/target/pdf/project.fo [style] Loading stylesheet /home/bflorat/.maven/cache/maven-pdf-plugin-2.1/plugin-resources/project2fo.xslt BUILD FAILED File.. /home/bflorat/.maven/cache/maven-pdf-plugin-2.1/plugin.jelly Element... style Line.. 70 Column 113 Provider org.apache.xalan.processor.TransformerFactoryImpl not found Total time: 14 seconds Finished at: Fri Oct 08 21:17:20 CEST 2004 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MPPDF-37) Page numbering not correct with more than 10 items in menu
Page numbering not correct with more than 10 items in menu --- Key: MPPDF-37 URL: http://jira.codehaus.org/browse/MPPDF-37 Project: maven-pdf-plugin Type: Bug Versions: 2.2 Environment: any Reporter: Lukas Theussl Assigned to: Arnaud HERITIER Priority: Minor With the following menus in my navigation.xml file: menu name=User Guide item name=Home href=/index.html/ item name=Introduction href=/intro.html/ item name=Installation href=/install.html/ item name=Screen Elements href=/screen.html/ item name=Usagehref=/usage.html/ item name=Known Problems href=/problems.html/ item name=Documentationhref=/doc.html/ item name=History href=/history.html/ item name=Credits href=/credits.html/ item name=Style Files href=/style.html/ item name=License href=/license.html/ /menu menu name=Appendix item name=Bibliography href=/bib.html/ /menu the page number of the pdf file gets reset to one at the 11th section (License). Interestingly, if I move 10 items from the first into the second menu, the page numbering stays correct, so it only seems to affect the first menu. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Reopened: (MPPDF-21) PDF print style tag content
[ http://jira.codehaus.org/browse/MPPDF-21?page=history ]
Arnaud HERITIER reopened MPPDF-21:
--
reopen to change fix version
PDF print style tag content
---
Key: MPPDF-21
URL: http://jira.codehaus.org/browse/MPPDF-21
Project: maven-pdf-plugin
Type: Bug
Versions: 2.2
Environment: Maven 1.0 with xdoc plugin 1.9
Reporter: Siveton Vincent
Assignee: Arnaud HERITIER
Fix For: 2.2.1
My XDOC XML file contains a style tag to define an image style:
style type=text/css
img.screenshot {
padding: 10px;
}
/style
img class=screenshot src=images/logos/MYLOGO.gif/
The pdf plugin prints correctly my image but prints over the image:
img.screenshot { padding: 10px; }
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
http://jira.codehaus.org/secure/Administrators.jspa
-
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MPPDF-21) PDF print style tag content
[ http://jira.codehaus.org/browse/MPPDF-21?page=history ]
Arnaud HERITIER closed MPPDF-21:
Fix Version: (was: 2.3)
2.2.1
Resolution: Fixed
Fixed in 2.2.1
PDF print style tag content
---
Key: MPPDF-21
URL: http://jira.codehaus.org/browse/MPPDF-21
Project: maven-pdf-plugin
Type: Bug
Versions: 2.2
Environment: Maven 1.0 with xdoc plugin 1.9
Reporter: Siveton Vincent
Assignee: Arnaud HERITIER
Fix For: 2.2.1
My XDOC XML file contains a style tag to define an image style:
style type=text/css
img.screenshot {
padding: 10px;
}
/style
img class=screenshot src=images/logos/MYLOGO.gif/
The pdf plugin prints correctly my image but prints over the image:
img.screenshot { padding: 10px; }
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
http://jira.codehaus.org/secure/Administrators.jspa
-
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MPPDF-16) Maven PDF fails
[ http://jira.codehaus.org/browse/MPPDF-16?page=history ] Arnaud HERITIER closed MPPDF-16: Fix Version: (was: 2.3) 2.2.1 Resolution: Fixed Fixed in 2.2.1 Maven PDF fails --- Key: MPPDF-16 URL: http://jira.codehaus.org/browse/MPPDF-16 Project: maven-pdf-plugin Type: Bug Versions: 2.0, 2.2, 2.1 Environment: Maven 1.0, Linux. Reporter: bflorat Assignee: Arnaud HERITIER Priority: Blocker Fix For: 2.2.1 Attachments: pdf.patch maven pdf __ __ | \/ |__ _Apache__ ___ | |\/| / _` \ V / -_) ' \ ~ intelligent projects ~ |_| |_\__,_|\_/\___|_||_| v. 1.0 Plugin cache will be regenerated build:start: xdoc:init: pdf:init: pdf:prepare: [copy] Copying 14 files to /data/projects/jajuk/maven_rep/target/pdf fo:fo: [echo] Generating /data/projects/jajuk/maven_rep/target/docs/project.fo ... [style] Processing /data/projects/jajuk/maven_rep/xdocs/navigation.xml to /data/projects/jajuk/maven_rep/target/pdf/project.fo [style] Loading stylesheet /home/bflorat/.maven/cache/maven-pdf-plugin-2.1/plugin-resources/project2fo.xslt BUILD FAILED File.. /home/bflorat/.maven/cache/maven-pdf-plugin-2.1/plugin.jelly Element... style Line.. 70 Column 113 Provider org.apache.xalan.processor.TransformerFactoryImpl not found Total time: 14 seconds Finished at: Fri Oct 08 21:17:20 CEST 2004 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MPPDF-31) Cannot insert logo image to PDF
[ http://jira.codehaus.org/browse/MPPDF-31?page=comments#action_31301 ]
Lukas Theussl commented on MPPDF-31:
You probably don't see that because the logo locations are overridden in the
project.properties file (maven.pdf.projectLogo and maven.pdf.companyLogo), at
least that's the case with the maven project. This can actually be used as a
workaround, or use a maven.pdf.navigationFile with relative paths for the logos.
However, if you want to stay consistent with the site navigation file, then you
cannot use the maven:makeAbsolutePath tag, because the slash in the beginning
will make it be interpreted as an absolute path already.
Cannot insert logo image to PDF
---
Key: MPPDF-31
URL: http://jira.codehaus.org/browse/MPPDF-31
Project: maven-pdf-plugin
Type: Bug
Versions: 2.2
Environment: Windows XP professional version 2002 and
Linux Red Hat / Maven 1.0.2 / maven-pdf-plugin-2.2.1
Reporter: Oleg F. Vlasenko
Assignee: Arnaud HERITIER
Fragment of text of project.xml:
?xml version=1.0 encoding=UTF-8?
project
...
organization
logo/images/XXX.gif/logo
/organization
logo/images/YYY.gif/logo
...
Fragment of text of maven.xml:
postGoal name=site
attainGoal name=pdf/
/postGoal
In compile time the error is generated.
...
[java] [ERROR] Error while creating area : Error while recovering Image
Informations (file:/images/YYY.gif) : /images/YYY.gif (No such file or
directory)
...
As I understand the problem is connected with following code:
j:if test=not ${maven.pdf.projectLogo.startsWith('http://')}
maven:makeAbsolutePath
var=maven.pdf.projectLogo
basedir=${maven.xdoc.src}
path=${maven.pdf.projectLogo}
trim=true/
/j:if
logo/images/YYY.gif/logo includes the path which is absolute. And so the
prefix ${maven.xdoc.src}is not concatenated to the path. And so the file
YYY.gif cannot be found.
I have simplified code and YYY.gif was found:
j:if test=${not maven.pdf.companyLogo.startsWith('http://')}
j:set
var=maven.pdf.companyLogo${maven.xdoc.src}${maven.pdf.companyLogo}/j:set
/j:if
I think this problem can be resolved by more general way.
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
http://jira.codehaus.org/secure/Administrators.jspa
-
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MPPMD-15) Upgrade pmd version to 3.0
Upgrade pmd version to 3.0 -- Key: MPPMD-15 URL: http://jira.codehaus.org/browse/MPPMD-15 Project: maven-pmd-plugin Type: Improvement Versions: 1.6 Reporter: Julien Kirch Current mpd version is 1.9, please update to 3.0, new version includes the usual stuff (new rules, optimizations and so on) API didn't changed, only dependency version change seems to be required. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
