Commit Graph

45 Commits

Author SHA1 Message Date
Brett Leslie Porter 511af3d3e2 PR: MNG-596
add XSD definition to m2 poms and archetypes



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220079 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:58:42 +00:00
John Dennis Casey e84dc8c753 Fixing reporting problem due to inlining the old per-artifact reports into the repository report. Turned a couple of ERROR's to WARNING's.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189788 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 18:47:37 +00:00
John Dennis Casey 8095007690 Fixing nested iterator confusion that was leading to NoSuchElementException
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189787 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 18:41:31 +00:00
John Dennis Casey d1e7f4d5ad Solving MRM-4. If the source pom doesn't exist, it'll check for the existence of the target pom before writing the skeleton.
It'll always try to verify/patch the MD5/SHA1 for the target pom.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189785 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 18:19:21 +00:00
John Dennis Casey 0db2b646d2 JIRA issues fixed:
MRM-1
MRM-7
MRM-3
MRM-5
o Pipelining all logging through a single Reporter now, to repository.report.txt
o Disabled WARNING reports by default, add 'reportWarnings=true' to config file to enable them.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189629 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 20:19:41 +00:00
John Dennis Casey 8833620278 o Added support to RewritePhase of repoclean to copy -SNAPSHOT.version.txt and -RELEASE.version.txt (or whatever it's called) using ArtifactMetadata, where these files exist in the source repo.
o Reformatted mojo annotation doco to tabular format.
o Committed a start to the plugin-overview (developer's PoV on this)...it's just an outline with an incomplete introduction for now, but it's still a start.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169873 13f79535-47bb-0310-9956-ffa450edef68
2005-05-12 18:59:54 +00:00
John Dennis Casey 7eda955b1d o Cleaned up a couple of things in repoclean that broke with the last update.
o Added concept of ErrorDiagnoser to help interpret errors and provide user feedback
o Added PluginParameterException to provide richer information than simply PluginConfigurationException (it's derived from PluginConfigurationException)
o Added implementations of ErrorDiagnoser for artifact resolution and plugin configuration handling.
o Modified DefaultMaven's logFailure(..) method to use errorDiagnosers Map (injected via Plexus)

I approached the plugin parameter expression/name feedback in this way, as it seems like a general pattern for interpreting errors without embedding this logic deep within the app itself. Feel free to rollback if this causes issues.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169379 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 23:30:01 +00:00
John Dennis Casey 17c195e01d o Fixed NPE in LegacyArtifactDiscoverer when the resulting Artifact from the buildArtifact() method is null (was an errant debug statement)
o Removed requirement and attempt at copying wagon-http-lightweight when ./install.sh runs.
o Cleaned up the output from ./repoclean.sh to remove a couple debug lines
o Fixed components.xml to comply with the new component refactorings (simplified RepositoryCleaner using two new processing phases: DiscoveryPhase and RewritePhase, with NO common interface)

We should be ready to process mixed bags of m1 and m2 poms in the same source repo now!

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169330 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 15:36:32 +00:00
John Dennis Casey 4e19394875 Adding the phases as promised.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169042 13f79535-47bb-0310-9956-ffa450edef68
2005-05-07 05:45:57 +00:00
John Dennis Casey 099c5383c2 o Refactored RepositoryCleaner to use DiscoveryPhase and RewritePhase.
o Added the ability to read a pom and figure out whether it's a v4 pom (based on presence of modelVersion)
o Added a more accurate counter for artifacts that are actually rewritten successfully, rather than just the ones that enter the rewriting process.
o Probably need to add the phases still...


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169041 13f79535-47bb-0310-9956-ffa450edef68
2005-05-07 05:45:20 +00:00
John Dennis Casey 6dbf18fceb Fixed handling of <id>ant+optional</id> in pom-level info as well as dependencies.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168631 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 17:41:40 +00:00
John Dennis Casey 1755900b98 Cleaned up the sysout stuff to make the logs quieter when things are basically alright.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168062 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 03:14:35 +00:00
John Dennis Casey e7d6dcf398 Fixed email problem (misuse of API); fixed digest generation and handling; updated the plexus-container-default dependency version to 1.0-alpha-3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164943 13f79535-47bb-0310-9956-ffa450edef68
2005-04-27 04:00:29 +00:00
John Dennis Casey 6e51d420ed o fixed conditions under which error emails should be sent
o fixed emailing to contain a link to the report
o reformatted using IDEA
o removed directory tracking from transactions, b/c undo order is too tricky for now
o adjusted code to maven-artifact (post maven-project creation) changes.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164705 13f79535-47bb-0310-9956-ffa450edef68
2005-04-26 01:32:07 +00:00
John Dennis Casey 92260f82ef Added support for running repoclean from outside the repoclean dir.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164125 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 21:18:39 +00:00
John Dennis Casey ba80b40d9b Fixed plus-to-minus formatting for pom translation, and for bridged pom file creation.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164123 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 21:09:23 +00:00
John Dennis Casey 35cc18bfbd Fixed '+' to '-' conversion for file paths so it will work with both poms and artifacts.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164120 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 20:47:20 +00:00
John Dennis Casey a02dd8e9d9 Worked on MNG-309 and subtasks...
o Added digest creation/verification for POMs

o Added separate logging of kickouts and exclusions for ArtifactDiscoverer to keep it from polluting the repository.report.txt

o Added transactional behavior for each artifact conversion: if the artifact, its POM and all the myriad supporting files cannot be converted/created, then all files associated with that artifact are backed out of the target repo.

  NOTE: This WILL NOT happen if "--force" is used.

o Translating '+' characters to '-' in legacy artifact paths (not in v4 source repo paths, since we'll assume those are valid for use in m2). This is taking place inside the V3PomRewriter currently.

Validated all of this on localhost using a test repo. Next step is to validate on beaver with production source and test target repos, and fix anything that's outstanding (also add test cases to the test repo as needed).



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164116 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 20:34:10 +00:00
Brett Leslie Porter 125430b2f6 set a default path to java, for cron
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164002 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 04:47:54 +00:00
John Dennis Casey 65b542741b o Added --force CLI support
o Added blacklistedPatterns to configuration file, to enhance the exclusion filter during artifact discovery with a set of non-copy-able files.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163997 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 02:17:51 +00:00
John Dennis Casey 666c60dea6 o Fixed, pending changes to DefaultRepositoryLayout as outlined in MNG-321
PR: MNG-332


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163990 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 23:39:30 +00:00
John Dennis Casey 0e5b4e565c o Improved support for classifier parsing and added test artifact to the test repository for this.
o Fixed issue in createXXX(..) method for constructing an artifact with a classifier...it was not actually calling the constructor that passes in the classifier.

PR: MNG-312


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163989 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 23:06:04 +00:00
John Dennis Casey 84e67faf30 o Added support for weeding out potential artifacts that don't have an extension matching the '...s' pattern in the legacy layout (eg. things in '/jars/' that don't have a .jar extension).
o Added artifacts to my local testing repository (which I will be sync'ing with the one on beaver) to satisfy the dotted groupId, the no-extension test, the '.txt' extension test.

o not sure what to do with the last test-case in MNG-312, though, given that I thought we decided not to convert distributions, and the classifiers currently only happen in distros. Will take this discussion to jira, though.

PR: MNG-312


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163988 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 22:10:24 +00:00
John Dennis Casey 6003f258b3 o Fixed problem causing commons-logging-1.0.4 not to get copied over...
NOTE: There still may be a problem with invalid XML in the pom. There is a bad <resources/> specification in the build section that I had to remove.

PR: MNG-328


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163987 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 21:51:25 +00:00
John Dennis Casey 8d19eb5e90 o Added creation of SHA1 digests alongside MD5's
o Modified digest-file creation to be text files, not binaries.

PR: MNG-311, MNG-287


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163975 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 00:44:17 +00:00
John Dennis Casey d7e66db253 Implemented list items #2 and #3 from the main issue (scope from m1, and plugin entry translation in POMs). Tests included.
PR: MNG-309


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163974 13f79535-47bb-0310-9956-ffa450edef68
2005-04-19 20:05:15 +00:00
John Dennis Casey 47db74ddb0 Added the ability to generate an index file under .index.txt for the repository as we convert it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163846 13f79535-47bb-0310-9956-ffa450edef68
2005-04-07 21:26:21 +00:00
John Dennis Casey 793d10f7d2 o Fixed missing requirement in the component definition for the RepositoryCleaner (was missing requirement on MailSender)
o Added a new logging message to report on the actual number of artifacts rewritten during the conversion process.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163841 13f79535-47bb-0310-9956-ffa450edef68
2005-04-07 16:37:18 +00:00
John Dennis Casey 5653c7e402 added ability to mail out the repository-level report contents in the event an error occurs...also the ability to configure the email options using the config properties file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163821 13f79535-47bb-0310-9956-ffa450edef68
2005-04-06 20:15:07 +00:00
John Dennis Casey 20620b4e09 o Changed the repository to test.maven.codehaus.org for testing of the new repository and layout.
o Added <layout/> element to <repository/> elements in the maven.mdo
o Added pluginRepository configuration to the super-POM.
o Tested it all.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163791 13f79535-47bb-0310-9956-ffa450edef68
2005-04-06 01:28:29 +00:00
John Dennis Casey 26ec2d757b Clean-ups. Reporters only write on error/warn...since info no longer exists, and file opening is lazy now.
Also, cleaner now checks to make sure the target file is missing and/or out of date before processing the source file. This should allow us to avoid reprocessing the whole source repo every time.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163774 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 02:47:43 +00:00
John Dennis Casey 0b06278758 o Refined DirectoryScanner excludes
o Fixed some problems with version parsing from legacy repo searches.
o Added extension() method to artifact handlers used for conversions only
o Changed reports-directory layout to be less flat (faster to load on web browser, etc.)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163750 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 03:43:11 +00:00
John Dennis Casey dc92832ad2 o Fixed bash scripts (cygwin option was being tested incorrectly, and resulting in no such file: cygpath)
o Changed POM handling to use ArtifactMetadata API rather than direct Artifact construction for POMs
o Streamlined ArtifactDigestor to avoid use of byte arrays for transfer between methods (resulted in a bit of cut-and-paste code, but should run better)
o Pegged OutOfMemoryError to the ArtifactDigestVerifier/ArtifactDigestor combo (motivated the previous change)
o Cleaned up artifact source-file checking before creating any of the target directory structures
o Maybe works, maybe not...will resume testing tomorrow or the next day


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163743 13f79535-47bb-0310-9956-ffa450edef68
2005-04-02 02:17:19 +00:00
Brett Leslie Porter 49593155d0 update poms for releases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163741 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 16:03:43 +00:00
John Dennis Casey 5b5a124caa 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.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163736 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 02:45:05 +00:00
Brett Leslie Porter 89423d23de fix for windows, add profiling if needed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163735 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 01:01:20 +00:00
Brett Leslie Porter 3638539f6f fix for cygwin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163734 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 00:35:51 +00:00
Brett Leslie Porter 32aef3b0d7 fix error in cygwin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163733 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 00:32:07 +00:00
John Dennis Casey 2eed725153 o Reworked the artifact parsing code for the legacy artifact discoverer.
o Getting OutOfMemoryError when running against ibiblio-v1.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163732 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 00:24:45 +00:00
John Dennis Casey 1b4723f972 o Added more filters on the excludes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163671 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 06:58:47 +00:00
Brett Leslie Porter 14bb2c805a change the maven group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163670 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 06:52:55 +00:00
John Dennis Casey 80880d071e o Fixed a configuration issue for the DefaultRepositoryLayout in components.xml...it needed a requirement on the ArtifactHandlerManager.
o Fixed a formatting issue for the layout in DefaultRepositoryLayout relating to groupId's.
o Revamped the repoclean tool to use an Artifact-centric approach to converting, cleaning, and reporting on repositories.
o Added the ability for repoclean to report on the health of an existing v3 or v4 repository, using a DefaultArtifactDiscoverer (Default* being the prefix given to the new repo layout going forward) and a V4PomRewriter implementation.
o Tested repoclean by converting my local m1 repository to a m2 repository.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163669 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 04:53:30 +00:00
John Dennis Casey fcb311e99c o Changed the package name of the POM translator from *.pom to *.translate
o Changed the type of notifier created by the nagEmailAddress from 'email' to 'mail' following brett's changes to the maven-components pom.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163614 13f79535-47bb-0310-9956-ffa450edef68
2005-03-18 17:06:26 +00:00
John Dennis Casey a8eedaa06a o Adding initial design document for repoclean.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163604 13f79535-47bb-0310-9956-ffa450edef68
2005-03-18 00:28:31 +00:00
John Dennis Casey a436d8a8b6 o Adding new repository cleanup tool which does:
- artifact-to-POM correlation
 - artifact-to-MD5 correlation and synchronization
 - v3-to-v4 POM syntax conversion
 - v4 model validation (minimum required)
 - v4 model patching from POM path in repo (reconstructs some missing info from loss of <extends/>).

o This application has been tested and should be ready to run. Will try to arrange test with a copy of the ibiblio-v1 repo on beaver.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163602 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 22:56:42 +00:00