svn commit: r509329 - in /incubator/nmaven/branches/SI_IDE/components: dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/
Author: sisbell
Date: Mon Feb 19 12:49:53 2007
New Revision: 509329
URL: http://svn.apache.org/viewvc?view=rev&rev=509329
Log:
Changed the path of AssemblyInfo generated file from net/sf/nmaven to the a
file sperated groupId of the invoking project.
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayout.java
incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayout.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayout.java?view=diff&rev=509329&r1=509328&r2=509329
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayout.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayout.java
Mon Feb 19 12:49:53 2007
@@ -104,4 +104,7 @@
*/
public String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata )
{
-C
\ No newline at end of file
+System.out.println( "CALLING REMOTE : " + metadata.getRemoteFilename()
);
+return "";
+}
+}
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java?view=diff&rev=509329&r1=509328&r2=509329
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
Mon Feb 19 12:49:53 2007
@@ -73,9 +73,11 @@
FileOutputStream man = null;
try
{
-File file = new File( src + "/META-INF/net/sf/nmaven" );
+String groupIdAsDir = mavenProject.getGroupId().replace( ".",
File.separator);
+File file = new File( src + "/META-INF/" + groupIdAsDir );
file.mkdirs();
-man = new FileOutputStream( src +
"/META-INF/net/sf/nmaven/AssemblyInfo." + plugin.getExtension() );
+man = new FileOutputStream( src + "/META-INF/" + groupIdAsDir +
File.separator +
+"AssemblyInfo." + plugin.getExtension() );
man.write( sb.toString().getBytes() );
}
catch ( IOException e )
svn commit: r509334 [3/3] - in /incubator/nmaven/branches/SI_IDE/assemblies: ./ NMaven.Core/ NMaven.Core/src/ NMaven.Core/src/main/ NMaven.Core/src/main/csharp/ NMaven.Core/src/main/csharp/Core/ NMave
Propchange: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/Pom.xsd
--
svn:eol-style = native
Added: 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=auto&rev=509334
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml (added)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Mon
Feb 19 13:10:29 2007
@@ -0,0 +1,35 @@
+
+ 4.0.0
+ NMaven.Model
+ NMaven.Model.Pom
+ library
+ 0.14
+ NMaven.Model.Pom
+
+
+src/main/csharp
+src/test/csharp
+
+
+
+org.apache.maven.dotnet.plugins
+maven-compile-plugin
+true
+
+
+org.apache.maven.dotnet.plugins
+maven-xsd-plugin
+
+
+
+ xsd
+
+
+
+
+ ${basedir}/Pom.xsd
+
+
+
+
+
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
--
svn:eol-style = native
Added: incubator/nmaven/branches/SI_IDE/assemblies/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/pom.xml?view=auto&rev=509334
==
--- incubator/nmaven/branches/SI_IDE/assemblies/pom.xml (added)
+++ incubator/nmaven/branches/SI_IDE/assemblies/pom.xml Mon Feb 19 13:10:29 2007
@@ -0,0 +1,136 @@
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ 4.0.0
+ org.apache.maven.dotnet
+ nmaven-components
+ pom
+ 0.14
+ nmaven-components
+ http://incubator.apache.org/nmaven
+
+NMaven provides Maven 2.x plugins to support building of .NET applications
+
+
+
+ NMaven Dev List
+ [EMAIL PROTECTED]
+ [EMAIL PROTECTED]
+ nmaven-dev@incubator.apache.org
+
http://mail-archives.apache.org/mod_mbox/incubator-nmaven-dev/
+
+
http://www.nabble.com/nmaven-dev-f17655.html
+
+
+
+ NMaven Commits List
+ [EMAIL PROTECTED]
+ [EMAIL PROTECTED]
+ nmaven-commits@incubator.apache.org
+
http://mail-archives.apache.org/mod_mbox/incubator-nmaven-commits/
+
+
http://www.nabble.com/nmaven-commits-f17656.html
+
+
+
+
+https://svn.apache.org/repos/asf/incubator/nmaven/
+
scm:svn:https://svn.apache.org/repos/asf/incubator/nmaven/
+
+
scm:svn:https://svn.apache.org/repos/asf/incubator/nmaven/
+REL_0_14_SNAPSHOT
+
+
+NMaven
+http://incubator.apache.org/nmaven
+
+
+JIRA Bugtracking
+http://jira.codehaus.org/browse/NMAVEN
+
+
+
+
+ Apache 2.0
+ LICENSE.txt
+
+
+
+
+
+ Brett Porter
+ brett
+ [EMAIL PROTECTED]
+
+champion
+mentor
+
+
+
+ Jason van Zyl
+ jvanzyl
+ [EMAIL PROTECTED]
+
+champion
+mentor
+
+
+
+ Shane Isbell
+ sisbell
+ [EMAIL PROTECTED]
+ http://jroller.com/page/random7
+
+committer
+
+
+
+ Dan Fabulich
+ dfabulich
+ [EMAIL PROTECTED]
+
+committer
+
+
+
+ Chris Stevenson
+ chrisjs
+ [EMAIL PROTECTED]
+
+committer
+
+
+
+ Trygve Laugstol
+ trygvis
+ [EMAIL PROTECTED]
+
+committer
+
+
+
+ James Strachan
+ jstrachan
+ [EMAIL PROTECTED]
+
+committer
+
+
+
+
+NMaven.Core
+NMaven.Model/Pom
+
+
+src/main/csharp
+src/test/csharp
+
+
+
+org.apache.maven.dotnet.plugins
+maven-compile-plugin
+true
+
+
+
+
+
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_IDE/assemblies/pom.xml
--
svn:eol-style = native
svn commit: r509334 [1/3] - in /incubator/nmaven/branches/SI_IDE/assemblies: ./ NMaven.Core/ NMaven.Core/src/ NMaven.Core/src/main/ NMaven.Core/src/main/csharp/ NMaven.Core/src/main/csharp/Core/ NMave
Author: sisbell
Date: Mon Feb 19 13:10:29 2007
New Revision: 509334
URL: http://svn.apache.org/viewvc?view=rev&rev=509334
Log:
First Version of the IDE: pom.xml to csproj converter. Does the basics such as
setting up the folders, pom dependencies, etc. Still has some hard-coded values
and needs a lot more work. Did this in .NET since the MS Project structure
already has object bindings and .NET has good support for binding the Maven pom.
Added:
incubator/nmaven/branches/SI_IDE/assemblies/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (with
props)
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/NMavenContext.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/NMaven/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/NMaven/Core/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/NMaven/Core/NMavenContextImplTest.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/Pom.xsd
(with props)
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
(with props)
incubator/nmaven/branches/SI_IDE/assemblies/pom.xml (with props)
Added: 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=auto&rev=509334
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (added)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Mon Feb 19
13:10:29 2007
@@ -0,0 +1,40 @@
+
+ 4.0.0
+ NMaven.Core
+ NMaven.Core
+ library
+ 0.14
+ NMaven.Core
+
+
+ NMaven.Model
+ NMaven.Model.Pom
+ library
+ 0.14
+
+
+ Microsoft.Build.Engine
+ Microsoft.Build.Engine
+ gac
+ 2.0.0.0__b03f5f7f11d50a3a
+
+
+ org.nunit
+ nunit.framework
+ 2.2.8.0
+ library
+
+
+
+src/main/csharp
+src/test/csharp
+
+
+
+org.apache.maven.dotnet.plugins
+maven-compile-plugin
+true
+
+
+
+
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml
--
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs?view=auto&rev=509334
==
---
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
(added)
+++
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
Mon Feb 19 13:10:29 2007
@@ -0,0 +1,124 @@
+using System;
+using System.IO;
+using System.Xml.Serialization;
+using NMaven.Model;
+using NMaven.Core;
+using Microsoft.Build.BuildEngine;
+
+namespace NMaven.Core.Impl {
+
+ public class NMavenContextImpl : NMavenContext
+ {
+ private string localRepository;
+
+ private string basedir;
+
+ public NMaven.Model.Model createPomModelFor(string fileName)
+ {
+ TextReader reader = new StreamReader(fileName);
+ XmlSerializer serializer = new
XmlSerializer(typeof(NMaven.Model.Model));
+ return (NMaven.Model.Model)
serializer.Deserialize(reader);
+ }
+
+ public Project createProjectFor(string fileName)
+ {
+Engine engine = new
Engine(@"C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727");
+Project project = new Project(engine);
+project.Load(@fileName);
+return project;
+ }
+
+ private void addFoldersToProject
svn commit: r509335 - /incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/NMaven/
Author: sisbell Date: Mon Feb 19 13:11:22 2007 New Revision: 509335 URL: http://svn.apache.org/viewvc?view=rev&rev=509335 Log: Remove dup files. Removed: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/NMaven/
svn commit: r509398 - in /incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core: pom.xml src/main/csharp/Core/Impl/NMavenContextImpl.cs
Author: sisbell
Date: Mon Feb 19 16:50:39 2007
New Revision: 509398
URL: http://svn.apache.org/viewvc?view=rev&rev=509398
Log:
FEATURE: Now handles dynamically adding dependencies to the csproj file by
parsing the cs class files and extracting dependencies.
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
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=509398&r1=509397&r2=509398
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Mon Feb 19
16:50:39 2007
@@ -1,4 +1,4 @@
-
+http://maven.apache.org/POM/4.0.0";>>
4.0.0
NMaven.Core
NMaven.Core
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs?view=diff&rev=509398&r1=509397&r2=509398
==
---
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
(original)
+++
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
Mon Feb 19 16:50:39 2007
@@ -4,6 +4,8 @@
using NMaven.Model;
using NMaven.Core;
using Microsoft.Build.BuildEngine;
+using System.Collections.Generic;
+using System.Reflection;
namespace NMaven.Core.Impl {
@@ -33,11 +35,13 @@
DirectoryInfo sourcedir = new DirectoryInfo(basedir +
@"src\main\csharp");
DirectoryInfo[] directoryInfos =
rootDirectoryInfo.GetDirectories();
if(directoryInfos != null && directoryInfos.Length > 0)
-{
+{
if(folderGroup == null) folderGroup = project.AddNewItemGroup();
foreach(DirectoryInfo di in directoryInfos)
{
+ if(di.FullName.Contains(".svn") ||
di.FullName.Contains(@"obj") || di.FullName.Contains(@"bin"))
+ continue;
folderGroup.AddNewItem("Folder",
di.FullName.Substring(sourcedir.FullName.Length + 1));
addFoldersToProject(project, folderGroup, di);
}
@@ -54,6 +58,8 @@
foreach(DirectoryInfo di in directoryInfos)
{
+ if(di.FullName.Contains(".svn") ||
di.FullName.Contains("obj") || di.FullName.Contains("bin"))
+ continue;
foreach(FileInfo fileInfo in di.GetFiles())
{
BuildItem buildItem =
@@ -66,6 +72,59 @@
}
}
+ private void addProjectDependencies(Project project,
NMaven.Model.Model model, DirectoryInfo rootDirectoryInfo)
+ {
+
+ BuildItemGroup group = project.AddNewItemGroup();
+ group.AddNewItem("Reference", "System.Xml");
+
+ foreach(Dependency dependency in model.dependencies) {
+ String repoPath = @localRepository +
dependency.groupId.Replace(".", "\\")
+ + "\\" + dependency.artifactId + "\\" +
dependency.version + "\\" + dependency.artifactId + ".dll";
+ BuildItem buildItem =
group.AddNewItem("Reference", dependency.artifactId);
+ if(!dependency.GetType().Equals("gac"))
buildItem.SetMetadata("HintPath", repoPath, true);
+ }
+
+ DirectoryInfo sourcedir = new DirectoryInfo(basedir +
@"src\main\csharp");
+DirectoryInfo[] directoryInfos =
rootDirectoryInfo.GetDirectories();
+
+ClassParser classParser = new ClassParser();
+List fileInfos = new List();
+addFileInfosFromSourceDirectories(rootDirectoryInfo, fileInfos);
+List dependencies = classParser.getDependencies(fileInfos);
+foreach(string dependency in dependencies)
+{
+ try {
+ DirectoryInfo fileInfo = new
DirectoryInfo(@"C:\WINDOWS\assembly\GAC_MSIL\" + dependency);
+ if(fileInfo.Exists) {
+ group.AddNewIte
svn commit: r509410 - /incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
Author: sisbell
Date: Mon Feb 19 17:59:51 2007
New Revision: 509410
URL: http://svn.apache.org/viewvc?view=rev&rev=509410
Log:
Fixed small bug that caused failure on VS 2005. VS doesn't accept links in the
source directory, while SharpDevelop does.
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs?view=diff&rev=509410&r1=509409&r2=509410
==
---
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
(original)
+++
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/NMavenContextImpl.cs
Mon Feb 19 17:59:51 2007
@@ -65,7 +65,7 @@
BuildItem buildItem =
compileGroup.AddNewItem("Compile",
fileInfo.FullName.Substring(sourcedir.FullName.Length + 1));
- buildItem.SetMetadata("Link",
fileInfo.FullName.Substring(sourcedir.FullName.Length + 1));
+ //buildItem.SetMetadata("Link",
fileInfo.FullName.Substring(sourcedir.FullName.Length + 1));
}
addClassFilesToProject(project, compileGroup, di);
}
svn commit: r509430 - /incubator/nmaven/branches/BUG_NMAVEN_7/
Author: sisbell Date: Mon Feb 19 22:01:25 2007 New Revision: 509430 URL: http://svn.apache.org/viewvc?view=rev&rev=509430 Log: Bug fix branch Added: incubator/nmaven/branches/BUG_NMAVEN_7/ - copied from r509429, incubator/nmaven/trunk/
