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 2008/06/28 18:11:04 UTC
svn commit: r672541 - in /maven/sandbox/trunk/shared/maven-shared-model/src:
main/java/org/apache/maven/shared/model/
main/java/org/apache/maven/shared/model/impl/
test/java/org/apache/maven/shared/model/
test/java/org/apache/maven/shared/model/impl/
Author: sisbell
Date: Sat Jun 28 09:11:04 2008
New Revision: 672541
URL: http://svn.apache.org/viewvc?rev=672541&view=rev
Log:
Bug fixes ,introduced sort for things like plugin properties.
Modified:
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainer.java
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelTransformerContextTest.java
maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainer.java?rev=672541&r1=672540&r2=672541&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainer.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainer.java Sat Jun 28 09:11:04 2008
@@ -35,5 +35,7 @@
* @return new instance of model container
*/
ModelContainer createNewInstance(List<ModelProperty> modelProperties);
+
+ void sort(List<ModelProperty> modelProperties);
}
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java?rev=672541&r1=672540&r2=672541&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java Sat Jun 28 09:11:04 2008
@@ -30,7 +30,7 @@
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
- KXmlParser parser = new KXmlParser();
+ KXmlParser parser = new KXmlParser();
try {
parser.setInput(inputStream, null);
} catch (XmlPullParserException e) {
@@ -49,7 +49,6 @@
try {
for (; ; parser.next()) {
int type = parser.getEventType();
- // System.out.println(parser.isEmptyElementTag());
switch (type) {
case XmlPullParser.TEXT: {
String tmp = parser.getText();
@@ -78,9 +77,7 @@
break;
}
case XmlPullParser.END_TAG: {
- // if (parser.isEmptyElementTag()) {
- if(tagValue == null) tagValue = "";
- // }
+ if (tagValue == null) tagValue = "";
break;
}
case XmlPullParser.END_DOCUMENT: {
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=672541&r1=672540&r2=672541&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java Sat Jun 28 09:11:04 2008
@@ -72,18 +72,19 @@
}
}
}
- System.out.println("Time= " + (System.currentTimeMillis() - start));
+ // System.out.println("Time= " + (System.currentTimeMillis() - start));
//interpolator
List<ModelProperty> mps = modelDataSource.getModelProperties();
long s = System.currentTimeMillis();
+ /*
for (ModelProperty mp : mps) {
InterpolatorProperty ip = mp.asInterpolatorProperty(baseUriForModel);
if (ip != null) {
properties.add(ip);
}
}
-
+ */
List<ModelProperty> unresolvedProperties = new ArrayList<ModelProperty>();
for (ModelProperty mp : mps) {
if (!mp.isResolved()) {
@@ -96,7 +97,7 @@
mp.resolveWith(ip);
}
}
- System.out.println("Resolve Time = " + (System.currentTimeMillis() - s));
+ //System.out.println("Resolve Time = " + (System.currentTimeMillis() - s));
return toModelTransformer.transformToDomainModel(mps);
}
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=672541&r1=672540&r2=672541&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java Sat Jun 28 09:11:04 2008
@@ -156,6 +156,7 @@
uris.add(p.getUri());
}
}
+ a.sort(processedProperties);
return processedProperties;
}
}
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelTransformerContextTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelTransformerContextTest.java?rev=672541&r1=672540&r2=672541&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelTransformerContextTest.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelTransformerContextTest.java Sat Jun 28 09:11:04 2008
@@ -11,6 +11,45 @@
@Test
+ public void sortWithDuplicateProperty1() {
+/*
+Uri = http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId, Value = maven-release-plugin, Resolved Value = maven-release-plugin
+Uri = http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId, Value = org.apache.maven.plugins, Resolved Value = org.apache.maven.plugins
+Uri = http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration/arguments, Value = -Prelease, Resolved Value = -Prelease
+Uri = http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration/goals, Value = deploy, Resolved Value = deploy
+Uri = http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration/useReleaseProfile, Value = false, Resolved Value = false
+*/
+ ModelProperty dup0 = new ModelProperty("http://apache.org/maven/project", null);
+ ModelProperty dup1 = new ModelProperty("http://apache.org/maven/project/build", null);
+ ModelProperty dup2 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement", null);
+ ModelProperty dup3 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection", null);
+ ModelProperty dup4 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null);
+ ModelProperty dup5 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration", null);
+ ModelProperty dup6 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration/tagBase", "tag");
+ ModelProperty dup7 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "1.1");
+
+ ModelProperty dup10 = new ModelProperty("http://apache.org/maven/project", null);
+ ModelProperty dup11 = new ModelProperty("http://apache.org/maven/project/build", null);
+ ModelProperty dup12 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement", null);
+ ModelProperty dup13 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection", null);
+ ModelProperty dup14 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null);
+ ModelProperty dup15 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration", null);
+ ModelProperty dup16 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration/tagBase", "tag");
+ ModelProperty dup17 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "1.1");
+
+ List<ModelProperty> modelProperties = Arrays.asList(dup0, dup1, dup2, dup3, dup4, dup5, dup6, dup7,
+ dup10, dup11, dup12, dup13, dup14, dup15, dup16, dup17);
+
+ ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList<ModelContainerFactory>());
+ List<ModelProperty> sortedProperties = ctx.sort(modelProperties, "http://apache.org/maven");
+ for(ModelProperty mp : sortedProperties) {
+ System.out.println(mp);
+ }
+ // assertTrue(sortedProperties.contains(dup0));
+ // assertFalse(sortedProperties.contains(dup1));
+ }
+
+ @Test
public void sortWithDuplicateProperty() {
ModelProperty dup0 = new ModelProperty("http://apache.org/maven/project/version", "1.1");
ModelProperty dup1 = new ModelProperty("http://apache.org/maven/project/version", "1.2");
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java?rev=672541&r1=672540&r2=672541&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java Sat Jun 28 09:11:04 2008
@@ -257,6 +257,10 @@
public ModelContainer createNewInstance(List<ModelProperty> modelProperties) {
return new DummyModelContainer(modelProperties);
}
+
+ public void sort(List<ModelProperty> modelProperties) {
+
+ }
}
}
}