svn commit: r603417 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox: components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/ components/dotnet-compiler/src/main/java/or

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 15:53:16 2007
New Revision: 603417

URL: http://svn.apache.org/viewvc?rev=603417&view=rev
Log:
Compiling now working.

Added:

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/resources/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/resources/META-INF/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/resources/META-INF/nmaven/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/resources/META-INF/nmaven/annotation-resources.txt
   (with props)
Modified:

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/ClassCompiler.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CommandExecutor.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerContext.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java

Modified: 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/ClassCompiler.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/ClassCompiler.java?rev=603417&r1=603416&r2=603417&view=diff
==
--- 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/ClassCompiler.java
 (original)
+++ 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/ClassCompiler.java
 Tue Dec 11 15:53:16 2007
@@ -2,17 +2,10 @@
 
 import java.io.File;
 import java.util.Set;
+import java.util.List;
 
 public interface ClassCompiler
 {
-/**
- * Returns a file pointing to the compiled artifact for this executable.
- *
- * @return a file pointing to the compiled artifact for this executable
- * @throws InvalidArtifactException if the artifact is invalid
- */
-File getCompiledArtifact()
-throws InvalidArtifactException;
 
 /**
  * Returns true to fail the build if the compiler writes anything to the 
error stream, otherwise return false.
@@ -26,7 +19,7 @@
  *
  * @return the commands that this compiler will use to compile the 
application
  */
-Set getCommands();
+List getCommands();
 
 /**
  * Resets the commands to be used by the executable. This should only be 
used if the executable is being reused with
@@ -34,12 +27,13 @@
  *
  * @param commands
  */
-void resetCommands( Set commands );
+void resetCommands( List commands );
 
 /**
  * Compiles class files.
+ * @return a file pointing to the compiled artifact
  */
-void compile();
+File compile() throws InvalidArtifactException;
 
 /**
  * Returns the executable file name that this compiler will use to compile 
the application.

Modified: 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CommandExecutor.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CommandExecutor.java?rev=603417&r1=603416&r2=603417

svn commit: r603459 - /incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/resources/

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 21:14:14 2007
New Revision: 603459

URL: http://svn.apache.org/viewvc?rev=603459&view=rev
Log:
Removed unneeded test resource.

Removed:

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/resources/



svn commit: r603468 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION: ./ archetypes/maven-archetype-dotnet-simple/ archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/ archetypes/

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 21:44:43 2007
New Revision: 603468

URL: http://svn.apache.org/viewvc?rev=603468&view=rev
Log:
Merged over changes from trunk: rev. 594585.

Modified:

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/pom.xml

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/archetype.xml

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/archetype-resources/pom.xml

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-netexecutable/pom.xml

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Model/Pom/pom.xml

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Plugin/pom.xml

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml

Modified: 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/pom.xml?rev=603468&r1=603467&r2=603468&view=diff
==
--- 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/pom.xml
 (original)
+++ 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/pom.xml
 Tue Dec 11 21:44:43 2007
@@ -9,6 +9,5 @@
   4.0.0  
   org.apache.maven.dotnet  
   maven-archetype-dotnet-simple  
-  maven-plugin  
   maven-archetype-dotnet-simple 
 

Modified: 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/archetype.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/archetype.xml?rev=603468&r1=603467&r2=603468&view=diff
==
--- 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/archetype.xml
 (original)
+++ 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/archetype.xml
 Tue Dec 11 21:44:43 2007
@@ -2,5 +2,6 @@
   maven-archetype-dotnet-simple
   
 src/main/csharp/Sample/MyApp.cs
+src/test/csharp/Sample/MyAppTest.cs
   
 

Modified: 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/archetype-resources/pom.xml?rev=603468&r1=603467&r2=603468&view=diff
==
--- 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/archetype-resources/pom.xml
 Tue Dec 11 21:44:43 2007
@@ -4,8 +4,16 @@
   4.0.0  
   ${groupId}  
   ${artifactId}  
-  0.14-incubating-SNAPSHOT  
-  library  
+  ${version}
+  library
+
+
+  NUnit
+  NUnit.Framework
+  2.2.8.0
+  library
+
+

 src/main/csharp  
 src/test/csharp  
@@ -14,7 +22,7 @@
 org.apache.maven.dotnet.plugins  
 maven-compile-plugin  
 true 
-   
+  
  

 

Modified: 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-netexecutable/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-netexecutable/pom.xml?rev=603468&r1=603467&r2=603468&view=diff
==
--- 
incubator/nmaven/branc

svn commit: r603472 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION: ./ archetypes/ archetypes/maven-archetype-dotnet-simple/ archetypes/maven-archetype-netexecutable/ assemblies/ imports/ integr

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 21:57:53 2007
New Revision: 603472

URL: http://svn.apache.org/viewvc?rev=603472&view=rev
Log:
Removing old directories.

Removed:

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-netexecutable/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/pom.xml
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/imports/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/integration-tests/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/misc/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/modify-versions.bat
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom-dotnet.xml
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom-modify-versions.xml



svn commit: r603476 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION: archetypes/ components/dotnet-dao/ components/dotnet-embedder/ components/dotnet-executable/ components/dotnet-jetty/ componen

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 22:06:24 2007
New Revision: 603476

URL: http://svn.apache.org/viewvc?rev=603476&view=rev
Log:
Removing old directories.

Removed:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-embedder/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-executable/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-jetty/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-model/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-registry/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-repository/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-service/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-vendor/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/NOTICE.txt
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/README.txt
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compile-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-deploy-plugin/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-embedder-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-fxcop-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-install-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-link-plugin/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-mojo-generator-plugin/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-repository-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-resgen-plugin/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-resolver-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-test-plugin/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-vsinstaller-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-vstudio-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-webapp-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-wsdl-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-xsd-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-xsp-plugin/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/net-exe.bat
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/netplugins/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/pom.xml
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/src/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/thirdparty/Castle/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/thirdparty/org.apache.ws/



svn commit: r603479 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox: components/dotnet-extensions-maven/ components/pom.xml plugins/ pom.xml

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 22:22:47 2007
New Revision: 603479

URL: http://svn.apache.org/viewvc?rev=603479&view=rev
Log:
Moved some packages from sandbox to root directoru.

Removed:

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/pom.xml
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/plugins/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/pom.xml



svn commit: r603480 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components: README.txt dotnet-artifact/ dotnet-extensions-maven/ pom.xml src/

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 22:23:29 2007
New Revision: 603480

URL: http://svn.apache.org/viewvc?rev=603480&view=rev
Log:
Moved some packages from sandbox to root directoru.

Added:

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-extensions-maven/
  - copied from r603468, 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/
Removed:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/README.txt
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-artifact/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/src/
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/pom.xml

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/pom.xml?rev=603480&r1=603479&r2=603480&view=diff
==
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/pom.xml Tue Dec 
11 22:23:29 2007
@@ -18,54 +18,25 @@
 specific language governing permissions and limitations
 under the License.
 -->
-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-incubating-SNAPSHOT  
-dotnet-project 
-
-  4.0.0  
-  org.apache.maven.dotnet  
-  dotnet-components  
-  pom  
-  dotnet-components  
-  http://incubator.apache.org/nmaven  
-  NMaven provides Maven 2.x plugins to support building of .NET 
applications  
-   
-dotnet-artifact  
-dotnet-assembler  
-dotnet-core  
-dotnet-dao/project  
-dotnet-embedder  
-dotnet-executable  
-dotnet-jetty  
-dotnet-model  
-dotnet-plugin  
-dotnet-registry  
-dotnet-repository  
-dotnet-service/embedder  
-dotnet-vendor 
-
-   
- 
-   
- 
-  Rdf 
- 
-
-   
- 
-  aduna.org  
-  http://repository.aduna-software.org/maven2 
- 
-   
- 
-
-   
- 
-  nmaven-apache-site  
-  NMaven Site  
-  file://${basedir}/../../www 
- 
-   
-
+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-incubating-SNAPSHOT
+dotnet-project
+  
+  4.0.0
+  org.apache.maven.dotnet
+  dotnet-components
+  0.14-incubating-SNAPSHOT
+  pom
+  dotnet-components
+  http://incubator.apache.org/nmaven
+  NMaven provides Maven 2.x plugins to support building of .NET 
applications
+  
+dotnet-assembler
+dotnet-core
+dotnet-compiler
+dotnet-extensions-maven
+  
+
\ No newline at end of file




svn commit: r603478 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION: bootstrap-build.bat bootstrap-build.sh integration-tests/ plugins/maven-compiler-plugin/ pom.xml sandbox/integration-tests/ sa

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 22:16:18 2007
New Revision: 603478

URL: http://svn.apache.org/viewvc?rev=603478&view=rev
Log:
Moved some packages from sandbox to root directoru.

Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/integration-tests/
  - copied from r603468, 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/integration-tests/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/
  - copied from r603468, 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/plugins/maven-compiler-plugin/
Removed:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/bootstrap-build.bat
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/bootstrap-build.sh
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/integration-tests/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/plugins/maven-compiler-plugin/
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml?rev=603478&r1=603477&r2=603478&view=diff
==
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml Tue Dec 11 22:16:18 
2007
@@ -18,328 +18,175 @@
 specific language governing permissions and limitations
 under the License.
 -->
-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-project  
-  pom  
-  0.14-incubating-SNAPSHOT  
-  dotnet  
-   
- 
-  NMaven Dev List  
-  [EMAIL PROTECTED]  
-  [EMAIL PROTECTED]  
-  [EMAIL PROTECTED]  
-  
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 
-   
- 
-
-   
-components  
-archetypes  
-plugins  
-misc/dotnet-repository-builder 
-
-   
- 
-  apache.org  
-  Maven Snapshots  
-  http://people.apache.org/repo/m2-snapshot-repository  
-   
-false 
-
-   
-true 
-   
-  
- 
-  codehaus-snapshot-repo  
-  Codehaus Snapshot Repo  
-  http://snapshots.repository.codehaus.org  
-   
-false 
-   
- 
-
-   
- 
-   
-org.apache.maven.wagon  
-wagon-ssh-external  
-1.0-beta-2 
-
-   
-org.apache.maven.wagon  
-wagon-webdav  
-1.0-beta-2 
-   
-  
- 
-   
-maven-javadoc-plugin  
- 
-  true 
- 
-
-   
-maven-assembly-plugin  
- 
-  src/assembly/src.xml  
-  src/target 
- 
-
-   
-org.apache.maven.plugins  
-maven-compiler-plugin  
- 
-  1.5  
-  1.5 
- 
-   
-  
- 
-   
- 
-  org.codehaus.modello  
-  modello-maven-plugin  
-  1.0-alpha-13  
-   
- 
-   
-xpp3-reader  
-java 
-   
-   

svn commit: r603486 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION: components/dotnet-assembler/ components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/ components/dotnet-as

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 22:50:15 2007
New Revision: 603486

URL: http://svn.apache.org/viewvc?rev=603486&view=rev
Log:
Additional moving and adding of files.

Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-compiler/
  - copied from r603478, 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
   (with props)

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
   (with props)

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
   (with props)
Removed:

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblyPluginsRepository.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/resources/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/test/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenRepositoryRegistry.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/RepositoryNotFoundException.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Version.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/impl/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/resources/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/test/

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/
Modified:

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoException.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/pom.xml

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java

Modified: 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml?rev=603486&r1=603485&r2=603486&view=diff
==
--- 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml
 (original)
+++ 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml
 Tue Dec 11 22:50:15 2007
@@ -18,40 +18,37 @@
 specific language governing permissions and limitations
 under the License.
 -->
-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-incubating-SNAPSHOT  
-dotnet-components 
-
-  4.

svn commit: r603488 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION: sandbox/ site/

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 22:54:01 2007
New Revision: 603488

URL: http://svn.apache.org/viewvc?rev=603488&view=rev
Log:
More deleted directories.

Removed:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/site/



svn commit: r603489 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION: components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java plugins/pom.

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 22:55:38 2007
New Revision: 603489

URL: http://svn.apache.org/viewvc?rev=603489&view=rev
Log:
Missing files.

Added:

incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java
   (with props)
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/pom.xml   (with 
props)

Added: 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java?rev=603489&view=auto
==
--- 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java
 (added)
+++ 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java
 Tue Dec 11 22:55:38 2007
@@ -0,0 +1,12 @@
+package org.apache.maven.dotnet.assembler;
+
+import org.apache.maven.dotnet.ProgrammingLanguage;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
[EMAIL PROTECTED](RetentionPolicy.RUNTIME)
+public @interface AssemblyInfoMarshallerAnnotation
+{
+ProgrammingLanguage[] programmingLanguages();
+}

Propchange: 
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java
--
svn:eol-style = native

Added: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/pom.xml?rev=603489&view=auto
==
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/pom.xml (added)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/pom.xml Tue Dec 11 
22:55:38 2007
@@ -0,0 +1,35 @@
+
+
+
+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-incubating-SNAPSHOT  
+dotnet-project 
+
+  4.0.0  
+  org.apache.maven.dotnet.plugins  
+  maven-dotnet-plugins  
+  pom  
+  maven-dotnet-plugins  
+  
+maven-compiler-plugin
+  
+

Propchange: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/pom.xml
--
svn:eol-style = native




svn commit: r603490 - /incubator/nmaven/branches/SI_MAVEN_INTEGRATION/maven-dotnet.iml

2007-12-11 Thread sisbell
Author: sisbell
Date: Tue Dec 11 23:00:21 2007
New Revision: 603490

URL: http://svn.apache.org/viewvc?rev=603490&view=rev
Log:
Fixed idea project file.

Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/maven-dotnet.iml

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/maven-dotnet.iml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/maven-dotnet.iml?rev=603490&r1=603489&r2=603490&view=diff
==
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/maven-dotnet.iml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/maven-dotnet.iml Tue Dec 11 
23:00:21 2007
@@ -15,6 +15,8 @@
   
   
   
+  
+  
   
   
   
@@ -26,6 +28,7 @@
   
   
   
+  
   
   
   
@@ -68,6 +71,7 @@
   
   
   
+