date:20070228

svn commit: r512930 - in /incubator/nmaven/branches/SI_IDE: ./ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ components/dotnet-artifact/src/main/java/org/apache/maven/dotn

2007-02-28 Thread sisbell

Author: sisbell
Date: Wed Feb 28 11:45:25 2007
New Revision: 512930

URL: http://svn.apache.org/viewvc?view=rev&rev=512930
Log:
Added profile support for .NET dependencies (from the net-dependencies.xml 
file). This allows the maven plugins to have different sets of .NET 
dependencies, so we can target different build environments for NMaven.

Added:

incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependenciesRepository.java
   (with props)

incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependencyMatchPolicy.java
   (with props)

incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
   (with props)
Removed:

incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepository.java
Modified:

incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java

incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/resources/META-INF/nmaven/artifact-registry.xml

incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml

incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml

incubator/nmaven/branches/SI_IDE/components/dotnet-model/netdependency/netdependency.mdo
incubator/nmaven/branches/SI_IDE/maven-dotnet.iml

incubator/nmaven/branches/SI_IDE/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java

Added: 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependenciesRepository.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependenciesRepository.java?view=auto&rev=512930
==
--- 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependenciesRepository.java
 (added)
+++ 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependenciesRepository.java
 Wed Feb 28 11:45:25 2007
