You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/03/20 17:50:57 UTC
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/Settings/
components/dotnet-artifact/src/main/java/org...
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
- <groupId>NMaven.A</groupId>
+ <groupId>NMaven</groupId>
<version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<xs:schema id="NewDataSet" xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+<xs:schema id="NewDataSet" xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xs:element name="nmavenSettings">
<xs:complexType>
<xs:sequence>
@@ -9,8 +10,8 @@
<xs:complexType>
<xs:sequence>
<xs:element name="vendorName" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="vendorVersion" type="xs:string" minOccurs="0" maxOccurs="1" />
- <xs:element name="frameworkVersion" type="xs:string" minOccurs="0" maxOccurs="1" />
+ <xs:element name="vendorVersion" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="frameworkVersion" type="xs:string" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -31,6 +32,13 @@
<xs:sequence>
<xs:element name="frameworkVersion" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="installRoot" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="executablePaths" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="executablePath" type = "xs:string" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -49,7 +57,7 @@
<xs:element name="NewDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="nmavenSettings" />
+ <xs:element ref="nmavenSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
- <groupId>NMaven.A</groupId>
+ <groupId>NMaven</groupId>
<version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
@@ -33,6 +33,21 @@
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <frameworkVersion>1.1.4322</frameworkVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-xsd-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>xsd</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <xsdFile>${basedir}/nmaven-settings.xsd</xsdFile>
<frameworkVersion>1.1.4322</frameworkVersion>
</configuration>
</plugin>
Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/nmavenSettings.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/nmavenSettings.cs?view=diff&rev=520497&r1=520496&r2=520497
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/nmavenSettings.cs (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/nmavenSettings.cs Tue Mar 20 10:50:56 2007
@@ -1,95 +1,261 @@
-//------------------------------------------------------------------------------
-// <autogenerated>
+//------------------------------------------------------------------------------
+// <auto-generated>
// This code was generated by a tool.
-// Runtime Version: 1.1.4322.573
+// Runtime Version:2.0.50727.42
//
-// Changes to this file may cause incorrect behavior and will be lost if
+// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
-// </autogenerated>
+// </auto-generated>
//------------------------------------------------------------------------------
+using System.Xml.Serialization;
+
//
-// This source code was auto-generated by xsd, Version=1.1.4322.573.
+// This source code was auto-generated by xsd, Version=2.0.50727.42.
//
-using System.Xml.Serialization;
/// <remarks/>
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+[System.SerializableAttribute()]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
-public class nmavenSettings {
+public partial class nmavenSettings {
+
+ private string operatingSystemField;
+
+ private string architectureField;
+
+ private nmavenSettingsDefaultSetup defaultSetupField;
+
+ private nmavenSettingsVendor[] vendorsField;
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public string operatingSystem;
+ public string operatingSystem {
+ get {
+ return this.operatingSystemField;
+ }
+ set {
+ this.operatingSystemField = value;
+ }
+ }
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public string architecture;
+ public string architecture {
+ get {
+ return this.architectureField;
+ }
+ set {
+ this.architectureField = value;
+ }
+ }
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public nmavenSettingsDefaultSetup defaultSetup;
+ public nmavenSettingsDefaultSetup defaultSetup {
+ get {
+ return this.defaultSetupField;
+ }
+ set {
+ this.defaultSetupField = value;
+ }
+ }
/// <remarks/>
[System.Xml.Serialization.XmlArrayAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
[System.Xml.Serialization.XmlArrayItemAttribute("vendor", Form=System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable=false)]
- public nmavenSettingsVendor[] vendors;
+ public nmavenSettingsVendor[] vendors {
+ get {
+ return this.vendorsField;
+ }
+ set {
+ this.vendorsField = value;
+ }
+ }
}
/// <remarks/>
-public class nmavenSettingsDefaultSetup {
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+[System.SerializableAttribute()]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+public partial class nmavenSettingsDefaultSetup {
+
+ private string vendorNameField;
+
+ private string vendorVersionField;
+
+ private string frameworkVersionField;
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public string vendorName;
+ public string vendorName {
+ get {
+ return this.vendorNameField;
+ }
+ set {
+ this.vendorNameField = value;
+ }
+ }
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public string vendorVersion;
+ public string vendorVersion {
+ get {
+ return this.vendorVersionField;
+ }
+ set {
+ this.vendorVersionField = value;
+ }
+ }
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public string frameworkVersion;
+ public string frameworkVersion {
+ get {
+ return this.frameworkVersionField;
+ }
+ set {
+ this.frameworkVersionField = value;
+ }
+ }
}
/// <remarks/>
-public class nmavenSettingsVendorFramework {
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+[System.SerializableAttribute()]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+public partial class nmavenSettingsVendor {
+
+ private string vendorNameField;
+
+ private string vendorVersionField;
+
+ private string isDefaultField;
+
+ private nmavenSettingsVendorFramework[] frameworksField;
+
+ /// <remarks/>
+ [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
+ public string vendorName {
+ get {
+ return this.vendorNameField;
+ }
+ set {
+ this.vendorNameField = value;
+ }
+ }
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public string frameworkVersion;
+ public string vendorVersion {
+ get {
+ return this.vendorVersionField;
+ }
+ set {
+ this.vendorVersionField = value;
+ }
+ }
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public string installRoot;
+ public string isDefault {
+ get {
+ return this.isDefaultField;
+ }
+ set {
+ this.isDefaultField = value;
+ }
+ }
+
+ /// <remarks/>
+ [System.Xml.Serialization.XmlArrayAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
+ [System.Xml.Serialization.XmlArrayItemAttribute("framework", Form=System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable=false)]
+ public nmavenSettingsVendorFramework[] frameworks {
+ get {
+ return this.frameworksField;
+ }
+ set {
+ this.frameworksField = value;
+ }
+ }
}
/// <remarks/>
-public class nmavenSettingsVendor {
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+[System.SerializableAttribute()]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+public partial class nmavenSettingsVendorFramework {
- /// <remarks/>
- [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public string vendorName;
+ private string frameworkVersionField;
+
+ private string installRootField;
+
+ private string[] executablePathsField;
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public string vendorVersion;
+ public string frameworkVersion {
+ get {
+ return this.frameworkVersionField;
+ }
+ set {
+ this.frameworkVersionField = value;
+ }
+ }
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- public string isDefault;
+ public string installRoot {
+ get {
+ return this.installRootField;
+ }
+ set {
+ this.installRootField = value;
+ }
+ }
/// <remarks/>
[System.Xml.Serialization.XmlArrayAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
- [System.Xml.Serialization.XmlArrayItemAttribute("framework", Form=System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable=false)]
- public nmavenSettingsVendorFramework[] frameworks;
+ [System.Xml.Serialization.XmlArrayItemAttribute("executablePath", Form=System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable=false)]
+ public string[] executablePaths {
+ get {
+ return this.executablePathsField;
+ }
+ set {
+ this.executablePathsField = value;
+ }
+ }
}
/// <remarks/>
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+[System.SerializableAttribute()]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
-public class NewDataSet {
+public partial class NewDataSet {
+
+ private nmavenSettings[] itemsField;
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute("nmavenSettings")]
- public nmavenSettings[] Items;
+ public nmavenSettings[] Items {
+ get {
+ return this.itemsField;
+ }
+ set {
+ this.itemsField = value;
+ }
+ }
}
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=520497&r1=520496&r2=520497
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/pom.xml Tue Mar 20 10:50:56 2007
@@ -1,7 +1,7 @@
<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>NMaven.A</groupId>
+ <groupId>NMaven</groupId>
<artifactId>NMaven.Assemblies</artifactId>
<packaging>pom</packaging>
<version>0.14</version>
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=520497&r1=520496&r2=520497
==============================================================================
--- 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 Mar 20 10:50:56 2007
@@ -83,7 +83,14 @@
void installFileWithNoPom( String groupId, String artifactId, String version, File installFile )
throws ArtifactInstallationException;
- void installArtifactDependencies( Artifact artifact, List<Dependency> dependencies )
+ /**
+ * Installs the dependent libraries (or assemblies) of the specified artifact.
+ *
+ * @param artifact the artifact associated with the specified dependencies
+ * @param dependencies a list of dependencies of the specified artifact
+ * @throws ArtifactInstallationException if there is a problem installing the artifact
+ */
+ void installLibraryDependencies( Artifact artifact, List<Dependency> dependencies )
throws ArtifactInstallationException;
/**
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=520497&r1=520496&r2=520497
==============================================================================
--- 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 Tue Mar 20 10:50:56 2007
@@ -85,6 +85,7 @@
*/
public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository )
{
+
StringBuffer path = new StringBuffer();
for ( String groupId : metadata.getGroupId().split( "[.]" ) )
{
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=520497&r1=520496&r2=520497
==============================================================================
--- 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 Mar 20 10:50:56 2007
@@ -268,7 +268,7 @@
}
}
- public void installArtifactDependencies( Artifact projectArtifact, List<Dependency> dependencies )
+ public void installLibraryDependencies( Artifact projectArtifact, List<Dependency> dependencies )
throws ArtifactInstallationException
{
StringBuffer path = new StringBuffer();
@@ -283,6 +283,10 @@
for ( Dependency dependency : dependencies )
{
+ if(!dependency.getType().equals( "library"))
+ {
+ continue;
+ }
StringBuffer depPath = new StringBuffer();
depPath.append( localRepository.getAbsolutePath() ).append( File.separator );
for ( String id : dependency.getGroupId().split( "[.]" ) )
@@ -299,7 +303,7 @@
try
{
logger.info( "NMAVEN-002-016: Installing File: From = " + file.getAbsolutePath() + ", To = " +
- depPath.toString() + File.separator + dependency.getArtifactId() + "." + extension );
+ path.toString() + dependency.getArtifactId() + "." + extension );
FileUtils.copyFileToDirectory( file, new File( path.toString() ) );
}
catch ( IOException e )
@@ -308,6 +312,7 @@
"NMAVEN-002-017: Failed to install file into repo: File Name = " + file.getAbsolutePath() +
", Extension = " + extension + ", Type = " + dependency.getType(), e );
}
+
}
}
Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactMetadataImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactMetadataImpl.java?view=diff&rev=520497&r1=520496&r2=520497
==============================================================================
--- incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactMetadataImpl.java (original)
+++ incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactMetadataImpl.java Tue Mar 20 10:50:56 2007
@@ -64,7 +64,8 @@
*/
public String getRemoteFilename()
{
- return getArtifactId() + ".pom";
+ return super.getRemoteFilename();
+ //return getArtifactId() + ".pom";
}
/**
@@ -77,7 +78,8 @@
*/
public String getLocalFilename( ArtifactRepository repository )
{
- return getArtifactId() + ".pom";
+ return super.getLocalFilename(repository);
+ // return getArtifactId() + ".pom";
}
Modified: incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0007/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0007/pom.xml?view=diff&rev=520497&r1=520496&r2=520497
==============================================================================
--- incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0007/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0007/pom.xml Tue Mar 20 10:50:56 2007
@@ -27,7 +27,7 @@
</executions>
<configuration>
<xmlFiles>
- <xmlFile>registry-config.xml</xmlFile>
+ <xmlFile>${basedir}/registry-config.xml</xmlFile>
</xmlFiles>
<xsdFile>${project.build.directory}/generated-resources/registry-config.xsd</xsdFile>
</configuration>
Modified: incubator/nmaven/branches/SI_IDE/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java?view=diff&rev=520497&r1=520496&r2=520497
==============================================================================
--- incubator/nmaven/branches/SI_IDE/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java (original)
+++ incubator/nmaven/branches/SI_IDE/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java Tue Mar 20 10:50:56 2007
@@ -89,7 +89,7 @@
List<Dependency> dependencies = project.getDependencies();
try
{
- artifactContext.getArtifactInstaller().installArtifactDependencies( artifact, dependencies );
+ artifactContext.getArtifactInstaller().installLibraryDependencies( artifact, dependencies );
}
catch ( ArtifactInstallationException e )
{
Modified: incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/pom.xml?view=diff&rev=520497&r1=520496&r2=520497
==============================================================================
--- incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/plugins/maven-xsd-plugin/pom.xml Tue Mar 20 10:50:56 2007
@@ -14,15 +14,6 @@
<description>
Maven Plugin for .NET
</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.0-beta-1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<distributionManagement>
<site>
<id>nmaven-apache-site</id>