svn commit: r486820 - in /incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable: CapabilityMatcher.java impl/CapabilityMatcherImpl.java impl/NetExecutabl
Author: sisbell
Date: Wed Dec 13 11:54:44 2006
New Revision: 486820
URL: http://svn.apache.org/viewvc?view=rev&rev=486820
Log:
Removed unneeded init method.
Modified:
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CapabilityMatcher.java
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CapabilityMatcherImpl.java
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
Modified:
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CapabilityMatcher.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CapabilityMatcher.java?view=diff&rev=486820&r1=486819&r2=486820
==
---
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CapabilityMatcher.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CapabilityMatcher.java
Wed Dec 13 11:54:44 2006
@@ -88,14 +88,4 @@
List
matchPolicies )
throws PlatformUnsupportedException;
-/**
- * Initializes the factory.
- *
- * @param project the maven project
- * @throws org.apache.maven.dotnet.InitializationException if there is a
problem initializing this factory
- *
- */
-void init( MavenProject project )
-throws InitializationException;
-
}
Modified:
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CapabilityMatcherImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CapabilityMatcherImpl.java?view=diff&rev=486820&r1=486819&r2=486820
==
---
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CapabilityMatcherImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CapabilityMatcherImpl.java
Wed Dec 13 11:54:44 2006
@@ -19,7 +19,6 @@
package org.apache.maven.dotnet.executable.impl;
import org.apache.maven.dotnet.PlatformUnsupportedException;
-import org.apache.maven.dotnet.InitializationException;
import org.apache.maven.dotnet.executable.*;
import org.apache.maven.dotnet.executable.compiler.*;
@@ -29,53 +28,49 @@
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.apache.maven.dotnet.registry.RepositoryRegistry;
-import org.apache.maven.project.MavenProject;
/**
+ * Provides an implementation of the CapabilityMatcher interface.
+ *
* @author Shane Isbell
*/
public class CapabilityMatcherImpl
implements CapabilityMatcher, LogEnabled
{
-
private Logger logger;
-protected MavenProject project;
-
-protected RepositoryRegistry repositoryRegistry;
+private RepositoryRegistry repositoryRegistry;
public void enableLogging( Logger logger )
{
this.logger = logger;
}
-public void init( MavenProject project )
-throws InitializationException
-{
-this.project = project;
-}
-
public CompilerCapability matchCompilerCapabilityFor( CompilerRequirement
compilerRequirement,
List matchPolicies )
throws PlatformUnsupportedException
{
+if ( compilerRequirement == null )
+{
+throw new PlatformUnsupportedException( "NMAVEN-065-006: The
compiler requirement should not be null." );
+}
if ( matchPolicies == null )
{
matchPolicies = new ArrayList();
}
matchPolicies.add( MatchPolicyFactory.createOperatingSystemPolicy(
System.getProperty( "os.name" ) ) );
matchPolicies.add( MatchPolicyFactory.createVendorPolicy(
compilerRequirement.getVendor() ) );
-matchPolicies.add( MatchPolicyFactory.createLanguagePolicy( (
compilerRequirement ).getLanguage() ) );
+matchPolicies.add( MatchPolicyFactory.createLanguagePolicy(
compilerRequirement.getLanguage() ) );
matchPolicies.add(
MatchPolicyFactory.createFrameworkVersionPolicy(
compilerRequirement.getFrameworkVersion() ) );
matchPolicies.add( MatchPolicyFactory.createProfilePolicy(
compilerRequirement.getProfile() ) );
return (CompilerCapability) matchFromExecutableCapabilities(
getCompilerCapabilities(), matchPolicies );
}
-publ
svn commit: r487254 - /incubator/nmaven/branches/SI_SIGNING/
Author: sisbell Date: Thu Dec 14 08:56:18 2006 New Revision: 487254 URL: http://svn.apache.org/viewvc?view=rev&rev=487254 Log: Copy of r486820. This is a branch for creating an assembly signing plugin Added: incubator/nmaven/branches/SI_SIGNING/ - copied from r487253, incubator/nmaven/trunk/
svn commit: r487283 - /incubator/nmaven/branches/SI_SIGNING/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml
Author: sisbell Date: Thu Dec 14 10:06:30 2006 New Revision: 487283 URL: http://svn.apache.org/viewvc?view=rev&rev=487283 Log: Split out the MS c# compiler plugin config into framework version 1.1 and 2.0. The compiler command line options are different. Modified: incubator/nmaven/branches/SI_SIGNING/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml Modified: incubator/nmaven/branches/SI_SIGNING/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml?view=diff&rev=487283&r1=487282&r2=487283 == --- incubator/nmaven/branches/SI_SIGNING/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml (original) +++ incubator/nmaven/branches/SI_SIGNING/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml Thu Dec 14 10:06:30 2006 @@ -1,13 +1,12 @@ -MS-CS +MS-CS-1.1 org.apache.maven.dotnet.executable.compiler.impl.DefaultCompiler MICROSOFT csc C_SHARP FULL -2.0.50727 1.1.4322 @@ -20,6 +19,58 @@ out target +doc +recurse +reference +addmodule +win32res +win32icon +resource +linkresource +debug +optimize +warnaserror +warn +nowarn +checked +unsafe +define +noconfig +baseaddress +bugreport +codepage +utf8output +main +fullpaths +filealign +nostdlib +lib +errorreport +nologo + + + + + +MS-CS-2.0 + org.apache.maven.dotnet.executable.compiler.impl.DefaultCompiler +MICROSOFT +csc +C_SHARP +FULL + +2.0.50727 + + + +Windows +x86 + + + + +out +target delaysign doc keyfile @@ -54,11 +105,10 @@ lib errorreport moduleassemblyname -nologo +nologo - + - MS-CS:COMPACT org.apache.maven.dotnet.executable.compiler.impl.CSharpCompilerForProfile
svn commit: r487302 - /incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Author: sisbell
Date: Thu Dec 14 10:57:55 2006
New Revision: 487302
URL: http://svn.apache.org/viewvc?view=rev&rev=487302
Log:
Fixed compile error, where plugin was using a defunct component init method.
Modified:
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Modified:
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=487302&r1=487301&r2=487302
==
---
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
(original)
+++
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Thu Dec 14 10:57:55 2006
@@ -36,7 +36,9 @@
* @goal initialize
* @phase compile
*/
-public class ComponentInitializerMojo extends AbstractMojo {
+public class ComponentInitializerMojo
+extends AbstractMojo
+{
/**
* The maven project.
@@ -75,19 +77,21 @@
*/
private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
-public void execute() throws MojoExecutionException {
-try {
-assemblyResolver.resolveTransitivelyFor(project,
project.getArtifact(), project.getDependencies(), pomFile,
-localRepository, true);
-} catch (ArtifactResolutionException e) {
-throw new MojoExecutionException("NMAVEN-901-000: Unable to
resolve assemblies", e);
-} catch (ArtifactNotFoundException e) {
-throw new MojoExecutionException("NMAVEN-901-001: Unable to
resolve assemblies", e);
+public void execute()
+throws MojoExecutionException
+{
+try
+{
+assemblyResolver.resolveTransitivelyFor( project,
project.getArtifact(), project.getDependencies(), pomFile,
+ localRepository, true );
}
-try {
-capabilityMatcher.init(project);
-} catch (InitializationException e) {
-throw new MojoExecutionException("NMAVEN-901-002: Unable to load
the Executable Factory:", e);
+catch ( ArtifactResolutionException e )
+{
+throw new MojoExecutionException( "NMAVEN-901-000: Unable to
resolve assemblies", e );
+}
+catch ( ArtifactNotFoundException e )
+{
+throw new MojoExecutionException( "NMAVEN-901-001: Unable to
resolve assemblies", e );
}
}
}
svn commit: r487308 - /incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Author: sisbell
Date: Thu Dec 14 11:10:52 2006
New Revision: 487308
URL: http://svn.apache.org/viewvc?view=rev&rev=487308
Log:
Fixed compile error, where plugin was using a defunct component init method.
Modified:
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Modified:
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=487308&r1=487307&r2=487308
==
---
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Thu Dec 14 11:10:52 2006
@@ -84,10 +84,5 @@
} catch (ArtifactNotFoundException e) {
throw new MojoExecutionException("NMAVEN-901-001: Unable to
resolve assemblies", e);
}
-try {
-capabilityMatcher.init(project);
-} catch (InitializationException e) {
-throw new MojoExecutionException("NMAVEN-901-002: Unable to load
the Executable Factory:", e);
-}
}
}
svn commit: r487379 - in /incubator/nmaven/branches/SI_SIGNING: components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/ components/dotnet-assembler/src/main/java/org/apache/maven/
Author: sisbell
Date: Thu Dec 14 14:45:24 2006
New Revision: 487379
URL: http://svn.apache.org/viewvc?view=rev&rev=487379
Log:
Added support for signing assemblies.
Added:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoUnmarshaller.java
(with props)
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshaller.java
(with props)
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java
(with props)
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/resources/
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/resources/AssemblyInfo.cs
Modified:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/ExecutableConfig.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerConfig.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java
Added:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoUnmarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoUnmarshaller.java?view=auto&rev=487379
==
---
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoUnmarshaller.java
(added)
+++
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoUnmarshaller.java
Thu Dec 14 14:45:24 2006
@@ -0,0 +1,9 @@
+package org.apache.maven.dotnet.assembler;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public interface AssemblyInfoUnmarshaller
+{
+AssemblyInfo unmarshall( InputStream inputStream) throws IOException;
+}
Propchange:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoUnmarshaller.java
--
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshaller.java?view=auto&rev=487379
==
---
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshaller.java
(added)
+++
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshaller.java
Thu Dec 14 14:45:24 2006
@@ -0,0 +1,52
svn commit: r487380 - in /incubator/nmaven/branches/SI_SIGNING: components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/ integration-tests/tests/it0022/ integration-test
Author: sisbell
Date: Thu Dec 14 14:48:41 2006
New Revision: 487380
URL: http://svn.apache.org/viewvc?view=rev&rev=487380
Log:
Added support for signing assemblies.
Added:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java
(with props)
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/goals.txt
(with props)
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
(with props)
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/sample.snk
(with props)
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/src/
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/src/main/
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/src/main/csharp/
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/src/main/csharp/It0022.cs
Added:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java?view=auto&rev=487380
==
---
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java
(added)
+++
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java
Thu Dec 14 14:48:41 2006
@@ -0,0 +1,45 @@
+package org.apache.maven.dotnet.executable.compiler;
+
+import java.util.List;
+import java.io.File;
+
+public interface KeyInfo
+{
+String getKeyFileUri();
+
+void setKeyFileUri(String keyFileUri);
+
+public static class Factory
+{
+/**
+ * Constructor
+ */
+private Factory()
+{
+}
+
+/**
+ * Returns a default instance of key info.
+ *
+ * @return a default instance of key info
+ */
+public static KeyInfo createDefaultKeyInfo()
+{
+return new KeyInfo()
+{
+
+private String keyFileUri;
+
+public String getKeyFileUri() {
+return keyFileUri;
+}
+
+public void setKeyFileUri(String keyFileUri) {
+this.keyFileUri = keyFileUri;
+}
+
+};
+}
+}
+
+}
Propchange:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java
--
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/goals.txt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/goals.txt?view=auto&rev=487380
==
---
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/goals.txt
(added)
+++
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/goals.txt
Thu Dec 14 14:48:41 2006
@@ -0,0 +1 @@
+install
\ No newline at end of file
Propchange:
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/goals.txt
--
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml?view=auto&rev=487380
==
--- incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
(added)
+++ incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
Thu Dec 14 14:48:41 2006
@@ -0,0 +1,22 @@
+
+ 4.0.0
+ org.apache.maven.it
+ it0020
+ library
+ 1.0.0
+ it0020
+
+
+src/main/csharp
+
+
+org.apache.maven.dotnet.plugins
+maven-compile-plugin
+true
+
+ sample.snk
+
+
+
+
+
\ No newline at end of file
Propchange:
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
--
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/sample.snk
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/sample.snk?view
svn commit: r487442 - in /incubator/nmaven/branches/SI_SIGNING: components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/ components/dotnet-executable/src/main/java/org/a
Author: sisbell
Date: Thu Dec 14 20:10:21 2006
New Revision: 487442
URL: http://svn.apache.org/viewvc?view=rev&rev=487442
Log:
Added support for the keycontainer.
Modified:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
Modified:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java?view=diff&rev=487442&r1=487441&r2=487442
==
---
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java
(original)
+++
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java
Thu Dec 14 20:10:21 2006
@@ -1,14 +1,15 @@
package org.apache.maven.dotnet.executable.compiler;
-import java.util.List;
-import java.io.File;
-
public interface KeyInfo
{
String getKeyFileUri();
void setKeyFileUri(String keyFileUri);
+String getKeyContainerName();
+
+void setKeyContainerName(String keyContainerName);
+
public static class Factory
{
/**
@@ -30,12 +31,22 @@
private String keyFileUri;
+private String keyContainerName;
+
public String getKeyFileUri() {
return keyFileUri;
}
public void setKeyFileUri(String keyFileUri) {
this.keyFileUri = keyFileUri;
+}
+
+public String getKeyContainerName() {
+return keyContainerName;
+}
+
+public void setKeyContainerName(String keyContainerName) {
+this.keyContainerName = keyContainerName;
}
};
Modified:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java?view=diff&rev=487442&r1=487441&r2=487442
==
---
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
(original)
+++
incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
Thu Dec 14 20:10:21 2006
@@ -143,6 +143,8 @@
if(compilerContext.getKeyInfo().getKeyFileUri() != null)
{
commands.add("/keyfile:" +
compilerContext.getKeyInfo().getKeyFileUri());
+} else if(compilerContext.getKeyInfo().getKeyContainerName() != null) {
+commands.add("/keycontainer:" +
compilerContext.getKeyInfo().getKeyContainerName());
}
if ( config.getCommands() != null )
Modified:
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java?view=diff&rev=487442&r1=487441&r2=487442
==
---
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
(original)
+++
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
Thu Dec 14 20:10:21 2006
@@ -74,13 +74,14 @@
private boolean delaysign;
/**
- * Specify a strong name key file. (not currently supported)
+ * Specify a strong name key file.
* @parameter expression = "${keyfile}"
*/
private File keyfile;
/**
* Specifies a strong name key container. (not currently supported)
+ * @parameter expression = "${keycontainer}"
*/
private String keycontainer;
svn commit: r488750 - in /incubator/nmaven/branches/SI_SIGNING: components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/ components/dotnet-assembler/src/main/java/org/apache/maven/
Author: sisbell
Date: Tue Dec 19 10:24:53 2006
New Revision: 488750
URL: http://svn.apache.org/viewvc?view=rev&rev=488750
Log:
Added support for signing assemblies for MS version 1.1. Signing needs to be
handled differently for v1.1
Removed:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoUnmarshaller.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshaller.java
Modified:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
Modified:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java?view=diff&rev=488750&r1=488749&r2=488750
==
---
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
(original)
+++
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
Tue Dec 19 10:24:53 2006
@@ -18,6 +18,8 @@
*/
package org.apache.maven.dotnet.assembler;
+import java.io.File;
+
/**
* Provides the information to be included within the assembly. Class can be
extended to add additional assembly info
* parameters.
@@ -71,6 +73,10 @@
*/
private String configuration;
+private String keyName;
+
+private File keyFile;
+
/**
* Default constructor
*/
@@ -93,6 +99,26 @@
return sb.toString();
}
+public String getKeyName()
+{
+return keyName;
+}
+
+public void setKeyName( String keyName )
+{
+this.keyName = keyName;
+}
+
+public File getKeyFile()
+{
+return keyFile;
+}
+
+public void setKeyFile( File keyFile )
+{
+this.keyFile = keyFile;
+}
+
public String getVersion()
{
return ( version != null ) ? version : "";
@@ -182,6 +208,7 @@
{
this.configuration = configuration;
}
+
public boolean equals( Object o )
{
Modified:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java?view=diff&rev=488750&r1=488749&r2=488750
==
---
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
(original)
+++
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
Tue Dec 19 10:24:53 2006
@@ -20,6 +20,7 @@
import java.io.OutputStream;
import java.io.IOException;
+import java.io.InputStream;
import org.apache.maven.project.MavenProject;
import org.apache.maven.dotnet.model.assembly.plugins.AssemblyPlugin;
@@ -42,6 +43,8 @@
*/
void marshal( AssemblyInfo assemblyInfo, MavenProject mavenProject,
OutputStream outputStream )
throws IOExc
svn commit: r488759 - in /incubator/nmaven/branches/SI_SIGNING: components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/ integration-tests/tests/it0022/ plugins/maven-compile-
Author: sisbell
Date: Tue Dec 19 10:51:34 2006
New Revision: 488759
URL: http://svn.apache.org/viewvc?view=rev&rev=488759
Log:
Fixed a signing bug for framework v1.1
Modified:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
Modified:
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java?view=diff&rev=488759&r1=488758&r2=488759
==
---
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
(original)
+++
incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
Tue Dec 19 10:51:34 2006
@@ -31,6 +31,7 @@
import java.io.InputStreamReader;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.FileUtils;
/**
* Provides services for writing out the AssemblyInfo entries using the
bracket convention [assembly:
@@ -68,7 +69,7 @@
.append( createEntry( "Configuration",
assemblyInfo.getConfiguration() ) );
if(assemblyInfo.getKeyName() != null) sb.append( createEntry(
"KeyName", assemblyInfo.getKeyName() ) );
if(assemblyInfo.getKeyFile() != null)
-sb.append(createEntry("KeyFile",
assemblyInfo.getKeyFile().getAbsolutePath()));
+sb.append(createEntry("KeyFile",
assemblyInfo.getKeyFile().getAbsolutePath().replace( "\\", "")));
FileOutputStream man = null;
try
{
Modified:
incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml?view=diff&rev=488759&r1=488758&r2=488759
==
--- incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
(original)
+++ incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
Tue Dec 19 10:51:34 2006
@@ -1,10 +1,10 @@
4.0.0
org.apache.maven.it
- it0020
+ it0022
library
1.0.0
- it0020
+ it0022
src/main/csharp
Modified:
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java?view=diff&rev=488759&r1=488758&r2=488759
==
---
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
(original)
+++
incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
Tue Dec 19 10:51:34 2006
@@ -184,6 +184,7 @@
if ( vendorInfo.getVendor().equals( Vendor.MICROSOFT ) &&
vendorInfo.getVendorVersion().equals( "1.1.4322" ) )
{
+System.out.println(keyfile + ":" + keycontainer);
assemblyInfo.setKeyFile( keyfile );
assemblyInfo.setKeyName( keycontainer );
}
svn commit: r488773 - in /incubator/nmaven/trunk: components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/ components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembl
Author: sisbell Date: Tue Dec 19 11:25:41 2006 New Revision: 488773 URL: http://svn.apache.org/viewvc?view=rev&rev=488773 Log: Merge of branch SI_SIGNING. Added: incubator/nmaven/trunk/components/dotnet-assembler/src/test/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/ incubator/nmaven/trunk/components/dotnet-assembler/src/test/java/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/ incubator/nmaven/trunk/components/dotnet-assembler/src/test/java/org/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/ incubator/nmaven/trunk/components/dotnet-assembler/src/test/java/org/apache/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/ incubator/nmaven/trunk/components/dotnet-assembler/src/test/java/org/apache/maven/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/ incubator/nmaven/trunk/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/ incubator/nmaven/trunk/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/ incubator/nmaven/trunk/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/ incubator/nmaven/trunk/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java - copied unchanged from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java incubator/nmaven/trunk/components/dotnet-assembler/src/test/resources/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/resources/ incubator/nmaven/trunk/components/dotnet-assembler/src/test/resources/AssemblyInfo.cs - copied unchanged from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/test/resources/AssemblyInfo.cs incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java - copied unchanged from r488768, incubator/nmaven/branches/SI_SIGNING/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/KeyInfo.java incubator/nmaven/trunk/integration-tests/tests/it0022/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/ incubator/nmaven/trunk/integration-tests/tests/it0022/goals.txt - copied unchanged from r488768, incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/goals.txt incubator/nmaven/trunk/integration-tests/tests/it0022/pom.xml - copied unchanged from r488768, incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml incubator/nmaven/trunk/integration-tests/tests/it0022/sample.snk - copied unchanged from r488768, incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/sample.snk incubator/nmaven/trunk/integration-tests/tests/it0022/src/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/src/ incubator/nmaven/trunk/integration-tests/tests/it0022/src/main/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/src/main/ incubator/nmaven/trunk/integration-tests/tests/it0022/src/main/csharp/ - copied from r488768, incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/src/main/csharp/ incubator/nmaven/trunk/integration-tests/tests/it0022/src/main/csharp/It0022.cs - copied unchanged from r488768, incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/src/main/csharp/It0022.cs Modified: incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java incubator/nmaven/trunk/components/dotnet-assembler
svn commit: r489017 - in /incubator/nmaven/trunk: bootstrap-build.bat bootstrap-build.sh pom.xml
Author: sisbell Date: Wed Dec 20 02:30:12 2006 New Revision: 489017 URL: http://svn.apache.org/viewvc?view=rev&rev=489017 Log: Adding bootstrap builds for project. Added: incubator/nmaven/trunk/bootstrap-build.bat (with props) incubator/nmaven/trunk/bootstrap-build.sh (with props) incubator/nmaven/trunk/pom.xml (with props) Added: incubator/nmaven/trunk/bootstrap-build.bat URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/bootstrap-build.bat?view=auto&rev=489017 == --- incubator/nmaven/trunk/bootstrap-build.bat (added) +++ incubator/nmaven/trunk/bootstrap-build.bat Wed Dec 20 02:30:12 2006 @@ -0,0 +1,4 @@ +call mvn -f ./components/pom.xml install +call mvn -f ./plugins/pom-java-bootstrap.xml install +call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./plugins/imports/nunit-2.0/nunit.framework.dll -DgroupId=org.nunit -DartifactId=nunit.framework -Dpackaging=dll -Dversion=2.2.8.0 +call mvn -f ./plugins/pom-net-bootstrap.xml -Dmaven.test.skip=true -Dbootstrap install \ No newline at end of file Propchange: incubator/nmaven/trunk/bootstrap-build.bat -- svn:eol-style = native Added: incubator/nmaven/trunk/bootstrap-build.sh URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/bootstrap-build.sh?view=auto&rev=489017 == --- incubator/nmaven/trunk/bootstrap-build.sh (added) +++ incubator/nmaven/trunk/bootstrap-build.sh Wed Dec 20 02:30:12 2006 @@ -0,0 +1,4 @@ +mvn -f ./components/pom.xml install +mvn -f ./plugins/pom-java-bootstrap.xml install +mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./plugins/imports/nunit-2.0/nunit.framework.dll -DgroupId=org.nunit -DartifactId=nunit.framework -Dpackaging=dll -Dversion=2.2.8.0 +mvn -f ./plugins/pom-net-bootstrap.xml -Dmaven.test.skip=true -Dbootstrap install \ No newline at end of file Propchange: incubator/nmaven/trunk/bootstrap-build.sh -- svn:eol-style = native Added: incubator/nmaven/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom.xml?view=auto&rev=489017 == --- incubator/nmaven/trunk/pom.xml (added) +++ incubator/nmaven/trunk/pom.xml Wed Dec 20 02:30:12 2006 @@ -0,0 +1,12 @@ +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 +dotnet +pom +0.14-SNAPSHOT +dotnet + +components +plugins + + \ No newline at end of file Propchange: incubator/nmaven/trunk/pom.xml -- svn:eol-style = native
svn commit: r490442 - in /incubator/nmaven/trunk: README.txt components/dotnet-model/settings/settings.mdo maven-dotnet.iml maven-dotnet.ipr
Author: sisbell Date: Tue Dec 26 22:16:36 2006 New Revision: 490442 URL: http://svn.apache.org/viewvc?view=rev&rev=490442 Log: Adding project files for IntelliJ IDEA Setup. Added: incubator/nmaven/trunk/README.txt (with props) incubator/nmaven/trunk/maven-dotnet.iml incubator/nmaven/trunk/maven-dotnet.ipr Modified: incubator/nmaven/trunk/components/dotnet-model/settings/settings.mdo Added: incubator/nmaven/trunk/README.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/README.txt?view=auto&rev=490442 == --- incubator/nmaven/trunk/README.txt (added) +++ incubator/nmaven/trunk/README.txt Tue Dec 26 22:16:36 2006 @@ -0,0 +1,9 @@ +Initial Build +* On the first build, execute the bootstrap-build script. On subsequent builds, you can just type mvn install from +the command prompt. + +IntelliJ IDEA Setup +* Do the initial build. This will create the dotnet modello model source code and will download all of the maven +binary dependencies. Next, click the maven-dotnet.ipr file. Go to settings/Path variables and set localRepository + to your ~/.m2/repository directory (specify the absolute path). Exit IntelliJ and click the maven-dotnet.ipr file. + Now all of the binary dependencies will be mapped to the local maven repo. \ No newline at end of file Propchange: incubator/nmaven/trunk/README.txt -- svn:eol-style = native Modified: incubator/nmaven/trunk/components/dotnet-model/settings/settings.mdo URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/settings/settings.mdo?view=diff&rev=490442&r1=490441&r2=490442 == --- incubator/nmaven/trunk/components/dotnet-model/settings/settings.mdo (original) +++ incubator/nmaven/trunk/components/dotnet-model/settings/settings.mdo Tue Dec 26 22:16:36 2006 @@ -86,6 +86,10 @@ installRoot String + +sdkRoot +String + Added: incubator/nmaven/trunk/maven-dotnet.iml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/maven-dotnet.iml?view=auto&rev=490442 == --- incubator/nmaven/trunk/maven-dotnet.iml (added) +++ incubator/nmaven/trunk/maven-dotnet.iml Tue Dec 26 22:16:36 2006 @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: incubator/nmaven/trunk/maven-dotnet.ipr URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/maven-dotnet.ipr?view=auto&rev=490442 == --- incubator/nmaven/trunk/maven-dotnet.ipr (added) +++ incubator/nmaven/trunk/maven-dotnet.ipr Tue Dec 26 22:16:36 2006 @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r490443 - /incubator/nmaven/branches/SI_NET3/
Author: sisbell Date: Tue Dec 26 22:24:33 2006 New Revision: 490443 URL: http://svn.apache.org/viewvc?view=rev&rev=490443 Log: Creating branch for adding .NET 3.0 Support. Added: incubator/nmaven/branches/SI_NET3/ - copied from r490442, incubator/nmaven/trunk/
svn commit: r490445 - /incubator/nmaven/trunk/maven-dotnet.ipr
Author: sisbell Date: Tue Dec 26 22:30:42 2006 New Revision: 490445 URL: http://svn.apache.org/viewvc?view=rev&rev=490445 Log: Fixed IDEA project file. It was pointing to wrong iml file, causing the project to not load. Modified: incubator/nmaven/trunk/maven-dotnet.ipr Modified: incubator/nmaven/trunk/maven-dotnet.ipr URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/maven-dotnet.ipr?view=diff&rev=490445&r1=490444&r2=490445 == --- incubator/nmaven/trunk/maven-dotnet.ipr (original) +++ incubator/nmaven/trunk/maven-dotnet.ipr Tue Dec 26 22:30:42 2006 @@ -253,7 +253,7 @@ - +
svn commit: r490446 - /incubator/nmaven/branches/SI_NET3/maven-dotnet.ipr
Author: sisbell Date: Tue Dec 26 22:31:08 2006 New Revision: 490446 URL: http://svn.apache.org/viewvc?view=rev&rev=490446 Log: Fixed IDEA project file. It was pointing to wrong iml file, causing the project to not load. Modified: incubator/nmaven/branches/SI_NET3/maven-dotnet.ipr Modified: incubator/nmaven/branches/SI_NET3/maven-dotnet.ipr URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/maven-dotnet.ipr?view=diff&rev=490446&r1=490445&r2=490446 == --- incubator/nmaven/branches/SI_NET3/maven-dotnet.ipr (original) +++ incubator/nmaven/branches/SI_NET3/maven-dotnet.ipr Tue Dec 26 22:31:08 2006 @@ -1,276 +1,276 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r490630 - in /incubator/nmaven/branches/SI_NET3: components/dotnet-core/src/main/resources/META-INF/nmaven/ components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/co
Author: sisbell
Date: Wed Dec 27 18:25:30 2006
New Revision: 490630
URL: http://svn.apache.org/viewvc?view=rev&rev=490630
Log:
Support for .NET 3.0
Modified:
incubator/nmaven/branches/SI_NET3/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml
incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
incubator/nmaven/branches/SI_NET3/integration-tests/tests/README.txt
incubator/nmaven/branches/SI_NET3/integration-tests/tests/integration-tests.txt
incubator/nmaven/branches/SI_NET3/integration-tests/tests/it0021/pom.xml
incubator/nmaven/branches/SI_NET3/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java
incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-resx/pom.xml
incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
Modified:
incubator/nmaven/branches/SI_NET3/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml?view=diff&rev=490630&r1=490629&r2=490630
==
---
incubator/nmaven/branches/SI_NET3/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml
(original)
+++
incubator/nmaven/branches/SI_NET3/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml
Wed Dec 27 18:25:30 2006
@@ -60,6 +60,7 @@
FULL
2.0.50727
+3.0
Modified:
incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java?view=diff&rev=490630&r1=490629&r2=490630
==
---
incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
(original)
+++
incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
Wed Dec 27 18:25:30 2006
@@ -89,7 +89,6 @@
public List getCommands()
throws ExecutionException
{
-String fv =
compilerContext.getCompilerRequirement().getFrameworkVersion();
File path = new File(
compilerContext.getCompilerCapability().getAssemblyPath() );
if ( !path.exists() )
{
Modified:
incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java?view=diff&rev=490630&r1=490629&r2=490630
==
---
incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
(original)
+++
incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
Wed Dec 27 18:25:30 2006
@@ -140,11 +140,28 @@
commands.add( "/nologo" );
}
-if(compilerContext.getKeyInfo().getKeyFileUri() != null)
+if ( compilerContext.getCompilerRequirement().getVendor().equals(
Vendor.MICROSOFT ) &&
+
compilerContext.getCompilerRequirement().getFrameworkVersion().equals( "3.0" ) )
{
-commands.add("/keyfile:" +
compilerContext.getKeyInfo().getKeyFileUri());
-} else if(compilerContext.getKeyInfo().getKeyContainerName() != null) {
-commands.add("/keycontainer:" +
compilerContext.getKeyInfo().getKeyContainerName());
+String wcfRef =
+
"/reference:C:\\WINDOWS\\Microsoft.NET\\Framework\\v3.0\\Windows Communication
Foundation\\";
+//TODO: This is a hard-coded path: Don't have a registry value
eit
svn commit: r490631 - in /incubator/nmaven/trunk: components/dotnet-core/src/main/resources/META-INF/nmaven/ components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl
Author: sisbell
Date: Wed Dec 27 18:38:19 2006
New Revision: 490631
URL: http://svn.apache.org/viewvc?view=rev&rev=490631
Log:
Merged SI_NET3 branch which provides support for .NET 3.0
Modified:
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
incubator/nmaven/trunk/integration-tests/tests/README.txt
incubator/nmaven/trunk/integration-tests/tests/integration-tests.txt
incubator/nmaven/trunk/integration-tests/tests/it0021/pom.xml
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java
incubator/nmaven/trunk/plugins/nmaven-utility-resx/pom.xml
incubator/nmaven/trunk/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
Modified:
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml?view=diff&rev=490631&r1=490630&r2=490631
==
---
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml
(original)
+++
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml
Wed Dec 27 18:38:19 2006
@@ -60,6 +60,7 @@
FULL
2.0.50727
+3.0
Modified:
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java?view=diff&rev=490631&r1=490630&r2=490631
==
---
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
Wed Dec 27 18:38:19 2006
@@ -89,7 +89,6 @@
public List getCommands()
throws ExecutionException
{
-String fv =
compilerContext.getCompilerRequirement().getFrameworkVersion();
File path = new File(
compilerContext.getCompilerCapability().getAssemblyPath() );
if ( !path.exists() )
{
Modified:
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java?view=diff&rev=490631&r1=490630&r2=490631
==
---
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
Wed Dec 27 18:38:19 2006
@@ -140,11 +140,28 @@
commands.add( "/nologo" );
}
-if(compilerContext.getKeyInfo().getKeyFileUri() != null)
+if ( compilerContext.getCompilerRequirement().getVendor().equals(
Vendor.MICROSOFT ) &&
+
compilerContext.getCompilerRequirement().getFrameworkVersion().equals( "3.0" ) )
{
-commands.add("/keyfile:" +
compilerContext.getKeyInfo().getKeyFileUri());
-} else if(compilerContext.getKeyInfo().getKeyContainerName() != null) {
-commands.add("/keycontainer:" +
compilerContext.getKeyInfo().getKeyContainerName());
+String wcfRef =
+
"/reference:C:\\WINDOWS\\Microsoft.NET\\Framework\\v3.0\\Windows Communication
Foundation\\";
+//TODO: This is a hard-coded path: Don't have a registry value
either.
+commands.add( wcfRef + "System.ServiceModel.dll" );
+commands.add( wcfRef + "Microsoft.Transactions.Bridge.dll" );
+commands.add( wcfRef + "Microsoft.Tr
svn commit: r490636 - /incubator/nmaven/trunk/plugins/nmaven-utility-resx/pom.xml
Author: sisbell Date: Wed Dec 27 18:57:51 2006 New Revision: 490636 URL: http://svn.apache.org/viewvc?view=rev&rev=490636 Log: Removed hard-coded .NET3 compile. Modified: incubator/nmaven/trunk/plugins/nmaven-utility-resx/pom.xml Modified: incubator/nmaven/trunk/plugins/nmaven-utility-resx/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/nmaven-utility-resx/pom.xml?view=diff&rev=490636&r1=490635&r2=490636 == --- incubator/nmaven/trunk/plugins/nmaven-utility-resx/pom.xml (original) +++ incubator/nmaven/trunk/plugins/nmaven-utility-resx/pom.xml Wed Dec 27 18:57:51 2006 @@ -13,9 +13,6 @@ org.apache.maven.dotnet.plugins maven-compile-plugin true - -3.0 -
svn commit: r491492 - in /incubator/nmaven/trunk: ./ components/dotnet-core/src/main/resources/META-INF/nmaven/ components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ plug
Author: sisbell Date: Sun Dec 31 13:25:57 2006 New Revision: 491492 URL: http://svn.apache.org/viewvc?view=rev&rev=491492 Log: Support for starting and stopping Mono XSP server. Added: incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ThreadedNetExecutable.java (with props) incubator/nmaven/trunk/plugins/maven-xsp-plugin/ incubator/nmaven/trunk/plugins/maven-xsp-plugin/pom.xml (with props) incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/ incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/main/ incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/main/java/ incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/main/java/org/ incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/main/java/org/apache/ incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/ incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/dotnet/ incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/dotnet/plugin/ incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsp/ incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsp/XspStarterMojo.java (with props) incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsp/XspStopperMojo.java (with props) Modified: incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java incubator/nmaven/trunk/maven-dotnet.iml incubator/nmaven/trunk/plugins/pom.xml Modified: incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml?view=diff&rev=491492&r1=491491&r2=491492 == --- incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml (original) +++ incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml Sun Dec 31 13:25:57 2006 @@ -1,173 +1,201 @@ - -MONO:XSD - org.apache.maven.dotnet.executable.impl.DefaultNetExecutable -MONO -xsd -XSD:SCHEMA - -2.0.50727 -1.1.4322 - - - -Windows - - -Mac OS X - - -Linux - - -Solaris - - -FreeBSD - - - - -classes -dataset -element -namespace -language -generator -o -type -uri - - - - -MONO:XSD:XML_INSTANCE - org.apache.maven.dotnet.executable.impl.DefaultNetExecutable -MONO -xsd -XSD:XML_INSTANCE - -2.0.50727 -1.1.4322 - - - -Windows - - -Mac OS X - - -Linux - - -Solaris - - -FreeBSD - - - - -o - - - - -MS:XSD:XML_INSTANCE - org.apache.maven.dotnet.executable.impl.DefaultNetExecutable -MICROSOFT -xsd -XSD:XML_INSTANCE - -2.0.50727 -1.1.4322 - - - -Windows - - - - -o - - - - -MS:XSD:SCHEMA - org.apache.maven.dotnet.executable.impl.DefaultNetExecutable -MICROSOFT -xsd -XSD:SCHEMA - -2.0.50727 -1.1.4322 - - - -Windows - - - - -classes -dataset -element -fields -enableDataBinding -namespace -language -out -o -type -uri -parameters - - - - -MS:RESGEN - org.apache.maven.dotnet.executable.impl.DefaultNetExecutable -MICROSOFT -resgen -RESGEN - -
svn commit: r491493 - in /incubator/nmaven/trunk/integration-tests/tests/it0025: ./ it/ it/test1/ it/test1/src/ it/test1/src/main/ it/test1/src/main/csharp/
Author: sisbell
Date: Sun Dec 31 13:27:07 2006
New Revision: 491493
URL: http://svn.apache.org/viewvc?view=rev&rev=491493
Log:
Integration test for XSP plugin. Not complete.
Added:
incubator/nmaven/trunk/integration-tests/tests/it0025/
incubator/nmaven/trunk/integration-tests/tests/it0025/goals.txt (with
props)
incubator/nmaven/trunk/integration-tests/tests/it0025/it/
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/expected-results.txt
(with props)
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/goals.txt
(with props)
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/pom.xml
(with props)
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/src/
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/src/main/
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/src/main/csharp/
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/src/main/csharp/It0001.cs
incubator/nmaven/trunk/integration-tests/tests/it0025/pom.xml (with props)
Added: incubator/nmaven/trunk/integration-tests/tests/it0025/goals.txt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/it0025/goals.txt?view=auto&rev=491493
==
--- incubator/nmaven/trunk/integration-tests/tests/it0025/goals.txt (added)
+++ incubator/nmaven/trunk/integration-tests/tests/it0025/goals.txt Sun Dec 31
13:27:07 2006
@@ -0,0 +1 @@
+install
\ No newline at end of file
Propchange: incubator/nmaven/trunk/integration-tests/tests/it0025/goals.txt
--
svn:eol-style = native
Added:
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/expected-results.txt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/expected-results.txt?view=auto&rev=491493
==
---
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/expected-results.txt
(added)
+++
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/expected-results.txt
Sun Dec 31 13:27:07 2006
@@ -0,0 +1 @@
+target/it0001.netmodule
\ No newline at end of file
Propchange:
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/expected-results.txt
--
svn:eol-style = native
Added: incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/goals.txt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/goals.txt?view=auto&rev=491493
==
--- incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/goals.txt
(added)
+++ incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/goals.txt
Sun Dec 31 13:27:07 2006
@@ -0,0 +1 @@
+install
\ No newline at end of file
Propchange:
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/goals.txt
--
svn:eol-style = native
Added: incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/pom.xml?view=auto&rev=491493
==
--- incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/pom.xml
(added)
+++ incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/pom.xml Sun
Dec 31 13:27:07 2006
@@ -0,0 +1,19 @@
+
+4.0.0
+org.apache.maven.it
+it0001
+module
+1.0.0
+it0001
+
+
+ src/main/csharp
+
+
+org.apache.maven.dotnet.plugins
+maven-compile-plugin
+ true
+
+
+
+
\ No newline at end of file
Propchange:
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/pom.xml
--
svn:eol-style = native
Added:
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/src/main/csharp/It0001.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/src/main/csharp/It0001.cs?view=auto&rev=491493
==
---
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/src/main/csharp/It0001.cs
(added)
+++
incubator/nmaven/trunk/integration-tests/tests/it0025/it/test1/src/main/csharp/It0001.cs
Sun Dec 31 13:27:07 2006
@@ -0,0 +1,8 @@
+namespace org.apache.maven.it {
+
+public class It0001 {
+
svn commit: r491497 - /incubator/nmaven/branches/SI_IT/
Author: sisbell Date: Sun Dec 31 13:42:33 2006 New Revision: 491497 URL: http://svn.apache.org/viewvc?view=rev&rev=491497 Log: Branch for integration test plugin. Added: incubator/nmaven/branches/SI_IT/ - copied from r491496, incubator/nmaven/trunk/
svn commit: r503889 - /incubator/nmaven/www/
Author: sisbell Date: Mon Feb 5 13:51:58 2007 New Revision: 503889 URL: http://svn.apache.org/viewvc?view=rev&rev=503889 Log: Adding directory for web site. This is auto-generated and should not need branching. Added: incubator/nmaven/www/
svn commit: r503893 [13/13] - in /incubator/nmaven/www: ./ css/ images/ images/logos/ plugins/ plugins/maven-compile-plugin/ plugins/maven-compile-plugin/css/ plugins/maven-compile-plugin/images/ plug
Added: incubator/nmaven/www/plugins/maven-xsp-plugin/source-repository.html
URL:
http://svn.apache.org/viewvc/incubator/nmaven/www/plugins/maven-xsp-plugin/source-repository.html?view=auto&rev=503893
==
--- incubator/nmaven/www/plugins/maven-xsp-plugin/source-repository.html (added)
+++ incubator/nmaven/www/plugins/maven-xsp-plugin/source-repository.html Mon
Feb 5 14:01:37 2007
@@ -0,0 +1,180 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+
+
+
+
+
+
+
+
+
+
+
+NMaven - Source Repository
+
+ @import url("./css/maven-base.css");
+ @import url("./css/maven-theme.css");
+ @import url("./css/site.css");
+
+
+
+
+
+
+
+
+maven-xsp-plugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Last Published: 02/05/2007
+
+ http://incubator.apache.org/projects/nmaven.html";>Project Site
+ |
+ http://incubator.apache.org/nmaven";>NMaven
+ |
+ http://svn.apache.org/repos/asf/incubator/nmaven/";>NMaven
SVN
+ |
+ http://maven.apache.org/";>Maven
+ |
+ http://www.mono-project.com/";>Mono Project
+ |
+ http://dotgnu.org/";>DotGNU
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ General Info
+
+
+
+ About
+
+
+ Project Documentation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Project Information
+
+
+
+ Continuous Integration
+
+
+
+ Dependencies
+
+
+
+ Issue Tracking
+
+
+
+ Mailing Lists
+
+
+
+ Project License
+
+
+
+ Project Summary
+
+
+
+ Project Team
+
+
+
+ Source Repository
+
+
+
+
+ http://maven.apache.org/";
title="Built by Maven" id="poweredBy">
+
+
+
+
+
+
+
+
+
+
+
+
+
+Source RepositoryNo source
configuration management system is defined. Please check back at a later
date.
+
+
+
+
+
+
+ ©
+ 2007
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Propchange: incubator/nmaven/www/plugins/maven-xsp-plugin/source-repository.html
--
svn:eol-style = native
Added: incubator/nmaven/www/plugins/maven-xsp-plugin/start-xsp-mojo.html
URL:
http://svn.apache.org/viewvc/incubator/nmaven/www/plugins/maven-xsp-plugin/start-xsp-mojo.html?view=auto&rev=503893
==
--- incubator/nmaven/www/plugins/maven-xsp-plugin/start-xsp-mojo.html (added)
+++ incubator/nmaven/www/plugins/maven-xsp-plugin/start-xsp-mojo.html Mon Feb
5 14:01:37 2007
@@ -0,0 +1,235 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+
+
+
+
+
+
+
+
+
+
+
+NMaven -
+maven-xsp-plugin - xsp:start-xsp
+
+ @import url("./css/maven-base.css");
+ @import url("./css/maven-theme.css");
+ @import url("./css/site.css");
+
+
+
+
+
+
+
+
+maven-xsp-plugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Last Published: 02/05/2007
+
+ http://incubator.apache.org/projects/nmaven.html";>Project Site
+ |
+ http://incubator.apache.org/nmaven";>NMaven
+ |
+ http://svn.apache.org/repos/asf/incubator/nmaven/";>NMaven
SVN
+ |
+ http://maven.apache.org/";>Maven
+ |
+ http://www.mono-project.com/";>Mono Project
+ |
+ http://dotgnu.org/";>DotGNU
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ General Info
+
+
+
+ About
+
+
+ Project Documentation
+
+
+
+
svn commit: r503912 - in /incubator/nmaven/trunk: plugins/ plugins/maven-compile-plugin/ plugins/maven-compile-plugin/src/site/ plugins/maven-compile-plugin/src/site/apt/ plugins/maven-install-plugin/
Author: sisbell
Date: Mon Feb 5 14:52:00 2007
New Revision: 503912
URL: http://svn.apache.org/viewvc?view=rev&rev=503912
Log:
Updated site documentation.
Added:
incubator/nmaven/trunk/plugins/maven-install-plugin/src/site/
incubator/nmaven/trunk/plugins/maven-install-plugin/src/site/site.xml
(with props)
incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/site/
incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/site/site.xml
(with props)
incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/site/
incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/site/site.xml
(with props)
incubator/nmaven/trunk/plugins/maven-settings-plugin/src/site/
incubator/nmaven/trunk/plugins/maven-settings-plugin/src/site/site.xml
(with props)
incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/site/
incubator/nmaven/trunk/plugins/maven-xsp-plugin/src/site/site.xml (with
props)
Modified:
incubator/nmaven/trunk/plugins/maven-compile-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/site/apt/how-to-use.apt
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/site/site.xml
incubator/nmaven/trunk/plugins/maven-install-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-settings-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-test-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-test-plugin/src/site/site.xml
incubator/nmaven/trunk/plugins/maven-webapp-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-webapp-plugin/src/site/site.xml
incubator/nmaven/trunk/plugins/maven-wsdl-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/site/apt/how-to-use.apt
incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/site/site.xml
incubator/nmaven/trunk/plugins/maven-xsd-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-xsd-plugin/src/site/site.xml
incubator/nmaven/trunk/plugins/maven-xsp-plugin/pom.xml
incubator/nmaven/trunk/plugins/pom.xml
incubator/nmaven/trunk/site/pom.xml
incubator/nmaven/trunk/site/src/site/apt/plugins/index.apt
incubator/nmaven/trunk/site/src/site/site.xml
Modified: incubator/nmaven/trunk/plugins/maven-compile-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compile-plugin/pom.xml?view=diff&rev=503912&r1=503911&r2=503912
==
--- incubator/nmaven/trunk/plugins/maven-compile-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-compile-plugin/pom.xml Mon Feb 5
14:52:00 2007
@@ -1,24 +1,33 @@
-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";>
-
-org.apache.maven.dotnet.plugins
-0.14-SNAPSHOT
-maven-dotnet-plugins
-
-4.0.0
+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";>
+
org.apache.maven.dotnet.plugins
-maven-compile-plugin
-maven-plugin
0.14-SNAPSHOT
-maven-compile-plugin
-
-Maven Plugin for .NET
-
+maven-dotnet-plugins
+
+ 4.0.0
+ org.apache.maven.dotnet.plugins
+ maven-compile-plugin
+ maven-plugin
+ 0.14-SNAPSHOT
+ maven-compile-plugin
+
+Maven Plugin for .NET
+
-
-
-org.apache.maven
-maven-artifact
-2.0.4
-
-
+
+
+ org.apache.maven
+ maven-artifact
+ 2.0.4
+
+
+
+
+
+ nmaven-apache-site
+ NMaven Site
+ file://${basedir}/../../../www/plugins/maven-compile-plugin
+
+
Modified:
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/site/apt/how-to-use.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compile-plugin/src/site/apt/how-to-use.apt?view=diff&rev=503912&r1=503911&r2=503912
==
---
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/site/apt/how-to-use.apt
(original)
+++
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/site/apt/how-to-use.apt
Mon Feb 5 14:52:00 2007
@@ -1,6 +1,6 @@
How to Use
- Also make sure that you read
{{{http://nmaven.sourceforge.net/environment-configuration.html} Configuration}}
+ Also make sure that you read
{{{http://incubator.apache.org/nmaven/environment-configuration.html}
Configuration}}
* Pass-Through Compiler Commands
Modified: incubator/nmaven/trunk/plugins/maven-compile-plugin/src/site/site.xml
URL:
http://svn.apache.org/vi
svn commit: r504236 - in /incubator/nmaven/trunk/site/src/site/apt: features.apt getting-started.apt index.apt
Author: sisbell
Date: Tue Feb 6 10:52:17 2007
New Revision: 504236
URL: http://svn.apache.org/viewvc?view=rev&rev=504236
Log:
Updated site documentation.
Modified:
incubator/nmaven/trunk/site/src/site/apt/features.apt
incubator/nmaven/trunk/site/src/site/apt/getting-started.apt
incubator/nmaven/trunk/site/src/site/apt/index.apt
Modified: incubator/nmaven/trunk/site/src/site/apt/features.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/features.apt?view=diff&rev=504236&r1=504235&r2=504236
==
--- incubator/nmaven/trunk/site/src/site/apt/features.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/features.apt Tue Feb 6 10:52:17
2007
@@ -6,6 +6,8 @@
* DotGNU Support: C#
+ * Multiple Framework Version Support: 1.1, 2.0, 3.0
+
* NUnit support
* Resource generation and embedding
@@ -20,3 +22,4 @@
* nmaven-settings file for selecting the environment (MONO/MS/GNU,
vendor/framework version, install location, etc)
+ * Assembly Signing
\ No newline at end of file
Modified: incubator/nmaven/trunk/site/src/site/apt/getting-started.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/getting-started.apt?view=diff&rev=504236&r1=504235&r2=504236
==
--- incubator/nmaven/trunk/site/src/site/apt/getting-started.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/getting-started.apt Tue Feb 6
10:52:17 2007
@@ -16,17 +16,17 @@
* {{{getting-started.html#Generating Resources}Generating Resources}}
+ * {{{getting-started.html#Signing Assemblies}Signing Assemblies}}
+
+ * {{{getting-started.html#Using NMaven Settings File}Using NMaven Settings
File}}
+
* {Building NMaven}
Make sure that you have jdk1.5+ installed and then do the following:
- [[1]] Download the latest nmaven-components and nmaven-plugin project
archives from the sourceforge site.
+ [[1]] Do an SVN checkout: svn co
http://svn.apache.org/repos/asf/incubator/nmaven/trunk nmaven
- [[2]] Unarchive the nmaven-components. Build it by typing "mvn install" from
the root directory.
-
- [[3]] Unarchive the nmaven-plugins. Goto the scripts directory and run the
appropriate batch or shell script for
- your enviornment. This does a bootstrap build of Java jars and .NET
assemblies and places the 3rd party .NET libraries
- in the local maven repo.
+ [[2]] Execute bootstrap-build.bat (or bootstrap-build.sh) from the nmaven
directory.
Building on Linux, may take some extra steps. By default, on many Linux
environments, the GNU Compiler for Java is already
installed. The current GNU version will not work with NMaven. To check which
version the system uses, type "java -version"
@@ -85,11 +85,7 @@
* {Unit Testing with NUnit}
- Prior to being able to unit test with NUnit, you must install the
nunit.framework.dll into the local maven repository.
- Go to the scripts directory in the nmaven-plugins download and run the script
install-1.1 (.NET 1.1 environment)
- or install-2.0 (.NET 2.0 environment).
-
- After installing NUnit, add the org.nunit dependency to your pom.xml (as
shown below). You
+ Add the org.nunit dependency to your pom.xml (as shown below). You
will only need to add the nmaven-test-plugin to the pom under the following
circumstances:
[[1]] If you do not add the nunit bin to your path;
@@ -285,6 +281,8 @@
++
+ Note that there is no current support for the use of classifiers within
NMaven.
+
* {Generating Resources}
There are four types of resources to include within an assembly: linked
resources, embedded resources,
@@ -303,3 +301,122 @@
| src/main/resources/win32icon | Embed the icon within the assembly (icon will
show up in file viewer) |
*-++
+* {Signing Assemblies}
+
+ NMaven supports compile-time signing of assemblies. You can sign assemblies
by using the keyfile field in the
+ maven-compile-plugin.
+
+++
+
+src/main/csharp
+
+
+org.apache.maven.dotnet.plugins
+maven-compile-plugin
+true
+
+ sample.snk
+
+
+
+
+
+++
+
+ For both Mono framework versions 1.1/2.0 and Microsoft 2.0, NMaven uses the
keyfile and keycontainer compiler
+ parameters. For Microsoft 1.1, NMaven adds the KeyName and KeyFile entries
into the project's AssemblyInfo.cs.
+ Future NMaven features will include delayed-signing and post-compilation
signing of assemblies.
+
+ * Using NMaven Settings File
+
+ On Windows, NMaven will read the Windows Registry - regarding information
about Mono, Microsoft and DotGNU
+ installations - and will then output the registry info into a
~/.m2/nmaven-settings.xml file. This file assists
+ NMaven in determining the ca
svn commit: r504239 - in /incubator/nmaven/trunk/site/src/site/apt: getting-started.apt index.apt
Author: sisbell
Date: Tue Feb 6 10:59:47 2007
New Revision: 504239
URL: http://svn.apache.org/viewvc?view=rev&rev=504239
Log:
Updated site documentation. Fixed formatting problems.
Modified:
incubator/nmaven/trunk/site/src/site/apt/getting-started.apt
incubator/nmaven/trunk/site/src/site/apt/index.apt
Modified: incubator/nmaven/trunk/site/src/site/apt/getting-started.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/getting-started.apt?view=diff&rev=504239&r1=504238&r2=504239
==
--- incubator/nmaven/trunk/site/src/site/apt/getting-started.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/getting-started.apt Tue Feb 6
10:59:47 2007
@@ -327,7 +327,7 @@
parameters. For Microsoft 1.1, NMaven adds the KeyName and KeyFile entries
into the project's AssemblyInfo.cs.
Future NMaven features will include delayed-signing and post-compilation
signing of assemblies.
- * Using NMaven Settings File
+* {Using NMaven Settings File}
On Windows, NMaven will read the Windows Registry - regarding information
about Mono, Microsoft and DotGNU
installations - and will then output the registry info into a
~/.m2/nmaven-settings.xml file. This file assists
@@ -338,7 +338,7 @@
In the case of Linux, there is no registry so the nmaven-settings.xml file is
not automatically generated. You may,
however, create one by hand, allowing you to specify the location of DotGNU
and Mono implementations.
- ++
+++
http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
Microsoft Windows NT 5.1.2600 Service Pack
2
@@ -419,4 +419,4 @@
-++
\ No newline at end of file
+++
Modified: incubator/nmaven/trunk/site/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/index.apt?view=diff&rev=504239&r1=504238&r2=504239
==
--- incubator/nmaven/trunk/site/src/site/apt/index.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/index.apt Tue Feb 6 10:59:47 2007
@@ -11,5 +11,7 @@
vendors (Microsoft, Novell, DotGNU) and platforms (Windows, Linux). Specific,
near-term goals include:
* .NET Integration Test module
+
* Expanded Support for Assembly Signing
+
* Support for Classifiers
svn commit: r504244 - in /incubator/nmaven/www: ./ images/logos/
Author: sisbell Date: Tue Feb 6 11:03:27 2007 New Revision: 504244 URL: http://svn.apache.org/viewvc?view=rev&rev=504244 Log: New site docs that include current info about building, assembly signing and the nmaven-settings file. Modified: incubator/nmaven/www/dependencies.html incubator/nmaven/www/features.html incubator/nmaven/www/getting-started.html incubator/nmaven/www/images/logos/Thumbs.db incubator/nmaven/www/index.html incubator/nmaven/www/integration.html incubator/nmaven/www/issue-tracking.html incubator/nmaven/www/license.html incubator/nmaven/www/mail-lists.html incubator/nmaven/www/project-info.html incubator/nmaven/www/project-summary.html incubator/nmaven/www/source-repository.html incubator/nmaven/www/team-list.html Modified: incubator/nmaven/www/dependencies.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/dependencies.html?view=diff&rev=504244&r1=504243&r2=504244 == --- incubator/nmaven/www/dependencies.html (original) +++ incubator/nmaven/www/dependencies.html Tue Feb 6 11:03:27 2007 @@ -45,7 +45,7 @@ -Last Published: 02/05/2007 +Last Published: 02/06/2007 http://incubator.apache.org/projects/nmaven.html";>Project Site | Modified: incubator/nmaven/www/features.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/features.html?view=diff&rev=504244&r1=504243&r2=504244 == --- incubator/nmaven/www/features.html (original) +++ incubator/nmaven/www/features.html Tue Feb 6 11:03:27 2007 @@ -45,7 +45,7 @@ -Last Published: 02/05/2007 +Last Published: 02/06/2007 http://incubator.apache.org/projects/nmaven.html";>Project Site | @@ -145,7 +145,7 @@ -FeaturesMono Support: C#, Nemerle, PHPMicrosoft Support: C#, VB, .NET Compact ProfileDotGNU Support: C#NUnit supportResource generation and embeddingAutmomatic Generation of AssemblyInfo.* based on language and contents of the pom.Web Application Packaging and DeploymentXSD and WSDL GenerationPluggable architecture for adding new compilers and executables.nmaven-settings file for selecting the environment (MONO/MS/GNU, vendor/framework version, install location, etc) +FeaturesMono Support: C#, Nemerle, PHPMicrosoft Support: C#, VB, .NET Compact ProfileDotGNU Support: C#Multiple Framework Version Support: 1.1, 2.0, 3.0NUnit supportResource generation and embeddingAutmomatic Generation of AssemblyInfo.* based on language and contents of the pom.Web Application Packaging and DeploymentXSD and WSDL GenerationPluggable architecture for adding new compilers and executables.nmaven-settings file for selecting the environment (MONO/MS/GNU, vendor/framework version, install location, etc)Assembly Signing Modified: incubator/nmaven/www/getting-started.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/getting-started.html?view=diff&rev=504244&r1=504243&r2=504244 == --- incubator/nmaven/www/getting-started.html (original) +++ incubator/nmaven/www/getting-started.html Tue Feb 6 11:03:27 2007 @@ -45,7 +45,7 @@ -Last Published: 02/05/2007 +Last Published: 02/06/2007 http://incubator.apache.org/projects/nmaven.html";>Project Site | @@ -145,14 +145,14 @@ -Getting StartedSectionsBuilding NMavenAssembly InfoUnit Testing with NUnitBuilding & Deploying Web ApplicationsBuilding with .NET ModulesInstalling Existing Assemblies in the Maven RepositoryGenerating ResourcesBuilding NMavenMake sure that you have jdk1.5+ installed and then do the following:Download the latest n maven-components and nmaven-plugin project archives from the sourceforge site.Unarchive the nmaven-components. Build it by typing "mvn install" from the root directory.Unarchive the nmaven-plugins. Goto the scripts directory and run the appropriate batch or shell script for your enviornment. This does a bootstrap build of Java jars and .NET assemblies and places the 3rd party .NET libraries in the local maven repo.Building on Linux, may take some extra steps. By default, on many Linux environments, the GNU Compiler for Java is already installed. The current GNU version will not work with NMaven. To check which version the system uses, type "java -version" on the command line. If you see something similar to the following, you will need to take additional steps to get the build setup: +Getting Sta
svn commit: r504741 - in /incubator/nmaven/trunk: components/pom.xml site/pom.xml site/src/site/site.xml
Author: sisbell
Date: Wed Feb 7 15:45:59 2007
New Revision: 504741
URL: http://svn.apache.org/viewvc?view=rev&rev=504741
Log:
Updated docs: javadocs, project info...
Modified:
incubator/nmaven/trunk/components/pom.xml
incubator/nmaven/trunk/site/pom.xml
incubator/nmaven/trunk/site/src/site/site.xml
Modified: incubator/nmaven/trunk/components/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/pom.xml?view=diff&rev=504741&r1=504740&r2=504741
==
--- incubator/nmaven/trunk/components/pom.xml (original)
+++ incubator/nmaven/trunk/components/pom.xml Wed Feb 7 15:45:59 2007
@@ -1,51 +1,63 @@
-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
-dotnet-components
-pom
-0.14-SNAPSHOT
-dotnet-components
-
-dotnet-core
-dotnet-model
-dotnet-artifact
-dotnet-assembler
-dotnet-executable
-dotnet-registry
-dotnet-vendor
-
-
-
-org.easymock
-easymock
-2.0
-test
-
-
-junit
-junit
-3.8.1
-test
-
-
-
-
-
-
-maven-assembly-plugin
-
-src/assembly/src.xml
-src/target
-
-
-
-
-
-
-
-maven-release-plugin
-
-
-
-
+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
+ dotnet-components
+ pom
+ 0.14-SNAPSHOT
+ dotnet-components
+
+dotnet-core
+dotnet-model
+dotnet-artifact
+dotnet-assembler
+dotnet-executable
+dotnet-registry
+dotnet-vendor
+
+
+
+ org.easymock
+ easymock
+ 2.0
+ test
+
+
+ junit
+ junit
+ 3.8.1
+ test
+
+
+
+
+
+maven-javadoc-plugin
+
+ true
+
+
+
+maven-assembly-plugin
+
+ src/assembly/src.xml
+ src/target
+
+
+
+
+
+
+ maven-release-plugin
+
+
+
+
+
+
+ nmaven-apache-site
+ NMaven Site
+ file://${basedir}/../../www
+
+
Modified: incubator/nmaven/trunk/site/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/pom.xml?view=diff&rev=504741&r1=504740&r2=504741
==
--- incubator/nmaven/trunk/site/pom.xml (original)
+++ incubator/nmaven/trunk/site/pom.xml Wed Feb 7 15:45:59 2007
@@ -1,107 +1,135 @@
-4.0.0
-org.apache.maven-site
-nmaven-apache-site
-pom
-0.14
+ 4.0.0
+ org.apache.maven-site
+ nmaven-apache-site
+ pom
+ 0.14
+ NMaven
+ 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
-
-NMaven provides Maven 2.x plugins to support building of .NET
applications
-
-
-
-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://sourceforge.net/tracker/?atid=876936&group_id=176362&func=browse
-
-
-
-
-Apache 2.0
-LICENSE.txt
-
-
svn commit: r505519 - in /incubator/nmaven/trunk/site/src/site: apt/environment-configuration.apt images/ images/apache-incubator-logo.png images/matching_diagram.png
Author: sisbell
Date: Fri Feb 9 13:52:50 2007
New Revision: 505519
URL: http://svn.apache.org/viewvc?view=rev&rev=505519
Log:
Updated site docs: Capability Requirements/Matching.
Added:
incubator/nmaven/trunk/site/src/site/images/
incubator/nmaven/trunk/site/src/site/images/apache-incubator-logo.png
(with props)
incubator/nmaven/trunk/site/src/site/images/matching_diagram.png (with
props)
Modified:
incubator/nmaven/trunk/site/src/site/apt/environment-configuration.apt
Modified: incubator/nmaven/trunk/site/src/site/apt/environment-configuration.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/environment-configuration.apt?view=diff&rev=505519&r1=505518&r2=505519
==
--- incubator/nmaven/trunk/site/src/site/apt/environment-configuration.apt
(original)
+++ incubator/nmaven/trunk/site/src/site/apt/environment-configuration.apt Fri
Feb 9 13:52:50 2007
@@ -1,26 +1,169 @@
-Configuring the Environment
+Sections
-* How NMaven Chooses the Compiler Environment
+ * {{{environment-configuration.html#Configuring the Environment}Configuring
the Environment}}
- NMaven chooses the correct compiler by the following rules:
+ * {{{environment-configuration.html#Sample Configuration Files}Sample
Configuration Files}}
- [[1]] Is the \ tag set? If it is set, go to (2). If not, then
detect operating system. If OS is windows,
- set the vendor to MICROSOFT. If OS is not windows, set the vendor to MONO.
+{Configuring the Environment}
- [[2]] Is the \ tag set? If it is set, go to (3). If not, then set
the language to C_SHARP.
+* Introduction
- [[3]] Is the \ tag set? If it is set, go to (4). If not,
then set the version to 2.0.50727
+ NMaven is based on the concept of platform capabilities and platform
requirements. Examples of platform capabilities include:
- [[4]] Is the \ tag set? If if is set, go to (5). If not, then set
to the value "FULL".
+ [[1]] Linux (or Windows OS)
- [[5]] Is there a match in the compiler-plugins.xml for the given vendor,
language, frameworkVersion, profile and operating system?
- If not, fail the build. If so, instantiate the correct compiler plugin.
+ [[2]] Mono 1.1.18 installed, Microsoft 2.0 installed
- [[6]] If vendor is MICROSOFT, then set the execution path to
C:\WINDOWS\Microsoft.NET\Framework\v${frameworkVersion}\${executable}.
- If this directory does not exist, fail the build. Note that this execution
path is hard-coded, and precludes you from running the
- compiler from a non-standard location. In a future release, NMaven will
read the value from the registry. If vendor
- is not MICROSOFT, then NMaven will run whatever is specified within the
path.
+ [[3]] PHP .NET compiler (from 3rd party)
+ Platform requirements are those build requirements specified by the
developer. Typically, the requirements are given
+ either within the pom.xml or the nmaven-settings.xml file. Examples of
platform requirements include:
+
+ [[1]] C# target language
+
+ [[2]] Microsoft SDK
+
+ [[3]] Framework version 2.0
+
+ [[3]] Compact Profile
+
+ It is up to NMaven to understand what the developer is asking for (platform
requirements) and to determine whether the
+ build machine can support the requirements (with its platform capabilities).
If the capabilities match the requirements, NMaven
+ will return an executable (or compiler) that satifies the requirements.
+
+* Capability/Requirement Matching
+
+[./images/matching_diagram.png]
+
+ Consider the sequence diagram above.
+ The developer provides the compiler requirements - vendor, vendor version,
framework version, language and profile - within the pom.xml build file.
+
+++
+
+org.apache.maven.plugins
+maven-compile-plugin
+true
+
+MICROSOFT
+C_SHARP
+1.1.4322
+COMPACT
+
+
+
+++
+
+ Next, the <<>> class instance creates a <<>>
object (2), which contains artifact type (library, module) and key info.
+ The compiler needs the configuration information during execution, but the
information is not necessary for NMaven to match the correct compiler.
+
+ The <<>> object invokes the
<<>> method, passing in the
<<>>
+ and <<>> objects as parameters (3). In step (18), the
<<>> method returns a fully initialized
+ <<>> object. From the <<>> class instance
perspective, it simply constructs <<>>
+ and <<>> objects based on parameters within the pom and
gets back a fully initialized <<>> object from the
<<>>.
+
+ Now lets dig a little deeper and see whats going on underneath. The
<<>> object creates a <<>> object
+ (4) and populates the <<>> object with information vendor,
vendor version and framework
svn commit: r505521 - in /incubator/nmaven/www: ./ images/ plugins/
Author: sisbell Date: Fri Feb 9 13:53:45 2007 New Revision: 505521 URL: http://svn.apache.org/viewvc?view=rev&rev=505521 Log: Update website: Capability/Requirement Matching section. Added: incubator/nmaven/www/images/matching_diagram.png (with props) Modified: incubator/nmaven/www/adding-plugins.html incubator/nmaven/www/dependencies.html incubator/nmaven/www/environment-configuration.html incubator/nmaven/www/features.html incubator/nmaven/www/getting-started.html incubator/nmaven/www/index.html incubator/nmaven/www/integration.html incubator/nmaven/www/issue-tracking.html incubator/nmaven/www/license.html incubator/nmaven/www/mail-lists.html incubator/nmaven/www/plugins/index.html incubator/nmaven/www/project-info.html incubator/nmaven/www/project-summary.html incubator/nmaven/www/source-repository.html incubator/nmaven/www/team-list.html Modified: incubator/nmaven/www/adding-plugins.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/adding-plugins.html?view=diff&rev=505521&r1=505520&r2=505521 == --- incubator/nmaven/www/adding-plugins.html (original) +++ incubator/nmaven/www/adding-plugins.html Fri Feb 9 13:53:45 2007 @@ -45,7 +45,7 @@ -Last Published: 02/05/2007 +Last Published: 02/09/2007 http://incubator.apache.org/projects/nmaven.html";>Project Site | @@ -104,6 +104,10 @@ Configuration + + + + JavaDocs Project Documentation Modified: incubator/nmaven/www/dependencies.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/dependencies.html?view=diff&rev=505521&r1=505520&r2=505521 == --- incubator/nmaven/www/dependencies.html (original) +++ incubator/nmaven/www/dependencies.html Fri Feb 9 13:53:45 2007 @@ -45,7 +45,7 @@ -Last Published: 02/07/2007 +Last Published: 02/09/2007 http://incubator.apache.org/projects/nmaven.html";>Project Site | Modified: incubator/nmaven/www/environment-configuration.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/environment-configuration.html?view=diff&rev=505521&r1=505520&r2=505521 == --- incubator/nmaven/www/environment-configuration.html (original) +++ incubator/nmaven/www/environment-configuration.html Fri Feb 9 13:53:45 2007 @@ -45,7 +45,7 @@ -Last Published: 02/05/2007 +Last Published: 02/09/2007 http://incubator.apache.org/projects/nmaven.html";>Project Site | @@ -105,6 +105,10 @@ Configuration + + + JavaDocs + Project Documentation @@ -145,7 +149,70 @@ -Configuring the EnvironmentHow NMaven Chooses the Compiler EnvironmentNMaven chooses the correct compiler by the following rules:Is the <vendor/> tag set? If it is set, go to (2). If not, then detect operating system. If OS is windows, set the vendor to MICROSOFT. If OS is not windows, set the vendor to MONO.Is the <language> tag set? If it is set, go to (3). If not, then set the language to C_SHARP.Is the <frameworkVersion/> tag set? If it is set, go to (4). If not, then set the version to 2.0.50727Is the <profile> tag set? If if is set, go to (5). If not, then set to the value "FULL".Is there a match in the compiler-plugins.xml for the given vendor, language, frameworkVersion, profile and operating system? If not, fail the build. If so, instantiate the correct compiler plugin.If vendor is MICROSOFT, then set the execution path to C:\WINDOWS\Microsoft.NET\Framework\v$frameworkVersion\$executable. If this directory does not exist, fail the build. Note that this execution path is hard-coded, and precludes you from running the compiler from a non-standard location. In a future release, NMaven will read the value from the registry. If vendor is not MICROSOFT, then NMaven will run whatever is specified within the path.CSharp2.0:exe:Microsoft +SectionsConfiguring the EnvironmentSample Configuration FilesConfiguring the EnvironmentIntroductionNMaven is based on the concept of platform capabilities and platform requirements. Examples of platform capabilities include:Linux (or Windows OS)Mono 1.1.18 installed, Microsoft 2.0 installedPHP .NET compiler (from 3rd party)Platform requirements are those build requirements specified by the developer. Typically,
svn commit: r506204 - in /incubator/nmaven/trunk: components/ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ components/dotnet-assembler/src/main/java/org/apache/maven
Author: sisbell Date: Sun Feb 11 17:17:19 2007 New Revision: 506204 URL: http://svn.apache.org/viewvc?view=rev&rev=506204 Log: Updated site docs. Added: incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/impl/package.html incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/package.html incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/package.html incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/package.html incubator/nmaven/trunk/components/dotnet-model/assembly-plugins/src/ incubator/nmaven/trunk/components/dotnet-model/assembly-plugins/src/site/ incubator/nmaven/trunk/components/dotnet-model/assembly-plugins/src/site/site.xml (with props) incubator/nmaven/trunk/components/dotnet-model/executable-plugins/src/ incubator/nmaven/trunk/components/dotnet-model/executable-plugins/src/site/ incubator/nmaven/trunk/components/dotnet-model/executable-plugins/src/site/site.xml (with props) incubator/nmaven/trunk/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/package.html incubator/nmaven/trunk/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/package.html incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt Modified: incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/package.html incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/package.html incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml incubator/nmaven/trunk/components/dotnet-model/assembly-plugins/pom.xml incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/compiler-plugins.mdo incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/src/site/site.xml incubator/nmaven/trunk/components/dotnet-model/executable-plugins/executable-plugins.mdo incubator/nmaven/trunk/components/dotnet-model/executable-plugins/pom.xml incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/package.html incubator/nmaven/trunk/components/pom.xml incubator/nmaven/trunk/site/src/site/apt/adding-plugins.apt incubator/nmaven/trunk/site/src/site/site.xml Modified: incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/package.html URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/package.html?view=diff&rev=506204&r1=506203&r2=506204 == --- incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/package.html (original) +++ incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/package.html Sun Feb 11 17:17:19 2007 @@ -22,6 +22,6 @@ --> -Provides the implementation classes of the org.apache.maven.artifact package. +Provides the implementation classes of the org.apache.maven.dotnet.artifact package. Modified: incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java?view=diff&rev=506204&r1=506203&r2=506204 == --- incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java (original) +++ incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java Sun Feb 11 17:17:19 2007 @@ -39,11 +39,18 @@ * @param assemblyInfo the assembly info * @param mavenProject the maven project * @param outputStream the output stream to write to (currently unused) - * @throws IOException if there was a problem writing out the class file. + * @throws IOException if there was a problem writing out the class file */ void marshal( AssemblyInfo assemblyInfo, MavenProject mavenProject, OutputStream outputStream ) throws IOException; +/** + * Unmarshalls an AssemblyInfo.* class file. + * + * @param inputStream the input stream of the AssemblyInfo.* class file + * @return an Assemb
svn commit: r506208 [5/5] - in /incubator/nmaven/www/apidocs: ./ org/apache/maven/dotnet/ org/apache/maven/dotnet/artifact/ org/apache/maven/dotnet/artifact/class-use/ org/apache/maven/dotnet/artifact
Modified: incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-summary.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-summary.html?view=diff&rev=506208&r1=506207&r2=506208 == --- incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-summary.html (original) +++ incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-summary.html Sun Feb 11 17:25:26 2007 @@ -2,7 +2,7 @@ - + org.apache.maven.dotnet.vendor (dotnet-components 0.14-SNAPSHOT API) @@ -242,6 +242,6 @@ -Copyright © 2007 null. All Rights Reserved. +Copyright © 2007 NMaven. All Rights Reserved. Modified: incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-tree.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-tree.html?view=diff&rev=506208&r1=506207&r2=506208 == --- incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-tree.html (original) +++ incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-tree.html Sun Feb 11 17:25:26 2007 @@ -2,7 +2,7 @@ - + org.apache.maven.dotnet.vendor Class Hierarchy (dotnet-components 0.14-SNAPSHOT API) @@ -167,6 +167,6 @@ -Copyright © 2007 null. All Rights Reserved. +Copyright © 2007 NMaven. All Rights Reserved. Modified: incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-use.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-use.html?view=diff&rev=506208&r1=506207&r2=506208 == --- incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-use.html (original) +++ incubator/nmaven/www/apidocs/org/apache/maven/dotnet/vendor/package-use.html Sun Feb 11 17:25:26 2007 @@ -2,7 +2,7 @@ - + Uses of Package org.apache.maven.dotnet.vendor (dotnet-components 0.14-SNAPSHOT API) @@ -92,7 +92,8 @@ org.apache.maven.dotnet.executable.impl - +Provides the implementation classes of the org.apache.maven.dotnet.executable and +org.apache.maven.dotnet.executable.compiler packages. org.apache.maven.dotnet.vendor @@ -101,7 +102,7 @@ org.apache.maven.dotnet.vendor.impl -Provides the implementation classes of the org.apache.maven.vendor package. +Provides the implementation classes of the org.apache.maven.dotnet.vendor package. @@ -280,6 +281,6 @@ -Copyright © 2007 null. All Rights Reserved. +Copyright © 2007 NMaven. All Rights Reserved. Modified: incubator/nmaven/www/apidocs/overview-frame.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/apidocs/overview-frame.html?view=diff&rev=506208&r1=506207&r2=506208 == --- incubator/nmaven/www/apidocs/overview-frame.html (original) +++ incubator/nmaven/www/apidocs/overview-frame.html Sun Feb 11 17:25:26 2007 @@ -2,7 +2,7 @@ - + Overview (dotnet-components 0.14-SNAPSHOT API) Modified: incubator/nmaven/www/apidocs/overview-summary.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/apidocs/overview-summary.html?view=diff&rev=506208&r1=506207&r2=506208 == --- incubator/nmaven/www/apidocs/overview-summary.html (original) +++ incubator/nmaven/www/apidocs/overview-summary.html Sun Feb 11 17:25:26 2007 @@ -2,7 +2,7 @@ - + Overview (dotnet-components 0.14-SNAPSHOT API) @@ -90,7 +90,7 @@ org.apache.maven.dotnet - +Provides core interfaces and classes for common exceptions, contexts and registries. org.apache.maven.dotnet.artifact @@ -98,7 +98,7 @@ org.apache.maven.dotnet.artifact.impl -Provides the implementation classes of the org.apache.maven.artifact package. +Provides the implementation classes of the org.apache.maven.dotnet.artifact package. org.apache.maven.dotnet.assembler @@ -106,7 +106,7 @@ org.apache.maven.dotnet.assembler.impl -Provides the implementation classes of the org.apache.maven.assembler package. +Provides the implementation classes of the org.apache.maven.dotnent.assembler package. org.apache.maven.dotnet.executable @@ -118,23 +118,24 @@ org.apache.maven.dotnet.executable.compiler.impl - +Provides the various compiler implementation classes of the CompilerExecutable interface. org.apache.maven.dotnet.executable.impl - +Provides the implementation classes of the org.apache.maven.dotnet.executable and +org.apache.maven.dotnet.executable.compiler packages. org.apache.maven.dotnet.impl - +Provides the implementation classes of the org.apache.maven.dotnet package. org.apache.maven.dotnet.registry - +Provides interfaces
svn commit: r506743 - /incubator/nmaven/branches/BUG_NMAVEN_1/
Author: sisbell Date: Mon Feb 12 15:35:58 2007 New Revision: 506743 URL: http://svn.apache.org/viewvc?view=rev&rev=506743 Log: Branch to fix BUG NMAVEN-1 Added: incubator/nmaven/branches/BUG_NMAVEN_1/ - copied from r506742, incubator/nmaven/trunk/
svn commit: r506795 - in /incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/main/csharp: SettingsGenerator.cs nmavenSettings.cs
Author: sisbell
Date: Mon Feb 12 17:47:28 2007
New Revision: 506795
URL: http://svn.apache.org/viewvc?view=rev&rev=506795
Log:
Applied patch: nmaven1Patch20070210.patch
Modified:
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/main/csharp/nmavenSettings.cs
Modified:
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs?view=diff&rev=506795&r1=506794&r2=506795
==
---
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
(original)
+++
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
Mon Feb 12 17:47:28 2007
@@ -1,282 +1,288 @@
-//
-// Copyright 2006 Shane Isbell
-//
-// Licensed 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.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Xml.Serialization;
-using Microsoft.Win32;
-using NMaven.Utility;
-
-namespace NMaven.Utility.Settings
-{
-public class SettingsGenerator
-{
-protected internal SettingsGenerator() { }
-
-void Execute(string outputFile)
-{
-XmlSerializer serializer = new
XmlSerializer(typeof(nmavenSettings));
-
-nmavenSettings settings = new nmavenSettings();
-settings.operatingSystem = Environment.OSVersion.ToString();
-
-RegistryKey monoRegistryKey =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Novell\Mono");
-RegistryKey microsoftRegistryKey =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\.NETFramework");
-
-string defaultMonoCLR = (monoRegistryKey != null) ? (string)
monoRegistryKey.GetValue("DefaultCLR") : null;
-
-settings.defaultSetup = GetDefaultSetup(defaultMonoCLR,
-(string) microsoftRegistryKey.GetValue("InstallRoot"));
-
-nmavenSettingsVendor[] microsoftVendors = null;
-try
-{
-microsoftVendors =
GetVendorsForMicrosoft(microsoftRegistryKey);
-}
-catch(ExecutionException e)
-{
-Console.WriteLine(e.ToString());
-}
-
-nmavenSettingsVendor[] monoVendors = null;
-try
-{
-monoVendors = GetVendorsForMono(monoRegistryKey,
defaultMonoCLR);
-}
-catch(ExecutionException e)
-{
-Console.WriteLine(e.ToString());
-}
-
-nmavenSettingsVendor dotGnuVendor = null;
-try
-{
-dotGnuVendor =
GetVendorForGnu(Environment.GetEnvironmentVariable("CSCC_LIB_PATH"));
-}
-catch(ExecutionException e)
-{
-Console.WriteLine(e.ToString());
-}
-int monoVendorsLength = (monoVendors == null) ? 0:
monoVendors.Length;
-int dotGnuVendorLength = (dotGnuVendor == null) ? 0: 1;
-int microsoftVendorsLength = (microsoftVendors == null) ? 0:
microsoftVendors.Length;
-
-nmavenSettingsVendor[] vendors =
-new nmavenSettingsVendor[microsoftVendorsLength +
monoVendorsLength + dotGnuVendorLength];
-
-int copyLocation = 0;
-if(microsoftVendors != null)
-{
-microsoftVendors.CopyTo(vendors, copyLocation);
-copyLocation+=microsoftVendors.Length;
-}
-if(monoVendors != null)
-{
-monoVendors.CopyTo(vendors, copyLocation);
-copyLocation+=monoVendors.Length;
-}
-if(dotGnuVendor != null)
-vendors[copyLocation] = dotGnuVendor;
-
-settings.vendors = vendors;
-
-TextWriter writer = new StreamWriter(@outputFile);
-serializer.Serialize(writer, settings);
-writer.Close();
-}
-
-public static int Main(string[] args)
-{
-if(args == null || args.Length !=
svn commit: r506813 - /incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs
Author: sisbell
Date: Mon Feb 12 18:14:58 2007
New Revision: 506813
URL: http://svn.apache.org/viewvc?view=rev&rev=506813
Log:
Fixed problem of unit test using framework version 2.0 method. This caused
tests not to compile under 1.1
Modified:
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs
Modified:
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs?view=diff&rev=506813&r1=506812&r2=506813
==
---
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs
(original)
+++
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs
Mon Feb 12 18:14:58 2007
@@ -53,7 +53,7 @@
}
catch(ExecutionException e)
{
-if(!e.ToString().Contains("NMAVEN-9011-000"))
Assert.Fail("Unexpected failure code: Message = "
+if(!e.ToString().StartsWith("NMAVEN-9011-000"))
Assert.Fail("Unexpected failure code: Message = "
+ e.ToString());;
}
}
@@ -67,7 +67,7 @@
}
catch(ExecutionException e)
{
-if(!e.ToString().Contains("NMAVEN-9011-002"))
Assert.Fail("Unexpected failure code: Message = "
+if(!e.ToString().StartsWith("NMAVEN-9011-002"))
Assert.Fail("Unexpected failure code: Message = "
+ e.ToString());;
}
}
@@ -95,7 +95,7 @@
}
catch(ExecutionException e)
{
-if(!e.ToString().Contains("NMAVEN-9011-001"))
Assert.Fail("Unexpected failure code: Message = "
+if(!e.ToString().StartsWith("NMAVEN-9011-001"))
Assert.Fail("Unexpected failure code: Message = "
+ e.ToString());;
}
}
svn commit: r506821 - in /incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings: pom.xml src/test/csharp/SettingsGeneratorTest.cs
Author: sisbell
Date: Mon Feb 12 18:31:07 2007
New Revision: 506821
URL: http://svn.apache.org/viewvc?view=rev&rev=506821
Log:
Fixed problem with NUnit test. Unique error codes embedded in middle of message.
Modified:
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs
Modified:
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml?view=diff&rev=506821&r1=506820&r2=506821
==
---
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml
(original)
+++
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml
Mon Feb 12 18:31:07 2007
@@ -39,6 +39,7 @@
maven-compile-plugin
true
+MICROSOFT
1.1.4322
Modified:
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs?view=diff&rev=506821&r1=506820&r2=506821
==
---
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs
(original)
+++
incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs
Mon Feb 12 18:31:07 2007
@@ -53,7 +53,7 @@
}
catch(ExecutionException e)
{
-if(!e.ToString().StartsWith("NMAVEN-9011-000"))
Assert.Fail("Unexpected failure code: Message = "
+if(e.ToString().IndexOf("NMAVEN-9011-000") == 0)
Assert.Fail("Unexpected failure code: Message = "
+ e.ToString());;
}
}
@@ -67,7 +67,7 @@
}
catch(ExecutionException e)
{
-if(!e.ToString().StartsWith("NMAVEN-9011-002"))
Assert.Fail("Unexpected failure code: Message = "
+if(e.ToString().IndexOf("NMAVEN-9011-002") == 0)
Assert.Fail("Unexpected failure code: Message = "
+ e.ToString());;
}
}
@@ -95,7 +95,7 @@
}
catch(ExecutionException e)
{
-if(!e.ToString().StartsWith("NMAVEN-9011-001"))
Assert.Fail("Unexpected failure code: Message = "
+if(e.ToString().IndexOf("NMAVEN-9011-001") == 0)
Assert.Fail("Unexpected failure code: Message = "
+ e.ToString());;
}
}
svn commit: r506824 - /incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml
Author: sisbell Date: Mon Feb 12 18:41:53 2007 New Revision: 506824 URL: http://svn.apache.org/viewvc?view=rev&rev=506824 Log: Removed MS vendor from pom. Modified: incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml Modified: incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml?view=diff&rev=506824&r1=506823&r2=506824 == --- incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml (original) +++ incubator/nmaven/branches/BUG_NMAVEN_1/plugins/nmaven-utility-settings/pom.xml Mon Feb 12 18:41:53 2007 @@ -39,7 +39,6 @@ maven-compile-plugin true -MICROSOFT 1.1.4322
svn commit: r506828 - in /incubator/nmaven/trunk: integration-tests/tests/ integration-tests/tests/it0018/ plugins/nmaven-utility-settings/src/main/csharp/ plugins/nmaven-utility-settings/src/test/csh
Author: sisbell
Date: Mon Feb 12 18:49:23 2007
New Revision: 506828
URL: http://svn.apache.org/viewvc?view=rev&rev=506828
Log:
Merged BUG_NMAVEN_1 to the trunk.
Modified:
incubator/nmaven/trunk/integration-tests/tests/integration-tests.txt
incubator/nmaven/trunk/integration-tests/tests/it0018/pom.xml
incubator/nmaven/trunk/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
incubator/nmaven/trunk/plugins/nmaven-utility-settings/src/main/csharp/nmavenSettings.cs
incubator/nmaven/trunk/plugins/nmaven-utility-settings/src/test/csharp/SettingsGeneratorTest.cs
Modified: incubator/nmaven/trunk/integration-tests/tests/integration-tests.txt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/integration-tests.txt?view=diff&rev=506828&r1=506827&r2=506828
==
--- incubator/nmaven/trunk/integration-tests/tests/integration-tests.txt
(original)
+++ incubator/nmaven/trunk/integration-tests/tests/integration-tests.txt Mon
Feb 12 18:49:23 2007
@@ -15,5 +15,4 @@
it0019
it0020
it0021
-it0022
-it0023
\ No newline at end of file
+it0022
\ No newline at end of file
Modified: incubator/nmaven/trunk/integration-tests/tests/it0018/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/it0018/pom.xml?view=diff&rev=506828&r1=506827&r2=506828
==
--- incubator/nmaven/trunk/integration-tests/tests/it0018/pom.xml (original)
+++ incubator/nmaven/trunk/integration-tests/tests/it0018/pom.xml Mon Feb 12
18:49:23 2007
@@ -14,6 +14,8 @@
maven-compile-plugin
true
+
+ MONO
1.1.4322
Modified:
incubator/nmaven/trunk/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs?view=diff&rev=506828&r1=506827&r2=506828
==
---
incubator/nmaven/trunk/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
(original)
+++
incubator/nmaven/trunk/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
Mon Feb 12 18:49:23 2007
@@ -1,282 +1,288 @@
-//
-// Copyright 2006 Shane Isbell
-//
-// Licensed 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.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Xml.Serialization;
-using Microsoft.Win32;
-using NMaven.Utility;
-
-namespace NMaven.Utility.Settings
-{
-public class SettingsGenerator
-{
-protected internal SettingsGenerator() { }
-
-void Execute(string outputFile)
-{
-XmlSerializer serializer = new
XmlSerializer(typeof(nmavenSettings));
-
-nmavenSettings settings = new nmavenSettings();
-settings.operatingSystem = Environment.OSVersion.ToString();
-
-RegistryKey monoRegistryKey =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Novell\Mono");
-RegistryKey microsoftRegistryKey =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\.NETFramework");
-
-string defaultMonoCLR = (monoRegistryKey != null) ? (string)
monoRegistryKey.GetValue("DefaultCLR") : null;
-
-settings.defaultSetup = GetDefaultSetup(defaultMonoCLR,
-(string) microsoftRegistryKey.GetValue("InstallRoot"));
-
-nmavenSettingsVendor[] microsoftVendors = null;
-try
-{
-microsoftVendors =
GetVendorsForMicrosoft(microsoftRegistryKey);
-}
-catch(ExecutionException e)
-{
-Console.WriteLine(e.ToString());
-}
-
-nmavenSettingsVendor[] monoVendors = null;
-try
-{
-monoVendors = GetVendorsForMono(monoRegistryKey,
defaultMonoCLR);
-}
-catch(ExecutionException e)
-{
-Console.WriteLine(e.ToString());
-}
-
-nmavenSettingsVendor dotGnuVendor = null;
-try
-{
-dotGnuVendor =
GetVendorForGnu(Environm
svn commit: r507167 - /incubator/nmaven/branches/SI_IDE/
Author: sisbell Date: Tue Feb 13 11:21:50 2007 New Revision: 507167 URL: http://svn.apache.org/viewvc?view=rev&rev=507167 Log: Creating a branch for adding IDE support: VS components. Added: incubator/nmaven/branches/SI_IDE/ - copied from r507166, incubator/nmaven/trunk/
svn commit: r507266 - in /incubator/nmaven/branches/SI_IDE/plugins: maven-vstudio-plugin/ nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
Author: sisbell
Date: Tue Feb 13 14:27:28 2007
New Revision: 507266
URL: http://svn.apache.org/viewvc?view=rev&rev=507266
Log:
Copied visual studio plugin from sandbox
Added:
incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/
- copied from r507167,
incubator/nmaven/branches/SI_IDE/sandbox/maven-csharp/plugins/maven-vstudio-plugin/
Modified:
incubator/nmaven/branches/SI_IDE/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
Modified:
incubator/nmaven/branches/SI_IDE/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs?view=diff&rev=507266&r1=507265&r2=507266
==
---
incubator/nmaven/branches/SI_IDE/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs
Tue Feb 13 14:27:28 2007
@@ -1,288 +1,288 @@
-//
-// Copyright 2006 Shane Isbell
-//
-// Licensed 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.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Xml.Serialization;
-using Microsoft.Win32;
-using NMaven.Utility;
-
-namespace NMaven.Utility.Settings
-{
-public class SettingsGenerator
-{
-protected internal SettingsGenerator() { }
-
-void Execute(string outputFile)
-{
-XmlSerializer serializer = new
XmlSerializer(typeof(nmavenSettings));
-
-nmavenSettings settings = new nmavenSettings();
-settings.operatingSystem = Environment.OSVersion.ToString();
-
-RegistryKey monoRegistryKey =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Novell\Mono");
-RegistryKey microsoftRegistryKey =
Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\.NETFramework");
-
-string defaultMonoCLR = (monoRegistryKey != null) ? (string)
monoRegistryKey.GetValue("DefaultCLR") : null;
-
-settings.defaultSetup = GetDefaultSetup(defaultMonoCLR,
-(string) microsoftRegistryKey.GetValue("InstallRoot"));
-
-nmavenSettingsVendor[] microsoftVendors = null;
-try
-{
-microsoftVendors =
GetVendorsForMicrosoft(microsoftRegistryKey);
-}
-catch(ExecutionException e)
-{
-Console.WriteLine(e.ToString());
-}
-
-nmavenSettingsVendor[] monoVendors = null;
-try
-{
-monoVendors = GetVendorsForMono(monoRegistryKey,
defaultMonoCLR);
-}
-catch(ExecutionException e)
-{
-Console.WriteLine(e.ToString());
-}
-
-nmavenSettingsVendor dotGnuVendor = null;
-try
-{
-dotGnuVendor =
GetVendorForGnu(Environment.GetEnvironmentVariable("CSCC_LIB_PATH"));
-}
-catch(ExecutionException e)
-{
-Console.WriteLine(e.ToString());
-}
-int monoVendorsLength = (monoVendors == null) ? 0:
monoVendors.Length;
-int dotGnuVendorLength = (dotGnuVendor == null) ? 0: 1;
-int microsoftVendorsLength = (microsoftVendors == null) ? 0:
microsoftVendors.Length;
-
-nmavenSettingsVendor[] vendors =
-new nmavenSettingsVendor[microsoftVendorsLength +
monoVendorsLength + dotGnuVendorLength];
-
-int copyLocation = 0;
-if(microsoftVendors != null)
-{
-microsoftVendors.CopyTo(vendors, copyLocation);
-copyLocation+=microsoftVendors.Length;
-}
-if(monoVendors != null)
-{
-monoVendors.CopyTo(vendors, copyLocation);
-copyLocation+=monoVendors.Length;
-}
-if(dotGnuVendor != null)
-vendors[copyLocation] = dotGnuVendor;
-
-settings.vendors = vendors;
-
-TextWriter writer = new StreamWriter(@outputFile);
-serializer.Serialize(writer, settings);
-writer.Close();
-}
-
-public stat
svn commit: r507286 - in /incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin: pom.xml src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java
Author: sisbell
Date: Tue Feb 13 15:00:36 2007
New Revision: 507286
URL: http://svn.apache.org/viewvc?view=rev&rev=507286
Log:
Fixed the artifacts type to coincide with the ones in NMaven.
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/pom.xml
incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java
Modified: incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/pom.xml?view=diff&rev=507286&r1=507285&r2=507286
==
--- incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/pom.xml Tue
Feb 13 15:00:36 2007
@@ -1,17 +1,16 @@
-
-
+
+
-org.apache.maven.plugins
-maven-plugins
-1
+org.apache.maven.dotnet.plugins
+0.14-SNAPSHOT
+maven-dotnet-plugins
-
4.0.0
- org.apache.maven.plugins
+ org.apache.maven.dotnet.plugins
maven-vstudio-plugin
maven-plugin
Maven Visual Studio Plugin
- 1.0-SNAPSHOT
+ 0.14-SNAPSHOT
http://maven.apache.org/
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java?view=diff&rev=507286&r1=507285&r2=507286
==
---
incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java
Tue Feb 13 15:00:36 2007
@@ -87,9 +87,8 @@
* guide on how to do this.
*
* @parameter
- * @required
*/
-private String frameworkHome;
+private String frameworkHome =
"C:\\WINDOWS\\Microsoft.NET\\Framework\\v1.1.4322";
/**
* This is all the stuff that can be set up about a vs project. It is a
big object.
@@ -311,21 +310,21 @@
throws MojoExecutionException
{
-String outputType = "Library";
+String outputType;
-if ( type.equals( "dotnet-library" ) )
+if ( type.equals( "library" ) )
{
outputType = "Library";
}
-else if ( type.equals( "dotnet-exe" ) )
+else if ( type.equals( "exe" ) )
{
outputType = "Exe";
}
-else if ( type.equals( "dotnet-winexe" ) )
+else if ( type.equals( "exe" ) )
{
outputType = "Exe";
}
-else if ( type.equals( "dotnet-webapp" ) )
+else if ( type.equals( "webapp" ) )
{
outputType = "Web";
}
svn commit: r509030 - 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/dotnet/
Author: sisbell
Date: Sun Feb 18 15:39:21 2007
New Revision: 509030
URL: http://svn.apache.org/viewvc?view=rev&rev=509030
Log:
JIRA NMAVEN-5: This fix allows the adding of a GAC dependency within a build
file. The only tricky part is that artifact resolution comes prior to NMaven
becoming platform-aware. For GAC dependencies, NMaven waits until the
construction of the CompilerContext to add the GAC file location to GAC
artifacts. This fix only supports MS framework. For Mono/Linux may need to
mandate use of nmaven-settings.xml file so we know the location of the GAC.
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-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/branches/SI_IDE/plugins/pom-java-bootstrap.xml
incubator/nmaven/branches/SI_IDE/plugins/pom.xml
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=509030&r1=509029&r2=509030
==
---
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
Sun Feb 18 15:39:21 2007
@@ -104,7 +104,4 @@
*/
public String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata )
{
-System.out.println( "CALLING REMOTE : " + metadata.getRemoteFilename()
);
-return "";
-}
-}
+C
\ No newline at end of file
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java?view=diff&rev=509030&r1=509029&r2=509030
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
Sun Feb 18 15:39:21 2007
@@ -177,7 +177,7 @@
dependency.getVersion() ),
dependency.getType(), dependency.getClassifier(),
scope,
null );
-depSet.add( art );
+if(!art.getType().equals( "gac")) depSet.add( art );
}
try
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java?view=diff&rev=509030&r1=509029&r2=509030
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
Sun Feb 18 15:39:21 2007
@@ -103,6 +103,7 @@
sourceArtifact.addMetadata( meta );
Set artifactDependencies = new HashSet();
+Set gacDependencies = new HashSet();
for ( Dependency dependency : dependencies )
{
String scope = ( dependency.getScope() == null ) ?
Artifact.SCOPE_COMPILE : dependency.getScope();
@@ -112,7 +113,14 @@
dependency.getVersion() ),
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;
+ }
+
+
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);
+
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/
svn commit: r510317 - in /incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile: SourceProcessorMojo.java TestSourceProcessorMojo.java
Author: sisbell
Date: Wed Feb 21 15:55:01 2007
New Revision: 510317
URL: http://svn.apache.org/viewvc?view=rev&rev=510317
Log:
IDE project files need to reside in same folder as the source files. Need to
filter the IDE project files during source copy so maven won't try to compile.
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java?view=diff&rev=510317&r1=510316&r2=510317
==
---
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
Wed Feb 21 15:55:01 2007
@@ -25,6 +25,9 @@
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
/**
* Copies source files to target directory.
@@ -70,8 +73,14 @@
DirectoryScanner directoryScanner = new DirectoryScanner();
directoryScanner.setBasedir(sourceDirectory);
+List excludeList = new ArrayList();
+excludeList.add( "*.suo");
+excludeList.add( "*.csproj");
+excludeList.add( "*.sln");
+excludeList.add( "obj/**");
+
if(includes != null && includes.length > 0 )
directoryScanner.setIncludes(includes);
-if(excludes != null && excludes.length > 0)
directoryScanner.setExcludes(excludes);
+directoryScanner.setExcludes(excludeList.toArray(excludes));
directoryScanner.addDefaultExcludes();
directoryScanner.scan();
String[] files = directoryScanner.getIncludedFiles();
@@ -79,7 +88,7 @@
for (String file : files) {
try {
FileUtils.copyFile(new File(sourceDirectory + File.separator +
file),
-new File(outputDirectory + File.separator + file));
+ new File(outputDirectory + File.separator +
file));
} catch (IOException e) {
throw new MojoExecutionException("NMAVEN-904-000: Unable to
process sources", e);
}
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java?view=diff&rev=510317&r1=510316&r2=510317
==
---
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java
Wed Feb 21 15:55:01 2007
@@ -25,6 +25,8 @@
import java.io.File;
import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
/**
* Copies source files to target directory.
@@ -58,6 +60,14 @@
}
DirectoryScanner directoryScanner = new DirectoryScanner();
directoryScanner.setBasedir(sourceDirectory);
+
+List excludeList = new ArrayList();
+excludeList.add( "*.suo");
+excludeList.add( "*.csproj");
+excludeList.add( "*.sln");
+excludeList.add( "obj/**");
+directoryScanner.setExcludes(excludeList.toArray(new
String[excludeList.size()]));
+
directoryScanner.addDefaultExcludes();
directoryScanner.scan();
String[] files = directoryScanner.getIncludedFiles();
@@ -65,7 +75,7 @@
for (String file : files) {
try {
FileUtils.copyFile(new File(sourceDirectory + File.separator +
file),
-new File(outputDirectory + File.separator + file));
+ new File(outputDirectory + File.separator +
file));
} catch (IOException e) {
throw new MojoExecutionException("NMAVEN-905-000: Unable to
process test sources", e);
}
svn commit: r510396 - /incubator/nmaven/trunk/plugins/imports/nunit-2.0/nunit.framework.dll
Author: sisbell Date: Wed Feb 21 20:38:46 2007 New Revision: 510396 URL: http://svn.apache.org/viewvc?view=rev&rev=510396 Log: Upgrading the NUnit assembly due to bug: NMAVEN-8. This is NUnit version 2.2.9 (although the scripts will still install as 2.2.8). Also this version MAY break NUnit tests with DotGNU but fixes the problem on Windows. Modified: incubator/nmaven/trunk/plugins/imports/nunit-2.0/nunit.framework.dll Modified: incubator/nmaven/trunk/plugins/imports/nunit-2.0/nunit.framework.dll URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/imports/nunit-2.0/nunit.framework.dll?view=diff&rev=510396&r1=510395&r2=510396 == Binary files - no diff available.
svn commit: r510417 - in /incubator/nmaven/trunk/site/src/site/apt: getting-started.apt index.apt
Author: sisbell
Date: Wed Feb 21 22:36:33 2007
New Revision: 510417
URL: http://svn.apache.org/viewvc?view=rev&rev=510417
Log:
Updated build information.
Modified:
incubator/nmaven/trunk/site/src/site/apt/getting-started.apt
incubator/nmaven/trunk/site/src/site/apt/index.apt
Modified: incubator/nmaven/trunk/site/src/site/apt/getting-started.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/getting-started.apt?view=diff&rev=510417&r1=510416&r2=510417
==
--- incubator/nmaven/trunk/site/src/site/apt/getting-started.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/getting-started.apt Wed Feb 21
22:36:33 2007
@@ -24,9 +24,22 @@
Make sure that you have jdk1.5+ installed and then do the following:
- [[1]] Do an SVN checkout: svn co
http://svn.apache.org/repos/asf/incubator/nmaven/trunk nmaven
+ [[1]] Do an SVN checkout: svn co
https://svn.apache.org/repos/asf/incubator/nmaven/trunk nmaven.
- [[2]] Execute bootstrap-build.bat (or bootstrap-build.sh) from the nmaven
directory.
+ [[2]] If compiling on Windows, make sure that the csc executable is located
on the system path. This is only needed
+ for the initial bootstrap build and can be removed afterwards.
+
+ [[3]] Execute bootstrap-build.bat (or bootstrap-build.sh) from the nmaven
directory.
+
+ During step (1), you may receive an error similar to the following:
+
+++
+
+ svn: This client is too old to work with working copy
'nmaven-utility-resx\src\main\csharp'; please get a newer Subversion client
+++
+
+ In this case will need to upgrade to subversion 1.4 or higher. Click here for
+ {{{
http://subversion.tigris.org/servlets/ProjectDocumentView?documentID=35379&showInfo=true}
Windows Subversion Client}}.
Building on Linux, may take some extra steps. By default, on many Linux
environments, the GNU Compiler for Java is already
installed. The current GNU version will not work with NMaven. To check which
version the system uses, type "java -version"
Modified: incubator/nmaven/trunk/site/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/index.apt?view=diff&rev=510417&r1=510416&r2=510417
==
--- incubator/nmaven/trunk/site/src/site/apt/index.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/index.apt Wed Feb 21 22:36:33 2007
@@ -14,4 +14,8 @@
* Expanded Support for Assembly Signing
- * Support for Classifiers
\ No newline at end of file
+ * Support for Classifiers
+
+ * IDE Support: Visual Studio and SharpDevelop
+
+ * .NET Plugin Support (for writing Maven plugins in .NET).
\ No newline at end of file
svn commit: r510418 - in /incubator/nmaven/www: dependencies.html getting-started.html index.html integration.html issue-tracking.html license.html mail-lists.html project-info.html project-summary.ht
Author: sisbell Date: Wed Feb 21 22:38:07 2007 New Revision: 510418 URL: http://svn.apache.org/viewvc?view=rev&rev=510418 Log: Updated website: build info Modified: incubator/nmaven/www/dependencies.html incubator/nmaven/www/getting-started.html incubator/nmaven/www/index.html incubator/nmaven/www/integration.html incubator/nmaven/www/issue-tracking.html incubator/nmaven/www/license.html incubator/nmaven/www/mail-lists.html incubator/nmaven/www/project-info.html incubator/nmaven/www/project-summary.html incubator/nmaven/www/source-repository.html incubator/nmaven/www/team-list.html Modified: incubator/nmaven/www/dependencies.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/dependencies.html?view=diff&rev=510418&r1=510417&r2=510418 == --- incubator/nmaven/www/dependencies.html (original) +++ incubator/nmaven/www/dependencies.html Wed Feb 21 22:38:07 2007 @@ -45,7 +45,7 @@ -Last Published: 02/11/2007 +Last Published: 02/21/2007 http://incubator.apache.org/projects/nmaven.html";>Project Site | Modified: incubator/nmaven/www/getting-started.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/getting-started.html?view=diff&rev=510418&r1=510417&r2=510418 == --- incubator/nmaven/www/getting-started.html (original) +++ incubator/nmaven/www/getting-started.html Wed Feb 21 22:38:07 2007 @@ -45,7 +45,7 @@ -Last Published: 02/11/2007 +Last Published: 02/21/2007 http://incubator.apache.org/projects/nmaven.html";>Project Site | @@ -156,7 +156,8 @@ -Getting StartedSectionsBuilding NMavenAssembly InfoUnit Testing with NUnitBuilding & Deploying Web ApplicationsBuilding with .NET ModulesInstalling Existing Assemblies in the Maven RepositoryGenerating ResourcesSigning AssembliesUsing NMaven Settings FileBuilding NMavenMake sure that you have jdk1.5+ installed and then do the following:Do an SVN checkout: svn co http://svn.apache.org/repos/asf/incubator/nmaven/trunk nmavenExecute bootstrap-build.bat (or bootstrap-build.sh) from the nmaven directory.Building on Linux, may take some extra steps. By default, on many Linux environments, the GNU Compiler for Java is already installed. The current GNU version will not work with NMaven. To check which version the system uses, type "java -version" on the command line. If you see something similar to the following, you will need to take additional steps to get the build setup: +Getting StartedSectionsBuilding NMavenAssembly InfoUnit Testing with NUnitBuilding & Deploying Web ApplicationsBuilding with .NET ModulesInstalling Existing Assemblies in the Maven RepositoryGenerating ResourcesSigning AssembliesUsing NMaven Settings FileBuilding NMavenMake sure that you have jdk1.5+ installed and then do the following:Do an SVN checkout: svn co https://svn.apache.org/repos/asf/incubator/nmaven/trunk nmaven.If compiling on Windows, make sure that the csc executable is located on the system path. This is only needed for the initial bootstrap build and can be removed afterwards.Execute bootstrap-build.bat (or bootstrap-build.sh) from the nmaven directory.During step (1), you may receive an error similar to the following: + svn: This client is too old to work with working copy 'nmaven-utility-resx\src\main\csharp'; please get a newer Subversion client In this case will need to upgrade to subversion 1.4 or higher. Click here for http://subversion.tigris.org/servlets/ProjectDocumentView?documentID=35379&showInfo=true";> Windows Subversion Client.Building on Linux, may take some extra steps. By default, on many Linux environments, the GNU Compiler for Java is already installed. The current GNU version will not work with NMaven. To check which version the system uses, type "java -version" on the command line. If you see something similar to the following, you will need to take additional steps to get the build setup: java version "1.4.2" gij (GNU libgcj) version 4.1.1 20060525 (Red Hat 4.1.1-1) Create a file "/etc/profile.d/java.sh" with the following entries: export JAVA_HOME=/usr/java/jdk1.5.0_09 Modified: incubator/nmaven/www/index.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/index.html?view=diff&rev=510418&r1=510417&r2=510418 == --- incubator/nmaven/www/index.html (original) +++ incubator/nmaven/www/index.html Wed Feb 21 22:38:07 2007 @@ -45,7 +45,7 @@ -Last Published: 02/11/2007 +
svn commit: r510421 - /incubator/nmaven/trunk/README.txt
Author: sisbell Date: Wed Feb 21 22:48:08 2007 New Revision: 510421 URL: http://svn.apache.org/viewvc?view=rev&rev=510421 Log: Updated readme: build Modified: incubator/nmaven/trunk/README.txt Modified: incubator/nmaven/trunk/README.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/README.txt?view=diff&rev=510421&r1=510420&r2=510421 == --- incubator/nmaven/trunk/README.txt (original) +++ incubator/nmaven/trunk/README.txt Wed Feb 21 22:48:08 2007 @@ -1,3 +1,7 @@ +Prerequisites +* csc.exe must be available on your PATH. Usually it can be found in C:\WINDOWS\Microsoft.NET\Framework\[version] +* NUnit must be installed or otherwise configured, see http://incubator.apache.org/nmaven/getting-started.html + Initial Build * On the first build, execute the bootstrap-build script. On subsequent builds, you can just type mvn install from the command prompt.
svn commit: r510641 - in /incubator/nmaven/trunk/site/src/site/apt: getting-started.apt index.apt
Author: sisbell
Date: Thu Feb 22 12:17:00 2007
New Revision: 510641
URL: http://svn.apache.org/viewvc?view=rev&rev=510641
Log:
Update site docs: build info.
Modified:
incubator/nmaven/trunk/site/src/site/apt/getting-started.apt
incubator/nmaven/trunk/site/src/site/apt/index.apt
Modified: incubator/nmaven/trunk/site/src/site/apt/getting-started.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/getting-started.apt?view=diff&rev=510641&r1=510640&r2=510641
==
--- incubator/nmaven/trunk/site/src/site/apt/getting-started.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/getting-started.apt Thu Feb 22
12:17:00 2007
@@ -22,12 +22,37 @@
* {Building NMaven}
- Make sure that you have jdk1.5+ installed and then do the following:
+** Prerequisites
+
+ Prior to building NMaven, make sure that you have the following installed on
your system:
+
+ [[1]] {{{ http://java.sun.com/javase/downloads/index_jdk5.jsp} JDK 5.0
Update x}}
+
+ [[2]] {{{http://msdn2.microsoft.com/en-us/netframework/default.aspx}
Microsoft .NET Framework}} (1.1+)
+ OR {{{http://www.mono-project.com} Mono}} (1.1.13+ for Windows and 1.1.18+
for Linux)
+
+ [[3]] Subversion client 1.3+ (although 1.4 will soon be required). Click
here for
+ {{{
http://subversion.tigris.org/servlets/ProjectDocumentView?documentID=35379&showInfo=true}
Windows Subversion Client}}.
+
+ [[4]] {{{http://nunit.org/index.php?p=download} NUnit 2.2+}}
+
+** Bootstrap Build
+
+ To build NMaven:
[[1]] Do an SVN checkout: svn co
https://svn.apache.org/repos/asf/incubator/nmaven/trunk nmaven.
- [[2]] If compiling on Windows, make sure that the csc executable is located
on the system path. This is only needed
- for the initial bootstrap build and can be removed afterwards.
+ [[2]] If compiling on Windows:
+
+ [[a]] the csc executable directory should be located on the system path.
This is only needed for the initial bootstrap build
+ and may be removed afterwards.
+
+ [[b]] the directory path containing nunit-console should also be located on
the system path. After the bootstrap build, you should leave
+ the directory path containing the nunit-console executable within the
system path. For other options, see:
+ {{{getting-started.html#Unit Testing with NUnit}Unit Testing with NUnit}}
+
+ [[c]] If using Mono on Windows, both the csc executable and the
nunit-console executable are located within the same path:
+ typically something like "C:\Program Files\Mono-1.1.18\bin"
[[3]] Execute bootstrap-build.bat (or bootstrap-build.sh) from the nmaven
directory.
@@ -38,8 +63,9 @@
svn: This client is too old to work with working copy
'nmaven-utility-resx\src\main\csharp'; please get a newer Subversion client
++
- In this case will need to upgrade to subversion 1.4 or higher. Click here for
- {{{
http://subversion.tigris.org/servlets/ProjectDocumentView?documentID=35379&showInfo=true}
Windows Subversion Client}}.
+ In this case will need to upgrade to subversion 1.4 or higher.
+
+** Linux Specific Setup
Building on Linux, may take some extra steps. By default, on many Linux
environments, the GNU Compiler for Java is already
installed. The current GNU version will not work with NMaven. To check which
version the system uses, type "java -version"
Modified: incubator/nmaven/trunk/site/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/index.apt?view=diff&rev=510641&r1=510640&r2=510641
==
--- incubator/nmaven/trunk/site/src/site/apt/index.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/index.apt Thu Feb 22 12:17:00 2007
@@ -18,4 +18,10 @@
* IDE Support: Visual Studio and SharpDevelop
- * .NET Plugin Support (for writing Maven plugins in .NET).
\ No newline at end of file
+ * .NET Plugin Support (for writing Maven plugins in .NET).
+
+Reporting Bugs/Requesting Features
+
+ * {{{http://jira.codehaus.org/browse/NMAVEN} NMaven Issue Tracking}}
+
+ * {{{mailto:[EMAIL PROTECTED] Post to Mailing List}}
\ No newline at end of file
svn commit: r510642 - in /incubator/nmaven/www: dependencies.html getting-started.html index.html integration.html issue-tracking.html license.html mail-lists.html project-info.html project-summary.ht
Author: sisbell Date: Thu Feb 22 12:17:46 2007 New Revision: 510642 URL: http://svn.apache.org/viewvc?view=rev&rev=510642 Log: Updated web site: build info. Modified: incubator/nmaven/www/dependencies.html incubator/nmaven/www/getting-started.html incubator/nmaven/www/index.html incubator/nmaven/www/integration.html incubator/nmaven/www/issue-tracking.html incubator/nmaven/www/license.html incubator/nmaven/www/mail-lists.html incubator/nmaven/www/project-info.html incubator/nmaven/www/project-summary.html incubator/nmaven/www/source-repository.html incubator/nmaven/www/team-list.html Modified: incubator/nmaven/www/dependencies.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/dependencies.html?view=diff&rev=510642&r1=510641&r2=510642 == --- incubator/nmaven/www/dependencies.html (original) +++ incubator/nmaven/www/dependencies.html Thu Feb 22 12:17:46 2007 @@ -45,7 +45,7 @@ -Last Published: 02/21/2007 +Last Published: 02/22/2007 http://incubator.apache.org/projects/nmaven.html";>Project Site | Modified: incubator/nmaven/www/getting-started.html URL: http://svn.apache.org/viewvc/incubator/nmaven/www/getting-started.html?view=diff&rev=510642&r1=510641&r2=510642 == --- incubator/nmaven/www/getting-started.html (original) +++ incubator/nmaven/www/getting-started.html Thu Feb 22 12:17:46 2007 @@ -45,7 +45,7 @@ -Last Published: 02/21/2007 +Last Published: 02/22/2007 http://incubator.apache.org/projects/nmaven.html";>Project Site | @@ -156,15 +156,15 @@ -Getting StartedSectionsBuilding NMavenAssembly InfoUnit Testing with NUnitBuilding & Deploying Web ApplicationsBuilding with .NET ModulesInstalling Existing Assemblies in the Maven RepositoryGenerating ResourcesSigning AssembliesUsing NMaven Settings FileBuilding NMavenMake sure that you have jdk1.5+ installed and then do the following:Do an SVN checkout: svn co https://svn.apache.org/repos/asf/incubator/nmaven/trunk nmaven.If compiling on Windows, make sure that the csc executable is located on the system path. This is only needed for the initial bootstrap build and can be removed afterwards.Execute bootstrap-build.bat (or bootstrap-build.sh) from the nmaven directory.During step (1), you may receive an error similar to the following: - svn: This client is too old to work with working copy 'nmaven-utility-resx\src\main\csharp'; please get a newer Subversion client In this case will need to upgrade to subversion 1.4 or higher. Click here for http://subversion.tigris.org/servlets/ProjectDocumentView?documentID=35379&showInfo=true";> Windows Subversion Client.Building on Linux, may take some extra steps. By default, on many Linux environments, the GNU Compiler for Java is already installed. The current GNU version will not work with NMaven. To check which version the system uses, type "java -version" on the command line. If you see something similar to the following, you will need to take additional steps to get the build setup: +Getting StartedSectionsBuilding NMavenAssembly InfoUnit Testing with NUnitBuilding & Deploying Web ApplicationsBuilding with .NET ModulesInstalling Existing Assemblies in the Maven RepositoryGenerating ResourcesSigning AssembliesUsing NMaven Settings FileBuilding NMavenPrerequisitesPrior to building NMaven, make sure that you have the following installed on your system:http://java.sun.com/javase/downloads/index_jdk5.jsp";> JDK 5.0 Update xhttp://msdn2.microsoft.com/en-us/netframework/default.aspx";> Microsoft .NET Framework (1.1+) OR http://www.mono-project.com";> Mono (1.1.13+ for Windows and 1.1.18+ for Linux)Subversion client 1.3+ (although 1.4 will soon be required). Click here for http://subversion.tigris.org/servlets/ProjectDocumentView?documentID=35379&showInfo=true";> Windows Subversion Client.http://nunit.org/index.php?p=download";> NUnit 2.2+Bootstrap BuildTo build NMaven:Do an SVN checkout: svn co https://svn.apache.org/repos/asf/incubator/nmaven/trunk nma ven.If compiling on Windows:the csc executable directory should be located on the system path. This is only needed for the initial bootstrap build and may be removed afterwards.the directory path containing nunit-console should also be located on the system path. After the bootstrap build, you should leave the directory path containing the nunit-console executable within the system path. For other options, see: Unit Testing with NUnitIf using Mono on Windows, both the csc executable
svn commit: r511157 - in /incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src: main/csharp/Core/ main/csharp/Core/Impl/ test/csharp/Core/ test/csharp/Core/Impl/
Author: sisbell
Date: Fri Feb 23 14:54:03 2007
New Revision: 511157
URL: http://svn.apache.org/viewvc?view=rev&rev=511157
Log:
Handles generating Solution files and project files. API more flexible. Still
contains some hard-coded values.
Added:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectReference.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectRepository.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectReferenceImpl.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectRepositoryImpl.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/Impl/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/Impl/NMavenContextImplTest.cs
Removed:
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
Added:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs?view=auto&rev=511157
==
---
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
(added)
+++
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
Fri Feb 23 14:54:03 2007
@@ -0,0 +1,24 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using NMaven.Model;
+
+namespace NMaven.Core
+{
+ ///
+ /// Description of Interface1.
+ ///
+ public interface IProjectGenerator
+ {
+
+ IProjectReference generateProjectFor(NMaven.Model.Model model,
+ DirectoryInfo sourceFileDirectory,
+ string projectFileName,
+ List
projectReferences);
+
+ void generateSolutionFor(List
projectReferences);
+
+ NMaven.Model.Model createPomModelFor(string fileName);
+
+ }
+}
Added:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectReference.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectReference.cs?view=auto&rev=511157
==
---
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectReference.cs
(added)
+++
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectReference.cs
Fri Feb 23 14:54:03 2007
@@ -0,0 +1,30 @@
+
+using System;
+using System.IO;
+
+namespace NMaven.Core
+{
+ ///
+ /// Description of IProjectReference.
+ ///
+ public interface IProjectReference
+ {
+ FileInfo CsProjFile
+ {
+ get;
+ set;
+ }
+
+ string ProjectName
+ {
+ get;
+ set;
+ }
+
+ Guid ProjectGuid
+ {
+ get;
+ set;
+ }
+ }
+}
Added:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectRepository.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectRepository.cs?view=auto&rev=511157
==
---
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectRepository.cs
(added)
+++
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectRepository.cs
Fri Feb 23 14:54:03 2007
@@ -0,0 +1,17 @@
+
+using System;
+using System.Collections.Generic;
+
+namespace NMaven.Core
+{
+ ///
+ /// Description of IProjectRepositorycs.
+ ///
+ public interface IProjectRepository
+ {
+ List
getProjectObjectModelsFor(NMaven.Model.Model rootPom);
+
+ void init(IProjectGenerator projectGenerator);
+
+ }
+}
Added:
incubator/nmaven
svn commit: r511439 - in /incubator/nmaven/branches/SI_IDE/assemblies: NMaven.Plugin.Resx/ NMaven.Plugin.Resx/src/ NMaven.Plugin.Resx/src/main/ NMaven.Plugin.Resx/src/main/config/ NMaven.Plugin.Resx/s
Author: sisbell Date: Sat Feb 24 20:08:01 2007 New Revision: 511439 URL: http://svn.apache.org/viewvc?view=rev&rev=511439 Log: Copies of the assemblies from the plugins directory. Doing this to standardize the structure and naming of all .NET projects within NMaven. Added: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml (with props) incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/resx.exe.config (with props) incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/csharp/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/csharp/Plugin/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/MimeType.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/ResX.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/nmaven-settings.xsd (with props) incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml (with props) incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/ExecutionException.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/SettingsGenerator.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/nmavenSettings.cs Added: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml?view=auto&rev=511439 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml (added) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml Sat Feb 24 20:08:01 2007 @@ -0,0 +1,42 @@ + +4.0.0 +NMaven.Plugin.ResX +RexPlugin +exe +0.14 +NMaven.Plugin.ResX + + +src/main/csharp + + +org.apache.maven.dotnet.plugins +maven-compile-plugin +true + + + + + + + +version +1.1 + + + + + +org.apache.maven.dotnet.plugins +maven-compile-plugin +true + +1.1.4322 + + + + + + + + \ No newline at end of file Propchange: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml -- svn:eol-style = native Added: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/resx.exe.config URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/resx.exe.config?view=auto&rev=511439 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/resx.exe.config (added) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/resx.exe.config Sat Feb 24 20:08:01 2007 @@
svn commit: r511440 - in /incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src: main/csharp/Core/ main/csharp/Core/Impl/ test/csharp/Core/Impl/
Author: sisbell
Date: Sat Feb 24 20:08:39 2007
New Revision: 511440
URL: http://svn.apache.org/viewvc?view=rev&rev=511440
Log:
Deleting uneeded classes.
Removed:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectRepository.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectRepositoryImpl.cs
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/Impl/NMavenContextImplTest.cs
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs?view=diff&rev=511440&r1=511439&r2=511440
==
---
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
(original)
+++
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
Sat Feb 24 20:08:39 2007
@@ -16,7 +16,7 @@
string projectFileName,
List
projectReferences);
- void generateSolutionFor(List
projectReferences);
+ void generateSolutionFor(FileInfo fileInfo,
List projectReferences);
NMaven.Model.Model createPomModelFor(string fileName);
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=511440&r1=511439&r2=511440
==
---
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
Sat Feb 24 20:08:39 2007
@@ -28,8 +28,13 @@
Guid projectGuid = Guid.NewGuid();
if(projectReferences == null) projectReferences = new
List();
- Project project = getProjectFromPomModel(model,
sourceFileDirectory, projectFileName, projectGuid,
-
@"..\..\..\target\bin\Debug\", projectReferences);
+ Project project = getProjectFromPomModel(model,
+
sourceFileDirectory,
+
projectFileName,
+projectGuid,
+
@"..\..\..\target\bin\Debug\",
+
@"..\..\..\target\obj\",
+
projectReferences);
FileInfo fileInfo = new
FileInfo(sourceFileDirectory.FullName + @"\" + projectFileName + ".csproj");
project.Save(fileInfo.FullName);
@@ -40,10 +45,10 @@
return projectReference;
}
- public void generateSolutionFor(List
projectReferences)
+ public void generateSolutionFor(FileInfo fileInfo,
List projectReferences)
{
TextWriter writer =
- new StreamWriter(@"C:\Documents and
Settings\shane\nmaven-apache\SI_IDE\assemblies\test.sln", false,
System.Text.Encoding.UTF8);
+ new StreamWriter(fileInfo.FullName, false,
System.Text.Encoding.UTF8);
writer.WriteLine("");
writer.WriteLine("Microsoft Visual Studio Solution
File, Format Version 9.00");
writer.WriteLine("# Visual Studio 2005");
@@ -89,6 +94,7 @@
string assemblyName,
Guid projectGuid,
string
assemblyOutputPath,
+ string
baseIntermediateOutputPath,
List
projectReferences)
svn commit: r511676 - /incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
Author: sisbell Date: Sun Feb 25 16:46:17 2007 New Revision: 511676 URL: http://svn.apache.org/viewvc?view=rev&rev=511676 Log: Added namespace, which is required for the MS XSD bindings to work. Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml 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=511676&r1=511675&r2=511676 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Sun Feb 25 16:46:17 2007 @@ -1,4 +1,4 @@ - +http://maven.apache.org/POM/4.0.0";> 4.0.0 NMaven.Model NMaven.Model.Pom
svn commit: r511679 - in /incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution: ./ pom.xml src/ src/main/ src/main/csharp/ src/main/csharp/Plugin/ src/main/csharp/Plugin/Solution/ src/ma
Author: sisbell
Date: Sun Feb 25 16:49:45 2007
New Revision: 511679
URL: http://svn.apache.org/viewvc?view=rev&rev=511679
Log:
Initial import of the solution plugin. This executable recusively goes through
the pom.xml files generating project and soltuion files. This executable will
be executed by a maven plugin.
Added:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
(with props)
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs
Added:
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=auto&rev=511679
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
(added)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
Sun Feb 25 16:49:45 2007
@@ -0,0 +1,39 @@
+http://maven.apache.org/POM/4.0.0";>
+4.0.0
+NMaven.Plugin.Solution
+SolutionPlugin
+exe
+0.14
+NMaven.Plugin.Solution
+
+
+org.nunit
+nunit.framework
+2.2.8.0
+library
+
+
+NMaven.Core
+NMaven.Core
+0.14
+library
+
+
+ NMaven.Model
+ NMaven.Model.Pom
+ library
+ 0.14
+
+
+
+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.Plugin.Solution/pom.xml
--
svn:eol-style = native
Added:
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=auto&rev=511679
==
---
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs
(added)
+++
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs
Sun Feb 25 16:49:45 2007
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using NMaven.Core;
+using NMaven.Core.Impl;
+
+namespace NMaven.Plugin.Solution
+{
+ ///
+ /// Description
+ ///
+ public class SolutionPlugin
+ {
+ public SolutionPlugin()
+ {
+ }
+
+ public List execute(DirectoryInfo
currentDirectory, NMaven.Model.Model model)
+ {
+ if(model == null)
+ {
+ throw new ExecutionException("NMAVEN-000-000:
Model is null");
+ }
+
+ if(currentDirectory == null)
+ {
+ throw new ExecutionException("NMAVEN-000-000:
Current directory is null");
+ }
+ if(!currentDirectory.Exists)
+ {
+ throw new ExecutionException("NMAVEN-000-000:
Could not find current directory: Path = " + currentDirectory.FullName);
+ }
+
+ List projectReferences = new
List();
+ IProjectGenerator projectGenerator = new
ProjectGeneratorImpl();
+ if(model.packaging.Equals("pom"))
+ {
+ foreach(String module in model.modules)
+ {
+ DirectoryInfo newDir = new
DirectoryInfo(currentDirectory.FullName + @"\" + module );
+ Console.WriteLine("NMAVEN-000-0
svn commit: r511680 - in /incubator/nmaven/branches/SI_IDE/assemblies: NMaven.Plugin.Resx/pom.xml NMaven.Plugin.Settings/pom.xml pom.xml
Author: sisbell Date: Sun Feb 25 16:51:32 2007 New Revision: 511680 URL: http://svn.apache.org/viewvc?view=rev&rev=511680 Log: Updated poms. Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/pom.xml Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml?view=diff&rev=511680&r1=511679&r2=511680 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml Sun Feb 25 16:51:32 2007 @@ -1,4 +1,4 @@ - +http://maven.apache.org/POM/4.0.0";> 4.0.0 NMaven.Plugin.ResX RexPlugin Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml?view=diff&rev=511680&r1=511679&r2=511680 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml Sun Feb 25 16:51:32 2007 @@ -1,4 +1,4 @@ - +http://maven.apache.org/POM/4.0.0";> 4.0.0 NMaven.Plugin.Settings SettingsPlugin Modified: incubator/nmaven/branches/SI_IDE/assemblies/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/pom.xml?view=diff&rev=511680&r1=511679&r2=511680 == --- incubator/nmaven/branches/SI_IDE/assemblies/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/pom.xml Sun Feb 25 16:51:32 2007 @@ -119,6 +119,8 @@ NMaven.Core NMaven.Model/Pom +NMaven.Plugin.Resx +NMaven.Plugin.Settings src/main/csharp
svn commit: r511682 - in /incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src: main/csharp/Core/ExecutionException.cs main/csharp/Core/Impl/ProjectGeneratorImpl.cs test/csharp/Core/Impl/NMaven
Author: sisbell
Date: Sun Feb 25 16:54:26 2007
New Revision: 511682
URL: http://svn.apache.org/viewvc?view=rev&rev=511682
Log:
'Better
Added:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/ExecutionException.cs
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/Impl/NMavenContextImplTest.cs
Added:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/ExecutionException.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/ExecutionException.cs?view=auto&rev=511682
==
---
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/ExecutionException.cs
(added)
+++
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/ExecutionException.cs
Sun Feb 25 16:54:26 2007
@@ -0,0 +1,33 @@
+//
+// Copyright 2006 Shane Isbell
+//
+// Licensed 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.
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace NMaven.Core
+{
+[Serializable]
+public class ExecutionException : Exception
+{
+public ExecutionException() : base(){ }
+
+public ExecutionException(String message) : base(message) { }
+
+public ExecutionException(String message, Exception exception) :
base(message, exception) { }
+
+public ExecutionException(SerializationInfo info, StreamingContext
context) : base(info, context) { }
+}
+}
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=511682&r1=511681&r2=511682
==
---
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
Sun Feb 25 16:54:26 2007
@@ -97,6 +97,10 @@
string
baseIntermediateOutputPath,
List
projectReferences)
{
+ if(model == null || sourceFileDirectory == null ||
projectGuid == null)
+ {
+ throw new ExecutionException("NMAVEN-000-000:
Missing required parameter.");
+ }
Engine engine = new
Engine(@"C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727");
Project project = new Project(engine);
@@ -178,19 +182,20 @@
private void addProjectDependencies(Project project,
NMaven.Model.Model model, DirectoryInfo sourceFileDirectory)
{
-
BuildItemGroup group = project.AddNewItemGroup();
group.AddNewItem("Reference", "System.Xml");
-
- foreach(Dependency dependency in model.dependencies) {
- String repoPath =
Environment.GetEnvironmentVariable("HOMEDRIVE")
- +
Environment.GetEnvironmentVariable("HOMEPATH")
- + @"\.m2\repository\" +
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, false);
+ if(model.dependencies != null)
+ {
+ foreach(Dependency dependency in
model.dependenci
svn commit: r511935 - /incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Author: sisbell
Date: Mon Feb 26 10:04:52 2007
New Revision: 511935
URL: http://svn.apache.org/viewvc?view=rev&rev=511935
Log:
Fixed artifact installer to handle GAC: it removes the GAC dependency before
installing into local repo.
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
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/ArtifactInstallerImpl.java?view=diff&rev=511935&r1=511934&r2=511935
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Mon Feb 26 10:04:52 2007
@@ -24,6 +24,7 @@
import org.apache.maven.dotnet.artifact.ApplicationConfig;
import org.apache.maven.project.MavenProject;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
@@ -45,6 +46,7 @@
import java.io.FileReader;
import java.util.List;
import java.util.ArrayList;
+import java.util.Collections;
/**
* Provides an implementation of the ArtifactInstaller interface.
@@ -121,6 +123,18 @@
ApplicationConfig applicationConfig =
artifactContext.getApplicationConfigFor( artifact );
File configExeFile = new File(
applicationConfig.getConfigDestinationPath() );
+//TODO: Remove GAC dependencies before installing. This should be
removed and replaced with solution in the core.
+artifact.getMetadataList().clear();
+try
+{
+artifact.addMetadata( createArtifactMetadataFor( artifact,
pomFile, project.getDependencies() ) );
+}
+catch ( IOException e )
+{
+throw new ArtifactInstallationException( "NMAVEN-002-001: Unable
to add metadata to artifact", e );
+}
+//End GAC HACK
+
if ( configExeFile.exists() )
{
logger.info( "NMAVEN-002-000: Found config executable: File = " +
configExeFile.getAbsolutePath() );
@@ -343,10 +357,21 @@
e.printStackTrace();
throw new IOException( "NMAVEN-002-013: Unable to read pom file" );
}
+List dest = new ArrayList();
+dest.addAll( model.getDependencies());
+for ( Dependency dependency : dest )
+{
+model.removeDependency( dependency );
+}
for ( Dependency dependency : dependencies )
{
-model.addDependency( dependency );
+//TODO: This condition is only here since transitive gac
dependencies break the build. This needs to be fixed
+//within the core.
+if ( !dependency.getType().equals( "gac" ) )
+{
+model.addDependency( dependency );
+}
}
File tempFile = File.createTempFile( "mvninstall", ".pom" );
svn commit: r512011 - /incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
Author: sisbell
Date: Mon Feb 26 12:59:35 2007
New Revision: 512011
URL: http://svn.apache.org/viewvc?view=rev&rev=512011
Log:
Fixed bug NMAVEN_10: Unit test handles testing of .NET module.
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java?view=diff&rev=512011&r1=512010&r2=512011
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
Mon Feb 26 12:59:35 2007
@@ -133,6 +133,13 @@
{
artifacts.add( project.getArtifact() );
}
+
+if ( config.isTestCompile() &&
+project.getArtifact().getType().equals(
ArtifactType.MODULE.getArtifactTypeName() ) &&
+project.getArtifact().getFile() != null &&
project.getArtifact().getFile().exists() )
+{
+artifacts.add( project.getArtifact() );
+}
return artifacts;
}
@@ -153,7 +160,7 @@
{
if ( config.isTestCompile() && config.getArtifactType().equals(
ArtifactType.LIBRARY ) &&
project.getArtifact().getFile() != null &&
project.getArtifact().getFile().exists() &&
-!libraries.contains( project.getArtifact() ) )
+!libraries.contains( project.getArtifact() ) &&
!project.getArtifact().getType().equals( "module" ) )
{
libraries.add( project.getArtifact() );
}
svn commit: r512021 - in /incubator/nmaven/branches/SI_IDE/assemblies: NMaven.Core/pom.xml NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs NMaven.Model/Pom/pom.xml NMaven.Plugin.Solution
Author: sisbell
Date: Mon Feb 26 13:38:45 2007
New Revision: 512021
URL: http://svn.apache.org/viewvc?view=rev&rev=512021
Log:
Changed library types to module types. Did this as a work-around to NMaven-9:
we can use the existing code that handles adding module dependencies to
executables both within the target directory and the local maven repo. Only
downside is that each plugin will have a copy of the .netmodules, resulting in
duplicate modules to download.
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
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=512021&r1=512020&r2=512021
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Mon Feb 26
13:38:45 2007
@@ -2,14 +2,14 @@
4.0.0
NMaven.Core
NMaven.Core
- library
+ module
0.14
NMaven.Core
NMaven.Model
NMaven.Model.Pom
- library
+ module
0.14
@@ -37,4 +37,29 @@
+
+
+
+
+
+debug
+
+
+
+
+
+org.apache.maven.dotnet.plugins
+maven-compile-plugin
+true
+
+
+/debug+
+
+
+
+
+
+
+
+
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=512021&r1=512020&r2=512021
==
---
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
Mon Feb 26 13:38:45 2007
@@ -121,7 +121,18 @@
groupProject.AddNewProperty( "OutputPath", assemblyOutputPath,
false);
project.AddNewImport(@"$(MSBuildBinPath)\Microsoft.CSharp.Targets", null);
-
+DirectoryInfo configDirectory = new
DirectoryInfo(Environment.CurrentDirectory + @"\src\main\config");
+if(configDirectory.Exists)
+{
+ BuildItemGroup configGroup = project.AddNewItemGroup();
+ foreach(FileInfo fileInfo in configDirectory.GetFiles())
+ {
+ if(fileInfo.Extension.Equals("exe.config"))
+ {
+ configGroup.AddNewItem("None",
@"src\main\config\" + fileInfo.Name);
+ }
+ }
+}
addProjectDependencies(project, model, sourceFileDirectory);
addFoldersToProject(project, null, sourceFileDirectory,
sourceFileDirectory);
addClassFilesToProject(project, null, sourceFileDirectory,
sourceFileDirectory);
@@ -240,6 +251,7 @@
if (type.Equals("library")) return "Library";
else if (type.Equals("exe")) return "Exe";
else if (type.Equals("winexe")) return "WinExe";
+ else if (type.Equals("module")) return "Module";
return null;
}
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=512021&r1=512020&r2=512021
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Mon
Feb 26 13:38:45 2007
@@ -2,7 +2,7 @@
4.0.0
NMaven.Model
NMaven.Model.Pom
- library
+ module
0.14
NMaven.Model.Pom
Modified:
incubator/nmaven/branches/SI_IDE/assem
svn commit: r512063 - in /incubator/nmaven/branches/SI_IDE: ./ assemblies/ assemblies/NMaven.Plugin.Resx/ assemblies/NMaven.Plugin.Settings/ assemblies/NMaven.Plugin.Solution/ components/dotnet-core/s
Author: sisbell Date: Mon Feb 26 15:03:55 2007 New Revision: 512063 URL: http://svn.apache.org/viewvc?view=rev&rev=512063 Log: Moved over the .NET plugins into the assembly directory: changed bootstrap build. Added: incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml (with props) Removed: incubator/nmaven/branches/SI_IDE/plugins/nmaven-utility-resx/ incubator/nmaven/branches/SI_IDE/plugins/nmaven-utility-settings/ Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/pom.xml incubator/nmaven/branches/SI_IDE/bootstrap-build.bat incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml incubator/nmaven/branches/SI_IDE/maven-dotnet.iml incubator/nmaven/branches/SI_IDE/maven-dotnet.ipr incubator/nmaven/branches/SI_IDE/plugins/imports/nunit-2.0/nunit.framework.dll incubator/nmaven/branches/SI_IDE/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java incubator/nmaven/branches/SI_IDE/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java 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.Plugin.Resx/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml?view=diff&rev=512063&r1=512062&r2=512063 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml Mon Feb 26 15:03:55 2007 @@ -1,7 +1,7 @@ http://maven.apache.org/POM/4.0.0";> 4.0.0 -NMaven.Plugin.ResX -RexPlugin +NMaven.Plugin +NMaven.Plugin.Resx exe 0.14 NMaven.Plugin.ResX Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml?view=diff&rev=512063&r1=512062&r2=512063 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml Mon Feb 26 15:03:55 2007 @@ -1,7 +1,7 @@ http://maven.apache.org/POM/4.0.0";> 4.0.0 -NMaven.Plugin.Settings -SettingsPlugin +NMaven.Plugin +NMaven.Plugin.Settings exe 0.14 NMaven.Plugin.Settings 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=512063&r1=512062&r2=512063 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml Mon Feb 26 15:03:55 2007 @@ -1,7 +1,7 @@ http://maven.apache.org/POM/4.0.0";> 4.0.0 -NMaven.Plugin.Solution -SolutionPlugin +NMaven.Plugin +NMaven.Plugin.Solution exe 0.14 NMaven.Plugin.Solution Added: incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml?view=auto&rev=512063 == --- incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml (added) +++ incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml Mon Feb 26 15:03:55 2007 @@ -0,0 +1,30 @@ +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.plugins +maven-dotnet-plugins +pom +0.14-SNAPSHOT +maven-dotnet-plugins + +NMaven.Plugin.Resx +NMaven.Plugin.Settings + + + +org.apache.maven.dotnet +dotnet-assembler +0.14-SNAPSHOT + + +org.apache.maven.dotnet +dotnet-executable +0.14-SNAPSHOT + + +org.apache.maven.dotnet +dotnet-artifact +0.14-SNAPSHOT + + + \ No newli
svn commit: r512117 - /incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Author: sisbell
Date: Mon Feb 26 18:29:35 2007
New Revision: 512117
URL: http://svn.apache.org/viewvc?view=rev&rev=512117
Log:
Fixed bug where GAC dependency breaks build on multi-module builds.
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
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/ArtifactInstallerImpl.java?view=diff&rev=512117&r1=512116&r2=512117
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Mon Feb 26 18:29:35 2007
@@ -127,6 +127,16 @@
artifact.getMetadataList().clear();
try
{
+List dependencies = project.getDependencies();
+List newDependencies = new ArrayList();
+for(Dependency dependency : dependencies)
+{
+if(!dependency.getType().equals("gac"))
+{
+newDependencies.add( dependency );
+}
+}
+project.setDependencies( newDependencies );
artifact.addMetadata( createArtifactMetadataFor( artifact,
pomFile, project.getDependencies() ) );
}
catch ( IOException e )
svn commit: r512118 - in /incubator/nmaven/branches/SI_IDE: ./ assemblies/ assemblies/NMaven.Plugin.Resx/src/main/config/ assemblies/NMaven.Plugin.Solution/
Author: sisbell Date: Mon Feb 26 18:40:51 2007 New Revision: 512118 URL: http://svn.apache.org/viewvc?view=rev&rev=512118 Log: Build now works with a -DwithIde option, using a profile within the pom. Adding this option will compile the .NET assemblies used for generating csproj files. This requires MS/Windows/.NET 2.0, so we need a profile so that the bootstrap build does not break for everyone else. Added: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config (with props) Removed: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/resx.exe.config Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml incubator/nmaven/branches/SI_IDE/assemblies/pom.xml incubator/nmaven/branches/SI_IDE/bootstrap-build.bat Added: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config?view=auto&rev=512118 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config (added) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config Mon Feb 26 18:40:51 2007 @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config -- svn:eol-style = native 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=512118&r1=512117&r2=512118 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml Mon Feb 26 18:40:51 2007 @@ -1,40 +1,39 @@ http://maven.apache.org/POM/4.0.0";> -4.0.0 -NMaven.Plugin -NMaven.Plugin.Solution -exe -0.14 -NMaven.Plugin.Solution - - -org.nunit -nunit.framework -2.2.8.0 -library - - -NMaven.Core -NMaven.Core -0.14 -module - + 4.0.0 + NMaven.Plugin + NMaven.Plugin.Solution + exe + 0.14 + NMaven.Plugin.Solution + + + org.nunit + nunit.framework + 2.2.8.0 + library + + + NMaven.Core + NMaven.Core + 0.14 + module + NMaven.Model NMaven.Model.Pom module 0.14 - - - -src/main/csharp -src/test/csharp - - -org.apache.maven.dotnet.plugins -maven-compile-plugin -true - - - + + +src/main/csharp +src/test/csharp + + +org.apache.maven.dotnet.plugins +maven-compile-plugin +true + + + Modified: incubator/nmaven/branch
svn commit: r512336 [2/2] - in /incubator/nmaven/branches/SI_IDE/plugins: maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ maven-resolver-plugin/src/main/java/org/apache/maven/
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java?view=diff&rev=512336&r1=512335&r2=512336
==
---
incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java
Tue Feb 27 09:45:32 2007
@@ -39,7 +39,9 @@
* @phase process-sources
*/
-public class XsdGeneratorMojo extends AbstractMojo {
+public class XsdGeneratorMojo
+extends AbstractMojo
+{
/**
@@ -163,47 +165,75 @@
*/
private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
-public void execute() throws MojoExecutionException {
-try {
+public void execute()
+throws MojoExecutionException
+{
+try
+{
nmavenRegistry.createRepositoryRegistry();
-} catch (IOException e) {
-throw new MojoExecutionException("NMAVEN-1400-0032 Failed to
create the repository registry for this plugin", e);
+}
+catch ( IOException e )
+{
+throw new MojoExecutionException(
+"NMAVEN-1400-0032 Failed to create the repository registry for
this plugin", e );
}
-FileUtils.mkdir(outputDirectory);
-try {
-netExecutableFactory.getNetExecutableFor(vendor, frameworkVersion,
profile,
-project, getCommands(), netHome).execute();
-} catch (ExecutionException e) {
-throw new MojoExecutionException("NMAVEN-1400-000: Unable to
execute xsd: Vendor " + vendor
-+ ", frameworkVersion = " + frameworkVersion + ", Profile
= " + profile, e);
-} catch (PlatformUnsupportedException e) {
-throw new MojoExecutionException("NMAVEN-1400-001: Platform
Unsupported: Vendor " + vendor
-+ ", frameworkVersion = " + frameworkVersion + ", Profile
= " + profile, e);
+FileUtils.mkdir( outputDirectory );
+try
+{
+netExecutableFactory.getNetExecutableFor( vendor,
frameworkVersion, profile, project, getCommands(),
+ netHome ).execute();
+}
+catch ( ExecutionException e )
+{
+throw new MojoExecutionException( "NMAVEN-1400-000: Unable to
execute xsd: Vendor " + vendor +
+", frameworkVersion = " + frameworkVersion + ", Profile = " +
profile, e );
+}
+catch ( PlatformUnsupportedException e )
+{
+throw new MojoExecutionException( "NMAVEN-1400-001: Platform
Unsupported: Vendor " + vendor +
+", frameworkVersion = " + frameworkVersion + ", Profile = " +
profile, e );
}
}
-public List getCommands() throws MojoExecutionException {
+public List getCommands()
+throws MojoExecutionException
+{
List commands = new ArrayList();
-commands.add(new File(xsdFile.trim()).getAbsolutePath());
-commands.add("/o:" + outputDirectory);
-commands.add("/" + generate.trim());
-commands.add("/language:" + language.trim());
-commands.add("/namespace:" + namespace.trim());
-if (!isEmpty(uri)) commands.add("/uri:" + uri);
-if (enableDataBinding) commands.add("/enableDataBinding");
-if (fields) commands.add("/fields");
-if (order) commands.add("/order");
-if (elements != null) {
-for (String element : elements) {
-commands.add("/element:" + element);
+commands.add( new File( xsdFile.trim() ).getAbsolutePath() );
+commands.add( "/o:" + outputDirectory );
+commands.add( "/" + generate.trim() );
+commands.add( "/language:" + language.trim() );
+commands.add( "/namespace:" + namespace.trim() );
+if ( !isEmpty( uri ) )
+{
+commands.add( "/uri:" + uri );
+}
+if ( enableDataBinding )
+{
+commands.add( "/enableDataBinding" );
+}
+if ( fields )
+{
+commands.add( "/fields" );
+}
+if ( order )
+{
+commands.add( "/order" );
+}
+if ( elements != null )
+{
+for ( String element : elements )
+{
+commands.add( "/element:" + element );
}
}
// commands.add("/nologo");
return commands;
}
-private boolean isEmpty(String value) {
-return (value == null || value.trim().equals(""));
+privat
svn commit: r512338 - in /incubator/nmaven/branches/SI_IDE/plugins: maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ maven-install-plugin/ maven-install-plugin/src/main/java/
Author: sisbell
Date: Tue Feb 27 09:47:23 2007
New Revision: 512338
URL: http://svn.apache.org/viewvc?view=rev&rev=512338
Log:
Reformatted plugin classes to follow code conventions.
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-install-plugin/pom.xml
incubator/nmaven/branches/SI_IDE/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-resgen-plugin/pom.xml
incubator/nmaven/branches/SI_IDE/plugins/maven-webapp-plugin/pom.xml
incubator/nmaven/branches/SI_IDE/plugins/maven-wsdl-plugin/pom.xml
incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/pom.xml
incubator/nmaven/branches/SI_IDE/plugins/maven-xsp-plugin/pom.xml
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java?view=diff&rev=512338&r1=512337&r2=512338
==
---
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
Tue Feb 27 09:47:23 2007
@@ -37,7 +37,9 @@
* @phase process-sources
*/
-public class SourceProcessorMojo extends AbstractMojo {
+public class SourceProcessorMojo
+extends AbstractMojo
+{
/**
* Source directory
@@ -65,32 +67,43 @@
*/
private String[] excludes;
-public void execute() throws MojoExecutionException {
-if (!new File(sourceDirectory).exists()) {
-getLog().info("NMAVEN-904-001: No source files to copy");
+public void execute()
+throws MojoExecutionException
+{
+if ( !new File( sourceDirectory ).exists() )
+{
+getLog().info( "NMAVEN-904-001: No source files to copy" );
return;
}
DirectoryScanner directoryScanner = new DirectoryScanner();
-directoryScanner.setBasedir(sourceDirectory);
+directoryScanner.setBasedir( sourceDirectory );
-List excludeList = new ArrayList();
-excludeList.add( "*.suo");
-excludeList.add( "*.csproj");
-excludeList.add( "*.sln");
-excludeList.add( "obj/**");
-
-if(includes != null && includes.length > 0 )
directoryScanner.setIncludes(includes);
-directoryScanner.setExcludes(excludeList.toArray(excludes));
+List excludeList = new ArrayList();
+excludeList.add( "*.suo" );
+excludeList.add( "*.csproj" );
+excludeList.add( "*.sln" );
+excludeList.add( "obj/**" );
+
+if ( includes != null && includes.length > 0 )
+{
+directoryScanner.setIncludes( includes );
+}
+directoryScanner.setExcludes( excludeList.toArray( excludes ) );
directoryScanner.addDefaultExcludes();
directoryScanner.scan();
String[] files = directoryScanner.getIncludedFiles();
-getLog().info("NMAVEN-904-002: Copying source files: From = " +
sourceDirectory + ", To = " + outputDirectory);
-for (String file : files) {
-try {
-FileUtils.copyFile(new File(sourceDirectory + File.separator +
file),
- new File(outputDirectory + File.separator +
file));
-} catch (IOException e) {
-throw new MojoExecutionException("NMAVEN-904-000: Unable to
process sources", e);
+getLog().info(
+"NMAVEN-904-002: Copying source files: From = " + sourceDirectory
+ ", To = " + outputDirectory );
+for ( String file : files )
+{
+try
+{
+FileUtils.copyFile( new File( sourceDirectory + File.separator
+ file ),
+new File( outputDirectory + File.
svn commit: r512359 - in /incubator/nmaven/branches/SI_IDE: components/dotnet-core/src/main/resources/META-INF/nmaven/ plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/ plugins/maven-li
Author: sisbell Date: Tue Feb 27 10:58:21 2007 New Revision: 512359 URL: http://svn.apache.org/viewvc?view=rev&rev=512359 Log: Added support for linking netmodules to assemblies. I need this because some of the assemblies that I am using are netmodules and the IDE can only reference assemblies. To get around this, we can use the link plugin to link an assembly to a netmodule, thus making the netmodule accessible from the IDE. Added: incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/ incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/LICENSE.txt (with props) incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/pom.xml (with props) incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/src/ incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/src/main/ incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/src/main/java/ incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/src/main/java/org/ incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/src/main/java/org/apache/ incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/src/main/java/org/apache/maven/ incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/src/main/java/org/apache/maven/dotnet/ incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/src/main/java/org/apache/maven/dotnet/plugin/ incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/src/main/java/org/apache/maven/dotnet/plugin/link/ incubator/nmaven/branches/SI_IDE/plugins/maven-link-plugin/src/main/java/org/apache/maven/dotnet/plugin/link/LinkerMojo.java (with props) Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml?view=diff&rev=512359&r1=512358&r2=512359 == --- incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml Tue Feb 27 10:58:21 2007 @@ -198,4 +198,48 @@ + +MS:AL + org.apache.maven.dotnet.executable.impl.DefaultNetExecutable +MICROSOFT +al +AL + + 2.0.50727 + 1.1.4322 + + + +Windows + + + + +MONO:AL + org.apache.maven.dotnet.executable.impl.DefaultNetExecutable +MONO +al +AL + + 2.0.50727 + 1.1.4322 + + + +Windows + + +Mac OS X + + +Linux + + +Solaris + + +FreeBSD + + + Modified: incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=512359&r1=512358&r2=512359 == --- incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml (original) +++ incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml Tue Feb 27 10:58:21 2007 @@ -1,245 +1,246 @@ - - - org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout - org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout - - -org.apache.maven.lifecycle.mapping.LifecycleMapping -nar - -org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping - - - - - org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize, - org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve, - org.apache.maven.dotnet.plugins:maven-settings-plugin:generate-settings - - - org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info - - - org.apache.maven.dotnet.plugins:maven-co
svn commit: r512377 - 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/dotnet/
Author: sisbell
Date: Tue Feb 27 12:02:53 2007
New Revision: 512377
URL: http://svn.apache.org/viewvc?view=rev&rev=512377
Log:
Added ability to install a file (without meta-data) into the local repo. This
is needed to install the dll wrapper for netmodules, so that the IDE can
reference the assemblies.
Modified:
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/FileInstallerMojo.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/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=512377&r1=512376&r2=512377
==
---
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
Tue Feb 27 12:02:53 2007
@@ -42,7 +42,7 @@
* will also check whether an exe.config file is associated with the
artifact and install the exe.config into
* the local maven repository. This will allow installed artifacts, with
their associated configuration information,
* to be directly executed from the local maven repository.
- *
+ *
* Typically the artifact parameter will be obtained directly through the
maven project:
* MavenProject.getArtifact. In those cases where the
MavenProject object is unavailable, then
* you can use the installFile method from this interface.
@@ -66,6 +66,19 @@
* @throws ArtifactInstallationException if there is a problem installing
the artifact
*/
void installFile( String groupId, String artifactId, String version,
String packaging, File pomFile )
+throws ArtifactInstallationException;
+
+/**
+ * Installs a file into the local maven repository, without generating a
pom.xml. This is used for placing
+ * files and resources into the local repository, where there are no
explicit dependencies (as given in the pom file).
+ *
+ * @param groupId the group id of the file to install
+ * @param artifactId the artifact id of the file to install
+ * @param version the version of the file to install
+ * @param installFile the file to install
+ * @throws ArtifactInstallationException if there is a problem installing
the artifact
+ */
+void installFileWithNoPom( String groupId, String artifactId, String
version, File installFile )
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/ArtifactInstallerImpl.java?view=diff&rev=512377&r1=512376&r2=512377
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Tue Feb 27 12:02:53 2007
@@ -24,7 +24,6 @@
import org.apache.maven.dotnet.artifact.ApplicationConfig;
import org.apache.maven.project.MavenProject;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
@@ -46,7 +45,6 @@
import java.io.FileReader;
import java.util.List;
import java.util.ArrayList;
-import java.util.Collections;
/**
* Provides an implementation of the ArtifactInstaller interface.
@@ -129,9 +127,9 @@
{
List dependencies = project.getDependencies();
List newDependencies = new ArrayList();
-for(Dependency dependency : dependencies)
+for ( Dependency dependency : dependencies )
{
-if(!depe
svn commit: r512424 - in /incubator/nmaven/branches/SI_IDE/assemblies: NMaven.Core/pom.xml NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs NMaven.Model/Pom/pom.xml
Author: sisbell
Date: Tue Feb 27 13:34:25 2007
New Revision: 512424
URL: http://svn.apache.org/viewvc?view=rev&rev=512424
Log:
Added IDE support for reading the dll linked file (instead of the .netmodule).
This solution works for SharpDevelop 2.0.0 (not 2.1 RC1) and for Visual Studio
2005.
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
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=512424&r1=512423&r2=512424
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Tue Feb 27
13:34:25 2007
@@ -35,6 +35,16 @@
maven-compile-plugin
true
+
+org.apache.maven.dotnet.plugins
+maven-link-plugin
+
+
+${basedir}/target/NMaven.Core.netmodule
+
+ ${basedir}/target/NMaven.Core.dll
+
+
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=512424&r1=512423&r2=512424
==
---
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
Tue Feb 27 13:34:25 2007
@@ -198,10 +198,16 @@
if(model.dependencies != null)
{
foreach(Dependency dependency in
model.dependencies) {
+ String artifactExtension =
(dependency.type == "module") ? "dll" : getExtension(dependency.type);
+ if(dependency.type == "module")
+ {
+
+ }
String repoPath =
Environment.GetEnvironmentVariable("HOMEDRIVE")
+
Environment.GetEnvironmentVariable("HOMEPATH")
+ @"\.m2\repository\" +
dependency.groupId.Replace(".", "\\")
- + "\\" + dependency.artifactId
+ "\\" + dependency.version + "\\" + dependency.artifactId + ".dll";
+ + "\\" + dependency.artifactId
+ "\\" + dependency.version + "\\" + dependency.artifactId + "."
+ + artifactExtension;
BuildItem buildItem =
group.AddNewItem("Reference", dependency.artifactId);
if(!dependency.GetType().Equals("gac"))
buildItem.SetMetadata("HintPath", repoPath, false);
}
@@ -253,7 +259,16 @@
else if (type.Equals("winexe")) return "WinExe";
else if (type.Equals("module")) return "Module";
return null;
- }
+ }
+
+ private string getExtension(String type)
+ {
+ if (type.Equals("library")) return "dll";
+ else if (type.Equals("exe")) return "exe";
+ else if (type.Equals("winexe")) return "exe";
+ else if (type.Equals("module")) return "netmodule";
+ return null;
+ }
private class ClassParser {
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=512424&r1=512423&r2=512424
==
--- incubator/nmaven/branches
svn commit: r512444 - /incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs
Author: sisbell
Date: Tue Feb 27 14:14:11 2007
New Revision: 512444
URL: http://svn.apache.org/viewvc?view=rev&rev=512444
Log:
The solution plugin now handles building a .NET solution specific to maven
profile.
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs
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=512444&r1=512443&r2=512444
==
---
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
Tue Feb 27 14:14:11 2007
@@ -14,8 +14,25 @@
public SolutionPlugin()
{
}
+
+ 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)
+ {
+ Console.WriteLine(
p.activation.property.name.ToString() );
+ if(p.activation.property.name.Equals(profile))
+ {
+ return p.modules;
+ }
+ }
+ return model.modules;
+}
- public List execute(DirectoryInfo
currentDirectory, NMaven.Model.Model model)
+ public List execute(DirectoryInfo
currentDirectory, NMaven.Model.Model model, string profile)
{
if(model == null)
{
@@ -35,12 +52,12 @@
IProjectGenerator projectGenerator = new
ProjectGeneratorImpl();
if(model.packaging.Equals("pom"))
{
- foreach(String module in model.modules)
+ foreach(String module in
getModulesForProfile(profile, model))
{
DirectoryInfo newDir = new
DirectoryInfo(currentDirectory.FullName + @"\" + module );
Console.WriteLine("NMAVEN-000-000:
Generating model for pom: File Name = " + newDir.FullName + @"\pom.xml");
NMaven.Model.Model m =
projectGenerator.createPomModelFor(newDir.FullName + @"\pom.xml");
-
projectReferences.AddRange(execute(newDir, m));
+
projectReferences.AddRange(execute(newDir, m, profile));
}
}
else
@@ -71,14 +88,14 @@
return projectReferences;
}
- public static void Main()
+ public static void Main(string[] args)
{
IProjectGenerator projectGenerator = new
ProjectGeneratorImpl();
NMaven.Model.Model rootPom =
projectGenerator.createPomModelFor("pom.xml");
SolutionPlugin plugin = new SolutionPlugin();
List projectReferences =
plugin.execute(new DirectoryInfo(Environment.CurrentDirectory),
-
rootPom);
+
rootPom, "withIde");
projectGenerator.generateSolutionFor(new
FileInfo(@"test-1.sln"), projectReferences);
}
}
svn commit: r512624 - in /incubator/nmaven/branches/SI_IDE/assemblies: NMaven.Core/src/main/csharp/Core/ NMaven.Core/src/main/csharp/Core/Impl/ NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/ NMaven.P
Author: sisbell Date: Tue Feb 27 22:44:43 2007 New Revision: 512624 URL: http://svn.apache.org/viewvc?view=rev&rev=512624 Log: Updated license info and api docs. Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/ExecutionException.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectReference.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectReferenceImpl.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/MimeType.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/ResX.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/ExecutionException.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/SettingsGenerator.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/ExecutionException.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/ExecutionException.cs?view=diff&rev=512624&r1=512623&r2=512624 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/ExecutionException.cs (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/ExecutionException.cs Tue Feb 27 22:44:43 2007 @@ -1,17 +1,20 @@ // -// Copyright 2006 Shane Isbell +// 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 // -// Licensed 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 // -// 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. +// 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. // using System; Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs?view=diff&rev=512624&r1=512623&r2=512624 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs Tue Feb 27 22:44:43 2007 @@ -1,3 +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. +// + using System; using System.IO; using System.Collections.Generic; @@ -6,1
svn commit: r512629 - in /incubator/nmaven/branches/SI_IDE/assemblies: NMaven.Core/LICENSE.txt NMaven.Core/src/main/csharp/Core/IProjectReference.cs NMaven.Plugin.Resx/LICENSE.txt NMaven.Plugin.Settin
Author: sisbell Date: Tue Feb 27 22:57:40 2007 New Revision: 512629 URL: http://svn.apache.org/viewvc?view=rev&rev=512629 Log: License files. Added: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/LICENSE.txt (with props) incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/LICENSE.txt (with props) incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/LICENSE.txt (with props) incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/LICENSE.txt (with props) Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectReference.cs Added: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/LICENSE.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/LICENSE.txt?view=auto&rev=512629 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/LICENSE.txt (added) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/LICENSE.txt Tue Feb 27 22:57:40 2007 @@ -0,0 +1,176 @@ + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldw
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
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 n
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
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("NM
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/
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
svn commit: r513874 - 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/dotnet/
Author: sisbell
Date: Fri Mar 2 10:14:08 2007
New Revision: 513874
URL: http://svn.apache.org/viewvc?view=rev&rev=513874
Log:
Moved ArtifactType to dotnet.artifact module. The concept of artifact type is
no longer specific to compilers, we need a way of installing artifacts
differently based on type (specifically exe).
Added:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
(with props)
Removed:
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/ArtifactType.java
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.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/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/ExecutableConfig.java
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerConfig.java
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.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/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java?view=diff&rev=513874&r1=513873&r2=513874
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
Fri Mar 2 10:14:08 2007
@@ -79,7 +79,7 @@
* but not null.
*/
List getArtifactsFor( String groupId, String artifactId, String
version, String type );
-
+
/**
* Returns an artifact installer used for installing NMaven artifacts into
the local Maven repository.
*
Added:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java?view=auto&rev=513874
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
(added)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
Fri Mar 2 10:14:08 2007
@@ -0,0 +1,118 @@
+/*
+ * 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;
+
+/**
+ * Enumeration of all the valid target types (module, library, winexe, exe,
nar) for the .NET platform.
+ *
+ * @author Shane Isbell
+ */
+public enum ArtifactType
+{
+MODULE( "module", "netmodule" ),
+LIBRARY( "library", "dll" ),
+EXE( "exe", "exe" ),
+WINEXE( "winexe", "exe" ),
+NAR( "nar", "nar" ),
+EXECONFIG( "exe.config", "exe.config" ),
+NULL( "null", "null" );
+
+private String extension;
+
+private Stri
svn commit: r513883 - in /incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact: ArtifactType.java impl/ArtifactInstallerImpl.java
Author: sisbell
Date: Fri Mar 2 10:49:07 2007
New Revision: 513883
URL: http://svn.apache.org/viewvc?view=rev&rev=513883
Log:
Bug fix.
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java?view=diff&rev=513883&r1=513882&r2=513883
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
Fri Mar 2 10:49:07 2007
@@ -88,6 +88,14 @@
{
return ArtifactType.LIBRARY;
}
+else if ( name.equals( ArtifactType.NAR.getArtifactTypeName() ) )
+{
+ return ArtifactType.NAR;
+}
+else if ( name.equals( ArtifactType.EXECONFIG.getArtifactTypeName() ) )
+{
+ return ArtifactType.EXECONFIG;
+}
return ArtifactType.NULL;
}
@@ -112,6 +120,10 @@
else if ( extension.equals( ArtifactType.NAR.getExtension() ) )
{
return ArtifactType.LIBRARY;
+}
+else if ( extension.equals( ArtifactType.EXECONFIG.getExtension() ) )
+{
+ return ArtifactType.EXECONFIG;
}
return ArtifactType.NULL;
}
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/ArtifactInstallerImpl.java?view=diff&rev=513883&r1=513882&r2=513883
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Fri Mar 2 10:49:07 2007
@@ -292,18 +292,21 @@
depPath.append( dependency.getArtifactId() ).append(
File.separator )
.append( dependency.getVersion() ).append( File.separator );
-File file = new File( depPath.toString() +
dependency.getArtifactId() +
-ArtifactType.getArtifactTypeForName( dependency.getType() ) );
//TODO: other types
+String extension = ArtifactType.getArtifactTypeForName(
dependency.getType() ).getExtension();
+File file =
+new File( depPath.toString() + dependency.getArtifactId() +
"." + extension ); //TODO: other types
try
{
logger.info( "NMAVEN-002-016: Installing File: From = " +
file.getAbsolutePath() + ", To = " +
-depPath.toString() + dependency.getArtifactId() + ".dll" );
+depPath.toString() + File.separator +
dependency.getArtifactId() + "." + extension );
FileUtils.copyFileToDirectory( file, new File( path.toString()
) );
}
catch ( IOException e )
{
-e.printStackTrace();
+throw new ArtifactInstallationException(
+"NMAVEN-002-017: Failed to install file into repo: File
Name = " + file.getAbsolutePath() +
+", Extension = " + extension + ", Type = " +
dependency.getType(), e );
}
}
}
svn commit: r513884 - in /incubator/nmaven/branches/SI_IDE/assemblies: NMaven.Core/src/main/csharp/Core/ NMaven.Core/src/main/csharp/Core/Impl/ NMaven.Core/src/test/csharp/Core/Impl/ NMaven.Plugin.Sol
Author: sisbell
Date: Fri Mar 2 10:50:56 2007
New Revision: 513884
URL: http://svn.apache.org/viewvc?view=rev&rev=513884
Log:
Minor updates to follow .NET code conventions.
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/Impl/NMavenContextImplTest.cs
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionPlugin.cs
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs?view=diff&rev=513884&r1=513883&r2=513884
==
---
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
(original)
+++
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
Fri Mar 2 10:50:56 2007
@@ -38,7 +38,7 @@
/// the name of the project: usually
corresponds to the artifact id
/// references to other projects that
this project is dependent upon
///
- IProjectReference generateProjectFor(NMaven.Model.Model model,
+ IProjectReference GenerateProjectFor(NMaven.Model.Model model,
DirectoryInfo sourceFileDirectory,
string projectFileName,
List
projectReferences);
@@ -48,14 +48,14 @@
///
/// the solution file
/// csproj references
- void generateSolutionFor(FileInfo fileInfo,
List projectReferences);
+ void GenerateSolutionFor(FileInfo fileInfo,
List projectReferences);
///
/// Creates a model from the pom.
///
/// file name of the pom.xml file
/// a model binding of the pom file
- NMaven.Model.Model createPomModelFor(string fileName);
+ NMaven.Model.Model CreatePomModelFor(string fileName);
}
}
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=513884&r1=513883&r2=513884
==
---
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
Fri Mar 2 10:50:56 2007
@@ -42,7 +42,7 @@
{
}
- public IProjectReference generateProjectFor(NMaven.Model.Model
model,
+ public IProjectReference GenerateProjectFor(NMaven.Model.Model
model,
DirectoryInfo
sourceFileDirectory,
string projectFileName,
List
projectReferences)
@@ -67,7 +67,7 @@
return projectReference;
}
- public void generateSolutionFor(FileInfo fileInfo,
List projectReferences)
+ public void GenerateSolutionFor(FileInfo fileInfo,
List projectReferences)
{
TextWriter writer =
new StreamWriter(fileInfo.FullName, false,
System.Text.Encoding.UTF8);
@@ -96,14 +96,14 @@
Console.WriteLine("NMAVEN-000-000: Generate solution
file: File Name = " + fileInfo.FullName);
}
- public NMaven.Model.Model createPomModelFor(string fileName)
+ 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);
}
- private Project createProjectFor(string fileName)
+ private Project CreateProjectFor(string fileName)
{
Engine engine = new
Engine(@"C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727");
Project
svn commit: r513948 - in /incubator/nmaven/branches/SI_IDE/components: dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ dotnet-vendor/src/main/java/org/apache/maven/dotnet/vend
Author: sisbell
Date: Fri Mar 2 13:02:26 2007
New Revision: 513948
URL: http://svn.apache.org/viewvc?view=rev&rev=513948
Log:
Fixed bug: if the plugin passed an empty vendor version or vendor framework
version, the state machine processor would treat it as valid and not try to
resolved the empty value. Also added a post process state for filling in
executable paths. These bugs caused NMaven to only use the system path for
executables.
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/StateMachineProcessorImpl.java
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=513948&r1=513947&r2=513948
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
Fri Mar 2 13:02:26 2007
@@ -72,7 +72,7 @@
}
/**
- * @see
+ * @see
*/
public CompilerExecutable getCompilerExecutableFor( CompilerRequirement
compilerRequirement,
CompilerConfig
compilerConfig, MavenProject project,
@@ -98,7 +98,7 @@
throw new PlatformUnsupportedException( "NMAVEN-066-012: Vendor
could not be found: " + vendorInfo );
}
-logger.info( "NMAVEN-066-012: Found Vendor = " + vendorInfo );
+logger.info( "NMAVEN-066-013: Found Vendor = " + vendorInfo );
compilerRequirement.setVendor( vendorInfo.getVendor() );
compilerRequirement.setVendorVersion( vendorInfo.getVendorVersion() );
compilerRequirement.setFrameworkVersion(
vendorInfo.getFrameworkVersion() );
@@ -133,7 +133,10 @@
throws PlatformUnsupportedException
{
-if(commands == null) commands = new ArrayList();
+if ( commands == null )
+{
+commands = new ArrayList();
+}
try
{
@@ -229,9 +232,22 @@
ExecutableConfig executableConfig =
ExecutableConfig.Factory.createDefaultExecutableConfig();
executableConfig.setCommands( commands );
+
if ( netHome != null )
{
+logger.info( "NMAVEN-066-014: Found executable path: Path = " +
netHome.getAbsolutePath() );
executableConfig.setExecutionPath( netHome.getAbsolutePath() );
+}
+else if ( vendorInfo.getExecutablePath() != null &&
vendorInfo.getExecutablePath().exists() )
+{
+logger.info(
+"NMAVEN-066-015: Found executable path: Path = " +
vendorInfo.getExecutablePath().getAbsolutePath() );
+executableConfig.setExecutionPath(
vendorInfo.getExecutablePath().getAbsolutePath() );
+}
+else
+{
+logger.info( "NMAVEN-066-016: Did not find executable path, will
try system path: Executable Path = " +
+vendorInfo.getExecutablePath() );
}
executableContext.init( executableRequirement, executableConfig,
project, capabilityMatcher );
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java?view=diff&rev=513948&r1=513947&r2=513948
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java
Fri Mar 2 13:02:26 2007
@@ -118,7 +118,12 @@
/**
* Null state of VendorInfo object
*/
-NULL;
+NULL,
+
+/**
+ * Post processing state
+ */
+POST_PROCESS;
/**
* Returns
svn commit: r514036 - in /incubator/nmaven/branches/SI_IDE: assemblies/NMaven.Core/src/main/csharp/Core/Impl/ assemblies/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/ plugins/maven-resolver-
Author: sisbell
Date: Fri Mar 2 17:04:21 2007
New Revision: 514036
URL: http://svn.apache.org/viewvc?view=rev&rev=514036
Log:
Numerous bug fixes for IDE support.
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/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java
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=514036&r1=514035&r2=514036
==
---
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
Fri Mar 2 17:04:21 2007
@@ -234,17 +234,16 @@
{
foreach(Dependency dependency in
model.dependencies) {
String artifactExtension =
(dependency.type == "module") ? "dll" : GetExtension(dependency.type);
- if(dependency.type == "module")
- {
-
- }
String repoPath =
Environment.GetEnvironmentVariable("HOMEDRIVE")
+
Environment.GetEnvironmentVariable("HOMEPATH")
+ @"\.m2\repository\" +
dependency.groupId.Replace(".", "\\")
+ "\\" + dependency.artifactId
+ "\\" + dependency.version + "\\" + dependency.artifactId + "."
+ artifactExtension;
BuildItem buildItem =
group.AddNewItem("Reference", dependency.artifactId);
- if(!dependency.GetType().Equals("gac"))
buildItem.SetMetadata("HintPath", repoPath, false);
+ //TODO: Fix this. Just because it is in
the GAC on the system that builds the .csproj does not mean
+ //it is in the GAC on another system.
+ if(!dependency.GetType().Equals("gac")
&& !IsInGac(dependency.artifactId))
+
buildItem.SetMetadata("HintPath", repoPath, false);
}
}
@@ -258,22 +257,25 @@
{
try {
string assembly = GetAssemblyFor(dependency);
- DirectoryInfo fileInfo = new
DirectoryInfo(@"C:\WINDOWS\assembly\GAC_MSIL\" + assembly);
- if(fileInfo.Exists) {
+if(IsInGac(assembly)) {
group.AddNewItem("Reference", assembly);
}
}
catch(Exception e)
{
- Console.WriteLine(e.Message);
+ Console.WriteLine("NMAVEN-000-000: Could not find
assembly dependency", e.Message);
}
-
}
}
+
+ private bool IsInGac(string assembly)
+ {
+ return new
DirectoryInfo(@"C:\WINDOWS\assembly\GAC_MSIL\" + assembly).Exists;
+ }
private string GetAssemblyFor(string dependency)
{
-if(dependency.Equals("System.Resource")) return
"System.Windows.Form";
+if(dependency.Trim().Equals("System.Resources")) return
"System.Windows.Forms";
return dependency;
}
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=514036&r1=514035&r2=51403
svn commit: r518030 - in /incubator/nmaven/branches/SI_IDE/components/dotnet-assembler: ./ src/main/java/org/apache/maven/dotnet/assembler/ src/main/java/org/apache/maven/dotnet/assembler/impl/
Author: sisbell Date: Tue Mar 13 23:08:03 2007 New Revision: 518030 URL: http://svn.apache.org/viewvc?view=rev&rev=518030 Log: Added support for getting the extension of a language from the context. This is needed because some plugins need know the language extension to know what to copy from the source directory into the build directory (this in turn is related the project structure necessary for IDE). Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/pom.xml incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblyPluginsRepository.java incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/pom.xml?view=diff&rev=518030&r1=518029&r2=518030 == --- incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/pom.xml Tue Mar 13 23:08:03 2007 @@ -1,57 +1,43 @@ -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";> - -org.apache.maven.dotnet -0.14-SNAPSHOT -dotnet-components - -4.0.0 +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";> + org.apache.maven.dotnet -dotnet-assembler 0.14-SNAPSHOT -dotnet-assembler - -NMaven - - - - - -org.apache.maven -maven-plugin-api -2.0.4 - - -org.apache.maven -maven-project -2.0.4 - - -org.apache.maven.dotnet -dotnet-model-assembly-plugins -0.14-SNAPSHOT - - -org.apache.maven.dotnet -dotnet-artifact -0.14-SNAPSHOT - - -org.apache.maven.dotnet -dotnet-core -0.14-SNAPSHOT - - - - - - -org.apache.maven.plugins -maven-compiler-plugin - -1.5 -1.5 - - - - +dotnet-components + + 4.0.0 + org.apache.maven.dotnet + dotnet-assembler + 0.14-SNAPSHOT + dotnet-assembler + +NMaven + + + + org.apache.maven + maven-plugin-api + 2.0.4 + + + org.apache.maven + maven-project + 2.0.4 + + + org.apache.maven.dotnet + dotnet-model-assembly-plugins + 0.14-SNAPSHOT + + + org.apache.maven.dotnet + dotnet-artifact + 0.14-SNAPSHOT + + + org.apache.maven.dotnet + dotnet-core + 0.14-SNAPSHOT + + Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java?view=diff&rev=518030&r1=518029&r2=518030 == --- incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java Tue Mar 13 23:08:03 2007 @@ -19,6 +19,7 @@ package org.apache.maven.dotnet.assembler; import org.apache.maven.dotnet.InitializationException; +import org.apache.maven.dotnet.PlatformUnsupportedException; import org.apache.maven.project.MavenProject; /** @@ -50,6 +51,15 @@ */ AssemblyInfoMarshaller getAssemblyInfoMarshallerFor( String language ) throws AssemblyInfoException; + +/** + * Returns the class extension (cs, vb) for the specifi
svn commit: r518032 - in /incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin: ./ src/main/java/org/apache/maven/dotnet/plugin/compile/
Author: sisbell
Date: Tue Mar 13 23:12:25 2007
New Revision: 518032
URL: http://svn.apache.org/viewvc?view=rev&rev=518032
Log:
compile plugin now supports a flat directory structure (For IDE support).
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/pom.xml
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
Modified: incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/pom.xml?view=diff&rev=518032&r1=518031&r2=518032
==
--- incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/pom.xml Tue
Mar 13 23:12:25 2007
@@ -22,6 +22,19 @@
2.0.4
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+ 1.5
+ 1.5
+
+
+
+
+
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java?view=diff&rev=518032&r1=518031&r2=518032
==
---
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
Tue Mar 13 23:12:25 2007
@@ -119,6 +119,7 @@
public void execute()
throws MojoExecutionException
{
+
if ( project.getArtifact().getType().equals( "module" ) )
{
return;
@@ -144,14 +145,7 @@
}
getLog().info( "NMAVEN-902-000: Generating Assembly Info: Language = "
+ language.trim() );
-try
-{
-assemblerContext.init( project );
-}
-catch ( InitializationException e )
-{
-throw new MojoExecutionException( "NMAVEN-902-006: Failed to
initialize the assembler context" );
-}
+
//TODO: Investigate the affect of not setting isDefault and profile.
In the case of executables, this is
//managed by the framework. I intended to keep vendor info and state
machine processor out of the
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java?view=diff&rev=518032&r1=518031&r2=518032
==
---
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
Tue Mar 13 23:12:25 2007
@@ -27,6 +27,8 @@
import org.apache.maven.dotnet.executable.ExecutionException;
import org.apache.maven.dotnet.vendor.VendorFactory;
import org.apache.maven.dotnet.executable.compiler.*;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.artifact.Artifact;
import java.util.ArrayList;
import java.io.File;
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=518032&r1=518031&r2=518032
==
---
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
(original)
+++
incubator/
svn commit: r518035 - in /incubator/nmaven/branches/SI_IDE/plugins: README.txt maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/WsdlGeneratorMojo.java pom.xml
Author: sisbell
Date: Tue Mar 13 23:15:56 2007
New Revision: 518035
URL: http://svn.apache.org/viewvc?view=rev&rev=518035
Log:
Minor plugin updates.
Modified:
incubator/nmaven/branches/SI_IDE/plugins/README.txt
incubator/nmaven/branches/SI_IDE/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/WsdlGeneratorMojo.java
incubator/nmaven/branches/SI_IDE/plugins/pom.xml
Modified: incubator/nmaven/branches/SI_IDE/plugins/README.txt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/README.txt?view=diff&rev=518035&r1=518034&r2=518035
==
--- incubator/nmaven/branches/SI_IDE/plugins/README.txt (original)
+++ incubator/nmaven/branches/SI_IDE/plugins/README.txt Tue Mar 13 23:15:56 2007
@@ -1,4 +1,4 @@
-Find the latest documentation at: http://nmaven.sf.net.
+Find the latest documentation at: http://incubator.apache.org/nmaven
Before building the nmaven-plugin project, build the nmaven-components project
and then go to the scripts directory and
execute the install script. It will install the nunit.framework.dll and other
3rd party libs into the local Maven repo.
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/WsdlGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/WsdlGeneratorMojo.java?view=diff&rev=518035&r1=518034&r2=518035
==
---
incubator/nmaven/branches/SI_IDE/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/WsdlGeneratorMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/WsdlGeneratorMojo.java
Tue Mar 13 23:15:56 2007
@@ -176,7 +176,6 @@
getLog().debug( "NMAVEN-1300-000: Commands = " + commands.toString() );
CommandExecutor commandExecutor =
CommandExecutor.Factory.createDefaultCommmandExecutor();
-//commandExecutor.setLog(getLog());
try
{
commandExecutor.executeCommand( getExecutableFor( vendor, netHome
), commands );
@@ -223,7 +222,7 @@
for ( String path : paths )
{
-commands.add( commandFlag + "out:" + outputDirectory +
File.separator + getFileNameFor( path ) );
+commands.add( commandFlag + "out:" + outputDirectory +
getFileNameFor( path ) );
}
for ( String path : paths )
Modified: incubator/nmaven/branches/SI_IDE/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/pom.xml?view=diff&rev=518035&r1=518034&r2=518035
==
--- incubator/nmaven/branches/SI_IDE/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/plugins/pom.xml Tue Mar 13 23:15:56 2007
@@ -6,22 +6,21 @@
pom
0.14-SNAPSHOT
maven-dotnet-plugins
-
maven-compile-plugin
+maven-install-plugin
+maven-link-plugin
+maven-resgen-plugin
+maven-resolver-plugin
+maven-settings-plugin
+maven-solution-plugin
maven-test-plugin
+maven-vstudio-plugin
maven-webapp-plugin
maven-xsd-plugin
maven-xsp-plugin
maven-wsdl-plugin
-maven-install-plugin
-maven-resgen-plugin
-maven-resolver-plugin
-maven-settings-plugin
-maven-solution-plugin
-maven-vstudio-plugin
-
org.apache.maven.dotnet
svn commit: r518318 [2/2] - in /incubator/nmaven/branches/SI_IDE/components: dotnet-embedder/ dotnet-embedder/src/ dotnet-embedder/src/main/ dotnet-embedder/src/main/java/ dotnet-embedder/src/main/jav
Added: incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/pom.xml?view=auto&rev=518318
==
--- incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/pom.xml (added)
+++ incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/pom.xml Wed Mar
14 13:47:58 2007
@@ -0,0 +1,38 @@
+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";>
+
+org.apache.maven.dotnet
+0.14-SNAPSHOT
+dotnet-components
+
+ 4.0.0
+ org.apache.maven.dotnet
+ dotnet-embedder
+ 0.14-SNAPSHOT
+ dotnet-embedder
+
+NMaven
+
+
+
+ org.apache.maven
+ maven-embedder
+ 2.0.4
+
+
+ org.codehaus.xfire
+ xfire-plexus
+ 1.2
+
+
+ org.codehaus.xfire
+ xfire-java5
+ 1.2.4
+
+
+ org.codehaus.xfire
+ javax.ws
+ 1.0.0
+
+
+
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/pom.xml
--
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java?view=auto&rev=518318
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java
(added)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java
Wed Mar 14 13:47:58 2007
@@ -0,0 +1,18 @@
+package org.apache.maven.dotnet.embedder;
+
+public interface MavenEmbedderService
+{
+
+/**
+ * Role used to register component implementations with the container.
+ */
+String ROLE = MavenEmbedderService.class.getName();
+
+/**
+ *
+ * @param request
+ */
+void execute( MavenExecutionRequest request );
+
+
+}
Propchange:
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java
--
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenExecutionRequest.java?view=auto&rev=518318
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenExecutionRequest.java
(added)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenExecutionRequest.java
Wed Mar 14 13:47:58 2007
@@ -0,0 +1,19 @@
+package org.apache.maven.dotnet.embedder;
+
+import org.codehaus.xfire.aegis.type.java5.*;
+
[EMAIL PROTECTED](namespace="urn:maven-embedder")
+public interface MavenExecutionRequest
+{
+
+/**
+ * Role used to register component implementations with the container.
+ */
+String ROLE = MavenExecutionRequest.class.getName();
+
+@XmlElement(name="pomFile", namespace="urn:maven-embedder")
+String getPomFile();
+
+void setPomFile(java.lang.String string);
+
+}
Propchange:
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenExecutionRequest.java
--
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenEmbedderServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenEmbedderServiceImpl.java?view=auto&rev=518318
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenEmbedderServiceImpl.java
(added)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenEmbedderServiceImpl.java
Wed Mar 14 13:47:58 2007
@@ -0,0 +1,159 @@
+package org.apache.maven.do
svn commit: r518320 - /incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/out.log
Author: sisbell Date: Wed Mar 14 13:51:06 2007 New Revision: 518320 URL: http://svn.apache.org/viewvc?view=rev&rev=518320 Log: Remove log file. Removed: incubator/nmaven/branches/SI_IDE/components/dotnet-embedder/out.log
svn commit: r520142 - in /incubator/nmaven/branches/SI_IDE: assemblies/NMaven.Model/Pom/pom.xml assemblies/pom.xml bootstrap-build.bat plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotne
Author: sisbell
Date: Mon Mar 19 15:39:43 2007
New Revision: 520142
URL: http://svn.apache.org/viewvc?view=rev&rev=520142
Log:
Fixed a couple of problems with the project building from bootstrap.
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/pom.xml
incubator/nmaven/branches/SI_IDE/bootstrap-build.bat
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
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=520142&r1=520141&r2=520142
==
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Mon
Mar 19 15:39:43 2007
@@ -1,11 +1,16 @@
http://maven.apache.org/POM/4.0.0";>
+
+org.apache.maven.dotnet
+0.14
+nmaven-assemblies
+..\..\pom.xml
+
4.0.0
NMaven.Model
NMaven.Model.Pom
library
0.14
NMaven.Model.Pom
-
Modified: incubator/nmaven/branches/SI_IDE/assemblies/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/pom.xml?view=diff&rev=520142&r1=520141&r2=520142
==
--- incubator/nmaven/branches/SI_IDE/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/pom.xml Mon Mar 19 15:39:43 2007
@@ -117,7 +117,6 @@
NMaven.Plugin.Resx
NMaven.Plugin.Settings
-NMaven.Service/Embedder
src/main/csharp
@@ -143,7 +142,6 @@
NMaven.Plugin.Resx
NMaven.Plugin.Settings
NMaven.Plugin.Solution
-NMaven.Service/Embedderr
Modified: incubator/nmaven/branches/SI_IDE/bootstrap-build.bat
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/bootstrap-build.bat?view=diff&rev=520142&r1=520141&r2=520142
==
--- incubator/nmaven/branches/SI_IDE/bootstrap-build.bat (original)
+++ incubator/nmaven/branches/SI_IDE/bootstrap-build.bat Mon Mar 19 15:39:43
2007
@@ -1,6 +1,6 @@
call mvn install:install-file
-Dfile=./components/imports/xfire-jsr181/xfire-jsr181-api-1.0-M1.zip
-DgroupId=org.codehaus.xfire -DartifactId=javax.ws -Dpackaging=jar
-Dversion=1.0.0
-#call mvn -f ./components/pom.xml install
-#call mvn -f ./plugins/pom-java-bootstrap.xml install
-#call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file
-Dfile=./plugins/imports/nunit-2.0/nunit.framework.dll -DgroupId=org.nunit
-DartifactId=nunit.framework -Dpackaging=dll -Dversion=2.2.8.0
-#call mvn -f ./assemblies/pom-net-bootstrap.xml -Dmaven.test.skip=true
-Dbootstrap install %*
+call mvn -f ./components/pom.xml install
+call mvn -f ./plugins/pom-java-bootstrap.xml install
+call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file
-Dfile=./plugins/imports/nunit-2.0/nunit.framework.dll -DgroupId=org.nunit
-DartifactId=nunit.framework -Dpackaging=dll -Dversion=2.2.8.0
+call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install %*
#call mvn org.apache.maven.dotnet.plugins:maven-solution-plugin:solution
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java?view=diff&rev=520142&r1=520141&r2=520142
==
---
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
Mon Mar 19 15:39:43 2007
@@ -105,11 +105,11 @@
List includeList = new ArrayList();
try
{
-includeList.add( "*" + assemblerContext.getClassExtensionFor(
language));
+includeList.add( "**/*." + assemblerContext.getClassExtensionFor(
language ) );
}
catch ( PlatformUnsupportedException e )
{
-throw new MojoExecutionException("NMAVEN-904-003: Language is not
supported: Language = " + language, e);
+throw new MojoExecutionException( "NMAVEN-904-003: Language is not
supported: Language = " + language, e );
}
directoryScanner.
svn commit: r520167 - in /incubator/nmaven/branches/SI_IDE: ./ assemblies/NMaven.Core/ assemblies/NMaven.Plugin.Settings/ assemblies/NMaven.Plugin.Solution/ imports/ imports/org.apache.maven/ integrat
Author: sisbell Date: Mon Mar 19 16:24:41 2007 New Revision: 520167 URL: http://svn.apache.org/viewvc?view=rev&rev=520167 Log: Cleanup of the build: brought the import and 3rdparty up to top level and got rid of unneeded bootstrap poms. Added: incubator/nmaven/branches/SI_IDE/imports/ incubator/nmaven/branches/SI_IDE/imports/org.apache.maven/ incubator/nmaven/branches/SI_IDE/imports/org.apache.maven/maven-core-it-verifier-2.1.jar (with props) incubator/nmaven/branches/SI_IDE/thirdparty/ incubator/nmaven/branches/SI_IDE/thirdparty/NUnit-1.1/ incubator/nmaven/branches/SI_IDE/thirdparty/NUnit-1.1/license.html incubator/nmaven/branches/SI_IDE/thirdparty/NUnit-1.1/nunit.framework.dll (with props) incubator/nmaven/branches/SI_IDE/thirdparty/NUnit-2.0/ incubator/nmaven/branches/SI_IDE/thirdparty/NUnit-2.0/license.html incubator/nmaven/branches/SI_IDE/thirdparty/NUnit-2.0/nunit.framework.dll (with props) Removed: incubator/nmaven/branches/SI_IDE/integration-tests/imports/ incubator/nmaven/branches/SI_IDE/plugins/imports/ incubator/nmaven/branches/SI_IDE/plugins/pom-java-bootstrap.xml incubator/nmaven/branches/SI_IDE/plugins/pom-net-bootstrap.xml Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml incubator/nmaven/branches/SI_IDE/bootstrap-build.bat incubator/nmaven/branches/SI_IDE/integration-tests/tests/it.bat incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0004/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0017/pom.xml incubator/nmaven/branches/SI_IDE/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java incubator/nmaven/branches/SI_IDE/plugins/scripts/build-2.0.bat incubator/nmaven/branches/SI_IDE/site/src/site/apt/getting-started.apt 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=520167&r1=520166&r2=520167 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Mon Mar 19 16:24:41 2007 @@ -24,8 +24,8 @@ 2.0.0.0__b03f5f7f11d50a3a - org.nunit - nunit.framework + NUnit + Nunit.Framework 2.2.8.0 library Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml?view=diff&rev=520167&r1=520166&r2=520167 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml Mon Mar 19 16:24:41 2007 @@ -12,8 +12,8 @@ NMaven.Plugin.Settings - org.nunit - nunit.framework + NUnit + NUnit.Framework 2.2.8.0 library 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=520167&r1=520166&r2=520167 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml Mon Mar 19 16:24:41 2007 @@ -12,8 +12,8 @@ NMaven.Plugin.Solution - org.nunit - nunit.framework + NUnit + Nunit.Framework 2.2.8.0 library Modified: incubator/nmaven/branches/SI_IDE/bootstrap-build.bat URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/bootstrap-build.bat?view=diff&rev=520167&r1=520166&r2=520167 == --- incubator/nmaven/branches/SI_IDE/bootstrap-build.bat (original) +++ incubator/nmaven/branches/SI_IDE/bootstrap-build.bat Mon Mar 19 16:24:41 2007 @@ -1,6 +1,5 @@ -call mvn install:install-file -Dfile=./components/imports/xfire-jsr181/xfire-jsr181-api-1.0-M1.zip -DgroupId=org.codehaus.xfire -DartifactId=javax.ws -Dpackaging=jar -Dversion=1.0.0 call mvn -f ./components/pom.xml install -call mvn -f ./plugins/pom-java-bootstrap.xml install -call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./plugins/imports/nunit-2.0/nunit.framework.dll -DgroupId=org.nunit -DartifactId=nunit.framework -Dpackaging=dll -Dversion=2.2.
svn commit: r520242 - /incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayout.java
Author: sisbell
Date: Mon Mar 19 19:56:17 2007
New Revision: 520242
URL: http://svn.apache.org/viewvc?view=rev&rev=520242
Log:
Fix for NMaven-23.
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayout.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=520242&r1=520241&r2=520242
==
---
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 Mar 19 19:56:17 2007
@@ -21,6 +21,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import java.io.File;
@@ -51,6 +52,12 @@
*/
public String pathOf( Artifact artifact )
{
+if ( artifact.getType().equals( "pom" ) )//Use standard format for pom
packaging
+{
+ArtifactRepositoryLayout defaultLayout = new
DefaultRepositoryLayout();
+return defaultLayout.pathOf( artifact );
+}
+
StringBuffer artifactPath = new StringBuffer();
for ( String groupId : artifact.getGroupId().split( "[.]" ) )
{
@@ -72,8 +79,8 @@
/**
* Returns the path (relative to the specified local repository) of an
artifact's metadata.
*
- * @param metadata the artifact metadata
- * @param repository the artifact repository that contains the metadata
+ * @param metadata the artifact metadata. This value may not be null.
+ * @param repository the artifact repository that contains the metadata.
This value may not be null.
* @return the path of an artifact's metadata within the specified
repository
*/
public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata,
ArtifactRepository repository )
@@ -96,15 +103,28 @@
}
/**
- * Returns empty string. This method is here because it is part of the
required API but it is not used within the context of the
- * invoking framework.
+ * Returns the path of an artifact's metadata within the the remote
repository. This method is here because it is
+ * part of the required API but it is not used within the context of the
invoking framework.
*
- * @param metadata the artifact metadata. This may be null.
- * @return empty string
+ * @param metadata the artifact metadata. This may not be null.
+ * @return the path of an artifact's metadata within the specified
repository.
*/
public String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata )
{
-System.out.println( "CALLING REMOTE : " + metadata.getRemoteFilename()
);
-return "";
+StringBuffer path = new StringBuffer();
+for ( String groupId : metadata.getGroupId().split( "[.]" ) )
+{
+path.append( groupId ).append( File.separator );
+}
+
+if ( !metadata.storedInGroupDirectory() )
+{
+path.append( metadata.getArtifactId() ).append( File.separator );
+if ( metadata.storedInArtifactVersionDirectory() )
+{
+path.append( metadata.getBaseVersion() ).append(
File.separator );
+}
+}
+return path.append( metadata.getRemoteFilename() ).toString();
}
}
svn commit: r520248 - in /incubator/nmaven/branches/SI_IDE: ./ assemblies/ assemblies/NMaven.Core/ assemblies/NMaven.Model/Pom/ assemblies/NMaven.Plugin.Resx/ assemblies/NMaven.Plugin.Settings/ assemb
Author: sisbell Date: Mon Mar 19 20:16:41 2007 New Revision: 520248 URL: http://svn.apache.org/viewvc?view=rev&rev=520248 Log: Updated NUnit assembly to be compatible with MS, Mono and DotGnu. Simplified the build further. Added: incubator/nmaven/branches/SI_IDE/thirdparty/NUnit/ incubator/nmaven/branches/SI_IDE/thirdparty/NUnit/NUnit.Framework.dll (with props) Removed: incubator/nmaven/branches/SI_IDE/plugins/scripts/ incubator/nmaven/branches/SI_IDE/thirdparty/NUnit-1.1/ incubator/nmaven/branches/SI_IDE/thirdparty/NUnit-2.0/ Modified: incubator/nmaven/branches/SI_IDE/README.txt 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.Resx/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/pom.xml incubator/nmaven/branches/SI_IDE/bootstrap-build.bat incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0001/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0002/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0004/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0017/pom.xml incubator/nmaven/branches/SI_IDE/site/src/site/apt/getting-started.apt Modified: incubator/nmaven/branches/SI_IDE/README.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/README.txt?view=diff&rev=520248&r1=520247&r2=520248 == --- incubator/nmaven/branches/SI_IDE/README.txt (original) +++ incubator/nmaven/branches/SI_IDE/README.txt Mon Mar 19 20:16:41 2007 @@ -1,5 +1,12 @@ Initial Build -* On the first build, execute the bootstrap-build script. On subsequent builds, you can just type mvn install from +* On the first build, for Windows execute +bootstrap-build.bat or +bootstrap-build.bat -DwithIDE" + Or on *nix, +bootstrap-build.sh + +Note that the -DwithIDE option requires Microsoft 2.0 or higher. If this is a clean build (meaning that you do not have a ~./m2/nmaven-settings.xml file) +then you will also need to make sure that you have csc within your path. On subsequent builds, you can just type mvn install from the command prompt. IntelliJ IDEA Setup 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=520248&r1=520247&r2=520248 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Mon Mar 19 20:16:41 2007 @@ -1,8 +1,8 @@ http://maven.apache.org/POM/4.0.0";> -org.apache.maven.dotnet +NMaven 0.14 -nmaven-assemblies +NMaven.Assemblies 4.0.0 NMaven.Core @@ -25,7 +25,7 @@ NUnit - Nunit.Framework + NUnit.Framework 2.2.8.0 library 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=520248&r1=520247&r2=520248 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Mon Mar 19 20:16:41 2007 @@ -1,10 +1,10 @@ http://maven.apache.org/POM/4.0.0";> -org.apache.maven.dotnet +NMaven 0.14 -nmaven-assemblies +NMaven.Assemblies ..\..\pom.xml - + 4.0.0 NMaven.Model NMaven.Model.Pom Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml?view=diff&rev=520248&r1=520247&r2=520248 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml Mon Mar 19 20:16:41 2007 @@ -1,8 +1,8 @@ http://maven.apache.org/POM/4.0.0";> -org.apache.maven.dotnet +NMaven.A 0.14 -nmaven-assemblies +NMaven.Assemblies 4.0.0 NMaven.Plugin Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/a
svn commit: r520253 - in /incubator/nmaven/branches/SI_IDE: integration-tests/tests/it0005/ integration-tests/tests/it0006/ integration-tests/tests/it0007/ integration-tests/tests/it0010/ integration-
Author: sisbell Date: Mon Mar 19 20:21:27 2007 New Revision: 520253 URL: http://svn.apache.org/viewvc?view=rev&rev=520253 Log: Minor cleanup. Modified: incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0005/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0006/StockingHandlers_1_0.xsd incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0006/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0007/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0007/registry-config.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0010/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0011/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0012/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0013/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0014/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0015/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0016/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0018/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0019/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0020/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0021/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0022/pom.xml incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0025/pom.xml incubator/nmaven/branches/SI_IDE/plugins/maven-vstudio-plugin/pom.xml incubator/nmaven/branches/SI_IDE/plugins/pom-release.xml incubator/nmaven/branches/SI_IDE/site/pom.xml Modified: incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0005/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0005/pom.xml?view=diff&rev=520253&r1=520252&r2=520253 == --- incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0005/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0005/pom.xml Mon Mar 19 20:21:27 2007 @@ -1,36 +1,35 @@ -4.0.0 -org.apache.maven.it -it0005 -nar -1.0.0 -it0005 - - -org.apache.maven.it -it0003 -library -1.0.0 - - + 4.0.0 + org.apache.maven.it + it0005 + nar + 1.0.0 + it0005 + + + org.apache.maven.it + it0003 + library + 1.0.0 + + - -src/main/csharp -src/test/csharp - - - -org.apache.maven.dotnet.plugins -maven-compile-plugin -true - - -org.apache.maven.dotnet.plugins -maven-webapp-plugin - -./target/test-deploy - - - - + +src/main/csharp +src/test/csharp + + +org.apache.maven.dotnet.plugins +maven-compile-plugin +true + + +org.apache.maven.dotnet.plugins +maven-webapp-plugin + + ./target/test-deploy + + + + Modified: incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0006/StockingHandlers_1_0.xsd URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0006/StockingHandlers_1_0.xsd?view=diff&rev=520253&r1=520252&r2=520253 == --- incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0006/StockingHandlers_1_0.xsd (original) +++ incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0006/StockingHandlers_1_0.xsd Mon Mar 19 20:21:27 2007 @@ -1,135 +1,135 @@ http://www.w3.org/2001/XMLSchema"; - targetNamespace="http://jvending.org/xsd/jvending-cp"; - xmlns:jvending-cp="http://jvending.org/xsd/jvending-cp"; - xmlns:xsd="http://www.w3.org/2001/XMLSchema"; - elementFormDefault="qu
svn commit: r520334 - in /incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl: SettingsRepository.java VendorInfoTransitionRuleFactory.java
Author: sisbell
Date: Tue Mar 20 01:52:59 2007
New Revision: 520334
URL: http://svn.apache.org/viewvc?view=rev&rev=520334
Log:
Bug fix for NMaven-4
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java?view=diff&rev=520334&r1=520333&r2=520334
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
Tue Mar 20 01:52:59 2007
@@ -86,7 +86,7 @@
catch ( XmlPullParserException e )
{
e.printStackTrace();
-throw new IOException( "NMAVEN-104-000: Could not read
executable-plugins.xml" );
+throw new IOException( "NMAVEN-104-000: Could not read
nmaven-settings.xml" );
}
vendors = settings.getVendors();
defaultSetup = settings.getDefaultSetup();
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java?view=diff&rev=520334&r1=520333&r2=520334
==
---
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
Tue Mar 20 01:52:59 2007
@@ -108,6 +108,7 @@
try
{
defaultVendor = VendorFactory.createVendorFromName(
settingsRepository.getDefaultSetup().getVendorName() );
+logger.debug( "NMAVEN-103-036: Default Vendor Initialized: Name =
" + defaultVendor );
}
catch ( VendorUnsupportedException e )
{
@@ -469,6 +470,14 @@
}
else
{
+try
+{
+vendorInfo.setVendor(
VendorFactory.getDefaultVendorForOS() );
+}
+catch ( PlatformUnsupportedException e )
+{
+return VendorInfoState.POST_PROCESS;
+}
List v =
vendorInfoRepository.getVendorInfosFor( vendorInfo, true );
if ( !v.isEmpty() )
{
@@ -477,7 +486,6 @@
if ( vi.getFrameworkVersion().equals(
vendorInfo.getFrameworkVersion() ) )
{
vendorInfo.setVendorVersion(
vi.getVendorVersion() );
-vendorInfo.setVendor( vi.getVendor() );
if ( vi.getVendor().equals( Vendor.MICROSOFT )
)
{
return VendorInfoState.MTT;
@@ -499,7 +507,6 @@
if ( vi.getFrameworkVersion().equals(
vendorInfo.getFrameworkVersion() ) )
{
vendorInfo.setVendorVersion( vi.getVendorVersion()
);
-vendorInfo.setVendor( vi.getVendor() );
if ( vi.getVendor().equals( Vendor.MICROSOFT ) )
{
return VendorInfoState.MTT;
@@ -772,7 +779,7 @@
{
public VendorInfoState process( VendorInfo vendorInfo )
{
-logger.debug( "NMAVEN-103-023: Entering State = GFF" );
+logger.debug( "NMAVEN-103-035: Entering State = GFF" );
if ( vendorInfo.getVendor().equals( defaultVendor ) )
{
vendorInfo.setVendorVersion( defaultVendorVersion );
svn commit: r520497 - in /incubator/nmaven/branches/SI_IDE: ./ assemblies/ assemblies/NMaven.Plugin.Resx/ assemblies/NMaven.Plugin.Settings/ assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Se
Author: sisbell Date: Tue Mar 20 10:50:56 2007 New Revision: 520497 URL: http://svn.apache.org/viewvc?view=rev&rev=520497 Log: Fixed the problem of copying a blank exe config to the repo. Modified: incubator/nmaven/branches/SI_IDE/README.txt incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/nmaven-settings.xsd incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/nmavenSettings.cs incubator/nmaven/branches/SI_IDE/assemblies/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/AssemblyRepositoryLayout.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/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactMetadataImpl.java incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0007/pom.xml incubator/nmaven/branches/SI_IDE/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/pom.xml Modified: incubator/nmaven/branches/SI_IDE/README.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/README.txt?view=diff&rev=520497&r1=520496&r2=520497 == --- incubator/nmaven/branches/SI_IDE/README.txt (original) +++ incubator/nmaven/branches/SI_IDE/README.txt Tue Mar 20 10:50:56 2007 @@ -1,7 +1,7 @@ Initial Build * On the first build, for Windows execute bootstrap-build.bat or -bootstrap-build.bat -DwithIDE" +bootstrap-build.bat -DwithIDE Or on *nix, bootstrap-build.sh Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml?view=diff&rev=520497&r1=520496&r2=520497 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml Tue Mar 20 10:50:56 2007 @@ -1,6 +1,6 @@ http://maven.apache.org/POM/4.0.0";> -NMaven.A +NMaven 0.14 NMaven.Assemblies Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/nmaven-settings.xsd URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/nmaven-settings.xsd?view=diff&rev=520497&r1=520496&r2=520497 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/nmaven-settings.xsd (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/nmaven-settings.xsd Tue Mar 20 10:50:56 2007 @@ -1,5 +1,6 @@  -http://www.w3.org/2001/XMLSchema"; xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> +http://www.w3.org/2001/XMLSchema"; + xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> @@ -9,8 +10,8 @@ - - + + @@ -31,6 +32,13 @@ + + + + + + + @@ -49,7 +57,7 @@ - + Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml?view=diff&rev=520497&r1=520496&r2=520497 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml Tue Mar 20 10:50:56 2007 @@ -1,6 +1,6 @@ http://maven.apache.org/POM/4.0.0";> -NMaven.A +NMaven 0.14 NMaven.Assemblies
svn commit: r520761 - in /incubator/nmaven/branches/SI_IDE/components/dotnet-model: assembly-plugins/ compiler-plugins/ entries/ executable-plugins/ netdependency/ settings/
Author: sisbell Date: Tue Mar 20 22:48:53 2007 New Revision: 520761 URL: http://svn.apache.org/viewvc?view=rev&rev=520761 Log: Largely reformatting and adding sdkInstallRoot and executionPaths to the settings model. This allows us to configure and use multiple directories for searching for executables. Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-model/assembly-plugins/assembly-plugins.mdo incubator/nmaven/branches/SI_IDE/components/dotnet-model/compiler-plugins/compiler-plugins.mdo incubator/nmaven/branches/SI_IDE/components/dotnet-model/compiler-plugins/pom.xml incubator/nmaven/branches/SI_IDE/components/dotnet-model/entries/entries.mdo incubator/nmaven/branches/SI_IDE/components/dotnet-model/entries/pom.xml incubator/nmaven/branches/SI_IDE/components/dotnet-model/entries/sample.xml incubator/nmaven/branches/SI_IDE/components/dotnet-model/executable-plugins/executable-plugins.mdo incubator/nmaven/branches/SI_IDE/components/dotnet-model/netdependency/netdependency.mdo incubator/nmaven/branches/SI_IDE/components/dotnet-model/netdependency/pom.xml incubator/nmaven/branches/SI_IDE/components/dotnet-model/settings/settings.mdo Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-model/assembly-plugins/assembly-plugins.mdo URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-model/assembly-plugins/assembly-plugins.mdo?view=diff&rev=520761&r1=520760&r2=520761 == --- incubator/nmaven/branches/SI_IDE/components/dotnet-model/assembly-plugins/assembly-plugins.mdo (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-model/assembly-plugins/assembly-plugins.mdo Tue Mar 20 22:48:53 2007 @@ -1,47 +1,46 @@ -assembly-plugin -AssemblyPlugin -Assembly Info Plugin - - -package -org.apache.maven.dotnet.model.assembly.plugins - - - - -AssemblyPluginsModel - - -assemblyPlugins - -AssemblyPlugin -* - - - - - - -AssemblyPlugin - - -identifier -String - - -pluginClass -String - - -language -String - - -extension -String - - - - + assembly-plugin + AssemblyPlugin + Assembly Info Plugin + + + package + org.apache.maven.dotnet.model.assembly.plugins + + + + + AssemblyPluginsModel + + + assemblyPlugins + +AssemblyPlugin +* + + + + + + AssemblyPlugin + + + identifier + String + + + pluginClass + String + + + language + String + + + extension + String + + + + Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-model/compiler-plugins/compiler-plugins.mdo URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-model/compiler-plugins/compiler-plugins.mdo?view=diff&rev=520761&r1=520760&r2=520761 == --- incubator/nmaven/branches/SI_IDE/components/dotnet-model/compiler-plugins/compiler-plugins.mdo (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-model/compiler-plugins/compiler-plugins.mdo Tue Mar 20 22:48:53 2007 @@ -1,163 +1,163 @@ -compiler-plugin -CompilerPlugin -A configuration file for compilers. - - -package -org.apache.maven.dotnet.model.compiler.plugins - - - - -CompilerPluginsModel - - -compilerPlugins -Plugin configurations. - -CompilerPlugin -* - - - - + compiler-plugin + CompilerPlugin + A configuration file for compilers. + + + package + org.apache.maven.dotnet.model.compiler.plugins + + + + + CompilerPluginsModel + + + compilerPlugins + Plugin configurations. + +CompilerPlugin +* + + + + - -CompilerPlugin - - -identifie
svn commit: r520928 - /incubator/nmaven/branches/SI_IDE/bootstrap-build.sh
Author: sisbell Date: Wed Mar 21 09:09:00 2007 New Revision: 520928 URL: http://svn.apache.org/viewvc?view=rev&rev=520928 Log: The build script for linux. Modified: incubator/nmaven/branches/SI_IDE/bootstrap-build.sh Modified: incubator/nmaven/branches/SI_IDE/bootstrap-build.sh URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/bootstrap-build.sh?view=diff&rev=520928&r1=520927&r2=520928 == --- incubator/nmaven/branches/SI_IDE/bootstrap-build.sh (original) +++ incubator/nmaven/branches/SI_IDE/bootstrap-build.sh Wed Mar 21 09:09:00 2007 @@ -1,4 +1,4 @@ mvn -f ./components/pom.xml install -mvn -f ./plugins/pom-java-bootstrap.xml install -mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./plugins/imports/nunit-2.0/nunit.framework.dll -DgroupId=org.nunit -DartifactId=nunit.framework -Dpackaging=dll -Dversion=2.2.8.0 -mvn -f ./plugins/pom-net-bootstrap.xml -Dmaven.test.skip=true -Dbootstrap install \ No newline at end of file +mvn -f ./plugins/pom.xml install +mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./thirdparty/NUnit/NUnit.Framework -DgroupId=NUnit -DartifactId=NUnit.Framework -Dpackaging=dll -Dversion=2.2.8.0 +mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install $*
