You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/08/08 17:19:23 UTC
svn commit: r563949 [1/2] - in /incubator/nmaven/trunk: ./ archetypes/
archetypes/maven-archetype-dotnet-simple/
archetypes/maven-archetype-netexecutable/ assemblies/
assemblies/NMaven.Artifact/ assemblies/NMaven.IDE/
assemblies/NMaven.Logging/ assembl...
Author: sisbell
Date: Wed Aug 8 10:19:04 2007
New Revision: 563949
URL: http://svn.apache.org/viewvc?view=rev&rev=563949
Log:
Changed back to snapshot versions.
Modified:
incubator/nmaven/trunk/README.txt
incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml
incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml
incubator/nmaven/trunk/archetypes/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Artifact/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.IDE/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Logging/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Model/AutomationExtensibility/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Model/VSContent/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Plugin.Loader/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Solution/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/src/main/csharp/ArchetypeProjectForm.Designer.cs
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/src/main/csharp/ArchetypeProjectForm.cs
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio/pom.xml
incubator/nmaven/trunk/assemblies/pom.xml
incubator/nmaven/trunk/components/README.txt
incubator/nmaven/trunk/components/dotnet-artifact/pom.xml
incubator/nmaven/trunk/components/dotnet-assembler/pom.xml
incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
incubator/nmaven/trunk/components/dotnet-core/pom.xml
incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java
incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml
incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/Project.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDependency.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/Requirement.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java
incubator/nmaven/trunk/components/dotnet-embedder/pom.xml
incubator/nmaven/trunk/components/dotnet-executable/pom.xml
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
incubator/nmaven/trunk/components/dotnet-jetty/pom.xml
incubator/nmaven/trunk/components/dotnet-model/assembly-plugins/pom.xml
incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml
incubator/nmaven/trunk/components/dotnet-model/configuration-appenders/pom.xml
incubator/nmaven/trunk/components/dotnet-model/entries/pom.xml
incubator/nmaven/trunk/components/dotnet-model/executable-plugins/pom.xml
incubator/nmaven/trunk/components/dotnet-model/netdependency/pom.xml
incubator/nmaven/trunk/components/dotnet-model/pom.xml
incubator/nmaven/trunk/components/dotnet-model/settings/pom.xml
incubator/nmaven/trunk/components/dotnet-plugin/pom.xml
incubator/nmaven/trunk/components/dotnet-registry/pom.xml
incubator/nmaven/trunk/components/dotnet-repository/pom.xml
incubator/nmaven/trunk/components/dotnet-service/embedder/pom.xml
incubator/nmaven/trunk/components/dotnet-vendor/pom.xml
incubator/nmaven/trunk/components/pom.xml
incubator/nmaven/trunk/plugins/maven-compile-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-deploy-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-embedder-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-install-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-link-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-mojo-generator-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-repository-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-resgen-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-resolver-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-test-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
incubator/nmaven/trunk/plugins/maven-vstudio-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-webapp-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-wsdl-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-xsd-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-xsp-plugin/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/pom.xml
incubator/nmaven/trunk/plugins/netplugins/pom.xml
incubator/nmaven/trunk/plugins/pom.xml
incubator/nmaven/trunk/pom-dotnet.xml
incubator/nmaven/trunk/pom.xml
Modified: incubator/nmaven/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/README.txt?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/README.txt (original)
+++ incubator/nmaven/trunk/README.txt Wed Aug 8 10:19:04 2007
@@ -48,4 +48,11 @@
* Click on Tools/NMaven Addin
A small box will appear showing a tree view of all the projects. Right click to build the project. You will see
- the build results within the output window.
\ No newline at end of file
+ the build results within the output window.
+
+ Places to change the versions in the code:
+ Connect.cs
+ EmbedderStarterMojo.java
+ VsInstallerMojo.java
+ registry-config.xml
+ template under the maven-vsinstaller-plugin
\ No newline at end of file
Modified: incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml (original)
+++ incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml Wed Aug 8 10:19:04 2007
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-archetypes</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml (original)
+++ incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml Wed Aug 8 10:19:04 2007
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-archetypes</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/archetypes/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/archetypes/pom.xml (original)
+++ incubator/nmaven/trunk/archetypes/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-project</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Artifact/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Artifact/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Artifact/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Artifact/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,13 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Artifact</groupId>
<artifactId>NMaven.Artifact</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>library</packaging>
<name>NMaven.Artifact</name>
<dependencies>
@@ -33,7 +33,7 @@
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>NUnit</groupId>
Modified: incubator/nmaven/trunk/assemblies/NMaven.IDE/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.IDE/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.IDE/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.IDE/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,32 +19,32 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.IDE</groupId>
<artifactId>NMaven.IDE</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>library</packaging>
<name>NMaven.IDE</name>
<dependencies>
<dependency>
<groupId>NMaven.Service</groupId>
<artifactId>NMaven.Service.Embedder</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Artifact</groupId>
<artifactId>NMaven.Artifact</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Logging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Logging/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Logging/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Logging/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,13 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>library</packaging>
<name>NMaven.Library</name>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Model/AutomationExtensibility/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Model/AutomationExtensibility/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Model/AutomationExtensibility/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Model/AutomationExtensibility/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,14 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.AutomationExtensibility</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>library</packaging>
<name>NMaven.Model.AutomationExtensibility</name>
<!--
Modified: incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,14 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>library</packaging>
<name>NMaven.Model.Pom</name>
<build>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Model/VSContent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Model/VSContent/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Model/VSContent/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Model/VSContent/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
<relativePath>..\..\pom.xml</relativePath>
</parent>
@@ -27,7 +27,7 @@
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.VSContent</artifactId>
<packaging>library</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Model.VSContent</name>
<build>
<!--
Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin.Loader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin.Loader/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin.Loader/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin.Loader/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,13 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.Loader</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>exe</packaging>
<name>NMaven.Plugin.Loader</name>
<dependencies>
@@ -33,7 +33,7 @@
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,13 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.MojoGenerator</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>exe</packaging>
<name>NMaven.Plugin.MojoGenerator</name>
<dependencies>
@@ -33,7 +33,7 @@
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,13 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.Runner</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>exe</packaging>
<name>NMaven.Plugin.Runner</name>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,13 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>library</packaging>
<name>NMaven.Plugin</name>
<dependencies>
@@ -33,7 +33,7 @@
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,14 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Service</groupId>
<artifactId>NMaven.Service.Embedder</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>library</packaging>
<name>NMaven.Service.Embedder</name>
<build>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Solution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Solution/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Solution/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Solution/pom.xml Wed Aug 8 10:19:04 2007
@@ -1,13 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven</groupId>
<artifactId>NMaven.Solution</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>library</packaging>
<name>NMaven.Solution</name>
<dependencies>
@@ -15,13 +15,13 @@
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>NMaven.Artifact</groupId>
<artifactId>NMaven.Artifact</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>Microsoft.Build.Engine</groupId>
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,51 +19,51 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio.Addin</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>visual-studio-addin</packaging>
<name>NMaven.VisualStudio.Addin</name>
<dependencies>
<dependency>
<groupId>NMaven.IDE</groupId>
<artifactId>NMaven.IDE</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Service</groupId>
<artifactId>NMaven.Service.Embedder</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>NMaven.Artifact</groupId>
<artifactId>NMaven.Artifact</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs Wed Aug 8 10:19:04 2007
@@ -14,7 +14,7 @@
{
public AddArtifactsForm()
{
- InitializeComponent();
+ InitializeForm();
localListView.View = View.Details;
// IWindsorContainer container = new WindsorContainer(new XmlInterpreter(@"C:\Documents and Settings\shane\nmaven-apache\trunk-fix\assemblies\NMaven.VisualStudio.Addin\src\main\resources\components.xml"));
// ArtifactContext artifactContext = (ArtifactContext) container[typeof(ArtifactContext)];
@@ -38,6 +38,24 @@
// item.SubItems.Add("1.2.3.4");
// localListView.Items.Add(item);
+ }
+
+ private void InitializeForm()
+ {
+ this.SuspendLayout();
+ //
+ // AddArtifactsForm
+ //
+ this.ClientSize = new System.Drawing.Size(292, 260);
+ this.Name = "AddArtifactsForm";
+ this.Load += new System.EventHandler(this.AddArtifactsForm_Load);
+ this.ResumeLayout(false);
+
+ }
+
+ private void AddArtifactsForm_Load(object sender, EventArgs e)
+ {
+
}
}
}
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs Wed Aug 8 10:19:04 2007
@@ -120,10 +120,10 @@
String localRepository = Environment.GetEnvironmentVariable("HOMEDRIVE")
+ Environment.GetEnvironmentVariable("HOMEPATH") + @"\.m2\repository\";
- IWindsorContainer container = new WindsorContainer(new XmlInterpreter(@"C:\Documents and Settings\shane\nmaven-apache\trunk-fix\assemblies\NMaven.VisualStudio.Addin\src\main\resources\components.xml"));
- ArtifactContext artifactContext = (ArtifactContext) container[typeof(ArtifactContext)];
-
- NMaven.Artifact.Artifact artifactWar = artifactContext.CreateArtifact("org.apache.maven.dotnet", "dotnet-service-embedder", "0.14", "war");
+ // IWindsorContainer container = new WindsorContainer(new XmlInterpreter(@"C:\Documents and Settings\shane\nmaven-apache\trunk-fix\assemblies\NMaven.VisualStudio.Addin\src\main\resources\components.xml"));
+ // ArtifactContext artifactContext = (ArtifactContext) container[typeof(ArtifactContext)];
+ ArtifactContext artifactContext = new ArtifactContext();
+ NMaven.Artifact.Artifact artifactWar = artifactContext.CreateArtifact("org.apache.maven.dotnet", "dotnet-service-embedder", "0.14-SNAPSHOT", "war");
FileInfo warFileInfo = new FileInfo(localRepository + "/" + new JavaRepositoryLayout().pathOf(artifactWar) + "war");
logger.Log(Level.INFO, "Executing external command plugin: "
+ @"mvn org.apache.maven.dotnet.plugins:maven-embedder-plugin:start -Dport=8080 -DwarFile="""
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,18 +19,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio.ProjectWizard</artifactId>
+ <version>0.14-SNAPSHOT</version>
<packaging>library</packaging>
<name>NMaven.VisualStudio.ProjectWizard</name>
<dependencies>
<dependency>
<groupId>Microsoft.VisualStudio.TemplateWizardInterface</groupId>
<artifactId>Microsoft.VisualStudio.TemplateWizardInterface</artifactId>
+ <version>8.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
<type>gac_msil</type>
</dependency>
<dependency>
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/src/main/csharp/ArchetypeProjectForm.Designer.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/src/main/csharp/ArchetypeProjectForm.Designer.cs?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/src/main/csharp/ArchetypeProjectForm.Designer.cs (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/src/main/csharp/ArchetypeProjectForm.Designer.cs Wed Aug 8 10:19:04 2007
@@ -36,25 +36,27 @@
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button();
+ this.label5 = new System.Windows.Forms.Label();
+ this.listBoxArtifactType = new System.Windows.Forms.ListBox();
this.SuspendLayout();
//
// groupIdTextBox
//
- this.groupIdTextBox.Location = new System.Drawing.Point(117, 54);
+ this.groupIdTextBox.Location = new System.Drawing.Point(121, 54);
this.groupIdTextBox.Name = "groupIdTextBox";
this.groupIdTextBox.Size = new System.Drawing.Size(246, 22);
this.groupIdTextBox.TabIndex = 0;
//
// artifactIdTextBox
//
- this.artifactIdTextBox.Location = new System.Drawing.Point(117, 98);
+ this.artifactIdTextBox.Location = new System.Drawing.Point(121, 98);
this.artifactIdTextBox.Name = "artifactIdTextBox";
this.artifactIdTextBox.Size = new System.Drawing.Size(246, 22);
this.artifactIdTextBox.TabIndex = 1;
//
// versionTextBox
//
- this.versionTextBox.Location = new System.Drawing.Point(117, 147);
+ this.versionTextBox.Location = new System.Drawing.Point(121, 137);
this.versionTextBox.Name = "versionTextBox";
this.versionTextBox.Size = new System.Drawing.Size(246, 22);
this.versionTextBox.TabIndex = 2;
@@ -80,7 +82,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(26, 147);
+ this.label3.Location = new System.Drawing.Point(26, 137);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(56, 17);
this.label3.TabIndex = 5;
@@ -98,7 +100,7 @@
//
// button1
//
- this.button1.Location = new System.Drawing.Point(303, 211);
+ this.button1.Location = new System.Drawing.Point(303, 233);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 7;
@@ -106,11 +108,34 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(26, 178);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(88, 17);
+ this.label5.TabIndex = 9;
+ this.label5.Text = "Artifact Type";
+ this.label5.Click += new System.EventHandler(this.label5_Click);
+ //
+ // listBoxArtifactType
+ //
+ this.listBoxArtifactType.AllowDrop = true;
+ this.listBoxArtifactType.FormattingEnabled = true;
+ this.listBoxArtifactType.ItemHeight = 16;
+ this.listBoxArtifactType.Location = new System.Drawing.Point(121, 178);
+ this.listBoxArtifactType.Name = "listBoxArtifactType";
+ this.listBoxArtifactType.Size = new System.Drawing.Size(134, 20);
+ this.listBoxArtifactType.TabIndex = 10;
+ this.listBoxArtifactType.SelectedIndexChanged += new System.EventHandler(this.listBoxArtifactType_SelectedIndexChanged);
+ //
// ArchetypeProjectForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(402, 279);
+ this.Controls.Add(this.listBoxArtifactType);
+ this.Controls.Add(this.label5);
this.Controls.Add(this.button1);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
@@ -137,6 +162,8 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.ListBox listBoxArtifactType;
}
}
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/src/main/csharp/ArchetypeProjectForm.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/src/main/csharp/ArchetypeProjectForm.cs?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/src/main/csharp/ArchetypeProjectForm.cs (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/src/main/csharp/ArchetypeProjectForm.cs Wed Aug 8 10:19:04 2007
@@ -74,5 +74,15 @@
artifactIdTextBox.Text = this.ArtifactId;
versionTextBox.Text = this.Version;
}
+
+ private void listBoxArtifactType_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void label5_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio/pom.xml Wed Aug 8 10:19:04 2007
@@ -19,20 +19,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>library</packaging>
<name>NMaven.VisualStudio</name>
<dependencies>
<dependency>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
Modified: incubator/nmaven/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/assemblies/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,14 +20,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>NMaven.Project</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Project</artifactId>
<relativePath>../pom-dotnet.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven</groupId>
<artifactId>NMaven.Assemblies</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<packaging>pom</packaging>
<name>NMaven.Assemblies</name>
<url>http://incubator.apache.org/nmaven</url>
@@ -57,6 +57,7 @@
<module>NMaven.VisualStudio</module>
<module>NMaven.VisualStudio.Addin</module>
<module>NMaven.IDE</module>
+ <module>NMaven.VisualStudio.ProjectWizard</module>
</modules>
<build>
<plugins>
Modified: incubator/nmaven/trunk/components/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/README.txt?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/README.txt (original)
+++ incubator/nmaven/trunk/components/README.txt Wed Aug 8 10:19:04 2007
@@ -4,11 +4,13 @@
000-019: dotnet-artifact
020-039: dotnet-assembler
040-059: dotnet-core
+180-189: dotnet-dao
120-139: dotnet-embedder
060-079: dotnet-executable
140-149: dotnet-jetty
150-179: dotnet-plugin
080-099: dotnet-registry
+190-199: dotnet-repository
180-189: dotnet-service
100-119: dotnet-vendor
Modified: incubator/nmaven/trunk/components/dotnet-artifact/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-artifact/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-artifact/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-assembler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-assembler/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-assembler/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-assembler/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java (original)
+++ incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java Wed Aug 8 10:19:04 2007
@@ -18,7 +18,6 @@
*/
package org.apache.maven.dotnet.assembler.impl;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.dotnet.assembler.AssemblerContext;
import org.apache.maven.dotnet.assembler.AssemblyInfo;
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller;
@@ -35,7 +34,6 @@
import org.apache.maven.dotnet.registry.RepositoryRegistry;
import java.io.*;
-
/**
* Provides an implementation of the <code>AssemblerContext</code>.
Modified: incubator/nmaven/trunk/components/dotnet-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-core/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-core/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java (original)
+++ incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java Wed Aug 8 10:19:04 2007
@@ -18,8 +18,6 @@
*/
package org.apache.maven.dotnet;
-import org.apache.maven.project.MavenProject;
-
import org.apache.maven.dotnet.registry.Repository;
import org.codehaus.plexus.logging.Logger;
@@ -31,7 +29,6 @@
public interface NMavenContext
{
-
/**
* Role used to register component implementations with the container.
*/
Modified: incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java (original)
+++ incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java Wed Aug 8 10:19:04 2007
@@ -1,30 +1,59 @@
+/*
+ * 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.
+ */
package org.apache.maven.dotnet;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.dotnet.ArtifactType;
import java.io.File;
import java.util.logging.Logger;
-public class PathUtil
+/**
+ * This class provides methods for obtaining the location of artifacts.
+ */
+
+public final class PathUtil
{
private static final Logger logger = Logger.getAnonymousLogger();
+ /**
+ * Returns the path of the artifact within the global assembly cache.
+ *
+ * @param artifact the artifact to find the path of. This value should not be null.
+ * @param gacRepository the root directory of the GAC. This value should not be null.
+ * @return the path of the artifact within the global assembly cache or null if either of the specified
+ * parameters is null
+ */
public static File getGlobalAssemblyCacheFileFor( Artifact artifact, File gacRepository )
{
if ( artifact == null )
{
- logger.warning( "NMAVEN-000-000: Artifact is null - Cannot get application file." );
+ logger.warning( "NMAVEN-040-000: Artifact is null - Cannot get application file." );
return null;
}
if ( gacRepository == null )
{
- logger.warning( "NMAVEN-000-000: GAC Repository is null - Cannot get application file." );
+ logger.warning( "NMAVEN-040-001: GAC Repository is null - Cannot get application file." );
return null;
}
if ( artifact.getClassifier() == null )
{
- logger.warning( "NMAVEN-000-000: Assembly must be signed - Cannot get application file." );
+ logger.warning( "NMAVEN-040-002: Assembly must be signed - Cannot get application file." );
}
String version = artifact.getVersion();
int count = version.split( "[.]" ).length;
@@ -38,16 +67,24 @@
"__" + artifact.getClassifier() + "\\" + artifact.getArtifactId() + ".dll" );
}
+ /**
+ * Returns the path of the artifact within the private application base.
+ *
+ * @param artifact the artifact to find the path of. This value should not be null.
+ * @param localRepository the local repository. This value should not be null.
+ * @return the path of the artifact within the private application base or null if either of the specified
+ * parameters is null
+ */
public static File getPrivateApplicationBaseFileFor( Artifact artifact, File localRepository )
{
if ( artifact == null )
{
- logger.warning( "NMAVEN-000-000: Artifact is null - Cannot get application file." );
+ logger.warning( "NMAVEN-040-003: Artifact is null - Cannot get application file." );
return null;
}
if ( localRepository == null )
{
- logger.warning( "NMAVEN-000-000: Local Repository is null - Cannot get application file." );
+ logger.warning( "NMAVEN-040-004: Local Repository is null - Cannot get application file." );
return null;
}
return new File( localRepository.getParentFile(), "pab\\gac_msil\\" + artifact.getArtifactId() + "\\" +
@@ -55,16 +92,24 @@
ArtifactType.getArtifactTypeForPackagingName( artifact.getType() ).getExtension() );
}
+ /**
+ * Returns the path of the artifact within the user assembly cache.
+ *
+ * @param artifact the artifact to find the path of. This value should not be null.
+ * @param localRepository the local repository. This value should not be null.
+ * @return the path of the artifact within the user assembly cache or null if either of the specified
+ * parameters is null
+ */
public static File getUserAssemblyCacheFileFor( Artifact artifact, File localRepository )
{
if ( artifact == null )
{
- logger.warning( "NMAVEN-000-000: Artifact is null - Cannot get application file." );
+ logger.warning( "NMAVEN-040-005: Artifact is null - Cannot get application file." );
return null;
}
if ( localRepository == null )
{
- logger.warning( "NMAVEN-000-000: Local Repository is null - Cannot get application file." );
+ logger.warning( "NMAVEN-040-006: Local Repository is null - Cannot get application file." );
return null;
}
return new File( localRepository.getParentFile(), "uac\\gac_msil\\" + artifact.getArtifactId() + "\\" +
Modified: incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml Wed Aug 8 10:19:04 2007
@@ -40,7 +40,7 @@
<repository-config>/META-INF/nmaven/net-dependencies.xml</repository-config>
<init-param>
<param-name>nmaven.version</param-name>
- <param-value>0.14</param-value>
+ <param-value>0.14-SNAPSHOT</param-value>
</init-param>
</repository>
<repository>
Modified: incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-components</artifactId>
<relativePath>..\..\pom.xml</relativePath>
</parent>
@@ -34,12 +34,12 @@
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
<artifactId>dotnet-registry</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
<artifactId>dotnet-core</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openrdf</groupId>
Modified: incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/Project.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/Project.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/Project.java (original)
+++ incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/Project.java Wed Aug 8 10:19:04 2007
@@ -1,48 +1,121 @@
+/*
+ * 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.
+ */
package org.apache.maven.dotnet.dao;
import java.util.Set;
import java.util.HashSet;
+/**
+ * Class for accessing information about a project.
+ */
public class Project
{
+ /**
+ * The group id of the project
+ */
private String groupId;
+ /**
+ * The artifact id of the project
+ */
private String artifactId;
+ /**
+ * The version of the project
+ */
private String version;
+ /**
+ * The public key token id (classifier) of the project
+ */
private String publicKeyTokenId;
+ /**
+ * Have the project artifacts been resolved
+ */
private boolean isResolved = false;
+ /**
+ * The type of artifact: library, exe, winexe, netmodule
+ */
private String artifactType = "library";
+ /**
+ * The set of project dependencies for this project
+ */
private Set<ProjectDependency> projectDependencies = new HashSet<ProjectDependency>();
+ /**
+ * The set of requirements for this project
+ */
private Set<Requirement> requirements = new HashSet<Requirement>();
+ /**
+ * The parent project
+ */
private Project parentProject;
+ /**
+ * Returns the parent project
+ *
+ * @return the parent project
+ */
public Project getParentProject()
{
return parentProject;
}
+ /**
+ * Sets the parent project
+ *
+ * @param parentProject the parent project
+ */
public void setParentProject( Project parentProject )
{
this.parentProject = parentProject;
}
+ /**
+ * Adds a requirement to the project.
+ *
+ * @param requirement a requirement needed for the artifact to run
+ */
public void addRequirement( Requirement requirement )
{
requirements.add( requirement );
}
+ /**
+ * Returns the set of requirements for the project.
+ *
+ * @return he set of requirements for the project
+ */
public Set<Requirement> getRequirements()
{
return requirements;
}
+ /**
+ * Sets all requirements for the project. This will override any requirements added through Project#addRequirement
+ *
+ * @param requirements the project requirements
+ */
public void setRequirements( Set<Requirement> requirements )
{
this.requirements = requirements;
Modified: incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java (original)
+++ incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java Wed Aug 8 10:19:04 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.maven.dotnet.dao;
import org.apache.maven.dotnet.registry.DataAccessObject;
@@ -15,6 +33,9 @@
import java.io.IOException;
import java.io.File;
+/**
+ * Provides methods for storing and retreiving project information.
+ */
public interface ProjectDao
extends DataAccessObject
{
@@ -23,33 +44,107 @@
*/
String ROLE = ProjectDao.class.getName();
+ /**
+ * Returns a project that matches the specified parameters.
+ *
+ * @param groupId the group id of the project
+ * @param artifactId the artifact id of the project
+ * @param version the version of the project
+ * @param artifactType the type of artifact: library, exe, winexe, netmodule
+ * @param publicKeyTokenId the public key token id. This should match the token id within the manifest of a signed
+ * .NET assesmbly. This value may be null.
+ * @return a project that matches the specified parameters
+ * @throws IOException if there was a problem retrieving the project
+ */
Project getProjectFor( String groupId, String artifactId, String version, String artifactType,
String publicKeyTokenId )
throws IOException;
+ /**
+ * Returns a project that matches the information contained within the specified maven project.
+ *
+ * @param mavenProject the maven project used in finding the returned project
+ * @return a project that matches the information contained within the specified maven project
+ * @throws IOException if there was a problem retrieving the project
+ */
Project getProjectFor( MavenProject mavenProject )
throws IOException;
+ /**
+ * Method not implemented.
+ *
+ * @param project
+ * @param localRepository
+ * @param artifactRepositories
+ * @throws IOException
+ */
void storeProject( Project project, File localRepository, List<ArtifactRepository> artifactRepositories )
throws IOException;
+ /**
+ * Stores the specified project and resolves and stores the project's dependencies.
+ *
+ * @param project the project to store
+ * @param localRepository the local artifact repository
+ * @param artifactRepositories the remote artifact repositories used in resolving dependencies
+ * @return a set of artifacts, including the project and its dependencies
+ * @throws IOException if there was a problem in storing or resolving the artifacts
+ */
Set<Artifact> storeProjectAndResolveDependencies( Project project, File localRepository,
List<ArtifactRepository> artifactRepositories )
throws IOException;
+ /**
+ * Stores the project object model and resolves and stores the model's dependencies.
+ *
+ * @param model the project object model
+ * @param pomFileDirectory the directory containing the pom file
+ * @param localArtifactRepository the local repository
+ * @param artifactRepositories the remote artifact repositories used in resolving dependencies
+ * @return a set of artifacts, including the model and its dependencies
+ * @throws IOException if there was a problem in storing or resolving the artifacts
+ */
Set<Artifact> storeModelAndResolveDependencies( Model model, File pomFileDirectory, File localArtifactRepository,
List<ArtifactRepository> artifactRepositories )
throws IOException;
+ /**
+ * Initializes the data access object
+ *
+ * @param artifactFactory the artifact factory used in creating artifacts
+ * @param wagonManager the manager used for downloading artifacts
+ */
void init( ArtifactFactory artifactFactory, WagonManager wagonManager );
+ /**
+ * Returns all projects.
+ *
+ * @return all projects
+ * @throws IOException if there is a problem retrieving the projects
+ */
Set<Project> getAllProjects()
throws IOException;
+ /**
+ * Sets the repository for the data access object. This method overrides the data source object set in the
+ * DataAccessObject#init
+ *
+ * @param repository the rdf repository
+ */
void setRdfRepository( Repository repository );
+ /**
+ * Opens the repository connection specified within ProjectDao#setRdfRepository or DataAccessObject#init method
+ *
+ * @return true if the rdf repository successfully opens, otherwise return false
+ */
boolean openConnection();
+ /**
+ * Closes the repository connection specified within ProjectDao#setRdfRepository or DataAccessObject#init method
+ *
+ * @return true if the rdf repository successfully closes, otherwise return false
+ */
boolean closeConnection();
}
Modified: incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDependency.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDependency.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDependency.java (original)
+++ incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDependency.java Wed Aug 8 10:19:04 2007
@@ -1,6 +1,22 @@
+/*
+ * 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.
+ */
package org.apache.maven.dotnet.dao;
-
-import org.apache.maven.dotnet.dao.Project;
public class ProjectDependency extends Project
{
Modified: incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java (original)
+++ incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java Wed Aug 8 10:19:04 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.maven.dotnet.dao;
import org.apache.maven.model.Model;
@@ -13,13 +31,25 @@
import java.util.List;
import java.util.ArrayList;
+import java.util.logging.Logger;
import java.io.FileReader;
import java.io.IOException;
import java.io.File;
-
-public class ProjectFactory
+/**
+ * Class for creating Project/ProjectDependency objects.
+ */
+public final class ProjectFactory
{
+ private static final Logger logger = Logger.getAnonymousLogger();
+
+ /**
+ * Creates model from the specified project.
+ *
+ * @param project the project to create the model from.
+ * @return model created from the specified project
+ * @throws IOException if there was a problem creating the model
+ */
public static Model createModelFrom( Project project )
throws IOException
{
@@ -45,6 +75,14 @@
}
+ /**
+ * Creates a project from the specified model
+ *
+ * @param model the project object model used to create the project.
+ * @param pomFileDirectory the directory containing the pom.xml (model).
+ * @return a project created from the specified model
+ * @throws IOException if there was a problem creating the project
+ */
public static Project createProjectFrom( Model model, File pomFileDirectory )
throws IOException
{
@@ -68,11 +106,9 @@
}
catch ( XmlPullParserException e )
{
- throw new IOException( "NMAVEN-000-000: Unable to read model: Message = " + e.getMessage() );
+ throw new IOException( "NMAVEN-180-000: Unable to read model: Message = " + e.getMessage() );
}
- //System.out.println( "Pom File: " + pomFileDirectory.getAbsolutePath() );
- //System.out.println( "Parent: " + parentPomFile.getParentFile().getAbsolutePath() );
Project parentProject = createProjectFrom( parentModel, parentPomFile.getParentFile() );
project.setParentProject( parentProject );
}
@@ -94,11 +130,16 @@
projectDependency.setVersion( dependency.getVersion() );
projectDependency.setPublicKeyTokenId( dependency.getClassifier() );
projectDependency.setArtifactType( dependency.getType() );
+
+ logAndVerifyProjectParameters(projectDependency);
+
return projectDependency;
}
public static Dependency createDependencyFrom( ProjectDependency projectDependency )
{
+ logAndVerifyProjectParameters(projectDependency);
+
Dependency dependency = new Dependency();
dependency.setGroupId( projectDependency.getGroupId() );
dependency.setArtifactId( projectDependency.getArtifactId() );
@@ -110,6 +151,8 @@
public static Artifact createArtifactFrom( Project project, ArtifactFactory artifactFactory, File localRepository )
{
+ logAndVerifyProjectParameters(project);
+
Artifact assembly = artifactFactory.createArtifactWithClassifier( project.getGroupId(), project.getArtifactId(),
project.getVersion(),
project.getArtifactType(),
@@ -128,6 +171,8 @@
public static Artifact createArtifactFrom( ProjectDependency projectDependency, ArtifactFactory artifactFactory )
{
+ logAndVerifyProjectParameters(projectDependency);
+
String scope = ( projectDependency.getScope() == null ) ? Artifact.SCOPE_COMPILE : projectDependency.getScope();
Artifact assembly = artifactFactory.createDependencyArtifact( projectDependency.getGroupId(),
projectDependency.getArtifactId(),
@@ -151,5 +196,34 @@
assembly.setFile( artifactFile );
return assembly;
+ }
+
+ private static boolean logAndVerifyProjectParameters( Project project )
+ {
+ if ( project.getGroupId() == null )
+ {
+ logger.warning( "NMAVEN-180-001: Project Group ID is missing" );
+ return false;
+ }
+ if ( project.getArtifactId() == null )
+ {
+ logger.warning(
+ "NMAVEN-180-002: Project Artifact ID is missing: Group Id = " + project.getGroupId() );
+ return false;
+ }
+ if ( project.getVersion() == null )
+ {
+ logger.warning( "NMAVEN-180-003: Project Version is missing: Group Id = " +
+ project.getGroupId() + ", Artifact Id = " + project.getArtifactId() );
+ return false;
+ }
+ if ( project.getArtifactType() == null )
+ {
+ logger.warning( "NMAVEN-180-004: Project Artifact Type is missing: Group Id" +
+ project.getGroupId() + ", Artifact Id = " + project.getArtifactId() +
+ ", Version = " + project.getVersion() );
+ return false;
+ }
+ return true;
}
}
Modified: incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java (original)
+++ incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java Wed Aug 8 10:19:04 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.maven.dotnet.dao;
public enum ProjectUri
Modified: incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/Requirement.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/Requirement.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/Requirement.java (original)
+++ incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/Requirement.java Wed Aug 8 10:19:04 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.maven.dotnet.dao;
import java.net.URI;
@@ -20,7 +38,7 @@
/**
* Creates a default implementation of Requirement
*
- * @return a default implementation of vendor info
+ * @return a default implementation of requirement
*/
public static Requirement createDefaultRequirement( final URI uri, final String value )
{
Modified: incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java (original)
+++ incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java Wed Aug 8 10:19:04 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.maven.dotnet.dao.impl;
import org.apache.maven.dotnet.dao.ProjectDao;
@@ -402,7 +420,6 @@
URI classifierNode = valueFactory.createURI( project.getPublicKeyTokenId() + ":" );
for ( Requirement requirement : project.getRequirements() )
{
- //System.out.println( "Add requirement: " + requirement.getUri() );
URI uri = valueFactory.createURI( requirement.getUri().toString() );
repositoryConnection.add( classifierNode, uri,
valueFactory.createLiteral( requirement.getValue() ) );
@@ -423,7 +440,7 @@
for ( ProjectDependency projectDependency : project.getProjectDependencies() )
{
- logger.info( "Project Dependency: Artifact ID = " + projectDependency.getArtifactId() +
+ logger.finest( "Project Dependency: Artifact ID = " + projectDependency.getArtifactId() +
", Group ID = " + projectDependency.getGroupId() + ", Version = " + projectDependency.getVersion() +
", Artifact Type = " + projectDependency.getArtifactType() );
if ( !projectDependency.isResolved() )
@@ -456,7 +473,6 @@
}
catch ( IOException e )
{
- //e.printStackTrace();
//safe to ignore: dependency not found
}
}
Modified: incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java (original)
+++ incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java Wed Aug 8 10:19:04 2007
@@ -23,9 +23,6 @@
import java.util.List;
import java.util.Collection;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
public class WagonManagerTestStub
Modified: incubator/nmaven/trunk/components/dotnet-embedder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-embedder/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-embedder/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-embedder/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-executable/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-executable/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-executable/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java (original)
+++ incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java Wed Aug 8 10:19:04 2007
@@ -310,7 +310,7 @@
{
modules.add( artifact );
}
- else if ( type.equals( "library" ) || type.equals( "exe" ) )
+ else if ( type.equals( "library" ) || type.equals( "exe" ) || type.equals( "jar" ) )
{
libraries.add( artifact );
}
Modified: incubator/nmaven/trunk/components/dotnet-jetty/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-jetty/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-jetty/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-jetty/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-model/assembly-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/assembly-plugins/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/assembly-plugins/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/assembly-plugins/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-model/configuration-appenders/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/configuration-appenders/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/configuration-appenders/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/configuration-appenders/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-model/entries/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/entries/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/entries/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/entries/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-model/executable-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/executable-plugins/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/executable-plugins/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/executable-plugins/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/components/dotnet-model/netdependency/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/netdependency/pom.xml?view=diff&rev=563949&r1=563948&r2=563949
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/netdependency/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/netdependency/pom.xml Wed Aug 8 10:19:04 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>