svn commit: r579711 - in /incubator/nmaven/trunk/plugins: maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/ maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/pl
Author: sisbell
Date: Wed Sep 26 09:48:16 2007
New Revision: 579711
URL: http://svn.apache.org/viewvc?rev=579711&view=rev
Log:
Fixed incorrect mojo parameters that cause the vsinstaller and embedder to fail.
Modified:
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
Modified:
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java?rev=579711&r1=579710&r2=579711&view=diff
==
---
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
Wed Sep 26 09:48:16 2007
@@ -133,7 +133,7 @@
private String frameworkVersion;
/**
- * @parameter expression = "${pom.version}"
+ * @parameter expression = "${project.version}"
*/
private String pomVersion;
Modified:
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java?rev=579711&r1=579710&r2=579711&view=diff
==
---
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
Wed Sep 26 09:48:16 2007
@@ -76,7 +76,7 @@
private Settings settings;
/**
- * @parameter expression = "${pom.version}"
+ * @parameter expression = "${project.version}"
*/
private String pomVersion;
svn commit: r579756 - /incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Author: sisbell
Date: Wed Sep 26 11:52:26 2007
New Revision: 579756
URL: http://svn.apache.org/viewvc?rev=579756&view=rev
Log:
Fixed problem that caused certain assemblies not to install into the pab.
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?rev=579756&r1=579755&r2=579756&view=diff
==
---
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Wed Sep 26 11:52:26 2007
@@ -266,11 +266,15 @@
dependency.getType(),
dependency.getClassifier(), scope,
null );
-
File artifactDependencyFile =
PathUtil.getUserAssemblyCacheFileFor( artifactDependency, localRepository );
-
- //Removing the following check because it breaks compatibility
with Mono. We would have to initialize
- // the Executable Context (perf hit) to get this check for
vendor. Fix This.
+// if(artifactDependencyFile != null) System.out.println("AD = " +
artifactDependencyFile.getAbsolutePath());
+//Removing the following check because it breaks compatibility
with Mono. We would have to initialize
+// the Executable Context (perf hit) to get this check for vendor.
Fix This.
+if ( ( artifactDependencyFile == null ||
!artifactDependencyFile.exists() ) &&
+artifactDependency.getType().startsWith( "gac" ) )
+{
+continue;
+}
/*
if ( artifactDependencyFile == null ||
!artifactDependencyFile.exists() )
{
@@ -285,13 +289,13 @@
( artifactDependencyFile != null &&
!artifactDependencyFile.exists() )
? artifactDependencyFile.getAbsolutePath() : null ) );
}
-*/
+*/
if ( artifactDependencyFile == null ||
!artifactDependencyFile.exists() )
{
-logger.info("NMAVEN-000-017: Could not find artifact to
install: Artifact ID = "
-+ artifact.getArtifactId() +", File Path = "
-+ ((artifactDependencyFile != null) ?
artifactDependencyFile.getAbsolutePath() : null));
+logger.warn( "NMAVEN-000-017: Could not find artifact to
install: Artifact ID = " +
+artifact.getArtifactId() + ", File Path = " +
+( ( artifactDependencyFile != null ) ?
artifactDependencyFile.getAbsolutePath() : null ) );
return;
}
svn commit: r579771 - /incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
Author: sisbell
Date: Wed Sep 26 12:26:32 2007
New Revision: 579771
URL: http://svn.apache.org/viewvc?rev=579771&view=rev
Log:
Fixed addin template. Introduced wrong path format when removing version
dependency.
Modified:
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
Modified:
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn?rev=579771&r1=579770&r2=579771&view=diff
==
---
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
(original)
+++
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
Wed Sep 26 12:26:32 2007
@@ -5,7 +5,7 @@
8.0
-
${localRepository}\gac_msil\NMaven.VisualStudio.Addin\${pom.version}_NMaven.VisualStudio\NMaven.VisualStudio.Addin.dll
+
${localRepository}\gac_msil\NMaven.VisualStudio.Addin\${pom.version}__NMaven.VisualStudio\NMaven.VisualStudio.Addin.dll
NMaven.VisualStudio.Addin.Connect
NMaven.VisualStudio.Addin
NMaven provides Maven 2.x plugins to support building of .NET
applications
svn commit: r579839 - in /incubator/nmaven/trunk: ./ assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/
Author: sisbell
Date: Wed Sep 26 15:30:53 2007
New Revision: 579839
URL: http://svn.apache.org/viewvc?rev=579839&view=rev
Log:
The resource image for the add artifacts folder was corrupted and caused adding
of artifacts through IDE to fail. Deleted the resource.
Modified:
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.Designer.cs
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.resx
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs
incubator/nmaven/trunk/maven-dotnet.iml
Modified:
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.Designer.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.Designer.cs?rev=579839&r1=579838&r2=579839&view=diff
==
---
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.Designer.cs
(original)
+++
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.Designer.cs
Wed Sep 26 15:30:53 2007
@@ -1,5 +1,7 @@
namespace NMaven.VisualStudio.Addin
{
+using System.Windows.Forms;
+
partial class AddArtifactsForm
{
///
@@ -28,11 +30,8 @@
///
private void InitializeComponent()
{
-this.components = new System.ComponentModel.Container();
-System.ComponentModel.ComponentResourceManager resources = new
System.ComponentModel.ComponentResourceManager(typeof(AddArtifactsForm));
this.addArtifact = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
-this.imageList1 = new
System.Windows.Forms.ImageList(this.components);
this.remoteTabPage = new System.Windows.Forms.TabPage();
this.treeView1 = new System.Windows.Forms.TreeView();
this.localTabPage = new System.Windows.Forms.TabPage();
@@ -65,13 +64,6 @@
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
-// imageList1
-//
-this.imageList1.ImageStream =
((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
-this.imageList1.TransparentColor =
System.Drawing.Color.Transparent;
-this.imageList1.Images.SetKeyName(0, "");
-this.imageList1.Images.SetKeyName(1, "unknown.gif");
-//
// remoteTabPage
//
this.remoteTabPage.Controls.Add(this.treeView1);
@@ -100,7 +92,6 @@
this.localTabPage.TabIndex = 0;
this.localTabPage.Text = "Local";
this.localTabPage.UseVisualStyleBackColor = true;
-
//
// localListView
//
@@ -114,7 +105,6 @@
this.localListView.Sorting =
System.Windows.Forms.SortOrder.Ascending;
this.localListView.TabIndex = 0;
this.localListView.UseCompatibleStateImageBehavior = false;
-
//
// ArtifactNameHeader
//
@@ -157,7 +147,6 @@
private System.Windows.Forms.Button addArtifact;
private System.Windows.Forms.Button button2;
-private System.Windows.Forms.ImageList imageList1;
private System.Windows.Forms.TabPage remoteTabPage;
private System.Windows.Forms.TreeView treeView1;
private System.Windows.Forms.TabPage localTabPage;
Modified:
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs?rev=579839&r1=579838&r2=579839&view=diff
==
---
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs
(original)
+++
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs
Wed Sep 26 15:30:53 2007
@@ -245,7 +245,7 @@
(@"]*href\s*=\s*[\""\']?(?[^""'>\s]*)[\""\']?[^>]*>(?[^<]+|.*?)?");
MatchCollection matches =
Regex.Matches(Encoding.ASCII.GetString(page), pattern, RegexOptions.IgnoreCase);
-treeView1.ImageL
svn commit: r579846 - in /incubator/nmaven/trunk: misc/dotnet-repository-builder/pom-dotnet.xml misc/dotnet-repository-builder/pom.xml pom.xml
Author: sisbell Date: Wed Sep 26 15:44:27 2007 New Revision: 579846 URL: http://svn.apache.org/viewvc?rev=579846&view=rev Log: Adding extensions for webdav. Modified: incubator/nmaven/trunk/misc/dotnet-repository-builder/pom-dotnet.xml incubator/nmaven/trunk/misc/dotnet-repository-builder/pom.xml incubator/nmaven/trunk/pom.xml Modified: incubator/nmaven/trunk/misc/dotnet-repository-builder/pom-dotnet.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/misc/dotnet-repository-builder/pom-dotnet.xml?rev=579846&r1=579845&r2=579846&view=diff == --- incubator/nmaven/trunk/misc/dotnet-repository-builder/pom-dotnet.xml (original) +++ incubator/nmaven/trunk/misc/dotnet-repository-builder/pom-dotnet.xml Wed Sep 26 15:44:27 2007 @@ -98,6 +98,18 @@ + + +org.apache.maven.wagon +wagon-ssh-external +1.0-beta-2 + + +org.apache.maven.wagon +wagon-webdav +1.0-beta-2 + + org.apache.maven.dotnet.plugins Modified: incubator/nmaven/trunk/misc/dotnet-repository-builder/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/misc/dotnet-repository-builder/pom.xml?rev=579846&r1=579845&r2=579846&view=diff == --- incubator/nmaven/trunk/misc/dotnet-repository-builder/pom.xml (original) +++ incubator/nmaven/trunk/misc/dotnet-repository-builder/pom.xml Wed Sep 26 15:44:27 2007 @@ -265,7 +265,19 @@ 1.1 - + + + +org.apache.maven.wagon +wagon-ssh-external +1.0-beta-2 + + +org.apache.maven.wagon +wagon-webdav +1.0-beta-2 + + maven-assembly-plugin Modified: incubator/nmaven/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom.xml?rev=579846&r1=579845&r2=579846&view=diff == --- incubator/nmaven/trunk/pom.xml (original) +++ incubator/nmaven/trunk/pom.xml Wed Sep 26 15:44:27 2007 @@ -161,7 +161,12 @@ org.apache.maven.wagon wagon-ssh-external 1.0-beta-2 - + + +org.apache.maven.wagon +wagon-webdav +1.0-beta-2 +
svn commit: r579869 - in /incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact: NetDependenciesRepository.java impl/NetDependenciesRepositoryImpl.java
Author: sisbell
Date: Wed Sep 26 19:19:26 2007
New Revision: 579869
URL: http://svn.apache.org/viewvc?rev=579869&view=rev
Log:
Public method for getting the config props of the NetDependency. This can be
used by plugins to get the version of NMaven that they need to run under.
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependenciesRepository.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependenciesRepository.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependenciesRepository.java?rev=579869&r1=579868&r2=579869&view=diff
==
---
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependenciesRepository.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependenciesRepository.java
Wed Sep 26 19:19:26 2007
@@ -65,4 +65,6 @@
* specified match policies
*/
List getDependenciesFor( List
matchPolicies );
+
+String getProperty(String key);
}
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java?rev=579869&r1=579868&r2=579869&view=diff
==
---
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
Wed Sep 26 19:19:26 2007
@@ -59,6 +59,9 @@
*/
private ArtifactFactory artifactFactory;
+private Hashtable properties;
+
+
/**
* Constructor. This method is intended to be invoked by the
RepositoryRegistry, not by the
* application developer.
@@ -73,6 +76,7 @@
public void load( InputStream inputStream, Hashtable properties )
throws IOException
{
+this.properties = properties;
NetDependencyXpp3Reader xpp3Reader = new NetDependencyXpp3Reader();
Reader reader = new InputStreamReader( inputStream );
NetDependencyModel model;
@@ -136,6 +140,11 @@
}
}
return dependencies;
+}
+
+public String getProperty( String key )
+{
+return (String) properties.get( key );
}
/**
svn commit: r579870 - in /incubator/nmaven/trunk/components: dotnet-dao/project/pom.xml pom.xml
Author: sisbell
Date: Wed Sep 26 19:20:04 2007
New Revision: 579870
URL: http://svn.apache.org/viewvc?rev=579870&view=rev
Log:
Reformatting.
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml
incubator/nmaven/trunk/components/pom.xml
Modified: incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml?rev=579870&r1=579869&r2=579870&view=diff
==
--- incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml Wed Sep 26
19:20:04 2007
@@ -70,12 +70,12 @@
org.openrdf
openrdf-rio-rdfxml
2.0-beta5
-
-
- info.aduna
- aduna-iteration
- 1.2
-
+
+
+ info.aduna
+ aduna-iteration
+ 1.2
+
org.slf4j
slf4j-jdk14
Modified: incubator/nmaven/trunk/components/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/pom.xml?rev=579870&r1=579869&r2=579870&view=diff
==
--- incubator/nmaven/trunk/components/pom.xml (original)
+++ incubator/nmaven/trunk/components/pom.xml Wed Sep 26 19:20:04 2007
@@ -18,55 +18,54 @@
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-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-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
+
+
svn commit: r579872 - in /incubator/nmaven/trunk/plugins: maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/ maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/te
Author: sisbell
Date: Wed Sep 26 19:21:20 2007
New Revision: 579872
URL: http://svn.apache.org/viewvc?rev=579872&view=rev
Log:
Plugins now correctly read the version of NMaven to run under.
Modified:
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
incubator/nmaven/trunk/plugins/netplugins/pom.xml
Modified:
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java?rev=579872&r1=579871&r2=579872&view=diff
==
---
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
Wed Sep 26 19:21:20 2007
@@ -35,10 +35,12 @@
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.dotnet.artifact.AssemblyResolver;
import org.apache.maven.dotnet.artifact.ArtifactContext;
+import org.apache.maven.dotnet.artifact.NetDependenciesRepository;
import org.apache.maven.dotnet.vendor.VendorInfo;
import org.apache.maven.dotnet.vendor.VendorFactory;
import org.apache.maven.dotnet.vendor.VendorUnsupportedException;
import org.apache.maven.dotnet.PlatformUnsupportedException;
+import org.apache.maven.dotnet.registry.RepositoryRegistry;
import java.util.List;
import java.util.ArrayList;
@@ -133,9 +135,11 @@
private String frameworkVersion;
/**
- * @parameter expression = "${project.version}"
+ * Provides access to configuration information used by NMaven.
+ *
+ * @component
*/
-private String pomVersion;
+private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
/**
* File logger: needed for creating logs when the IDE starts because the
console output and thrown exceptions are
@@ -309,8 +313,23 @@
}
}
-private String artifactsToClassPath( Set artifacts )
+private String artifactsToClassPath( Set artifacts ) throws
MojoExecutionException
{
+RepositoryRegistry repositoryRegistry;
+try
+{
+repositoryRegistry = nmavenRegistry.createRepositoryRegistry();
+}
+catch ( IOException e )
+{
+throw new MojoExecutionException(
+"NMAVEN-1400-002: Failed to create the repository registry for
this plugin", e );
+}
+
+NetDependenciesRepository repository =
+(NetDependenciesRepository) repositoryRegistry.find(
"net-dependencies" );
+String pomVersion = repository.getProperty( "nmaven.version");
+
StringBuffer sb = new StringBuffer();
for ( Artifact artifact : artifacts )
{
Modified:
incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java?rev=579872&r1=579871&r2=579872&view=diff
==
---
incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
Wed Sep 26 19:21:20 2007
@@ -138,7 +138,7 @@
public void execute()
throws MojoExecutionException
-{
+{
String skipTests = System.getProperty( "maven.test.skip" );
if ( ( skipTests != null && skipTests.equalsIgnoreCase( "true" ) ) ||
skipTest )
{
Modified:
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java?rev=579872&r1=579871&r2=579872&view=diff
==
---
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apa
svn commit: r579873 - in /incubator/nmaven/trunk/assemblies: NMaven.Model/Pom/pom.xml pom.xml
Author: sisbell Date: Wed Sep 26 19:25:53 2007 New Revision: 579873 URL: http://svn.apache.org/viewvc?rev=579873&view=rev Log: Formatting. Modified: incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml incubator/nmaven/trunk/assemblies/pom.xml Modified: incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml?rev=579873&r1=579872&r2=579873&view=diff == --- incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml (original) +++ incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml Wed Sep 26 19:25:53 2007 @@ -64,5 +64,5 @@ - + Modified: incubator/nmaven/trunk/assemblies/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/pom.xml?rev=579873&r1=579872&r2=579873&view=diff == --- incubator/nmaven/trunk/assemblies/pom.xml (original) +++ incubator/nmaven/trunk/assemblies/pom.xml Wed Sep 26 19:25:53 2007 @@ -52,8 +52,8 @@ VisualStudio2005 - -NMaven.Solution + +NMaven.Solution NMaven.VisualStudio NMaven.VisualStudio.Addin NMaven.IDE
svn commit: r579874 - in /incubator/nmaven/trunk: README.txt modify-versions.bat pom-dotnet.xml pom-modify-versions.xml pom.xml
Author: sisbell
Date: Wed Sep 26 19:26:23 2007
New Revision: 579874
URL: http://svn.apache.org/viewvc?rev=579874&view=rev
Log:
Updated readme.
Modified:
incubator/nmaven/trunk/README.txt
incubator/nmaven/trunk/modify-versions.bat
incubator/nmaven/trunk/pom-dotnet.xml
incubator/nmaven/trunk/pom-modify-versions.xml
incubator/nmaven/trunk/pom.xml
Modified: incubator/nmaven/trunk/README.txt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/README.txt?rev=579874&r1=579873&r2=579874&view=diff
==
--- incubator/nmaven/trunk/README.txt (original)
+++ incubator/nmaven/trunk/README.txt Wed Sep 26 19:26:23 2007
@@ -58,6 +58,8 @@
Building Against NonPublic Repo (For release versions)
Deploy local versioned snapshot of maven 2.1 to internal repo
Deploy openrdf artifacts to internal repo
+ Deploy Castle artifacts to internal repo
Modify version to internal release version (as shown above)
+ Manually change the mavenVersion property in the pom.xml to a release version
Type: bootstrap-build.bat -DrdfProfile.none -DVisualStudio2005
-DmavenVersion=<>
Modified: incubator/nmaven/trunk/modify-versions.bat
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/modify-versions.bat?rev=579874&r1=579873&r2=579874&view=diff
==
--- incubator/nmaven/trunk/modify-versions.bat (original)
+++ incubator/nmaven/trunk/modify-versions.bat Wed Sep 26 19:26:23 2007
@@ -1,4 +1,4 @@
cd imports/maven-pom-plugin
call mvn install
cd ../..
-call mvn install -f pom-modify-versions.xml -DnmavenVersion=%*
\ No newline at end of file
+call mvn install -f pom-modify-versions.xml -Dmodify-version
-DnmavenVersion=%1 -DmavenVersion=%2
\ No newline at end of file
Modified: incubator/nmaven/trunk/pom-dotnet.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom-dotnet.xml?rev=579874&r1=579873&r2=579874&view=diff
==
--- incubator/nmaven/trunk/pom-dotnet.xml (original)
+++ incubator/nmaven/trunk/pom-dotnet.xml Wed Sep 26 19:26:23 2007
@@ -220,29 +220,4 @@
-
-
- deployment.webdav
- Test Web Dav
- dav:http://localhost:8080/archiva/repository/snapshots/
-
-
-
-
Modified: incubator/nmaven/trunk/pom-modify-versions.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom-modify-versions.xml?rev=579874&r1=579873&r2=579874&view=diff
==
--- incubator/nmaven/trunk/pom-modify-versions.xml (original)
+++ incubator/nmaven/trunk/pom-modify-versions.xml Wed Sep 26 19:26:23 2007
@@ -42,11 +42,25 @@
alter-version
+
+
+
+ pom.xml
+ //project/properties/mavenVersion
+ ${mavenVersion}
alter-assembly-version-assemblies
process-sources
Modified: incubator/nmaven/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom.xml?rev=579874&r1=579873&r2=579874&view=diff
==
--- incubator/nmaven/trunk/pom.xml (original)
+++ incubator/nmaven/trunk/pom.xml Wed Sep 26 19:26:23 2007
@@ -131,7 +131,7 @@
components
archetypes
-plugins
+plugins
misc/dotnet-repository-builder
@@ -161,12 +161,12 @@
org.apache.maven.wagon
wagon-ssh-external
1.0-beta-2
-
-
-org.apache.maven.wagon
-wagon-webdav
-1.0-beta-2
-
+
+
+org.apache.maven.wagon
+wagon-webdav
+1.0-beta-2
+
@@ -232,6 +232,7 @@
2.1-SNAPSHOT
+0.14-SNAPSHOT
6.1.5
1.2.5
svn commit: r579876 - in /incubator/nmaven/trunk: pom-modify-versions.xml pom.xml
Author: sisbell Date: Wed Sep 26 19:45:23 2007 New Revision: 579876 URL: http://svn.apache.org/viewvc?rev=579876&view=rev Log: Remove uneeded prop. Modified: incubator/nmaven/trunk/pom-modify-versions.xml incubator/nmaven/trunk/pom.xml Modified: incubator/nmaven/trunk/pom-modify-versions.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom-modify-versions.xml?rev=579876&r1=579875&r2=579876&view=diff == --- incubator/nmaven/trunk/pom-modify-versions.xml (original) +++ incubator/nmaven/trunk/pom-modify-versions.xml Wed Sep 26 19:45:23 2007 @@ -42,7 +42,6 @@ alter-version - pom.xml Modified: incubator/nmaven/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom.xml?rev=579876&r1=579875&r2=579876&view=diff == --- incubator/nmaven/trunk/pom.xml (original) +++ incubator/nmaven/trunk/pom.xml Wed Sep 26 19:45:23 2007 @@ -232,7 +232,6 @@ 2.1-SNAPSHOT -0.14-SNAPSHOT 6.1.5 1.2.5
