Revision 768842

Jump to revision:
Author:	jvanzyl
Date:	Mon Apr 27 00:43:53 2009 UTC (15 years, 6 months ago)
Changed paths:	43
Log Message:	o trying to merge manually

Changed paths

Path	Details
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java	modified , text changed , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java	modified , text changed , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java	modified , text changed , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java	modified , props changed
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/	modified , props changed