jdcasey | 1 Apr 02:24
Picon
Favicon

cvs commit: maven-components/sandbox/repoclean pom.xml install.sh

jdcasey     2005/03/31 16:24:45

  Modified:    sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover
                        DefaultArtifactDiscoverer.java
                        LegacyArtifactDiscoverer.java
                        ArtifactDiscoverer.java
               sandbox/repoclean/src/main/resources/META-INF/plexus
                        components.xml
               maven-artifact/src/main/java/org/apache/maven/artifact/construction
                        ArtifactConstructionSupport.java
               sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/report
                        Reporter.java
               sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/rewrite
                        V3PomRewriter.java V4PomRewriter.java
               sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean
                        RepositoryCleaner.java Main.java
               sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate
                        PomV3ToV4Translator.java
               sandbox/repoclean pom.xml install.sh
  Added:       sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact
                        DtdHandler.java TldHandler.java SarHandler.java
                        TgzDistroHandler.java EarHandler.java
                        JarDistroHandler.java ZipDistroHandler.java
                        RarHandler.java
  Log:
  o Reworked the artifact parsing code for the legacy artifact discoverer.
  o Getting OutOfMemoryError when running against ibiblio-v1.
  
  Revision  Changes    Path
  1.1                  maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/DtdHandler.java
(Continue reading)

brett | 1 Apr 02:32
Picon
Favicon
Gravatar

cvs commit: maven-components/sandbox/repoclean install.sh

brett       2005/03/31 16:32:07

  Modified:    sandbox/repoclean install.sh
  Log:
  fix error in cygwin

  Revision  Changes    Path
  1.4       +1 -1      maven-components/sandbox/repoclean/install.sh

  Index: install.sh
  ===================================================================
  RCS file: /home/cvs/maven-components/sandbox/repoclean/install.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- install.sh	1 Apr 2005 00:24:45 -0000	1.3
  +++ install.sh	1 Apr 2005 00:32:07 -0000	1.4
  @@ -1,6 +1,6 @@
   #!/bin/sh

  -if [ $# == 0 ]; then
  +if [ $# -eq 0 ]; then

       echo ""
       echo "*******************"

brett | 1 Apr 02:35
Picon
Favicon
Gravatar

cvs commit: maven-components/sandbox/repoclean/src/main/bash repoclean.sh

brett       2005/03/31 16:35:52

  Modified:    sandbox/repoclean/src/main/bash repoclean.sh
  Log:
  fix for cygwin

  Revision  Changes    Path
  1.3       +9 -0      maven-components/sandbox/repoclean/src/main/bash/repoclean.sh

  Index: repoclean.sh
  ===================================================================
  RCS file: /home/cvs/maven-components/sandbox/repoclean/src/main/bash/repoclean.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- repoclean.sh	23 Mar 2005 04:53:30 -0000	1.2
  +++ repoclean.sh	1 Apr 2005 00:35:51 -0000	1.3
  @@ -10,4 +10,13 @@
   CP=$CP:./lib/wagon-file-1.0-alpha-2-SNAPSHOT.jar
   CP=$CP:./lib/wagon-http-lightweight-1.0-alpha-2-SNAPSHOT.jar

  +cygwin=false
  +case "`uname`" in
  +  CYGWIN*) cygwin=true ;;
  +esac
  +
  +if [ $cygwin ]; then
  +  CP=`cygpath -pw $CP`
  +fi
  +
(Continue reading)

brett | 1 Apr 03:01
Picon
Favicon
Gravatar

cvs commit: maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover LegacyArtifactDiscoverer.java

brett       2005/03/31 17:01:20

  Modified:    sandbox/repoclean/src/main/bash repoclean.sh
               sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover
                        LegacyArtifactDiscoverer.java
  Log:
  fix for windows, add profiling if needed

  Revision  Changes    Path
  1.4       +10 -1     maven-components/sandbox/repoclean/src/main/bash/repoclean.sh

  Index: repoclean.sh
  ===================================================================
  RCS file: /home/cvs/maven-components/sandbox/repoclean/src/main/bash/repoclean.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- repoclean.sh	1 Apr 2005 00:35:51 -0000	1.3
  +++ repoclean.sh	1 Apr 2005 01:01:20 -0000	1.4
  @@ -19,4 +19,13 @@
     CP=`cygpath -pw $CP`
   fi

  -java -classpath ${CP} org.apache.maven.tools.repoclean.Main $* | tee repoclean-log.txt
  +JAVA_OPTS=""
  +
  +if [ "$1" == "profile" ]; then
  +  JAVA_OPTS="-agentlib:yjpagent=onexit=memory"
  +  # You need to customise this path for your environment
  +  export PATH=$PATH:/usr/local/yourkit/bin/win32
(Continue reading)

jvanzyl | 1 Apr 03:11
Brett Porter | 1 Apr 04:42
Picon
Favicon
Gravatar

further changes to the new repository layout

I've just updated the confluence document (hopefully for the last time)
to work around an issue.

Artifact POMs now have the form:

/groupId/artifactId-version.pom

instead of:

/groupId/artifactId-version.jar.pom

This was necessary, as otherwise you would only ever be able to inherit
from a pom which had packaging=pom (generally a good practice anyway),
otherwise you'd not be able to find it as no type is specified in <parent/>.

This is now more consistent (the POM always has the same filename), and
you can still find the POM for the JAR easily.

It means that you cannot have two different projects with the same group
ID and artifact ID, but different packaging. I think this is reasonable
- I've never seen a use case for it. The commonly given TLD thing is
covered because it should have the same POM as the JAR it sprang from -
so the ids can be the same.

Anyway, check the document and let me know if there are any issues. This
is actually how it had inadvertently been implemented so it will save
some work :)

