You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by lc...@apache.org on 2011/12/09 09:22:36 UTC

svn commit: r1212295 [1/2] - in /incubator/npanday/branches/1.5.0-azuresupport: ./ components/ components/dotnet-core/ components/dotnet-model/ components/dotnet-model/assembly-plugins/ components/dotnet-model/assembly-plugins/src/test/ components/dotn...

Author: lcorneliussen
Date: Fri Dec  9 09:22:34 2011
New Revision: 1212295

URL: http://svn.apache.org/viewvc?rev=1212295&view=rev
Log:
[NPANDAY-499] Make configuration for compiler-plugins and executable-plugins more flexible

o Updated to newer modello version and added unit tests for the described xml formats

Added:
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/groovy/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/groovy/AssemblyPluginXpp3ReaderTest.groovy
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/resources/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/resources/sample-assembly-plugins.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/plugins/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/plugins/io/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/plugins/io/Xpp3ReaderTest.groovy
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/resources/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/resources/sample-compiler-plugins.xml
      - copied, changed from r1207095, incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/npanday/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/plugins/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/plugins/io/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/plugins/io/ExecutablePluginXpp3ReaderTest.groovy
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/resources/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/groovy/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/groovy/npanday/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/groovy/npanday/model/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/groovy/npanday/model/settings/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/groovy/npanday/model/settings/io/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/groovy/npanday/model/settings/io/NetDependencyXpp3ReaderTest.groovy
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/resources/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/resources/sample-netdependencies.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/groovy/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/groovy/npanday/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/groovy/npanday/model/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/groovy/npanday/model/settings/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/groovy/npanday/model/settings/io/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/groovy/npanday/model/settings/io/NPandaySettingsXpp3ReaderTest.groovy
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/resources/
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/resources/sample-settings.xml
Modified:
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/assembly-plugins.mdo
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/compiler-plugins.mdo
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/configuration-appenders/configurationAppenders.mdo
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/configuration-appenders/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/entries/entries.mdo
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/entries/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/executable-plugins.mdo
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/netdependency.mdo
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/settings.mdo
    incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java
    incubator/npanday/branches/1.5.0-azuresupport/components/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-fxcop-plugin/src/main/java/npanday/plugin/fxcop/FxCopAggregateMojo.java
    incubator/npanday/branches/1.5.0-azuresupport/pom.xml

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/pom.xml (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/pom.xml Fri Dec  9 09:22:34 2011
@@ -69,14 +69,12 @@ under the License.
       <plugin>
         <groupId>org.codehaus.gmaven</groupId>
         <artifactId>gmaven-plugin</artifactId>
-        <version>1.2</version>
         <executions>
           <execution>
+            <id>groovy-main</id>
             <goals>
               <goal>generateStubs</goal>
               <goal>compile</goal>
-              <goal>generateTestStubs</goal>
-              <goal>testCompile</goal>
             </goals>
           </execution>
         </executions>

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/assembly-plugins.mdo
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/assembly-plugins.mdo?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/assembly-plugins.mdo (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/assembly-plugins.mdo Fri Dec  9 09:22:34 2011
@@ -16,7 +16,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0 http://modello.codehaus.org/xsd/modello-1.4.0.xsd">
   <id>assembly-plugin</id>
   <name>AssemblyPlugin</name>
   <description>Assembly Info Plugin</description>
@@ -27,19 +28,19 @@ under the License.
     </default>
   </defaults>
   <classes>
-    <class rootElement="true" xml.tagName="assemblyPluginsXml">
+    <class rootElement="true" xml.tagName="assemblyPlugins">
       <name>AssemblyPluginsModel</name>
       <fields>
         <field>
           <name>assemblyPlugins</name>
-          <association>
+          <association xml.itemsStyle="flat">
             <type>AssemblyPlugin</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
       </fields>
     </class>
-    <class xml.tagName="assemblyPlugins">
+    <class>
       <name>AssemblyPlugin</name>
       <fields>
         <field>

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/pom.xml (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/pom.xml Fri Dec  9 09:22:34 2011
@@ -29,17 +29,14 @@ under the License.
   <name>NPanday :: Model :: Assembly Plugins</name>  
   <description>Assembly model used for reading in information about assembly info marshallers.</description>  
   <build> 
-    <resources> 
-      <resource> 
-        <directory>${basedir}/src/site</directory> 
-      </resource> 
-    </resources>  
-    <plugins> 
+    <plugins>
       <plugin> 
         <groupId>org.codehaus.modello</groupId>  
         <artifactId>modello-maven-plugin</artifactId>  
-        <configuration> 
-          <model>assembly-plugins.mdo</model>  
+        <configuration>
+          <models>
+            <model>assembly-plugins.mdo</model>
+          </models>
           <version>1.0.0</version> 
         </configuration> 
       </plugin> 

Added: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/groovy/AssemblyPluginXpp3ReaderTest.groovy
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/groovy/AssemblyPluginXpp3ReaderTest.groovy?rev=1212295&view=auto
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/groovy/AssemblyPluginXpp3ReaderTest.groovy (added)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/groovy/AssemblyPluginXpp3ReaderTest.groovy Fri Dec  9 09:22:34 2011
@@ -0,0 +1,36 @@
+/* Copyright 2010 NPanday
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import npanday.model.assembly.plugins.io.xpp3.AssemblyPluginXpp3Reader
+
+class AssemblyPluginXpp3ReaderTest
+{
+  @org.junit.Test
+  void passes()
+  {
+    def xpp3Reader = new AssemblyPluginXpp3Reader();
+    def stream = getClass().getResourceAsStream("/sample-assembly-plugins.xml")
+    assert stream != null : "couldn't find sample xml"
+    def xmlStream = new InputStreamReader(stream)
+    def model = xpp3Reader.read(xmlStream)
+
+    assert model != null
+    assert model.assemblyPlugins != null
+    assert model.assemblyPlugins.size() == 1
+  }
+}

Added: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/resources/sample-assembly-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/resources/sample-assembly-plugins.xml?rev=1212295&view=auto
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/resources/sample-assembly-plugins.xml (added)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/assembly-plugins/src/test/resources/sample-assembly-plugins.xml Fri Dec  9 09:22:34 2011
@@ -0,0 +1,26 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<assemblyPlugins>
+  <assemblyPlugin>
+    <identifier>CS</identifier>
+    <pluginClass>npanday.assembler.impl.DefaultAssemblyInfoMarshaller</pluginClass>
+    <language>C_SHARP</language>
+    <extension>cs</extension>
+  </assemblyPlugin>
+</assemblyPlugins>

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/compiler-plugins.mdo
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/compiler-plugins.mdo?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/compiler-plugins.mdo (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/compiler-plugins.mdo Fri Dec  9 09:22:34 2011
@@ -16,7 +16,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0 http://modello.codehaus.org/xsd/modello-1.4.0.xsd">
   <id>compiler-plugin</id>
   <name>CompilerPlugin</name>
   <description>A configuration file for compilers.</description>
@@ -27,31 +28,31 @@ under the License.
     </default>
   </defaults>
   <classes>
-    <class rootElement="true">
+    <class rootElement="true" xml.tagName="compilerPlugins">
       <name>CompilerPluginsModel</name>
       <fields>
         <field>
           <name>compilerPlugins</name>
           <description>Plugin configurations.</description>
-          <association>
+          <association xml.itemsStyle="flat">
             <type>CompilerPlugin</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
       </fields>
     </class>
-    <class xml.tagName="compilerPlugin">
+    <class>
       <name>CompilerPlugin</name>
       <fields>
         <field>
           <name>identifier</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>An id for the compiler. It should be (but is not required to be) unique.</description>
         </field>
         <field>
           <name>pluginClass</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>
             Class name of the compiler. NPanday will pass an instance of this class to the
@@ -60,31 +61,31 @@ under the License.
         </field>
         <field>
           <name>vendor</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>Vendor of the compiler: MICROSOFT, MONO, DotGNU</description>
         </field>
         <field>
           <name>language</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>The .NET language to use for compilation.</description>
         </field>
         <field>
           <name>profile</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>Profile for the plugin.</description>
         </field>
         <field>
           <name>executable</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>Executable, as run from the command line.</description>
         </field>
         <field>
           <name>netDependencyId</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
         </field>
         <field>
@@ -124,7 +125,7 @@ under the License.
         </field>
         <field>
           <name>platforms</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description>Platform configuration capabilities.</description>
           <association>
             <type>Platform</type>
@@ -133,7 +134,7 @@ under the License.
         </field>
         <field>
           <name>commandFilter</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description>A filter for including/excluding user-passed commands options.</description>
           <association>
             <type>CommandFilter</type>
@@ -146,7 +147,7 @@ under the License.
       <fields>
         <field>
           <name>excludes</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description>
             The command options to exclude from the user specified pass-through parameters (Currently unused)
           </description>
@@ -157,7 +158,7 @@ under the License.
         </field>
         <field>
           <name>includes</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description>
             The command options to allow from the user specified pass-through parameters.
           </description>
@@ -173,16 +174,15 @@ under the License.
       <fields>
         <field>
           <name>operatingSystem</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>The operating system that the compiler is capable of running on.</description>
         </field>
         <field>
           <name>architecture</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
-          <description>The architecture that the compiler is capable of running on (Currently
-            unused).</description>
+          <description>The architecture that the compiler is capable of running on.</description>
         </field>
       </fields>
     </class>

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/pom.xml (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/pom.xml Fri Dec  9 09:22:34 2011
@@ -32,8 +32,10 @@ under the License.
       <plugin> 
         <groupId>org.codehaus.modello</groupId>  
         <artifactId>modello-maven-plugin</artifactId>  
-        <configuration> 
-          <model>compiler-plugins.mdo</model>  
+        <configuration>
+          <models>
+            <model>compiler-plugins.mdo</model>
+          </models>
           <version>1.0.0</version> 
         </configuration> 
       </plugin> 

Added: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/plugins/io/Xpp3ReaderTest.groovy
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/plugins/io/Xpp3ReaderTest.groovy?rev=1212295&view=auto
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/plugins/io/Xpp3ReaderTest.groovy (added)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/plugins/io/Xpp3ReaderTest.groovy Fri Dec  9 09:22:34 2011
@@ -0,0 +1,37 @@
+/* Copyright 2010 NPanday
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package npanday.model.compiler.plugins.io;
+
+import npanday.model.compiler.plugins.io.xpp3.CompilerPluginXpp3Reader
+
+class Xpp3ReaderTest
+{
+  @org.junit.Test
+  void passes()
+  {
+    def xpp3Reader = new CompilerPluginXpp3Reader();
+    def stream = getClass().getResourceAsStream("/sample-compiler-plugins.xml")
+    assert stream != null : "couldn't find sample xml"
+    def xmlStream = new InputStreamReader(stream)
+    def model = xpp3Reader.read(xmlStream)
+
+    assert model != null
+    assert model.compilerPlugins != null
+    assert model.compilerPlugins.size() == 1
+  }
+}

Copied: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/resources/sample-compiler-plugins.xml (from r1207095, incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml)
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/resources/sample-compiler-plugins.xml?p2=incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/resources/sample-compiler-plugins.xml&p1=incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml&r1=1207095&r2=1212295&rev=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/compiler-plugins/src/test/resources/sample-compiler-plugins.xml Fri Dec  9 09:22:34 2011
@@ -18,1228 +18,6 @@ under the License.
 -->
 <compilerPlugins>
   <compilerPlugin>
-    <identifier>MS-CS-1.1</identifier>
-    <pluginClass>npanday.executable.compiler.impl.DefaultCompiler</pluginClass>
-    <vendor>MICROSOFT</vendor>
-    <executable>csc</executable>
-    <language>C_SHARP</language>
-    <profile>FULL</profile>
-    <frameworkVersions>
-      <frameworkVersion>1.1.4322</frameworkVersion>
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-        <architecture>x86</architecture>
-      </platform>
-    </platforms>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>doc</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>nologo</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MS-CS-2.0</identifier>
-    <pluginClass>npanday.executable.compiler.impl.DefaultCompiler</pluginClass>
-    <vendor>MICROSOFT</vendor>
-    <executable>csc</executable>
-    <language>C_SHARP</language>
-    <profile>FULL</profile>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>    
-      <frameworkVersion>3.5</frameworkVersion>
-      <frameworkVersion>3.0</frameworkVersion>
-      <frameworkVersion>2.0.50727</frameworkVersion>
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-        <architecture>x86</architecture>
-      </platform>
-    </platforms>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>platform</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>pdb</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>moduleassemblyname</include>
-        <include>nologo</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MS-CS:3.5</identifier>
-    <pluginClass>npanday.executable.compiler.impl.CSharpCompilerForProfile</pluginClass>
-    <vendor>MICROSOFT</vendor>
-    <executable>csc</executable>
-    <language>C_SHARP</language>
-    <profile>COMPACT</profile>
-    <frameworkVersions>
-      <frameworkVersion>3.0</frameworkVersion>
-      <frameworkVersion>3.5</frameworkVersion>
-      <frameworkVersion>4.0</frameworkVersion>      
-      <frameworkVersion>2.0.50727</frameworkVersion>
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-        <architecture>x86</architecture>
-      </platform>
-    </platforms>
-    <defaultAssemblyPath>C:\Program Files\Microsoft.NET\SDK\CompactFramework\v3.5\WindowsCE</defaultAssemblyPath>
-    <assemblies>
-      <assembly>mscorlib</assembly>
-      <assembly>System.Data</assembly>
-      <assembly>System</assembly>
-      <assembly>System.Drawing</assembly>
-      <assembly>System.Messaging</assembly>
-      <assembly>System.Web.Services</assembly>
-      <assembly>System.Windows.Forms.DataGrid</assembly>
-      <assembly>System.Windows.Forms</assembly>
-      <assembly>Microsoft.WindowsCE.Forms</assembly>
-      <assembly>System.Xml</assembly>
-      <assembly>System.Core</assembly>
-      <assembly>System.Data.DataSetExtensions</assembly>
-      <assembly>System.Xml.Linq</assembly>
-      <assembly>Microsoft.Transactions.Bridge</assembly>
-    </assemblies>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>platform</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>help</include>
-        <include>nologo</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>pdb</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>moduleassemblyname</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MS-CS:4.0+.NETPortable,Profile1</identifier>
-    <pluginClass>npanday.executable.compiler.impl.CSharpCompilerForProfile</pluginClass>
-    <vendor>MICROSOFT</vendor>
-    <executable>csc</executable>
-    <language>C_SHARP</language>
-    <profile>.NETPortable,Profile1</profile>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>      
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-        <architecture>x86</architecture>
-      </platform>
-    </platforms>
-    <targetFramework>.NETPortable,Version=v4.0,Profile=Profile1</targetFramework>
-    <defaultAssemblyPath>C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.0\Profile\Profile1</defaultAssemblyPath>
-    <assemblies>
-      <assembly>mscorlib</assembly>
-      <assembly>System</assembly>
-      <assembly>System.Core</assembly>
-      <assembly>System.Xml</assembly>
-    </assemblies>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>platform</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>help</include>
-        <include>nologo</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>pdb</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>moduleassemblyname</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MS-CS:4.0+.NETPortable,Profile2</identifier>
-    <pluginClass>npanday.executable.compiler.impl.CSharpCompilerForProfile</pluginClass>
-    <vendor>MICROSOFT</vendor>
-    <executable>csc</executable>
-    <language>C_SHARP</language>
-    <profile>.NETPortable,Profile2</profile>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>      
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-        <architecture>x86</architecture>
-      </platform>
-    </platforms>
-    <targetFramework>.NETPortable,Version=v4.0,Profile=Profile2</targetFramework>
-    <defaultAssemblyPath>C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.0\Profile\Profile2</defaultAssemblyPath>
-    <assemblies>
-      <assembly>mscorlib</assembly>
-      <assembly>System</assembly>
-      <assembly>System.Core</assembly>
-      <assembly>System.Net</assembly>
-      <assembly>System.Runtime.Serialization</assembly>
-      <assembly>System.ServiceModel</assembly>
-      <assembly>System.Xml</assembly>
-      <assembly>System.Xml.Serialization</assembly>
-    </assemblies>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>platform</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>help</include>
-        <include>nologo</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>pdb</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>moduleassemblyname</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MS-CS:4.0+.NETPortable,Profile3</identifier>
-    <pluginClass>npanday.executable.compiler.impl.CSharpCompilerForProfile</pluginClass>
-    <vendor>MICROSOFT</vendor>
-    <executable>csc</executable>
-    <language>C_SHARP</language>
-    <profile>.NETPortable,Profile3</profile>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>      
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-        <architecture>x86</architecture>
-      </platform>
-    </platforms>
-    <targetFramework>.NETPortable,Version=v4.0,Profile=Profile3</targetFramework>
-    <defaultAssemblyPath>C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.0\Profile\Profile3</defaultAssemblyPath>
-    <assemblies>
-      <assembly>mscorlib</assembly>
-      <assembly>System</assembly>
-      <assembly>System.ComponentModel.Composition</assembly>
-      <assembly>System.Core</assembly>
-      <assembly>System.Net</assembly>
-      <assembly>System.Runtime.Serialization</assembly>
-      <assembly>System.ServiceModel</assembly>
-      <assembly>System.Xml</assembly>
-      <assembly>System.Xml.Serialization</assembly>
-    </assemblies>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>platform</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>help</include>
-        <include>nologo</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>pdb</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>moduleassemblyname</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MS-CS:4.0+.NETPortable,Profile4</identifier>
-    <pluginClass>npanday.executable.compiler.impl.CSharpCompilerForProfile</pluginClass>
-    <vendor>MICROSOFT</vendor>
-    <executable>csc</executable>
-    <language>C_SHARP</language>
-    <profile>.NETPortable,Profile4</profile>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>      
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-        <architecture>x86</architecture>
-      </platform>
-    </platforms>
-    <targetFramework>.NETPortable,Version=v4.0,Profile=Profile4</targetFramework>
-    <defaultAssemblyPath>C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.0\Profile\Profile4</defaultAssemblyPath>
-    <assemblies>
-      <assembly>mscorlib</assembly>
-      <assembly>System</assembly>
-      <assembly>System.Core</assembly>
-      <assembly>System.Net</assembly>
-      <assembly>System.Runtime.Serialization</assembly>
-      <assembly>System.ServiceModel</assembly>
-      <assembly>System.Windows</assembly>
-      <assembly>System.Xml</assembly>
-      <assembly>System.Xml.Serialization</assembly>
-    </assemblies>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>platform</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>help</include>
-        <include>nologo</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>pdb</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>moduleassemblyname</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MS-VB</identifier>
-    <pluginClass>npanday.executable.compiler.impl.DefaultCompiler</pluginClass>
-    <vendor>MICROSOFT</vendor>
-    <executable>vbc</executable>
-    <language>VB</language>
-    <profile>FULL</profile>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>
-      <frameworkVersion>3.5</frameworkVersion>
-      <frameworkVersion>3.0</frameworkVersion>
-      <frameworkVersion>2.0.50727</frameworkVersion>
-      <frameworkVersion>1.1.4322</frameworkVersion>
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-    </platforms>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>doc</include>
-        <include>addmodule</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>linkresource</include>
-        <include>resource</include>
-        <include>win32icon</include>
-        <include>win32resource</include>
-        <include>optimize</include>
-        <include>removeintchecks</include>
-        <include>debug</include>
-        <include>nowarn</include>
-        <include>warnaserror</include>
-        <include>define</include>
-        <include>imports</include>
-        <include>optionexplicit</include>
-        <include>optioninfer</include>
-        <include>rootnamespace</include>
-        <include>optionstrict</include>
-        <include>optioncompare</include>
-        <include>noconfig</include>
-        <include>nologo</include>
-        <include>quiet</include>
-        <include>verbose</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>delaysign</include>
-        <include>errorreport</include>
-        <include>filealign</include>
-        <include>keycontainer</include>
-        <include>keyfile</include>
-        <include>libpath</include>
-        <include>main</include>
-        <include>netcf</include>
-        <include>nostdlib</include>
-        <include>platform</include>
-        <include>sdkpath</include>
-        <include>utf8output</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  
-  <compilerPlugin>
-    <identifier>ASP</identifier>
-    <pluginClass>npanday.executable.compiler.impl.AspxCompiler</pluginClass>
-    <vendor>MICROSOFT</vendor>
-    <executable>aspnet_compiler</executable>
-    <language>ASP</language>
-    <profile>FULL</profile>
-    <frameworkVersions>
-      <frameworkVersion>2.0.50727</frameworkVersion>
-      <frameworkVersion>3.0</frameworkVersion>
-      <frameworkVersion>3.5</frameworkVersion>
-      <frameworkVersion>4.0</frameworkVersion>      
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-    </platforms>
-    <commandFilter>
-      <includes>
-        <include>m</include>
-        <include>v</include>
-        <include>p</include>
-        <include>u</include>
-        <include>f</include>
-        <include>d</include>
-        <include>c</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>aptca</include>
-        <include>delaysign</include>
-        <include>fixednames</include>
-        <include>nologo</include>
-        <include>errorstack</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  
-  <compilerPlugin>
-    <identifier>MONO-CS</identifier>
-    <pluginClass>npanday.executable.compiler.impl.DefaultCompiler</pluginClass>
-    <vendor>MONO</vendor>
-    <language>C_SHARP</language>
-    <profile>FULL</profile>
-    <executable>mcs</executable>
-    <frameworkVersions>
-      <frameworkVersion>1.1.4322</frameworkVersion>
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-      <platform>     
-        <operatingSystem>Mac OS X</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Linux</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Solaris</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>FreeBSD</operatingSystem>
-      </platform>
-    </platforms>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>checked</include>
-        <include>codepage</include>
-        <include>clscheck</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>main</include>
-        <include>noconfig</include>
-        <include>nostdlib</include>
-        <include>nowarn</include>
-        <include>resource</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MONO-VB</identifier>
-    <pluginClass>npanday.executable.compiler.impl.DefaultCompiler</pluginClass>
-    <vendor>MONO</vendor>
-    <language>VB</language>
-    <profile>FULL</profile>
-    <executable>vbnc</executable>
-    <frameworkVersions>
-      <frameworkVersion>2.0.50727</frameworkVersion>
-      <frameworkVersion>1.1.4322</frameworkVersion>
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>      
-      <platform>
-        <operatingSystem>Mac OS X</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Linux</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Solaris</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>FreeBSD</operatingSystem>
-      </platform>
-    </platforms>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>doc</include>
-        <include>addmodule</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>linkresource</include>
-        <include>resource</include>
-        <include>win32icon</include>
-        <include>win32resource</include>
-        <include>optimize</include>
-        <include>removeintchecks</include>
-        <include>debug</include>
-        <include>nowarn</include>
-        <include>warnaserror</include>
-        <include>define</include>
-        <include>imports</include>
-        <include>optionexplicit</include>
-        <include>rootnamespace</include>
-        <include>optionstrict</include>
-        <include>optioncompare</include>
-        <include>noconfig</include>
-        <include>nologo</include>
-        <include>quiet</include>
-        <include>verbose</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>delaysign</include>
-        <include>errorreport</include>
-        <include>filealign</include>
-        <include>keycontainer</include>
-        <include>keyfile</include>
-        <include>libpath</include>
-        <include>main</include>
-        <include>netcf</include>
-        <include>nostdlib</include>
-        <include>platform</include>
-        <include>sdkpath</include>
-        <include>utf8output</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MONO-CS-2</identifier>
-    <pluginClass>npanday.executable.compiler.impl.DefaultCompiler</pluginClass>
-    <vendor>MONO</vendor>
-    <language>C_SHARP</language>
-    <profile>FULL</profile>
-    <executable>gmcs</executable>
-    <frameworkVersions>
-      <frameworkVersion>2.0.50727</frameworkVersion>
-      <frameworkVersion>3.0</frameworkVersion>
-      <frameworkVersion>3.5</frameworkVersion>
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-      <platform>      
-        <operatingSystem>Mac OS X</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Linux</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Solaris</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>FreeBSD</operatingSystem>
-      </platform>
-    </platforms>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>checked</include>
-        <include>codepage</include>
-        <include>clscheck</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>main</include>
-        <include>noconfig</include>
-        <include>nostdlib</include>
-        <include>nowarn</include>
-        <include>resource</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MONO-CS-4</identifier>
-    <pluginClass>npanday.executable.compiler.impl.DefaultCompiler</pluginClass>
-    <vendor>MONO</vendor>
-    <language>C_SHARP</language>
-    <profile>FULL</profile>
-    <executable>dmcs</executable>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>      
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-      <platform>      
-        <operatingSystem>Mac OS X</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Linux</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Solaris</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>FreeBSD</operatingSystem>
-      </platform>
-    </platforms>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>checked</include>
-        <include>codepage</include>
-        <include>clscheck</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>main</include>
-        <include>noconfig</include>
-        <include>nostdlib</include>
-        <include>nowarn</include>
-        <include>resource</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MONO-CS:4.0+.NETPortable,Profile1</identifier>
-    <pluginClass>npanday.executable.compiler.impl.CSharpCompilerForProfile</pluginClass>
-    <vendor>MONO</vendor>
-    <executable>dmcs</executable>
-    <language>C_SHARP</language>
-    <profile>.NETPortable,Profile1</profile>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>      
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-      <platform>      
-        <operatingSystem>Mac OS X</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Linux</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Solaris</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>FreeBSD</operatingSystem>
-      </platform>
-    </platforms>
-    <targetFramework>.NETPortable,Version=v4.0,Profile=Profile1</targetFramework>
-    <!-- Mono 2.10.2 missing .NETPortable defaultAssemblyPath, requires profileAssemblyPath -->
-    <assemblies>
-      <assembly>mscorlib</assembly>
-      <assembly>System</assembly>
-      <assembly>System.Core</assembly>
-      <assembly>System.Xml</assembly>
-    </assemblies>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>platform</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>help</include>
-        <include>nologo</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>pdb</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>moduleassemblyname</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MONO-CS:4.0+.NETPortable,Profile2</identifier>
-    <pluginClass>npanday.executable.compiler.impl.CSharpCompilerForProfile</pluginClass>
-    <vendor>MONO</vendor>
-    <executable>dmcs</executable>
-    <language>C_SHARP</language>
-    <profile>.NETPortable,Profile2</profile>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>      
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-      <platform>      
-        <operatingSystem>Mac OS X</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Linux</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Solaris</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>FreeBSD</operatingSystem>
-      </platform>
-    </platforms>
-    <targetFramework>.NETPortable,Version=v4.0,Profile=Profile2</targetFramework>
-    <!-- Mono 2.10.2 missing .NETPortable defaultAssemblyPath, requires profileAssemblyPath -->
-    <assemblies>
-      <assembly>mscorlib</assembly>
-      <assembly>System</assembly>
-      <assembly>System.Core</assembly>
-      <assembly>System.Net</assembly>
-      <assembly>System.Runtime.Serialization</assembly>
-      <assembly>System.ServiceModel</assembly>
-      <assembly>System.Xml</assembly>
-      <assembly>System.Xml.Serialization</assembly>
-    </assemblies>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>platform</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>help</include>
-        <include>nologo</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>pdb</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>moduleassemblyname</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MONO-CS:4.0+.NETPortable,Profile3</identifier>
-    <pluginClass>npanday.executable.compiler.impl.CSharpCompilerForProfile</pluginClass>
-    <vendor>MONO</vendor>
-    <executable>dmcs</executable>
-    <language>C_SHARP</language>
-    <profile>.NETPortable,Profile3</profile>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>      
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-      <platform>      
-        <operatingSystem>Mac OS X</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Linux</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Solaris</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>FreeBSD</operatingSystem>
-      </platform>
-    </platforms>
-    <targetFramework>.NETPortable,Version=v4.0,Profile=Profile3</targetFramework>
-    <!-- Mono 2.10.2 missing .NETPortable defaultAssemblyPath, requires profileAssemblyPath -->
-    <assemblies>
-      <assembly>mscorlib</assembly>
-      <assembly>System</assembly>
-      <assembly>System.ComponentModel.Composition</assembly>
-      <assembly>System.Core</assembly>
-      <assembly>System.Net</assembly>
-      <assembly>System.Runtime.Serialization</assembly>
-      <assembly>System.ServiceModel</assembly>
-      <assembly>System.Xml</assembly>
-      <assembly>System.Xml.Serialization</assembly>
-    </assemblies>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>platform</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>help</include>
-        <include>nologo</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>pdb</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>moduleassemblyname</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>MONO-CS:4.0+.NETPortable,Profile4</identifier>
-    <pluginClass>npanday.executable.compiler.impl.CSharpCompilerForProfile</pluginClass>
-    <vendor>MONO</vendor>
-    <executable>dmcs</executable>
-    <language>C_SHARP</language>
-    <profile>.NETPortable,Profile4</profile>
-    <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>      
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-      <platform>      
-        <operatingSystem>Mac OS X</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Linux</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Solaris</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>FreeBSD</operatingSystem>
-      </platform>
-    </platforms>
-    <targetFramework>.NETPortable,Version=v4.0,Profile=Profile4</targetFramework>
-    <!-- Mono 2.10.2 missing .NETPortable defaultAssemblyPath, requires profileAssemblyPath -->
-    <assemblies>
-      <assembly>mscorlib</assembly>
-      <assembly>System</assembly>
-      <assembly>System.Core</assembly>
-      <assembly>System.Net</assembly>
-      <assembly>System.Runtime.Serialization</assembly>
-      <assembly>System.ServiceModel</assembly>
-      <assembly>System.Windows</assembly>
-      <assembly>System.Xml</assembly>
-      <assembly>System.Xml.Serialization</assembly>
-    </assemblies>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>delaysign</include>
-        <include>doc</include>
-        <include>keyfile</include>
-        <include>keycontainer</include>
-        <include>platform</include>
-        <include>recurse</include>
-        <include>reference</include>
-        <include>addmodule</include>
-        <include>win32res</include>
-        <include>win32icon</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>optimize</include>
-        <include>warnaserror</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>checked</include>
-        <include>unsafe</include>
-        <include>define</include>
-        <include>langversion</include>
-        <include>help</include>
-        <include>nologo</include>
-        <include>noconfig</include>
-        <include>baseaddress</include>
-        <include>bugreport</include>
-        <include>codepage</include>
-        <include>utf8output</include>
-        <include>main</include>
-        <include>fullpaths</include>
-        <include>filealign</include>
-        <include>pdb</include>
-        <include>nostdlib</include>
-        <include>lib</include>
-        <include>errorreport</include>
-        <include>moduleassemblyname</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>NEM</identifier>
-    <pluginClass>npanday.executable.compiler.impl.NemerleCompiler</pluginClass>
-    <vendor>MONO</vendor>
-    <language>NEMERLE</language>
-    <profile>FULL</profile>
-    <executable>ncc</executable>
-    <frameworkVersions>
-      <frameworkVersion>2.0.50727</frameworkVersion>
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-      <platform>      
-        <operatingSystem>Mac OS X</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Linux</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Solaris</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>FreeBSD</operatingSystem>
-      </platform>
-    </platforms>
-    <commandFilter>
-      <includes>
-        <include>out</include>
-        <include>target</include>
-        <include>reference</include>
-        <include>library-path</include>
-        <include>define</include>
-        <include>doc</include>
-        <include>resource</include>
-        <include>linkresource</include>
-        <include>debug</include>
-        <include>pkg-config</include>
-        <include>warn</include>
-        <include>nowarn</include>
-        <include>keyfile</include>
-        <include>main</include>
-      </includes>
-    </commandFilter>
-  </compilerPlugin>
-  <compilerPlugin>
-    <identifier>DotGNU-CS</identifier>
-    <pluginClass>npanday.executable.compiler.impl.DotGNUCompiler</pluginClass>
-    <vendor>DotGNU</vendor>
-    <language>C_SHARP</language>
-    <profile>FULL</profile>
-    <executable>cscc</executable>
-    <frameworkVersions>
-      <frameworkVersion>2.0.50727</frameworkVersion>
-      <frameworkVersion>1.1.4322</frameworkVersion>
-    </frameworkVersions>
-    <platforms>
-      <platform>
-        <operatingSystem>Windows</operatingSystem>
-      </platform>
-      <platform>      
-        <operatingSystem>Mac OS X</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Linux</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>Solaris</operatingSystem>
-      </platform>
-      <platform>
-        <operatingSystem>FreeBSD</operatingSystem>
-      </platform>
-    </platforms>
-  </compilerPlugin>
-  <!--
-  <compilerPlugin>
     <identifier>Ruby</identifier>
     <pluginClass>npanday.executable.compiler.impl.RubyCompiler</pluginClass>
     <vendor>MICROSOFT</vendor>
@@ -1257,5 +35,4 @@ under the License.
       </platform>
     </platforms>
   </compilerPlugin>
-  -->
 </compilerPlugins>

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/configuration-appenders/configurationAppenders.mdo
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/configuration-appenders/configurationAppenders.mdo?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/configuration-appenders/configurationAppenders.mdo (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/configuration-appenders/configurationAppenders.mdo Fri Dec  9 09:22:34 2011
@@ -16,7 +16,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0 http://modello.codehaus.org/xsd/modello-1.4.0.xsd">
   <id>configurationappenders</id>
   <name>ConfigurationAppenders</name>
   <description></description>
@@ -27,25 +28,25 @@ under the License.
     </default>
   </defaults>
   <classes>
-    <class rootElement="true">
+    <class rootElement="true" xml.tagName="configurationAppenders">
       <name>ConfigurationAppenderModel</name>
       <fields>
         <field>
           <name>configurationAppenders</name>
           <description></description>
-          <association>
+          <association xml.itemsStyle="flat">
             <type>ConfigurationAppender</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
       </fields>
     </class>
-    <class xml.tagName="configurationAppender">
+    <class>
       <name>ConfigurationAppender</name>
       <fields>
         <field>
           <name>name</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description></description>
         </field>

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/configuration-appenders/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/configuration-appenders/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/configuration-appenders/pom.xml (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/configuration-appenders/pom.xml Fri Dec  9 09:22:34 2011
@@ -33,8 +33,10 @@ under the License.
       <plugin> 
         <groupId>org.codehaus.modello</groupId>  
         <artifactId>modello-maven-plugin</artifactId>  
-        <configuration> 
-          <model>configurationAppenders.mdo</model>  
+        <configuration>
+          <models>
+            <model>configurationAppenders.mdo</model>
+          </models>
           <version>1.0.0</version> 
         </configuration> 
       </plugin> 

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/entries/entries.mdo
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/entries/entries.mdo?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/entries/entries.mdo (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/entries/entries.mdo Fri Dec  9 09:22:34 2011
@@ -16,7 +16,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0 http://modello.codehaus.org/xsd/modello-1.4.0.xsd">
   <id>entries</id>
   <name>Entries</name>
   <description></description>
@@ -32,14 +33,14 @@ under the License.
       <fields>
         <field>
           <name>entry</name>
-          <association>
+          <association xml.itemsStyle="flat">
             <type>Entry</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
       </fields>
     </class>
-    <class xml.tagName="entry">
+    <class>
       <name>Entry</name>
       <fields>
         <field>

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/entries/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/entries/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/entries/pom.xml (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/entries/pom.xml Fri Dec  9 09:22:34 2011
@@ -42,7 +42,9 @@ under the License.
           </execution> 
         </executions>  
         <configuration> 
-          <model>entries.mdo</model>  
+          <models>
+            <model>entries.mdo</model>
+          </models>
           <version>1.0.0</version> 
         </configuration> 
       </plugin> 

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/executable-plugins.mdo
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/executable-plugins.mdo?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/executable-plugins.mdo (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/executable-plugins.mdo Fri Dec  9 09:22:34 2011
@@ -16,7 +16,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0 http://modello.codehaus.org/xsd/modello-1.4.0.xsd">
   <id>executable-plugin</id>
   <name>ExecutablePlugin</name>
   <description>A configuration file for compilers.</description>
@@ -27,13 +28,13 @@ under the License.
     </default>
   </defaults>
   <classes>
-    <class rootElement="true">
+    <class rootElement="true" xml.tagName="executablePlugins">
       <name>ExecutablePluginsModel</name>
       <fields>
         <field>
           <name>executablePlugins</name>
           <description>Plugin configurations.</description>
-          <association>
+          <association xml.itemsStyle="flat">
             <type>ExecutablePlugin</type>
             <multiplicity>*</multiplicity>
           </association>
@@ -41,18 +42,18 @@ under the License.
       </fields>
     </class>
 
-    <class xml.tagName="executablePlugin">
+    <class>
       <name>ExecutablePlugin</name>
       <fields>
         <field>
           <name>identifier</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>An id for the compiler. It should be (but is not required to be) unique.</description>
         </field>
         <field>
           <name>pluginClass</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>
             Class name of the compiler. NPanday will pass an instance of this class to the
@@ -61,25 +62,33 @@ under the License.
         </field>
         <field>
           <name>vendor</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>Vendor of the compiler: MICROSOFT, MONO, DotGNU</description>
         </field>
         <field>
+          <name>vendorVersion</name>
+          <!-- since NPanday 1.5.0 -->
+          <version>1.5.0+</version>
+          <type>String</type>
+          <description>The vendor version the executable is available for or supports.</description>
+        </field>
+        <field>
           <name>profile</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>Profile for the plugin.</description>
         </field>
         <field>
           <name>executable</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
-          <description>Executable, as run from the command line.</description>
+          <description>Executable name without extension, as run from the command line.</description>
         </field>
         <field>
           <name>frameworkVersions</name>
-          <description>Supported framework version(s) of the compiler: 1.1.4322, 2.0.50727, 3.0</description>
+          <description>Supported framework version(s): 1.1.4322, 2.0.50727, 3.0, ..</description>
+          <version>1.0.0+</version>
           <association>
             <type>String</type>
             <multiplicity>*</multiplicity>
@@ -87,7 +96,7 @@ under the License.
         </field>
         <field>
           <name>platforms</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description>Platform configuration capabilities.</description>
           <association>
             <type>Platform</type>
@@ -96,7 +105,7 @@ under the License.
         </field>
         <field>
           <name>commandFilter</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description>A filter for including/excluding user-passed commands options.</description>
           <association>
             <type>CommandFilter</type>
@@ -110,10 +119,9 @@ under the License.
       <fields>
         <field>
           <name>excludes</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description>
-            The command options to exclude from the user specified pass-through parameters (Currently
-            unused)
+            The command options to exclude from the user specified pass-through parameters.
           </description>
           <association>
             <type>String</type>
@@ -122,7 +130,7 @@ under the License.
         </field>
         <field>
           <name>includes</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description>
             The command options to allow from the user specified pass-through parameters.
           </description>
@@ -139,16 +147,15 @@ under the License.
       <fields>
         <field>
           <name>operatingSystem</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <description>The operating system that the compiler is capable of running on.</description>
         </field>
         <field>
           <name>architecture</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
-          <description>The architecture that the compiler is capable of running on (Currently
-            unused).</description>
+          <description>The architecture that the compiler is capable of running on.</description>
         </field>
       </fields>
     </class>

Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/pom.xml (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/pom.xml Fri Dec  9 09:22:34 2011
@@ -32,9 +32,11 @@ under the License.
       <plugin> 
         <groupId>org.codehaus.modello</groupId>  
         <artifactId>modello-maven-plugin</artifactId>  
-        <configuration> 
-          <model>executable-plugins.mdo</model>  
-          <version>1.0.0</version> 
+        <configuration>
+          <models>
+            <model>executable-plugins.mdo</model>
+          </models>
+          <version>1.5.0</version>
         </configuration> 
       </plugin> 
     </plugins> 

Added: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/plugins/io/ExecutablePluginXpp3ReaderTest.groovy
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/plugins/io/ExecutablePluginXpp3ReaderTest.groovy?rev=1212295&view=auto
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/plugins/io/ExecutablePluginXpp3ReaderTest.groovy (added)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/plugins/io/ExecutablePluginXpp3ReaderTest.groovy Fri Dec  9 09:22:34 2011
@@ -0,0 +1,38 @@
+package npanday.model.compiler.plugins.io
+/* Copyright 2010 NPanday
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+import npanday.model.compiler.plugins.io.xpp3.ExecutablePluginXpp3Reader
+
+class ExecutablePluginXpp3ReaderTest
+{
+  @org.junit.Test
+  void passes()
+  {
+    def xpp3Reader = new ExecutablePluginXpp3Reader();
+    def stream = getClass().getResourceAsStream("/sample-executable-plugins.xml")
+    assert stream != null : "couldn't find sample xml"
+    def xmlStream = new InputStreamReader(stream)
+    def model = xpp3Reader.read(xmlStream)
+
+    assert model != null
+    assert model.executablePlugins != null
+    assert model.executablePlugins.size() == 1
+  }
+}

Added: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml?rev=1212295&view=auto
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml (added)
+++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml Fri Dec  9 09:22:34 2011
@@ -0,0 +1,37 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<executablePlugins>
+  <executablePlugin>
+    <identifier>ncover</identifier>
+    <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
+    <vendor>MICROSOFT</vendor>
+    <executable>NCover.Console</executable>
+    <profile>NCover:NCover.Console</profile>
+    <frameworkVersions>
+      <frameworkVersion>4.0</frameworkVersion>
+      <frameworkVersion>3.5</frameworkVersion>
+      <frameworkVersion>2.0.50727</frameworkVersion>
+    </frameworkVersions>
+    <platforms>
+      <platform>
+        <operatingSystem>Windows</operatingSystem>
+      </platform>
+    </platforms>
+  </executablePlugin>
+</executablePlugins>