@@ -0,0 +1,68 @@
+/*
+ * 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.artifact;
+
+import org.apache.maven.dotnet.registry.Repository;
+import org.apache.maven.dotnet.registry.RepositoryRegistry;
+import org.apache.maven.model.Dependency;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.List;
+
+/**
+ * Provides methods for loading and reading the net dependency config file.
+ *
+ * @author Shane Isbell
+ */
+public interface NetDependenciesRepository
+extends Repository
+{
+/**
+ * @see 
org.apache.maven.dotnet.registry.Repository#load(java.io.InputStream, 
java.util.Hashtable)
+ */
+void load( InputStream inputStream, Hashtable properties )
+throws IOException;
+
+/**
+ * @see 
org.apache.maven.dotnet.registry.Repository#setRepositoryRegistry(org.apache.maven.dotnet.registry.RepositoryRegistry)
+ */
+void setRepositoryRegistry( RepositoryRegistry repositoryRegistry );
+
+/**
+ * Returns a list of .NET dependencies as given within the net 
dependencies config file. This dependency list
+ * is external to the pom file dependencies. This separation is necessary 
since some Java Maven plugins
+ * - which themselves are necessary for building .NET applications - may 
have  .NET executable dependencies that
+ * have not been built yet and can't be resolved.
+ *
+ * @return a list of .NET dependencies as given within the net 
dependencies config file
+ */
+List getDependencies();
+
+/**
+ * Returns a list of .NET dependencies as given within the net 
dependencies config file that mat

svn commit: r512983 - in /incubator/nmaven/branches/SI_IDE: ./ assemblies/NMaven.Core/src/main/csharp/Core/Impl/ assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/ plugins/ plugins/mav

2007-02-28 Thread sisbell

Author: sisbell
Date: Wed Feb 28 13:32:14 2007
New Revision: 512983

URL: http://svn.apache.org/viewvc?view=rev&rev=512983
Log:
Added maven solution plugin for generating project and solution files. Expanded 
params for .NET solution plugins.

Added:
incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/
incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/pom.xml   
(with props)
incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/
incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/main/

incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/main/java/

incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/main/java/org/

incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/main/java/org/apache/

incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/main/java/org/apache/maven/

incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/

incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/

incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/

incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java
   (with props)
Modified:

incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs

incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs
incubator/nmaven/branches/SI_IDE/bootstrap-build.bat
incubator/nmaven/branches/SI_IDE/plugins/pom-java-bootstrap.xml
incubator/nmaven/branches/SI_IDE/plugins/pom.xml
incubator/nmaven/branches/SI_IDE/plugins/scripts/build-2.0.bat

Modified: 
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs?view=diff&rev=512983&r1=512982&r2=512983
==
--- 
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
 (original)
+++ 
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
 Wed Feb 28 13:32:14 2007
@@ -93,6 +93,7 @@
}
writer.Flush();
writer.Close();
+   Console.WriteLine("NMAVEN-000-000: Generate solution 
file: File Name = " + fileInfo.FullName);
}

public NMaven.Model.Model createPomModelFor(string fileName)

Modified: 
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs?view=diff&rev=512983&r1=512982&r2=512983
==
--- 
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs
 (original)
+++ 
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs
 Wed Feb 28 13:32:14 2007
@@ -34,22 +34,6 @@
{
}
 
-   private string[] GetModulesForProfile(string profile,  
NMaven.Model.Model model)
-   {
-   NMaven.Model.Profile[] profiles = model.profiles;
-   if(profiles == null)
-   return model.modules;
-   
-   foreach(NMaven.Model.Profile p in profiles)
-   {
-   if(p.activation.property.name.Equals(profile))
-   {
-   return p.modules;
-   }
-   }
-   return model.modules;
-}
-   
public List Execute(DirectoryInfo 
currentDirectory, NMaven.Model.Model model, string profile)
{   
if(model == null)
@@ -63,7 +47,8 @@
}
if(!currentDirectory.Exists)
{
-   throw new ExecutionException("NMAVEN-000-000: 
Could not find current directory: Path = " + currentDirectory.FullName);
+   throw new ExecutionException("NMAVEN-000-000: 
Could not find current directory: Path = "
+   + cur

svn commit: r513070 - in /incubator/nmaven/branches/SI_IDE: assemblies/NMaven.Core/ assemblies/NMaven.Model/Pom/ assemblies/NMaven.Plugin.Solution/ components/dotnet-artifact/src/main/java/org/apache/

2007-02-28 Thread sisbell

Author: sisbell
Date: Wed Feb 28 15:51:25 2007
New Revision: 513070

URL: http://svn.apache.org/viewvc?view=rev&rev=513070
Log:
No longer using modules for NMaven.Core and pom model: could not get the module 
type (even with dll wrapper) to work in VS and SD IDEs. This required compiling 
all projects as dlls and adding some additional methods to installing dependent 
dlls into an executable directory in the local maven repo. This solution only 
works local: still need a resolver for this. Otherwise, this the first fully 
functional version fo the IDE to pom converter.

Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml

incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java

incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java

incubator/nmaven/branches/SI_IDE/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java

Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml?view=diff&rev=513070&r1=513069&r2=513070
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Wed Feb 28 
15:51:25 2007
@@ -2,14 +2,14 @@
   4.0.0
   NMaven.Core
   NMaven.Core
-  module
+  library
   0.14
   NMaven.Core
   
 
   NMaven.Model
   NMaven.Model.Pom
-  module
+  library
   0.14
 
 

Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml?view=diff&rev=513070&r1=513069&r2=513070
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml 
(original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Wed 
Feb 28 15:51:25 2007
@@ -2,7 +2,7 @@
   4.0.0
   NMaven.Model
   NMaven.Model.Pom
-  module
+  library
   0.14
   NMaven.Model.Pom
 

Modified: 
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml?view=diff&rev=513070&r1=513069&r2=513070
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml 
(original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml 
Wed Feb 28 15:51:25 2007
@@ -16,12 +16,12 @@
   NMaven.Core
   NMaven.Core
   0.14
-  module
+  library
 
 
   NMaven.Model
   NMaven.Model.Pom
-  module
+  library
   0.14
 
   

Modified: 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java?view=diff&rev=513070&r1=513069&r2=513070
==
--- 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
 (original)
+++ 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
 Wed Feb 28 15:51:25 2007
@@ -21,8 +21,10 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.installer.ArtifactInstallationException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.model.Dependency;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * Provides services for installing artifacts.
@@ -79,6 +81,9 @@
  * @throws ArtifactInstallationException if there is a problem installing 
the artifact
  */
 void installFileWithNoPom( String groupId, String artifactId, String 
version, File installFile )
+throws ArtifactInstallationException;
+
+void installArtifactDependencies( Artifact artifact, List 
dependencies )
 throws ArtifactInstallationException;
 
 /**

Modified: 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/Artifac

svn commit: r512930 - in /incubator/nmaven/branches/SI_IDE: ./ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ components/dotnet-artifact/src/main/java/org/apache/maven/dotn

svn commit: r512983 - in /incubator/nmaven/branches/SI_IDE: ./ assemblies/NMaven.Core/src/main/csharp/Core/Impl/ assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/ plugins/ plugins/mav

svn commit: r513070 - in /incubator/nmaven/branches/SI_IDE: assemblies/NMaven.Core/ assemblies/NMaven.Model/Pom/ assemblies/NMaven.Plugin.Solution/ components/dotnet-artifact/src/main/java/org/apache/

3 matches

Site Navigation

Mail list logo

Footer information