You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/02/17 21:30:03 UTC
svn commit: r745244 - in /maven/components/trunk:
maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
Author: sisbell
Date: Tue Feb 17 20:30:03 2009
New Revision: 745244
URL: http://svn.apache.org/viewvc?rev=745244&view=rev
Log:
Updated profiles with collection information.
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java?rev=745244&r1=745243&r2=745244&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java Tue Feb 17 20:30:03 2009
@@ -1160,7 +1160,7 @@
}
public static String optional =
- "http://apache.org/maven/project/profiles#collection/profile/dependencies/dependency/optional";
+ "http://apache.org/maven/project/profiles#collection/profile/dependencies#collection/dependency/optional";
}
}
@@ -1179,49 +1179,49 @@
public static class Plugins
{
public static String xUri =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection";
public static class Plugin
{
public static String xUri =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin";
public static String groupId =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/groupId";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/groupId";
public static String artifactId =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/artifactId";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/artifactId";
public static String version =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/version";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/version";
public static String inherited =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/inherited";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/inherited";
public static String configuration =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/configuration#set";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/configuration#set";
public static class ReportSets
{
public static String xUri =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection";
public static class ReportSet
{
public static String xUri =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet";
public static String id =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/id";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/id";
public static String configuration =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/configuration#set";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/configuration#set";
public static String inherited =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/inherited";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/inherited";
public static String reports =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/reports";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/reports";
}
}
}
@@ -1375,7 +1375,7 @@
"http://apache.org/maven/project/profiles#collection/profile/distributionManagement/status";
}
- public static String properties = "http://apache.org/maven/project/profiles#collection/profile/properties";
+ public static String properties = "http://apache.org/maven/project/profiles#collection/profile/properties#collection";
}
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=745244&r1=745243&r2=745244&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java Tue Feb 17 20:30:03 2009
@@ -307,9 +307,17 @@
s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
s.add(ProjectUri.Build.Plugins.Plugin.Executions.Execution.configuration);
//TODO: More profile info
+ s.add(ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.Plugin.Executions.xUri);
+ s.add(ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.Dependency.Exclusions.xUri);
+ s.add(ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.xUri);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.Goals.xURI);
+ s.add(ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.ReportSets.xUri);
+ s.add(ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.configuration);
+
s.add(ProjectUri.Profiles.Profile.modules);
s.add(ProjectUri.Profiles.Profile.Dependencies.xUri);
- s.add(ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri);
s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.configuration);
modelProperties = ModelMarshaller.marshallXmlToModelProperties(