You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by ap...@apache.org on 2011/02/09 10:05:08 UTC
svn commit: r1068826 -
/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
Author: apadilla
Date: Wed Feb 9 10:05:08 2011
New Revision: 1068826
URL: http://svn.apache.org/viewvc?rev=1068826&view=rev
Log:
[NPanday-368]
* fixed the issue when adding a service reference (no existing service reference) to correctly update the pom file
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs?rev=1068826&r1=1068825&r2=1068826&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs Wed Feb 9 10:05:08 2011
@@ -206,18 +206,6 @@ namespace NPanday.VisualStudio.Addin
if (reference != null)
{
addWebReference(pomUtil, projectItem.Name, refType + "\\" + projectItem.Name + "\\" + reference, string.Empty);
-
- String path = GetReferencePath(projectItem, refType);
- if (Directory.Exists(path))
- {
- string[] files = Directory.GetFiles(path, "*.cs");
-
- if (files.Length > 0)
- {
-
- }
- }
-
}
}
@@ -284,7 +272,7 @@ namespace NPanday.VisualStudio.Addin
// remove web reference configuration in pom.xml when using "Exclude in Project"
- string fullPath = projectItem.get_FileNames(0);
+ string fullPath = projectItem.get_FileNames(1);
string refType = Messages.MSG_D_WEB_REF;
if ( fullPath.StartsWith(Path.GetDirectoryName(projectItem.ContainingProject.FullName) + "\\" + Messages.MSG_D_SERV_REF))
@@ -726,6 +714,11 @@ namespace NPanday.VisualStudio.Addin
}
referenceFolder = Path.Combine(Path.GetDirectoryName(project.FullName), webReferenceFolder.Name);
serviceRefFolder = Path.Combine(Path.GetDirectoryName(project.FullName), Messages.MSG_D_SERV_REF);
+
+ if (!Directory.Exists(serviceRefFolder))
+ {
+ Directory.CreateDirectory(serviceRefFolder);
+ }
}
catch
{
@@ -963,7 +956,7 @@ namespace NPanday.VisualStudio.Addin
try
{
//wait for the files to be created
- System.Threading.Thread.Sleep(2500);
+ System.Threading.Thread.Sleep(3500);
Solution2 solution = (Solution2)_applicationObject.Solution;
e.Init(projectReferenceFolder(CurrentSelectedProject));
@@ -1018,6 +1011,7 @@ namespace NPanday.VisualStudio.Addin
string path = Path.Combine(Path.GetDirectoryName(CurrentSelectedProject.FullName), Messages.MSG_D_SERV_REF);
e.Init(path);
PomHelperUtility pomUtil = new PomHelperUtility(_applicationObject.Solution, CurrentSelectedProject);
+
pomUtil.AddWebReference(e.Namespace, e.WsdlFile, string.Empty);
}
catch (Exception ex)
@@ -1589,6 +1583,10 @@ namespace NPanday.VisualStudio.Addin
w.Stop();
}
+ foreach (WebServicesReferenceWatcher s in svRefWatcher)
+ {
+ s.Stop();
+ }
}
#endregion