svn commit: r678190 - in /maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder: PomClassicDomainModel.java PomClassicTransformer.java

[sisbell]

Author: sisbell
Date: Sat Jul 19 10:45:56 2008
New Revision: 678190

URL: http://svn.apache.org/viewvc?rev=678190&view=rev
Log:
Fix for IT MNG2254. Bug in String class, can't use it when encoding.

Modified:
    
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
    
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=678190&r1=678189&r2=678190&view=diff
==============================================================================
--- 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
 Sat Jul 19 10:45:56 2008
@@ -39,14 +39,14 @@
         MavenXpp3Writer writer = new MavenXpp3Writer();
         writer.write( out, model );
         out.close();
-        inputBytes = removeIllegalCharacters(baos.toByteArray());
+        inputBytes = baos.toByteArray();
     }
 
     public PomClassicDomainModel(InputStream inputStream) throws IOException {
         if (inputStream == null) {
             throw new IllegalArgumentException("inputStream: null");
         }
-        this.inputBytes = 
removeIllegalCharacters(IOUtil.toByteArray(inputStream));
+        this.inputBytes = IOUtil.toByteArray(inputStream);
     }
 
     public boolean matchesModel(Model a) {
@@ -105,8 +105,8 @@
         if(model != null) {
             return model;
         }
-        try {                                                                
-            return new MavenXpp3Reader().read( ReaderFactory.newXmlReader(new 
ByteArrayInputStream( inputBytes )) );
+        try {
+            return new MavenXpp3Reader().read(ReaderFactory.newXmlReader(new 
ByteArrayInputStream( inputBytes )) );
         }
         catch (XmlPullParserException e) {
             e.printStackTrace();

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=678190&r1=678189&r2=678190&view=diff
==============================================================================
--- 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 Sat Jul 19 10:45:56 2008
@@ -28,7 +28,7 @@
                 
ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.Exclusions.xUri,
                 
ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.xUri,
                 ProjectUri.Build.Plugins.xUri,
-                //ProjectUri.Build.Plugins.Plugin.configuration,
+                ProjectUri.Build.Plugins.Plugin.configuration,
                 ProjectUri.Build.Plugins.Plugin.Dependencies.xUri,
                 ProjectUri.Build.Plugins.Plugin.Executions.xUri,
                 ProjectUri.Build.Resources.xUri,
@@ -173,6 +173,30 @@
                 tmp.removeAll(removeProperties);
             }
 
+            //Not inherited plugin rule
+            if (domainModels.indexOf(domainModel) > 0) {
+                List<ModelProperty> removeProperties = new 
ArrayList<ModelProperty>();
+                ModelDataSource source = new DefaultModelDataSource();
+                source.init(tmp, Arrays.asList(new 
ArtifactModelContainerFactory(), new IdModelContainerFactory()));
+                List<ModelContainer> containers = 
source.queryFor(ProjectUri.Build.Plugins.Plugin.xUri);
+                for (ModelContainer container : containers) {
+                    for (ModelProperty mp : container.getProperties()) {
+                        if 
(mp.getUri().equals(ProjectUri.Build.Plugins.Plugin.inherited)
+                                && mp.getValue() != null && 
mp.getValue().equals("false")) {
+                            removeProperties.addAll(container.getProperties());
+                            for (int j = tmp.indexOf(mp); j >= 0; j--) {
+                                if 
(tmp.get(j).getUri().equals(ProjectUri.Build.Plugins.Plugin.xUri)) {
+                                    removeProperties.add(tmp.get(j));
+                                    break;
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+                tmp.removeAll(removeProperties);
+            }
+
 
             //SCM Rule
             ModelProperty scmUrlProperty = getPropertyFor(ProjectUri.Scm.url, 
tmp);