- Brett

(Continue reading)

jdcasey | 1 Apr 04:45
Picon
Favicon

cvs commit: maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate PomV3ToV4Translator.java

jdcasey     2005/03/31 18:45:05

  Modified:    sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/digest
                        ArtifactDigestVerifier.java
               maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout
                        LegacyRepositoryLayout.java
                        DefaultRepositoryLayout.java
               sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean
                        RepositoryCleaner.java Main.java
               sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate
                        PomV3ToV4Translator.java
  Log:
  o Updated the repo layout classes to use direct string concatenation rather than StringUtils.replace()
which is not useful because the layout is non-varying.
  o Repoclean still not working with the new artifact/artifactmetadata stuff...the above modifications
to the repo layout classes was primarily meant to improve performance when using repoclean.

  Revision  Changes    Path
  1.2       +12 -51    maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/digest/ArtifactDigestVerifier.java

  Index: ArtifactDigestVerifier.java
  ===================================================================
  RCS file: /home/cvs/maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/digest/ArtifactDigestVerifier.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactDigestVerifier.java	23 Mar 2005 04:53:29 -0000	1.1
  +++ ArtifactDigestVerifier.java	1 Apr 2005 02:45:05 -0000	1.2
  @@ -1,14 +1,5 @@
   package org.apache.maven.tools.repoclean.digest;
(Continue reading)

brett | 1 Apr 04:53
Picon
Favicon
Gravatar

cvs commit: maven-components/maven-core/src/main/java/org/apache/maven DefaultMaven.java

brett       2005/03/31 18:53:10

  Modified:    maven-core/src/main/java/org/apache/maven DefaultMaven.java
  Log:
  add comment

  Revision  Changes    Path
  1.44      +2 -1      maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

  Index: DefaultMaven.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- DefaultMaven.java	21 Mar 2005 08:18:33 -0000	1.43
  +++ DefaultMaven.java	1 Apr 2005 02:53:10 -0000	1.44
  @@ -166,6 +166,7 @@

               if ( project.getModules() != null && !project.getModules().isEmpty() && recursive )
               {
  +                // TODO: Really should fail if it was not? What if it is aggregating - eg "ear"?
                   project.setPackaging( "pom" );

                   String includes = StringUtils.join( project.getModules().iterator(), "/pom.xml," ) + "/pom.xml";

jvanzyl | 1 Apr 05:08
brett | 1 Apr 06:09
Picon
Favicon
Gravatar

cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout DefaultRepositoryLayout.java LegacyRepositoryLayout.java AbstractArtifactRepositoryLayout.java

brett       2005/03/31 20:09:37

  Modified:    maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout
                        DefaultRepositoryLayout.java
                        LegacyRepositoryLayout.java
  Removed:     maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout
                        AbstractArtifactRepositoryLayout.java
  Log:
  remove unneeded code

  Revision  Changes    Path
  1.8       +0 -13     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java

  Index: DefaultRepositoryLayout.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultRepositoryLayout.java	1 Apr 2005 02:45:05 -0000	1.7
  +++ DefaultRepositoryLayout.java	1 Apr 2005 04:09:36 -0000	1.8
  @@ -68,19 +68,6 @@
       {
           Artifact artifact = metadata.getArtifact();

  -        ArtifactHandler artifactHandler = null;
  -
  -        try
  -        {
  -            // TODO: this is a poor excuse to have this method throwing an exception. Validate the artifact first,
(Continue reading)


Gmane