incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r532601 - in /incubator/nmaven/branches/SI_XPT/assemblies: ./ NMaven.Core/ NMaven.Core/src/main/csharp/Core/Impl/ NMaven.IDE/ NMaven.IDE/src/main/csharp/ NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/ NMaven.IDE/src/main/csharp/NMaven/IDE/...
Date Thu, 26 Apr 2007 04:06:03 GMT
Author: sisbell
Date: Wed Apr 25 21:06:02 2007
New Revision: 532601

URL: http://svn.apache.org/viewvc?view=rev&rev=532601
Log:
Various  updates.

Added:
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/README.txt   (with props)
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/MavenProjectInjector.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/StringInjector.cs
Removed:
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/
Modified:
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/pom.xml
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/IdeContextImpl.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/pom.xml
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven/Logging/Logger.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/test/csharp/NMaven/Plugin/AbstractMojoTest.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio/pom.xml
    incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml
    incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml
    incubator/nmaven/branches/SI_XPT/assemblies/pom.xml

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml Wed Apr 25 21:06:02 2007
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven</groupId>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
(original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
Wed Apr 25 21:06:02 2007
@@ -296,7 +296,7 @@
 		
 		private string GetOutputType(String type)
 		{
-			if (type.Equals("library")) return "Library";
+			if (type.Equals("library") || type.Equals("netplugin") ) return "Library";
 			else if (type.Equals("exe")) return "Exe";
 			else if (type.Equals("winexe")) return "WinExe";
 			else if (type.Equals("module")) return "Module";
@@ -305,7 +305,7 @@
 		
 		private string GetExtension(String type)
 		{
-			if (type.Equals("library")) return "dll";
+			if (type.Equals("library") || type.Equals("netplugin") ) return "dll";
 			else if (type.Equals("exe")) return "exe";
 			else if (type.Equals("winexe")) return "exe";
 			else if (type.Equals("module")) return "netmodule";

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/pom.xml?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/pom.xml Wed Apr 25 21:06:02 2007
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven</groupId>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
(original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
Wed Apr 25 21:06:02 2007
@@ -46,6 +46,18 @@
       <HintPath>..\..\..\..\..\..\..\..\..\Program Files\SharpDevelop\2.0\bin\ICSharpCode.Core.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="AddinTest2">
+      <HintPath>..\..\..\..\..\..\..\My Documents\SharpDevelop Projects\AddinTest2\obj\Debug\AddinTest2.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpDevelop">
+      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\SharpDevelop\2.0\bin\ICSharpCode.SharpDevelop.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="ICSharpCode.Core">
+      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\SharpDevelop\2.0\bin\ICSharpCode.Core.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="NMaven\IDE\IIdeContext.cs" />
@@ -56,6 +68,7 @@
     <Compile Include="NMaven\IDE\View\MainForm.Designer.cs" />
     <Compile Include="NMaven\IDE\Commands\BuildCommand.cs" />
     <Compile Include="NMaven\IDE\Controls\MavenBuildControl.cs" />
+    <Compile Include="NMaven\IDE\Controls\MavenDependencyUserControl.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="NMaven" />

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs
(original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs
Wed Apr 25 21:06:02 2007
@@ -24,6 +24,8 @@
         private TreeView treeView = new TreeView();
         
         public event EventHandler ClearOutputWindow;
+        
+        public event EventHandler FocusOutputWindow;        
              
 		public MavenBuildControl()
 		{		
@@ -75,7 +77,8 @@
                 buildCommand.Goal = goal;
                 buildCommand.PomFile = pomFile;
                 buildCommand.LoggerPort = loggerPort;
-                menuItem.Click += new EventHandler(OnClearOutputWindow);
+                menuItem.Click += new EventHandler(OnFocusOutputWindow);
+                menuItem.Click += new EventHandler(OnClearOutputWindow);                
 				menuItem.Click += new EventHandler(buildCommand.Execute);
 				return menuItem;               		
 		}
@@ -87,6 +90,14 @@
 				ClearOutputWindow(this, args);	
 			}			
 		}
+		
+		private void OnFocusOutputWindow(object sender, EventArgs args)
+		{
+			if(FocusOutputWindow != null)
+			{
+				FocusOutputWindow(this, args);	
+			}			
+		}		
 
         private void treeView_MouseUp(object sender, MouseEventArgs e)
         {

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/IdeContextImpl.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/IdeContextImpl.cs?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/IdeContextImpl.cs
(original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/IdeContextImpl.cs
Wed Apr 25 21:06:02 2007
@@ -31,15 +31,10 @@
 		public void Build(MavenExecutionRequest request)
 		{  
 			configuration.SocketLoggerPort = FindOpenPort();
-			
-        	logger.Log(Level.INFO, "Entering Thread\r\n");
-        	logger.Log(Level.INFO, DateTime.Now + "\r\n");
             socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
             socket.Bind(new IPEndPoint(IPAddress.Any, configuration.SocketLoggerPort));
             socket.Listen(10);
-            logger.Log(Level.INFO, "Setup Socket Listener" + DateTime.Now + "\r\n");
-            
-			logger.Log(Level.INFO, "Setting up the Server Socket\r\n");	
+          
 			Thread thread = new Thread(new ThreadStart(WriteBuildResults));			
 			thread.Start();		
 			
@@ -101,13 +96,8 @@
 		                         
         private void WriteBuildResults()
         {
-                logger.Log(Level.INFO, "Waiting on client...\r\n"); 
-                logger.Log(Level.INFO, DateTime.Now + "\r\n");
-                Socket client = socket.Accept();
-                logger.Log(Level.INFO, "Accepted Client" + DateTime.Now + "\r\n");
-                
-                NetworkStream networkStream = new NetworkStream(client);
-                
+                Socket client = socket.Accept();            
+                NetworkStream networkStream = new NetworkStream(client);                
                 StreamReader streamReader = new StreamReader(new NetworkStream(client));
                 while(!streamReader.EndOfStream)
                 {

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs
(original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs
Wed Apr 25 21:06:02 2007
@@ -39,7 +39,9 @@
 			MavenBuildControl mavenBuildControl = new MavenBuildControl();
 			mavenBuildControl.Size = size;
 			mavenBuildControl.Init(logger, 9099, size);
-			this.Controls.Add(mavenBuildControl);			
+			this.Controls.Add(mavenBuildControl);	
+			MavenDependencyUserControl mpuc = new MavenDependencyUserControl();
+			this.Controls.Add(mpuc);
 		}
 	}
 }

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/pom.xml?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/pom.xml Wed Apr 25 21:06:02
2007
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven</groupId>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven/Logging/Logger.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven/Logging/Logger.cs?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven/Logging/Logger.cs
(original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven/Logging/Logger.cs
Wed Apr 25 21:06:02 2007
@@ -10,6 +10,8 @@
 		
 		private String name;
 		
+	    private static LogManager logManager = new LogManager();
+	    
 		private Logger(String name)
 		{
 			handlers = new List<IHandler>();
@@ -19,7 +21,6 @@
 		[MethodImpl(MethodImplOptions.Synchronized)]
 		public static Logger GetLogger(String name)
 		{
-			LogManager logManager = new LogManager();
 			Logger logger = logManager.GetLogger(name);
 			if(logger == null)
 			{

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml Wed Apr 25 21:06:02
2007
@@ -1,10 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven</groupId>
     <version>0.14</version>
     <artifactId>NMaven.Assemblies</artifactId>
     <relativePath>..\..\pom.xml</relativePath>
-  </parent>  
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>NMaven.Model</groupId>
   <artifactId>NMaven.Model.Pom</artifactId>
@@ -25,6 +43,22 @@
         </executions>
         <configuration>
           <xsdFile>${basedir}/Pom.xsd</xsdFile>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.dotnet.plugins</groupId>
+        <artifactId>maven-compile-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <keyfile>sample.snk</keyfile>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.dotnet.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <isGacInstall>true</isGacInstall>
         </configuration>
       </plugin>
       <plugin>

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/README.txt?view=auto&rev=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/README.txt (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/README.txt Wed Apr 25 21:06:02
2007
@@ -0,0 +1 @@
+These packages contain XML bindings for models.
\ No newline at end of file

Propchange: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs
(original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs
Wed Apr 25 21:06:02 2007
@@ -27,11 +27,11 @@
 namespace NMaven.Plugin.Loader
 {
 	/// <summary>
-	/// Description of PluginLoader.
+	/// Provides methods for loading plugins and for creating Mojos.
 	/// </summary>
-	public class PluginLoader
+	internal sealed class PluginLoader
 	{
-		public PluginLoader()
+		internal PluginLoader()
 		{
 		}
 
@@ -41,7 +41,7 @@
 		/// <param name="pluginAssemblyFile">the.NET maven plugin</param>
 		/// <returns>application domain for .NET maven plugin</returns>
 		/// 
-		public AppDomain LoadPlugin(FileInfo pluginAssemblyFile)
+		internal AppDomain LoadPlugin(FileInfo pluginAssemblyFile)
 		{
 			Console.WriteLine("Loading Plugin: " + pluginAssemblyFile.DirectoryName);
 			AppDomainSetup setup = new AppDomainSetup();
@@ -60,9 +60,10 @@
 		/// <param name="pluginAssemblyFile">the.NET maven plugin</param>
 		/// <param name="paramFile">the file containing the parameters to inject into an
instance 
 		/// of the specified mojo</param>
-		/// <param name="applicationDomain"></param>
+		/// <param name="applicationDomain">
+		/// the application domain used to create the specified mojo name instance</param>
 		/// <returns>an instance of the specified mojo name within the specified application
domain</returns>
-		public AbstractMojo CreateAbstractMojoFor(String mojoName, FileInfo pluginAssemblyFile,

+		internal AbstractMojo CreateAbstractMojoFor(String mojoName, FileInfo pluginAssemblyFile,

 		                                          FileInfo paramFile, AppDomain applicationDomain)
 		{
             ObjectHandle objectHandle = 

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/MavenProjectInjector.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/MavenProjectInjector.cs?view=auto&rev=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/MavenProjectInjector.cs
(added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/MavenProjectInjector.cs
Wed Apr 25 21:06:02 2007
@@ -0,0 +1,69 @@
+#region Apache License, Version 2.0 
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+#endregion
+using System;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+using System.Xml.Serialization;
+
+using NMaven.Plugin;
+
+namespace NMaven.Plugin.Injector.Impl
+{
+	/// <summary>
+	/// Provides methods for injecting maven project models values into fields.
+	/// </summary>
+	[FieldInjectorAttribute("NMaven.Model.Model")]
+	public sealed class MavenProjectInjector : IFieldInjector 
+	{
+		public MavenProjectInjector()
+		{
+		}
+		
+		/// 
+		/// <see cref ="NMaven.Plugin.Injector.IFieldInjector.Inject(object, FieldInfo, object)">

+		/// 
+		public void Inject(object targetObject, FieldInfo fieldInfo, object fieldObject)
+		{
+			fieldInfo.SetValue(targetObject, this.CreatePomModelFor( ((string) fieldObject) ));
+		}
+		
+		/// 
+		/// <see cref ="NMaven.Plugin.Injector.IFieldInjector.GetJavaClassName()"> 
+		/// 		
+		public string GetJavaClassName() 
+		{
+			return "org.apache.maven.project.MavenProject";				
+		}  		
+		
+		/// <summary>
+		/// Creates a model from the specified project file.
+		/// </summary>
+		/// <param name="fileName">The fully qualified file name of the project file</param>
+		/// <returns>A model from the specified project file</returns>
+   		private NMaven.Model.Model CreatePomModelFor(string fileName)
+		{
+			TextReader reader = new StreamReader(fileName);
+		    XmlSerializer serializer = new XmlSerializer(typeof(NMaven.Model.Model));
+			return (NMaven.Model.Model) serializer.Deserialize(reader);	
+		}  
+	}
+}

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/StringInjector.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/StringInjector.cs?view=auto&rev=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/StringInjector.cs
(added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/StringInjector.cs
Wed Apr 25 21:06:02 2007
@@ -0,0 +1,54 @@
+#region Apache License, Version 2.0 
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+#endregion
+using System;
+using System.Reflection;
+
+using NMaven.Plugin;
+
+namespace NMaven.Plugin.Injector.Impl
+{
+	/// <summary>
+	/// Provides methods for injecting string values into fields.
+	/// </summary>
+	[FieldInjectorAttribute("System.String")]
+	public sealed class StringInjector : IFieldInjector
+	{
+		public StringInjector()
+		{
+		}
+
+		/// 
+		/// <see cref ="NMaven.Plugin.Injector.IFieldInjector.Inject(object, FieldInfo, object)">

+		/// 		
+		public void Inject(object targetObject, FieldInfo fieldInfo, object fieldObject)
+		{
+			fieldInfo.SetValue(targetObject, (string) fieldObject );
+		}	
+
+		/// 
+		/// <see cref ="NMaven.Plugin.Injector.IFieldInjector.GetJavaClassName()"> 
+		/// 			
+		public string GetJavaClassName() 
+		{
+			return "java.lang.String";			
+		}
+	}
+}

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/test/csharp/NMaven/Plugin/AbstractMojoTest.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/test/csharp/NMaven/Plugin/AbstractMojoTest.cs?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/test/csharp/NMaven/Plugin/AbstractMojoTest.cs
(original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/test/csharp/NMaven/Plugin/AbstractMojoTest.cs
Wed Apr 25 21:06:02 2007
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using NMaven.Plugin.Generator;
 using NUnit.Framework;
 
 using System.Collections.Generic;
@@ -29,11 +28,11 @@
 	 	javaFields.Add(javaField);
 	 	javaClass.JavaFields = javaFields;
 	 	*/
-	 	JavaClassUnmarshaller jc = new JavaClassUnmarshaller();
+	 //	JavaClassUnmarshaller jc = new JavaClassUnmarshaller();
 	 	
-	 	JavaClass javaClass = jc.convert(typeof(TestMojo));
-	 	FileInfo fileInfo = new FileInfo(@"c:\test-1.java");
-	 	jc.unmarshall(javaClass, fileInfo);   
+	 //	JavaClass javaClass = jc.convert(typeof(TestMojo));
+	 //	FileInfo fileInfo = new FileInfo(@"c:\test-1.java");
+	 //	jc.unmarshall(javaClass, fileInfo);   
 	 	
 	 	//PluginLoader pluginLoader = new PluginLoader();
 	 	//pluginLoader.load();

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml Wed Apr 25
21:06:02 2007
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven</groupId>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio/pom.xml?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio/pom.xml Wed Apr 25 21:06:02
2007
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven</groupId>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml Wed Apr 25 21:06:02 2007
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <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>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml Wed Apr 25 21:06:02 2007
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <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>
@@ -124,7 +142,18 @@
     <module>NMaven.Logging</module>
     <module>NMaven.Service/Embedder</module>    
     <module>NMaven.VisualStudio</module>
+    <module>NMaven.Plugin.Runner</module>
+    <module>NMaven.Plugin.Loader</module>
+    <module>NMaven.Plugin.</module>
   </modules>
+  <dependencies>
+    <dependency>
+      <groupId>NUnit</groupId>
+      <artifactId>NUnit.Framework</artifactId>
+      <version>2.2.8.0</version>
+      <type>library</type>
+    </dependency>
+  </dependencies>  
   <build>
     <sourceDirectory>src/main/csharp</sourceDirectory>
     <testSourceDirectory>src/test/csharp</testSourceDirectory>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/pom.xml?view=diff&rev=532601&r1=532600&r2=532601
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom.xml Wed Apr 25 21:06:02 2007
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <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>
@@ -117,7 +135,18 @@
   <modules>
     <module>NMaven.Plugin.Resx</module>
     <module>NMaven.Plugin.Settings</module>
+    <module>NMaven.Plugin.Runner</module>
+    <module>NMaven.Plugin.Loader</module>
+    <module>NMaven.Plugin.</module>       
   </modules>
+  <dependencies>
+    <dependency>
+      <groupId>NUnit</groupId>
+      <artifactId>NUnit.Framework</artifactId>
+      <version>2.2.8.0</version>
+      <type>library</type>
+    </dependency>
+  </dependencies>
   <build>
     <sourceDirectory>src/main/csharp</sourceDirectory>
     <testSourceDirectory>src/test/csharp</testSourceDirectory>



Mime
View raw message