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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin.ResX</groupId>
- <artifactId>RexPlugin</artifactId>
+ <groupId>NMaven.Plugin</groupId>
+ <artifactId>NMaven.Plugin.Resx</artifactId>
<packaging>exe</packaging>
<version>0.14</version>
<name>NMaven.Plugin.ResX</name>
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin.Settings</groupId>
- <artifactId>SettingsPlugin</artifactId>
+ <groupId>NMaven.Plugin</groupId>
+ <artifactId>NMaven.Plugin.Settings</artifactId>
<packaging>exe</packaging>
<version>0.14</version>
<name>NMaven.Plugin.Settings</name>
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin.Solution</groupId>
- <artifactId>SolutionPlugin</artifactId>
+ <groupId>NMaven.Plugin</groupId>
+ <artifactId>NMaven.Plugin.Solution</artifactId>
<packaging>exe</packaging>
<version>0.14</version>
<name>NMaven.Plugin.Solution</name>
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 @@
+<project xmlns="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";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-dotnet-plugins</artifactId>
+ <packaging>pom</packaging>
+ <version>0.14-SNAPSHOT</version>
+ <name>maven-dotnet-plugins</name>
+ <modules>
+ <module>NMaven.Plugin.Resx</module>
+ <module>NMaven.Plugin.Settings</module>
+ </modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-assembler</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-executable</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-artifact</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=512063&r1=512062&r2=512063
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/pom.xml Mon Feb 26 15:03:55 2007
@@ -121,6 +121,7 @@
<module>NMaven.Model/Pom</module>
<module>NMaven.Plugin.Resx</module>
<module>NMaven.Plugin.Settings</module>
+ <module>NMaven.Plugin.Solution</module>
</modules>
<build>
<sourceDirectory>src/main/csharp</sourceDirectory>
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=512063&r1=512062&r2=512063
==============================================================================
--- incubator/nmaven/branches/SI_IDE/bootstrap-build.bat (original)
+++ incubator/nmaven/branches/SI_IDE/bootstrap-build.bat Mon Feb 26 15:03:55
2007
@@ -1,4 +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
+call mvn -f ./assemblies/pom-net-bootstrap.xml -Dmaven.test.skip=true
-Dbootstrap install
\ No newline at end of file
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml?view=diff&rev=512063&r1=512062&r2=512063
==============================================================================
---
incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
(original)
+++
incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
Mon Feb 26 15:03:55 2007
@@ -1,13 +1,13 @@
<netDependencies>
<netDependency>
- <groupId>NMaven.Utility.ResX</groupId>
- <artifactId>resx</artifactId>
+ <groupId>NMaven.Plugin</groupId>
+ <artifactId>NMaven.Plugin.Resx</artifactId>
<versionId>0.14</versionId>
<type>exe</type>
</netDependency>
<netDependency>
- <groupId>NMaven.Utility.Settings</groupId>
- <artifactId>SettingsGenerator</artifactId>
+ <groupId>NMaven.Plugin</groupId>
+ <artifactId>NMaven.Plugin.Settings</artifactId>
<versionId>0.14</versionId>
<type>exe</type>
</netDependency>
Modified: incubator/nmaven/branches/SI_IDE/maven-dotnet.iml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/maven-dotnet.iml?view=diff&rev=512063&r1=512062&r2=512063
==============================================================================
--- incubator/nmaven/branches/SI_IDE/maven-dotnet.iml (original)
+++ incubator/nmaven/branches/SI_IDE/maven-dotnet.iml Mon Feb 26 15:03:55 2007
@@ -24,6 +24,7 @@
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-resolver-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-settings-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-test-plugin/src/main/java"
isTestSource="false" />
+ <sourceFolder
url="file://$MODULE_DIR$/plugins/maven-vstudio-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-webapp-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-wsdl-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-xsd-plugin/src/main/java"
isTestSource="false" />
Modified: incubator/nmaven/branches/SI_IDE/maven-dotnet.ipr
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/maven-dotnet.ipr?view=diff&rev=512063&r1=512062&r2=512063
==============================================================================
--- incubator/nmaven/branches/SI_IDE/maven-dotnet.ipr (original)
+++ incubator/nmaven/branches/SI_IDE/maven-dotnet.ipr Mon Feb 26 15:03:55 2007
@@ -147,6 +147,35 @@
<option name="IS_EMACS_ERRORS_MODE" value="true" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
+ <component name="Maven Reloaded">
+ <option name="config">
+ <value>
+ <option name="pluginEnabled" value="false" />
+ <option name="updateClasspathsEnabled" value="true" />
+ <option name="sortDependenciesEnabled" value="false" />
+ <option name="removeDuplicateDependenciesEnabled" value="false" />
+ <option name="respondToPomChangesEnabled" value="true" />
+ <option name="manageSourceRootsEnabled" value="true" />
+ <option name="manageModuleInterdependenciesEnabled" value="true" />
+ <option name="downloadSourcesEnabled" value="false" />
+ <option name="downloadJavadocEnabled" value="false" />
+ <option name="generateSourcesEnabled" value="false" />
+ <option name="settingsPath" value="C:\Documents and
Settings\shane/.m2/settings.xml" />
+ <option name="searchFilter" value="" />
+ <option name="disabledPoms">
+ <value>
+ <collection type="java.util.TreeSet" />
+ </value>
+ </option>
+ <option name="moduleInterDependencies">
+ <value>
+ <map type="java.util.TreeMap" />
+ </value>
+ </option>
+ <option name="logLevel" value="1" />
+ </value>
+ </option>
+ </component>
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal
Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false">
Modified:
incubator/nmaven/branches/SI_IDE/plugins/imports/nunit-2.0/nunit.framework.dll
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/imports/nunit-2.0/nunit.framework.dll?view=diff&rev=512063&r1=512062&r2=512063
==============================================================================
Binary files - no diff available.
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java?view=diff&rev=512063&r1=512062&r2=512063
==============================================================================
---
incubator/nmaven/branches/SI_IDE/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
Mon Feb 26 15:03:55 2007
@@ -122,7 +122,7 @@
if(vendor != null)
vendorInfo.setVendor(VendorFactory.createVendorFromName(vendor));
vendorInfo.setFrameworkVersion(frameworkVersion);
vendorInfo.setVendorVersion(vendorVersion);
-
netExecutableFactory.getNetExecutableFromRepository("NMaven.Utility.ResX",
"resx",
+
netExecutableFactory.getNetExecutableFromRepository("NMaven.Plugin",
"NMaven.Plugin.Resx",
vendorInfo, project, localRepository, commands).execute();
} catch (PlatformUnsupportedException e) {
throw new MojoExecutionException("", e);
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java?view=diff&rev=512063&r1=512062&r2=512063
==============================================================================
---
incubator/nmaven/branches/SI_IDE/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java
(original)
+++
incubator/nmaven/branches/SI_IDE/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java
Mon Feb 26 15:03:55 2007
@@ -108,7 +108,7 @@
if(vendor != null)
vendorInfo.setVendor(VendorFactory.createVendorFromName(vendor));
vendorInfo.setFrameworkVersion(frameworkVersion);
vendorInfo.setVendorVersion(vendorVersion);
-
netExecutableFactory.getNetExecutableFromRepository("NMaven.Utility.Settings",
"SettingsGenerator",
+
netExecutableFactory.getNetExecutableFromRepository("NMaven.Plugin",
"NMaven.Plugin.Settings",
vendorInfo, project, localRepository, commands).execute();
} catch (PlatformUnsupportedException e) {
throw new MojoExecutionException("", e);
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=512063&r1=512062&r2=512063
==============================================================================
--- incubator/nmaven/branches/SI_IDE/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/plugins/pom.xml Mon Feb 26 15:03:55 2007
@@ -19,8 +19,6 @@
<module>maven-resolver-plugin</module>
<module>maven-settings-plugin</module>
<module>maven-vstudio-plugin</module>
- <module>nmaven-utility-resx</module>
- <module>nmaven-utility-settings</module>
</modules>
<dependencies>
Modified: incubator/nmaven/branches/SI_IDE/plugins/scripts/build-2.0.bat
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/scripts/build-2.0.bat?view=diff&rev=512063&r1=512062&r2=512063
==============================================================================
--- incubator/nmaven/branches/SI_IDE/plugins/scripts/build-2.0.bat (original)
+++ incubator/nmaven/branches/SI_IDE/plugins/scripts/build-2.0.bat Mon Feb 26
15:03:55 2007
@@ -1,3 +1,3 @@
call mvn -f ../pom-java-bootstrap.xml install
call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file
-Dfile=../imports/nunit-2.0/nunit.framework.dll -DgroupId=org.nunit
-DartifactId=nunit.framework -Dpackaging=dll -Dversion=2.2.8.0
-call mvn -f ../pom-net-bootstrap.xml -Dmaven.test.skip=true -Dbootstrap install
\ No newline at end of file
+call mvn -f ../../assemblies/pom-net-bootstrap.xml -Dmaven.test.skip=true
-Dbootstrap install
\ No newline at end of file
