Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/netdependency.mdo URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/netdependency.mdo?rev=1212295&r1=1212294&r2=1212295&view=diff ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/netdependency.mdo (original) +++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/netdependency.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>netdependency</id> <name>NetDependency</name> <description></description> @@ -27,68 +28,68 @@ under the License. </default> </defaults> <classes> - <class rootElement="true"> + <class rootElement="true" xml.tagName="netDependencies"> <name>NetDependencyModel</name> <fields> - <field> + <field xml.tagName="netDependency"> <name>netDependencies</name> <description></description> - <association> + <association xml.itemsStyle="flat"> <type>NetDependency</type> <multiplicity>*</multiplicity> </association> </field> </fields> </class> - <class xml.tagName="netDependency"> + <class> <name>NetDependency</name> <fields> <field> <name>id</name> - <version>1.0.0</version> + <version>1.0.0+</version> <type>String</type> <description></description> </field> <field> <name>groupId</name> - <version>1.0.0</version> + <version>1.0.0+</version> <type>String</type> <description></description> </field> <field> <name>version</name> - <version>1.0.0</version> + <version>1.0.0+</version> <type>String</type> <description> </description> </field> <field> <name>artifactId</name> - <version>1.0.0</version> + <version>1.0.0+</version> <type>String</type> <description></description> </field> <field> <name>type</name> - <version>1.0.0</version> + <version>1.0.0+</version> <type>String</type> <description></description> </field> <field> <name>profile</name> - <version>1.0.0</version> + <version>1.0.0+</version> <type>String</type> <description></description> </field> <field> <name>publicKeyToken</name> - <version>1.0.0</version> + <version>1.0.0+</version> <type>String</type> <description>The public key of the assembly.</description> </field> <field> <name>isGacInstall</name> - <version>1.0.0</version> + <version>1.0.0+</version> <type>boolean</type> <description>True if the framework should install the net dependency in the GAC, otherwise false.</description> </field>
Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/pom.xml (original) +++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/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>netdependency.mdo</model> + <configuration> + <models> + <model>netdependency.mdo</model> + </models> <version>1.0.0</version> </configuration> </plugin> Added: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/groovy/npanday/model/settings/io/NetDependencyXpp3ReaderTest.groovy URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/groovy/npanday/model/settings/io/NetDependencyXpp3ReaderTest.groovy?rev=1212295&view=auto ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/groovy/npanday/model/settings/io/NetDependencyXpp3ReaderTest.groovy (added) +++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/groovy/npanday/model/settings/io/NetDependencyXpp3ReaderTest.groovy Fri Dec 9 09:22:34 2011 @@ -0,0 +1,40 @@ +package npanday.model.settings.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.netdependency.io.xpp3.NetDependencyXpp3Reader +import org.junit.Test + + +class NetDependencyXpp3ReaderTest +{ + @Test + void passes() + { + def xpp3Reader = new NetDependencyXpp3Reader(); + def stream = getClass().getResourceAsStream("/sample-netdependencies.xml") + assert stream != null : "couldn't find sample xml" + def xmlStream = new InputStreamReader(stream) + def model = xpp3Reader.read(xmlStream) + + assert model != null + assert model.netDependencies != null + assert model.netDependencies.size() == 1 + } +} Added: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/resources/sample-netdependencies.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/resources/sample-netdependencies.xml?rev=1212295&view=auto ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/resources/sample-netdependencies.xml (added) +++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/netdependency/src/test/resources/sample-netdependencies.xml Fri Dec 9 09:22:34 2011 @@ -0,0 +1,25 @@ +<!-- +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. +--> +<netDependencies> + <netDependency> + <groupId>org.apache.npanday.plugins</groupId> + <artifactId>NPanday.Plugin.Resx</artifactId> + <type>exe</type> + </netDependency> +</netDependencies> Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/pom.xml (original) +++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/pom.xml Fri Dec 9 09:22:34 2011 @@ -43,7 +43,57 @@ under the License. <artifactId>plexus-utils</artifactId> </dependency> </dependencies> - <build> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.modello</groupId> + <artifactId>modello-maven-plugin</artifactId> + <version>1.5</version> + <configuration> + <useJava5>false</useJava5> + </configuration> + <executions> + <execution> + <id>generate-modello-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>java</goal> + <goal>xpp3-reader</goal> + <goal>xpp3-writer</goal> + </goals> + </execution> + <!--execution> + <id>generate-modello-xsd</id> + <phase>generate-resources</phase> + <goals> + <goal>xsd</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/xsd</outputDirectory> + </configuration> + </execution--> + <execution> + <id>generate-modello-xsd-for-site</id> + <phase>pre-site</phase> + <goals> + <goal>xsd</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/generated-site/resources/xsd</outputDirectory> + </configuration> + </execution> + <execution> + <id>generate-modello-docs</id> + <phase>pre-site</phase> + <goals> + <goal>xdoc</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -52,14 +102,12 @@ under the License. <workingDirectory>${project.build.directory}/site</workingDirectory> <siteDirectory>${project.build.directory}/generated-site</siteDirectory> </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/generated-site</outputDirectory> - </configuration> - </plugin> + </plugin> + <plugin> + <!-- enable groovy testing --> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>gmaven-plugin</artifactId> + </plugin> </plugins> </build> </project> Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/pom.xml (original) +++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/pom.xml Fri Dec 9 09:22:34 2011 @@ -33,7 +33,9 @@ under the License. <groupId>org.codehaus.modello</groupId> <artifactId>modello-maven-plugin</artifactId> <configuration> - <model>settings.mdo</model> + <models> + <model>settings.mdo</model> + </models> <version>1.0.0</version> </configuration> </plugin> Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/settings.mdo URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/settings.mdo?rev=1212295&r1=1212294&r2=1212295&view=diff ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/settings.mdo (original) +++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/settings.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>npanday-settings</id> <name>NPandaySettings</name> <description></description> @@ -50,7 +51,7 @@ under the License. </field> </fields> </class> - <class xml.tagName="defaultSetup"> + <class> <name>DefaultSetup</name> <fields> <field> @@ -67,7 +68,7 @@ under the License. </field> </fields> </class> - <class xml.tagName="vendor"> + <class> <name>Vendor</name> <fields> <field> Added: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/groovy/npanday/model/settings/io/NPandaySettingsXpp3ReaderTest.groovy URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/groovy/npanday/model/settings/io/NPandaySettingsXpp3ReaderTest.groovy?rev=1212295&view=auto ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/groovy/npanday/model/settings/io/NPandaySettingsXpp3ReaderTest.groovy (added) +++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/groovy/npanday/model/settings/io/NPandaySettingsXpp3ReaderTest.groovy Fri Dec 9 09:22:34 2011 @@ -0,0 +1,41 @@ +package npanday.model.settings.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.settings.io.xpp3.NPandaySettingsXpp3Reader +import org.junit.Test + + +class NPandaySettingsXpp3ReaderTest +{ + @Test + void passes() + { + def xpp3Reader = new NPandaySettingsXpp3Reader(); + def stream = getClass().getResourceAsStream("/sample-settings.xml") + assert stream != null : "couldn't find sample xml" + def xmlStream = new InputStreamReader(stream) + def model = xpp3Reader.read(xmlStream) + + assert model != null + assert model.operatingSystem != null + assert model.defaultSetup != null + assert model.vendors != 1 + } +} Added: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/resources/sample-settings.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/resources/sample-settings.xml?rev=1212295&view=auto ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/resources/sample-settings.xml (added) +++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-model/settings/src/test/resources/sample-settings.xml Fri Dec 9 09:22:34 2011 @@ -0,0 +1,42 @@ +<!-- +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. +--> +<npandaySettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <operatingSystem>Microsoft Windows NT 6.1.7600.0</operatingSystem> + <defaultSetup> + <vendorName>MICROSOFT</vendorName> + <vendorVersion>2.0.50727</vendorVersion> + <frameworkVersion>2.0.50727</frameworkVersion> + </defaultSetup> + <vendors> + <vendor> + <vendorName>MICROSOFT</vendorName> + <vendorVersion>2.0.50727</vendorVersion> + <frameworks> + <framework> + <frameworkVersion>2.0.50727</frameworkVersion> + <installRoot>C:\Windows\Microsoft.NET\Framework64\v2.0.50727</installRoot> + <sdkInstallRoot>C:\Program Files\Microsoft.NET\SDK\v2.0 64bit\</sdkInstallRoot> + <executablePaths> + <executablePath>C:\Program Files\Microsoft.NET\SDK\v2.0 64bit\bin</executablePath> + </executablePaths> + </framework> + </frameworks> + </vendor> + </vendors> +</npandaySettings> Modified: incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java?rev=1212295&r1=1212294&r2=1212295&view=diff ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java (original) +++ incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java Fri Dec 9 09:22:34 2011 @@ -188,7 +188,7 @@ public class StandardRepositoryLoader { throw new NPandayRepositoryException( String.format( "NPANDAY-084-010: Error on loading '%s' into the repository %s", location, - repositoryClass ) ); + repositoryClass ) , e); } } Modified: incubator/npanday/branches/1.5.0-azuresupport/components/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/components/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/components/pom.xml (original) +++ incubator/npanday/branches/1.5.0-azuresupport/components/pom.xml Fri Dec 9 09:22:34 2011 @@ -47,7 +47,20 @@ under the License. <artifactId>guava</artifactId> <!-- version is defined in parent pom --> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.7.0</version> + <scope>test</scope> + </dependency> </dependencies> + <reporting> <excludeDefaults>true</excludeDefaults> <plugins> Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-fxcop-plugin/src/main/java/npanday/plugin/fxcop/FxCopAggregateMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-fxcop-plugin/src/main/java/npanday/plugin/fxcop/FxCopAggregateMojo.java?rev=1212295&r1=1212294&r2=1212295&view=diff ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-fxcop-plugin/src/main/java/npanday/plugin/fxcop/FxCopAggregateMojo.java (original) +++ incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-fxcop-plugin/src/main/java/npanday/plugin/fxcop/FxCopAggregateMojo.java Fri Dec 9 09:22:34 2011 @@ -18,29 +18,28 @@ */ package npanday.plugin.fxcop; -import npanday.artifact.NPandayArtifactResolutionException; -import npanday.registry.NPandayRepositoryException; -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.project.MavenProject; -import npanday.artifact.AssemblyResolver; import npanday.ArtifactType; -import npanday.executable.ExecutionException; import npanday.PlatformUnsupportedException; +import npanday.artifact.AssemblyResolver; +import npanday.artifact.NPandayArtifactResolutionException; +import npanday.executable.ExecutionException; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; -import org.apache.maven.model.Model; import org.apache.maven.model.Dependency; +import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; -import java.io.IOException; import java.io.FileReader; -import java.util.Set; -import java.util.List; +import java.io.IOException; import java.util.ArrayList; +import java.util.List; +import java.util.Set; /** * Runs the FxCop Code Analysis Tool for the specified project's assembly and all of its dependencies. Modified: incubator/npanday/branches/1.5.0-azuresupport/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/pom.xml?rev=1212295&r1=1212294&r2=1212295&view=diff ============================================================================== --- incubator/npanday/branches/1.5.0-azuresupport/pom.xml (original) +++ incubator/npanday/branches/1.5.0-azuresupport/pom.xml Fri Dec 9 09:22:34 2011 @@ -321,26 +321,6 @@ under the License. </dependencies> </plugin> <plugin> - <groupId>org.codehaus.modello</groupId> - <artifactId>modello-maven-plugin</artifactId> - <version>1.0-alpha-13</version> - <executions> - <execution> - <goals> - <goal>xpp3-reader</goal> - <goal>java</goal> - </goals> - </execution> - <execution> - <id>site</id> - <phase>pre-site</phase> - <goals> - <goal>xdoc</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-maven-plugin</artifactId> <version>1.3.8</version> @@ -372,6 +352,20 @@ under the License. </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>groovy-tests</id> + <goals> + <goal>generateTestStubs</goal> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> </build>