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/04/14 04:56:11 UTC
svn commit: r528762 - in /incubator/nmaven/branches/SI_XPT/assemblies:
NMaven.IDE/src/main/csharp/ NMaven.IDE/src/main/csharp/NMaven/IDE/Commands/
NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/
NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/ NMaven.IDE/sr...
Author: sisbell
Date: Fri Apr 13 21:56:10 2007
New Revision: 528762
URL: http://svn.apache.org/viewvc?view=rev&rev=528762
Log:
Support for scrolling of log messages within the output window.
Added:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs
Modified:
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/Commands/BuildCommand.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/src/main/csharp/NMaven/Logging/Logger.cs
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven/Service/Embedder/MavenEmbedder.cs
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/resources/MavenEmbedder.wsdl
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=528762&r1=528761&r2=528762
==============================================================================
--- 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 Fri Apr 13 21:56:10 2007
@@ -12,7 +12,7 @@
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<NoStdLib>False</NoStdLib>
- <DebugType>None</DebugType>
+ <DebugType>Full</DebugType>
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>4194304</BaseAddress>
@@ -20,7 +20,7 @@
<FileAlignment>4096</FileAlignment>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <DebugSymbols>false</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -30,12 +30,22 @@
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System.Web.Services" />
- <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Windows.Forms">
+ <Private>False</Private>
+ </Reference>
<Reference Include="System.Drawing" />
<Reference Include="NMaven.Service.Embedder">
<HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Service\NMaven.Service.Embedder\0.14\NMaven.Service.Embedder.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" />
@@ -45,6 +55,7 @@
<Compile Include="NMaven\IDE\View\MainForm.cs" />
<Compile Include="NMaven\IDE\View\MainForm.Designer.cs" />
<Compile Include="NMaven\IDE\Commands\BuildCommand.cs" />
+ <Compile Include="NMaven\IDE\Controls\MavenBuildControl.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="NMaven" />
@@ -52,6 +63,7 @@
<Folder Include="NMaven\IDE\Impl" />
<Folder Include="NMaven\IDE\View" />
<Folder Include="NMaven\IDE\Commands" />
+ <Folder Include="NMaven\IDE\Controls" />
</ItemGroup>
<Import Project="$(SharpDevelopBinPath)\SharpDevelop.Build.CSharp.targets" />
</Project>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Commands/BuildCommand.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Commands/BuildCommand.cs?view=diff&rev=528762&r1=528761&r2=528762
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Commands/BuildCommand.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Commands/BuildCommand.cs Fri Apr 13 21:56:10 2007
@@ -13,6 +13,8 @@
private string pomFile;
+ private int loggerPort;
+
private IIdeContext ideContext;
public BuildCommand()
@@ -29,8 +31,24 @@
MavenExecutionRequest request = new MavenExecutionRequest();
request.goal = this.Goal;
request.pomFile = this.PomFile;
+ request.loggerPort = loggerPort;
+ request.loggerPortSpecified = true;
ideContext.Build(request);
- }
+ }
+
+ public int LoggerPort
+ {
+ get
+ {
+ return loggerPort;
+ }
+
+ set
+ {
+ loggerPort = value;
+ }
+ }
+
public String Goal
{
get
Added: 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=auto&rev=528762
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs Fri Apr 13 21:56:10 2007
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using NMaven.IDE;
+using NMaven.IDE.Impl;
+using NMaven.Service;
+using NMaven.IDE.Commands;
+using NMaven.Logging;
+
+namespace NMaven.IDE.Controls
+{
+ /// <summary>
+ /// Description of MavenBuildControl.
+ /// </summary>
+ public class MavenBuildControl : UserControl
+ {
+ private IIdeContext ideContext;
+
+ private int loggerPort;
+
+ private ContextMenu contextmenu = new ContextMenu();
+
+ private TreeView treeView = new TreeView();
+
+ public event EventHandler ClearOutputWindow;
+
+ public MavenBuildControl()
+ {
+ }
+
+ public void Init(Logger logger, int loggerPort, Size treeSize)
+ {
+ this.loggerPort = loggerPort;
+
+ treeView.ClientSize = treeSize;
+ ideContext = new IdeContextImpl();
+ IIdeConfiguration configuration = Factory.CreateIdeConfiguration();
+ configuration.Logger = logger;
+ configuration.SocketLoggerPort = loggerPort;
+ ideContext.Init(configuration);
+ List<MavenProject> mavenProjects = ideContext.GetMavenProjects();
+ foreach(MavenProject mavenProject in mavenProjects)
+ {
+ treeView.Nodes.Add(CreateTreeNodeFor(mavenProject));
+ }
+
+ treeView.MouseClick += new MouseEventHandler(this.treeView_MouseUp);
+ Controls.Add(treeView);
+ }
+
+ private TreeNode CreateTreeNodeFor(MavenProject mavenProject)
+ {
+ TreeNode rootNode = new TreeNode();
+ rootNode.Text = mavenProject.artifactId;
+
+ if(mavenProject.mavenProjects != null)
+ {
+ foreach(MavenProject childMavenProject in mavenProject.mavenProjects)
+ {
+ TreeNode childNode = CreateTreeNodeFor(childMavenProject);
+ rootNode.Nodes.Add(childNode);
+ }
+ }
+ rootNode.Tag = mavenProject;
+ return rootNode;
+ }
+
+ private MenuItem CreateMenuItemFor(String text, String goal, String pomFile)
+ {
+ MenuItem menuItem = new MenuItem();
+ menuItem.Text = text;
+ BuildCommand buildCommand = new BuildCommand();
+ buildCommand.Init(ideContext);
+ buildCommand.Goal = goal;
+ buildCommand.PomFile = pomFile;
+ buildCommand.LoggerPort = loggerPort;
+ menuItem.Click += new EventHandler(OnClearOutputWindow);
+ menuItem.Click += new EventHandler(buildCommand.Execute);
+ return menuItem;
+ }
+
+ private void OnClearOutputWindow(object sender, EventArgs args)
+ {
+ if(ClearOutputWindow != null)
+ {
+ ClearOutputWindow(this, args);
+ }
+ }
+
+ private void treeView_MouseUp(object sender, MouseEventArgs e)
+ {
+ if (e.Button == MouseButtons.Right)
+ {
+ Point point = new Point(e.X, e.Y);
+ TreeNode node = treeView.GetNodeAt(point);
+ if (node == null) return;
+ MavenProject mavenProject = (MavenProject) node.Tag;
+ contextmenu.MenuItems.Clear();
+ contextmenu.MenuItems.Add(CreateMenuItemFor("Compile Project", "compile", mavenProject.pomPath));
+ contextmenu.MenuItems.Add(CreateMenuItemFor("Clean Project", "clean", mavenProject.pomPath));
+ contextmenu.MenuItems.Add(CreateMenuItemFor("Test Project", "test", mavenProject.pomPath));
+ contextmenu.MenuItems.Add(CreateMenuItemFor("Install Project", "install", mavenProject.pomPath));
+
+ contextmenu.Show(this, PointToClient(treeView.PointToScreen(point)));
+ }
+ }
+ }
+}
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=528762&r1=528761&r2=528762
==============================================================================
--- 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 Fri Apr 13 21:56:10 2007
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Net;
using System.Net.Sockets;
using System.Text;
@@ -8,6 +9,7 @@
using NMaven.Logging;
using NMaven.IDE;
using NMaven.Service;
+using System.Threading;
namespace NMaven.IDE.Impl
{
@@ -27,8 +29,24 @@
}
public void Build(MavenExecutionRequest request)
- {
- MavenEmbedderService service = new MavenEmbedderService();
+ {
+ 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();
+
+ request.loggerPort = configuration.SocketLoggerPort;
+ request.loggerPortSpecified = true;
+
+ MavenEmbedderService service = new MavenEmbedderService();
try {
service.execute(request);
}
@@ -36,7 +54,7 @@
{
Console.Error.WriteLine(", " + e.Code + ", " + e.SubCode + "," + e.StackTrace);
throw new Exception(e.StackTrace + "," + e.Code, null);
- }
+ }
}
public List<MavenProject> GetMavenProjects()
@@ -50,17 +68,12 @@
public void Init(IIdeConfiguration configuration)
{
this.configuration = configuration;
- this.logger = configuration.Logger;
-
- System.Threading.Thread loggerThread =
- new System.Threading.Thread(new System.Threading.ThreadStart(WriteBuildResults));
- loggerThread.IsBackground = true;
- loggerThread.Start();
+ this.logger = configuration.Logger;
}
public void Dispose()
{
- socket.Close();
+ //socket.Close();
}
public Logger GetLogger()
@@ -68,24 +81,41 @@
return logger;
}
+ private int FindOpenPort()
+ {
+ for(int i = 1; i < 10; i++)
+ {
+ int port = (new Random()).Next(1025, 65536);
+ try {
+ Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+ socket.Bind(new IPEndPoint(IPAddress.Any, port));
+ socket.Close();
+ return port;
+ }
+ catch (SocketException e)
+ {
+ }
+ }
+ return -1;
+ }
+
private void WriteBuildResults()
{
- socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
- socket.Bind(new IPEndPoint(IPAddress.Any, configuration.SocketLoggerPort));
- socket.Listen(10);
- while (true)
- {
- logger.Log(Level.INFO, "Waiting on client...");
+ 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");
- byte[] buffer = new byte[1024];
- int i;
- while ((i = client.Receive(buffer)) > 0)
+ logger.Log(Level.INFO, "Accepted Client" + DateTime.Now + "\r\n");
+
+ NetworkStream networkStream = new NetworkStream(client);
+
+ StreamReader streamReader = new StreamReader(new NetworkStream(client));
+ while(!streamReader.EndOfStream)
{
- logger.Log(Level.INFO, Encoding.ASCII.GetString(buffer, 0, i));
+ logger.Log(Level.INFO, String.Concat(streamReader.ReadLine(), Environment.NewLine));
+
}
- client.Close();
- }
+ streamReader.Close();
+ client.Close();
}
}
}
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=528762&r1=528761&r2=528762
==============================================================================
--- 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 Fri Apr 13 21:56:10 2007
@@ -7,6 +7,8 @@
using NMaven.IDE.Impl;
using NMaven.Service;
using NMaven.IDE.Commands;
+using NMaven.IDE.Controls;
+using NMaven.Logging;
namespace NMaven.IDE.View {
/// <summary>
@@ -14,89 +16,30 @@
/// </summary>
public partial class MainForm
{
-
- private IIdeContext ideContext;
-
- private ContextMenu contextmenu = new ContextMenu();
-
- private TreeView treeView = new TreeView();
-
+
[STAThread]
public static void Main(string[] args)
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new MainForm());
+ MainForm mainForm = new MainForm();
+ Size size = new Size(400, 400);
+
+ mainForm.Init(Logger.GetLogger("IDE"), size);
+ Application.Run(mainForm);
}
public MainForm()
{
- InitializeComponent();
- Init();
- }
-
- private TreeNode CreateTreeNodeFor(MavenProject mavenProject)
- {
- TreeNode rootNode = new TreeNode();
- rootNode.Text = mavenProject.artifactId;
-
- if(mavenProject.mavenProjects != null)
- {
- foreach(MavenProject childMavenProject in mavenProject.mavenProjects)
- {
- TreeNode childNode = CreateTreeNodeFor(childMavenProject);
- rootNode.Nodes.Add(childNode);
- }
- }
- rootNode.Tag = mavenProject;
- return rootNode;
}
- public void Init()
+ public void Init(Logger logger, Size size)
{
- treeView.ClientSize = this.Size;
- ideContext = new IdeContextImpl();
- List<MavenProject> mavenProjects = ideContext.GetMavenProjects();
- foreach(MavenProject mavenProject in mavenProjects)
- {
- treeView.Nodes.Add(CreateTreeNodeFor(mavenProject));
- }
-
- treeView.MouseClick += new MouseEventHandler(this.treeView_MouseUp);
- Controls.Add(treeView);
-
- }
-
- private MenuItem CreateMenuItemFor(String text, String goal, String pomFile)
- {
- MenuItem menuItem = new MenuItem();
- menuItem.Text = text;
- BuildCommand buildCommand = new BuildCommand();
- buildCommand.Init(ideContext);
- buildCommand.Goal = goal;
- buildCommand.PomFile = pomFile;
- menuItem.Click += new EventHandler(buildCommand.Execute);
- return menuItem;
-
+ InitializeComponent();
+ MavenBuildControl mavenBuildControl = new MavenBuildControl();
+ mavenBuildControl.Size = size;
+ mavenBuildControl.Init(logger, 9099, size);
+ this.Controls.Add(mavenBuildControl);
}
-
- private void treeView_MouseUp(object sender, MouseEventArgs e)
- {
- if (e.Button == MouseButtons.Right)
- {
- Point point = new Point(e.X, e.Y);
- TreeNode node = treeView.GetNodeAt(point);
- if (node == null) return;
- MavenProject mavenProject = (MavenProject) node.Tag;
- contextmenu.MenuItems.Clear();
- contextmenu.MenuItems.Add(CreateMenuItemFor("Compile Project", "compile", mavenProject.pomPath));
- contextmenu.MenuItems.Add(CreateMenuItemFor("Clean Project", "clean", mavenProject.pomPath));
- contextmenu.MenuItems.Add(CreateMenuItemFor("Test Project", "test", mavenProject.pomPath));
- contextmenu.MenuItems.Add(CreateMenuItemFor("Install Project", "install", mavenProject.pomPath));
-
- contextmenu.Show(this, PointToClient(treeView.PointToScreen(point)));
- }
- }
-
}
}
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=528762&r1=528761&r2=528762
==============================================================================
--- 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 Fri Apr 13 21:56:10 2007
@@ -32,7 +32,6 @@
[MethodImpl(MethodImplOptions.Synchronized)]
public void Log(Level level, String msg)
{
- Console.WriteLine("[LOG]" + msg);
LogRecord logRecord = new LogRecord(level, msg);
if(handlers.Count == 0)
{
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=528762&r1=528761&r2=528762
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml Fri Apr 13 21:56:10 2007
@@ -37,7 +37,7 @@
</paths>
</configuration>
</plugin>
--->
+ -->
</plugins>
</build>
</project>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven/Service/Embedder/MavenEmbedder.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven/Service/Embedder/MavenEmbedder.cs?view=diff&rev=528762&r1=528761&r2=528762
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven/Service/Embedder/MavenEmbedder.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven/Service/Embedder/MavenEmbedder.cs Fri Apr 13 21:56:10 2007
@@ -136,8 +136,8 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:maven-embedder")]
- public class MavenProject {
-
+ public partial class MavenProject {
+
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
public string artifactId;
@@ -152,6 +152,14 @@
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
+ public System.Nullable<bool> isOrphaned;
+
+ /// <remarks/>
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool isOrphanedSpecified;
+
+ /// <remarks/>
+ [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
public string pomPath;
/// <remarks/>
@@ -173,11 +181,19 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:maven-embedder")]
- public class MavenExecutionRequest {
+ public partial class MavenExecutionRequest {
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
public string goal;
+
+ /// <remarks/>
+ [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
+ public System.Nullable<int> loggerPort;
+
+ /// <remarks/>
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool loggerPortSpecified;
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/resources/MavenEmbedder.wsdl
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/resources/MavenEmbedder.wsdl?view=diff&rev=528762&r1=528761&r2=528762
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/resources/MavenEmbedder.wsdl (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/resources/MavenEmbedder.wsdl Fri Apr 13 21:56:10 2007
@@ -1,68 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://incubator.apache.org/nmaven/MavenEmbedderService" xmlns:tns="http://incubator.apache.org/nmaven/MavenEmbedderService" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="urn:maven-embedder" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc11="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soapenc12="http://www.w3.org/2003/05/soap-encoding" xmlns:soap11="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions targetNamespace="http://incubator.apache.org/nmaven/MavenEmbedderService"
+ xmlns:tns="http://incubator.apache.org/nmaven/MavenEmbedderService"
+ xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:soap12="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="urn:maven-embedder"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soapenc11="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:soapenc12="http://www.w3.org/2003/05/soap-encoding"
+ xmlns:soap11="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://incubator.apache.org/nmaven/MavenEmbedderService">
-<xsd:element name="getMavenProjectsFor">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element maxOccurs="1" minOccurs="1" name="in0" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="getMavenProjectsForResponse">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element maxOccurs="1" minOccurs="1" name="out" nillable="true" type="ns1:ArrayOfMavenProject"/>
-</xsd:sequence>
-
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="execute">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element maxOccurs="1" minOccurs="1" name="in0" nillable="true" type="ns1:MavenExecutionRequest"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="executeResponse">
-<xsd:complexType/>
-</xsd:element>
-</xsd:schema>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="urn:maven-embedder">
-<xsd:complexType name="ArrayOfMavenProject">
-<xsd:sequence>
-<xsd:element maxOccurs="unbounded" minOccurs="0" name="MavenProject" nillable="true" type="ns1:MavenProject"/>
-
-</xsd:sequence>
-</xsd:complexType>
-<xsd:complexType name="MavenProject">
-<xsd:sequence>
-<xsd:element minOccurs="0" name="artifactId" nillable="true" type="xsd:string"/>
-<xsd:element minOccurs="0" name="groupId" nillable="true" type="xsd:string"/>
-<xsd:element minOccurs="0" name="mavenProjects" nillable="true" type="ns1:ArrayOfMavenProject"/>
-<xsd:element minOccurs="0" name="pomPath" nillable="true" type="xsd:string"/>
-<xsd:element minOccurs="0" name="version" nillable="true" type="xsd:string"/>
-<xsd:any maxOccurs="unbounded" minOccurs="0"/>
-</xsd:sequence>
-<xsd:anyAttribute/>
-</xsd:complexType>
-<xsd:complexType name="MavenExecutionRequest">
-<xsd:sequence>
-<xsd:element minOccurs="0" name="goal" nillable="true" type="xsd:string"/>
-<xsd:element minOccurs="0" name="pomFile" nillable="true" type="xsd:string"/>
-
-<xsd:any maxOccurs="unbounded" minOccurs="0"/>
-</xsd:sequence>
-<xsd:anyAttribute/>
-</xsd:complexType>
-</xsd:schema>
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified"
+ elementFormDefault="qualified"
+ targetNamespace="http://incubator.apache.org/nmaven/MavenEmbedderService">
+ <xsd:element name="getMavenProjectsFor">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="1" name="in0" nillable="true" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="getMavenProjectsForResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="1" name="out" nillable="true" type="ns1:ArrayOfMavenProject"/>
+ </xsd:sequence>
+
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="execute">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="1" name="in0" nillable="true" type="ns1:MavenExecutionRequest"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="executeResponse">
+ <xsd:complexType/>
+ </xsd:element>
+ </xsd:schema>
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified"
+ elementFormDefault="qualified" targetNamespace="urn:maven-embedder">
+ <xsd:complexType name="ArrayOfMavenProject">
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" name="MavenProject" nillable="true" type="ns1:MavenProject"/>
+
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="MavenProject">
+ <xsd:sequence>
+ <xsd:element minOccurs="0" name="artifactId" nillable="true" type="xsd:string"/>
+ <xsd:element minOccurs="0" name="groupId" nillable="true" type="xsd:string"/>
+ <xsd:element minOccurs="0" name="mavenProjects" nillable="true" type="ns1:ArrayOfMavenProject"/>
+ <xsd:element minOccurs="0" name="isOrphaned" nillable="true" type="xsd:boolean"/>
+ <xsd:element minOccurs="0" name="pomPath" nillable="true" type="xsd:string"/>
+ <xsd:element minOccurs="0" name="version" nillable="true" type="xsd:string"/>
+ <xsd:any maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:anyAttribute/>
+ </xsd:complexType>
+ <xsd:complexType name="MavenExecutionRequest">
+ <xsd:sequence>
+ <xsd:element minOccurs="0" name="goal" nillable="true" type="xsd:string"/>
+
+ <xsd:element minOccurs="0" name="loggerPort" nillable="true" type="xsd:int"/>
+ <xsd:element minOccurs="0" name="pomFile" nillable="true" type="xsd:string"/>
+ <xsd:any maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:anyAttribute/>
+ </xsd:complexType>
+ </xsd:schema>
</wsdl:types>
<wsdl:message name="getMavenProjectsForRequest">
<wsdl:part name="parameters" element="tns:getMavenProjectsFor">
</wsdl:part>
</wsdl:message>
- <wsdl:message name="getMavenProjectsForResponse">
+ <wsdl:message name="getMavenProjectsForResponse">
<wsdl:part name="parameters" element="tns:getMavenProjectsForResponse">
</wsdl:part>
</wsdl:message>
@@ -71,28 +84,28 @@
</wsdl:part>
</wsdl:message>
<wsdl:message name="executeResponse">
- <wsdl:part name="parameters" element="tns:executeResponse">
+ <wsdl:part name="parameters" element="tns:executeResponse">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="MavenEmbedderServicePortType">
<wsdl:operation name="getMavenProjectsFor">
<wsdl:input name="getMavenProjectsForRequest" message="tns:getMavenProjectsForRequest">
- </wsdl:input>
+ </wsdl:input>
<wsdl:output name="getMavenProjectsForResponse" message="tns:getMavenProjectsForResponse">
- </wsdl:output>
- </wsdl:operation>
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="execute">
<wsdl:input name="executeRequest" message="tns:executeRequest">
- </wsdl:input>
+ </wsdl:input>
<wsdl:output name="executeResponse" message="tns:executeResponse">
- </wsdl:output>
+ </wsdl:output>
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="MavenEmbedderServiceHttpBinding" type="tns:MavenEmbedderServicePortType">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="getMavenProjectsFor">
<wsdlsoap:operation soapAction=""/>
<wsdl:input name="getMavenProjectsForRequest">
@@ -101,8 +114,8 @@
<wsdl:output name="getMavenProjectsForResponse">
<wsdlsoap:body use="literal"/>
</wsdl:output>
- </wsdl:operation>
+ </wsdl:operation>
<wsdl:operation name="execute">
<wsdlsoap:operation soapAction=""/>
<wsdl:input name="executeRequest">
@@ -111,8 +124,8 @@
<wsdl:output name="executeResponse">
<wsdlsoap:body use="literal"/>
</wsdl:output>
- </wsdl:operation>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="MavenEmbedderService">
<wsdl:port name="MavenEmbedderServiceHttpPort" binding="tns:MavenEmbedderServiceHttpBinding">