Author: brett
Date: Mon Jan 2 04:41:43 2012
New Revision: 1226346
URL: http://svn.apache.org/viewvc?rev=1226346&view=rev
Log:
[NPANDAY-480] Add support for importing Azure cloud service projects and Azure
worker roles
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/PomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/WebProjectDigestAlgorithm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectReference.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/SlnParser/ProjectSolutionParser.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectType.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectTypeEnum.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyUnitTestsForm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportMultipleRolesTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportOneWebRoleTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportWorkerRoleTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WorkerRole/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld_WorkerRole/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/pom.test
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Mon Jan 2 04:41:43 2012
@@ -311,7 +311,7 @@ namespace NPanday.ProjectImporter.Conver
}
- protected void GenerateHeader(string defaultPackaging)
+ protected void GenerateHeader(string packaging)
{
// Add Parent Header
if (parent != null)
@@ -331,12 +331,12 @@ namespace NPanday.ProjectImporter.Conver
}
else
{
- model.groupId = !string.IsNullOrEmpty(groupId) ?
FilterID(groupId) : FilterID(projectDigest.AssemblyName);
+ model.groupId = !string.IsNullOrEmpty(groupId) ?
FilterID(groupId) : FilterID(projectDigest.ProjectName);
model.version = string.IsNullOrEmpty(version) ? "1.0-SNAPSHOT"
: version;
}
- string projectName = projectDigest.AssemblyName;
- if (HasSpecialCharacters(projectDigest.AssemblyName))
+ string projectName = projectDigest.ProjectName;
+ if (HasSpecialCharacters(projectDigest.ProjectName))
{
FileInfo f = new FileInfo(ProjectDigest.FullFileName);
projectName = f.Name.Substring(0, f.Name.Length -
f.Extension.Length);
@@ -344,15 +344,8 @@ namespace NPanday.ProjectImporter.Conver
model.modelVersion = "4.0.0";
model.artifactId = FilterID(projectName);
- model.name = string.Format("{0} : {1}",
!string.IsNullOrEmpty(groupId) ? groupId :
FilterID(projectDigest.AssemblyName), FilterID(projectDigest.AssemblyName));
-
- model.packaging = defaultPackaging;
- if (!string.IsNullOrEmpty(projectDigest.OutputType))
- {
- string type = projectDigest.OutputType.ToLower();
- if (npandayTypeMap.ContainsKey(type))
- model.packaging = npandayTypeMap[type];
- }
+ model.name = string.Format("{0} : {1}",
!string.IsNullOrEmpty(groupId) ? groupId : FilterID(projectDigest.ProjectName),
FilterID(projectDigest.ProjectName));
+ model.packaging = packaging;
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs
Mon Jan 2 04:41:43 2012
@@ -55,10 +55,14 @@ namespace NPanday.ProjectImporter.Conver
public override void ConvertProjectToPomModel(bool writePom, string
scmTag)
{
-
-
- GenerateHeader("dotnet-library");
-
+ string packaging = "dotnet-library";
+ if (!string.IsNullOrEmpty(projectDigest.OutputType))
+ {
+ string type = projectDigest.OutputType.ToLower();
+ if (npandayTypeMap.ContainsKey(type))
+ packaging = npandayTypeMap[type];
+ }
+ GenerateHeader(packaging);
Model.build.sourceDirectory = GetSourceDir();
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/PomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/PomConverter.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/PomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/PomConverter.cs
Mon Jan 2 04:41:43 2012
@@ -54,6 +54,7 @@ namespace NPanday.ProjectImporter.Conver
__converterAlgorithms.Add(VisualStudioProjectTypeEnum.Windows__VbDotNet,
typeof(NormalPomConverter));
__converterAlgorithms.Add(VisualStudioProjectTypeEnum.Web_Site,
typeof(WebPomConverter));
__converterAlgorithms.Add(VisualStudioProjectTypeEnum.Web_Application,
typeof(WebPomConverter));
+
__converterAlgorithms.Add(VisualStudioProjectTypeEnum.WindowsAzure_CloudService,
typeof(AzurePomConverter));
// combination of types
@@ -67,6 +68,15 @@ namespace NPanday.ProjectImporter.Conver
);
__converterAlgorithms.Add(
+ VisualStudioProjectTypeEnum.WindowsAzure_Worker |
VisualStudioProjectTypeEnum.Windows__CSharp,
+ typeof(AzureWorkerPomConverter)
+ );
+ __converterAlgorithms.Add(
+ VisualStudioProjectTypeEnum.WindowsAzure_Worker |
VisualStudioProjectTypeEnum.Windows__VbDotNet,
+ typeof(AzureWorkerPomConverter)
+ );
+
+ __converterAlgorithms.Add(
VisualStudioProjectTypeEnum.Web_Application |
VisualStudioProjectTypeEnum.Windows__CSharp,
typeof(WebWithVbOrCsProjectFilePomConverter)
);
@@ -236,7 +246,7 @@ namespace NPanday.ProjectImporter.Conver
{
if (!__converterAlgorithms.ContainsKey(projectDigest.ProjectType))
{
- throw new NotSupportedException("Not Supported Project Type: "
+ projectDigest.ProjectType);
+ throw new NotSupportedException("Unsupported project type: " +
projectDigest.ProjectType);
}
else
{
@@ -245,6 +255,10 @@ namespace NPanday.ProjectImporter.Conver
{
projectDigest.ProjectType |=
VisualStudioProjectTypeEnum.WebDeploy2;
}
+ if (projectDigest.RoleType != null &&
projectDigest.RoleType.Equals("Worker",
StringComparison.InvariantCultureIgnoreCase))
+ {
+ projectDigest.ProjectType |=
VisualStudioProjectTypeEnum.WindowsAzure_Worker;
+ }
try
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
Mon Jan 2 04:41:43 2012
@@ -274,6 +274,7 @@ namespace NPanday.ProjectImporter.Digest
ProjectReference prjRef = new
ProjectReference(projectBasePath);
prjRef.ProjectPath = buildItem.Include;
prjRef.Name =
GetProjectAssemblyName(Path.GetFullPath(prjRef.ProjectFullPath));
+ prjRef.RoleType =
buildItem.GetMetadata("RoleType");
projectReferences.Add(prjRef);
break;
case "Reference":
@@ -504,6 +505,10 @@ namespace NPanday.ProjectImporter.Digest
{
projectDigest.AssemblyName = buildProperty.Value;
}
+ else if ("Name".Equals(buildProperty.Name,
StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.Name = buildProperty.Value;
+ }
else if ("StartupObject".Equals(buildProperty.Name,
StringComparison.OrdinalIgnoreCase))
{
projectDigest.StartupObject = buildProperty.Value;
@@ -512,6 +517,10 @@ namespace NPanday.ProjectImporter.Digest
{
projectDigest.OutputType = buildProperty.Value;
}
+ else if ("RoleType".Equals(buildProperty.Name,
StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.RoleType = buildProperty.Value;
+ }
else if ("SignAssembly".Equals(buildProperty.Name,
StringComparison.OrdinalIgnoreCase))
{
projectDigest.SignAssembly = buildProperty.Value;
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/WebProjectDigestAlgorithm.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/WebProjectDigestAlgorithm.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/WebProjectDigestAlgorithm.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/WebProjectDigestAlgorithm.cs
Mon Jan 2 04:41:43 2012
@@ -57,19 +57,19 @@ namespace NPanday.ProjectImporter.Digest
// get Assembly name
if (projectMap.ContainsKey("Release.AspNetCompiler.VirtualPath"))
{
- projectDigest.AssemblyName =
projectMap["Release.AspNetCompiler.VirtualPath"].ToString()
+ projectDigest.Name =
projectMap["Release.AspNetCompiler.VirtualPath"].ToString()
.Replace(@"/", "")
.Replace(@"\\", "");
}
else if
(projectMap.ContainsKey("Debug.AspNetCompiler.VirtualPath"))
{
- projectDigest.AssemblyName =
projectMap["Debug.AspNetCompiler.VirtualPath"].ToString()
+ projectDigest.Name =
projectMap["Debug.AspNetCompiler.VirtualPath"].ToString()
.Replace(@"/", "")
.Replace(@"\\", "");
}
else if(projectMap.ContainsKey("ProjectFullPath"))
{
- projectDigest.AssemblyName = new
DirectoryInfo(projectMap["ProjectFullPath"].ToString()).Name;
+ projectDigest.Name = new
DirectoryInfo(projectMap["ProjectFullPath"].ToString()).Name;
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
Mon Jan 2 04:41:43 2012
@@ -38,6 +38,21 @@ namespace NPanday.ProjectImporter.Digest
set { assemblyName = value; }
}
+ private string name;
+ public string Name
+ {
+ get { return name; }
+ set { name = value; }
+ }
+
+ public string ProjectName
+ {
+ get
+ {
+ return name != null ? name : assemblyName;
+ }
+ }
+
private VisualStudioProjectTypeEnum projectType;
public VisualStudioProjectTypeEnum ProjectType
@@ -83,6 +98,12 @@ namespace NPanday.ProjectImporter.Digest
set { outputType = value; }
}
+ private string roleType;
+ public string RoleType
+ {
+ get { return roleType; }
+ set { roleType = value; }
+ }
private Reference[] references;
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectReference.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectReference.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectReference.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectReference.cs
Mon Jan 2 04:41:43 2012
@@ -49,6 +49,13 @@ namespace NPanday.ProjectImporter.Digest
set { projectPath = value; }
}
+ private string roleType;
+ public string RoleType
+ {
+ get { return roleType; }
+ set { roleType = value; }
+ }
+
public string ProjectFullPath
{
get
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
Mon Jan 2 04:41:43 2012
@@ -69,10 +69,10 @@ namespace NPanday.ProjectImporter.Digest
new NormalProjectDigestAlgorithm().DigestProject
);
-
-
-
-
+ _digestAlgoritms.Add(
+ VisualStudioProjectTypeEnum.WindowsAzure_CloudService,
+ new NormalProjectDigestAlgorithm().DigestProject
+ );
}
@@ -87,7 +87,7 @@ namespace NPanday.ProjectImporter.Digest
DigestProject digestProject =
_digestAlgoritms[(VisualStudioProjectTypeEnum)project["ProjectType"]];
ProjectDigest projDigest = digestProject(project);
projectDigests.Add(projDigest);
- projDigestDictionary.Add(projDigest.AssemblyName, projDigest);
+ projDigestDictionary.Add(projDigest.ProjectName, projDigest);
}
List<ProjectDigest> tobeIncluded = new List<ProjectDigest>();
@@ -123,8 +123,8 @@ namespace NPanday.ProjectImporter.Digest
"Project \"{0}\" Requires \"{1}\" which is not
included in the Solution File, "
+ "\nWould you like to include \"{1}\" Generating
NPanday Project Poms?"
+ "\nNote: Not adding \"{1}\" will result to a
missing Artifact Dependency \"{1}\"",
- projectDigest.AssemblyName,
- prjRefDigest.AssemblyName);
+ projectDigest.ProjectName,
+ prjRefDigest.ProjectName);
DialogResult includeResult = MessageBox.Show(errMsg,
"Include Project in Pom Generation:",
MessageBoxButtons.YesNo,
@@ -132,7 +132,7 @@ namespace NPanday.ProjectImporter.Digest
if (includeResult == DialogResult.Yes)
{
-
projDigestDictionary.Add(prjRefDigest.AssemblyName, prjRefDigest);
+ projDigestDictionary.Add(prjRefDigest.ProjectName,
prjRefDigest);
tobeIncluded.Add(prjRefDigest);
}
else
@@ -140,7 +140,7 @@ namespace NPanday.ProjectImporter.Digest
warningMsg = string.Format(
"{0}\n Please Make sure that
Artifact[GroupId: {1}, ArtifactId: {1}] exists in your NPanday Repository, " +
"\n Or an error will occur during
NPanday-Build due to Missing Artifact Dependency!",
- warningMsg, prjRefDigest.AssemblyName);
+ warningMsg, prjRefDigest.ProjectName);
}
}
}
@@ -188,7 +188,7 @@ namespace NPanday.ProjectImporter.Digest
foreach (ProjectReference prjRef in y.ProjectReferences)
{
- if (x.AssemblyName.Equals(prjRef.Name))
+ if (x.ProjectName.Equals(prjRef.Name))
{
// Greater than 0, x is greater than y. (x is reffered by
y)
return -1;
@@ -197,7 +197,7 @@ namespace NPanday.ProjectImporter.Digest
foreach (ProjectReference prjRef in x.ProjectReferences)
{
- if (y.AssemblyName.Equals(prjRef.Name))
+ if (y.ProjectName.Equals(prjRef.Name))
{
// Less than 0, x is less than y. (x is referring to y)
return 1;
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj
Mon Jan 2 04:41:43 2012
@@ -54,6 +54,8 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Converter\Algorithms\ASPNetPomConverter.cs" />
+ <Compile Include="Converter\Algorithms\AzurePomConverter.cs" />
+ <Compile Include="Converter\Algorithms\AzureWorkerPomConverter.cs" />
<Compile
Include="Converter\Algorithms\WebWithVbOrCsProjectFilePomConverter.cs" />
<Compile Include="Digest\Algorithms\BaseProjectDigestAlgorithm.cs" />
<Compile Include="Digest\Model\ComReference.cs" />
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
Mon Jan 2 04:41:43 2012
@@ -221,7 +221,7 @@ namespace NPanday.ProjectImporter
}
}
}
-
+
if (!string.Empty.Equals(UnsupportedProjectsMessage))
{
warningMsg = string.Format("{0}\n Unsupported Projects:
{1}", warningMsg, UnsupportedProjectsMessage);
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/SlnParser/ProjectSolutionParser.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/SlnParser/ProjectSolutionParser.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/SlnParser/ProjectSolutionParser.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/SlnParser/ProjectSolutionParser.cs
Mon Jan 2 04:41:43 2012
@@ -124,10 +124,7 @@ namespace NPanday.ProjectImporter.Parser
ParseProjectReferences(dictionary, project, solution);
}
// this is for normal projects
- else if (
- (VisualStudioProjectTypeEnum)dictionary["ProjectType"] ==
VisualStudioProjectTypeEnum.Windows__CSharp
- || (VisualStudioProjectTypeEnum)dictionary["ProjectType"]
== VisualStudioProjectTypeEnum.Windows__VbDotNet
- )
+ else
{
Microsoft.Build.BuildEngine.Project prj = new
Microsoft.Build.BuildEngine.Project(BUILD_ENGINE);
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectType.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectType.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectType.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectType.cs
Mon Jan 2 04:41:43 2012
@@ -198,11 +198,15 @@ namespace NPanday.ProjectImporter.Parser
__visualStudioProjectTypeGuids.Add(VisualStudioProjectTypeEnum.Website_MVC,
"603C0E0B-DB56-11DC-BE95-000D561079B0");
__visualStudioProjectTypeSupported.Add("603C0E0B-DB56-11DC-BE95-000D561079B0",
true);
- //Model View Controller (MVC)
{{F85E285D-A4E0-4152-9332-AB1D724D3325}}
+ //Model View Controller (MVC)
{F85E285D-A4E0-4152-9332-AB1D724D3325}
__visualStudioProjectTypes.Add("F85E285D-A4E0-4152-9332-AB1D724D3325",
VisualStudioProjectTypeEnum.Model_View_Controller_MVC);
__visualStudioProjectTypeGuids.Add(VisualStudioProjectTypeEnum.Model_View_Controller_MVC,
"F85E285D-A4E0-4152-9332-AB1D724D3325");
__visualStudioProjectTypeSupported.Add("F85E285D-A4E0-4152-9332-AB1D724D3325",
true);
+ //Windows Azure Project {CC5FD16D-436D-48AD-A40C-5A424C6E3E79}
+
__visualStudioProjectTypes.Add("CC5FD16D-436D-48AD-A40C-5A424C6E3E79",
VisualStudioProjectTypeEnum.WindowsAzure_CloudService);
+
__visualStudioProjectTypeGuids.Add(VisualStudioProjectTypeEnum.WindowsAzure_CloudService,
"CC5FD16D-436D-48AD-A40C-5A424C6E3E79");
+
__visualStudioProjectTypeSupported.Add("CC5FD16D-436D-48AD-A40C-5A424C6E3E79",
true);
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectTypeEnum.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectTypeEnum.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectTypeEnum.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectTypeEnum.cs
Mon Jan 2 04:41:43 2012
@@ -198,8 +198,12 @@ namespace NPanday.ProjectImporter.Parser
/// GUID: {69150728-AFCB-45A3-9D78-D96A5E0F1A27}
/// </summary>
Model_View_Controller_MVC = 1 << 26,
-
+
WebDeploy2 = 1 << 27,
+ WindowsAzure_CloudService = 1 << 28,
+
+ WindowsAzure_Worker = 1 << 29,
+ // TODO: if we get to 31 we'll run out, refactor so this is an enum of
the GUIDs instead
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyUnitTestsForm.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyUnitTestsForm.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyUnitTestsForm.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyUnitTestsForm.cs
Mon Jan 2 04:41:43 2012
@@ -61,7 +61,7 @@ namespace NPanday.ProjectImporter.Verifi
projectDigest.FullFileName =
projectDigest.FullFileName.Substring(0,
projectDigest.FullFileName.LastIndexOf("\\"));
}
- if
(chkListTestUnits.CheckedItems.Contains(projectDigest.AssemblyName))
+ if
(chkListTestUnits.CheckedItems.Contains(projectDigest.ProjectName))
{
projectDigest.UnitTest = true;
}
@@ -88,7 +88,7 @@ namespace NPanday.ProjectImporter.Verifi
projectName = projectNameTokens[projectNameTokens.Length -
2];
}
- chkListTestUnits.Items.Add(projectDigest.AssemblyName,
projectDigest.UnitTest);
+ chkListTestUnits.Items.Add(projectDigest.ProjectName,
projectDigest.UnitTest);
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportMultipleRolesTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportMultipleRolesTest.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportMultipleRolesTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportMultipleRolesTest.cs
Mon Jan 2 04:41:43 2012
@@ -23,7 +23,6 @@ using NUnit.Framework;
namespace NPanday.ProjectImporter.ImporterTests
{
- [Ignore] // not implemented yet
[TestFixture]
public class AzureImportMultipleRolesTest : AbstractProjectImportTest
{
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportOneWebRoleTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportOneWebRoleTest.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportOneWebRoleTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportOneWebRoleTest.cs
Mon Jan 2 04:41:43 2012
@@ -23,7 +23,6 @@ using NUnit.Framework;
namespace NPanday.ProjectImporter.ImporterTests
{
- [Ignore] // not implemented yet
[TestFixture]
public class AzureImportOneWebRoleTest : AbstractProjectImportTest
{
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportWorkerRoleTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportWorkerRoleTest.cs?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportWorkerRoleTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportWorkerRoleTest.cs
Mon Jan 2 04:41:43 2012
@@ -23,7 +23,6 @@ using NUnit.Framework;
namespace NPanday.ProjectImporter.ImporterTests
{
- [Ignore] // not implemented yet
[TestFixture]
public class AzureImportWorkerRoleTest : AbstractProjectImportTest
{
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.test?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.test
Mon Jan 2 04:41:43 2012
@@ -1,57 +1,30 @@
<?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/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns="http://maven.apache.org/POM/4.0.0";>
<parent>
- <groupId>NPanday.ITs.NPANDAY_480_AzureSupportOneWebRole</groupId>
- <artifactId>NPANDAY_480_AzureSupportOneWebRole-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>test-parent</artifactId>
+ <groupId>test.group</groupId>
+ <version>1.2.3-SNAPSHOT</version>
+ <relativePath>..\pom.xml</relativePath>
</parent>
-
- <artifactId>HelloWorld_CloudService</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>HelloWorld</artifactId>
<packaging>azure-cloud-service</packaging>
-
- <name>NPanday.ITs.NPANDAY_480_AzureSupportOneWebRole :: Hello World Cloud
Service</name>
-
- <dependencies>
- <dependency>
- <groupId>NPanday.ITs.NPANDAY_480_AzureSupportOneWebRole</groupId>
- <artifactId>HelloWorld_WebRole</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <type>msdeploy-package</type>
- </dependency>
- </dependencies>
-
+ <name>test.group : HelloWorld</name>
<build>
<plugins>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>azure-maven-plugin</artifactId>
<extensions>true</extensions>
- </plugin>
+ </plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>test.group</groupId>
+ <artifactId>HelloWorld_WebRole</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <type>msdeploy-package</type>
+ </dependency>
+ </dependencies>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/pom.test?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/pom.test
Mon Jan 2 04:41:43 2012
@@ -7,7 +7,7 @@
<name>test.group : test-parent</name>
<version>1.2.3-SNAPSHOT</version>
<modules>
- <module>HelloWorld</module>
<module>HelloWorld_WebRole</module>
+ <module>HelloWorld</module>
</modules>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld/pom.test?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld/pom.test
Mon Jan 2 04:41:43 2012
@@ -1,63 +1,36 @@
<?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/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns="http://maven.apache.org/POM/4.0.0";>
<parent>
- <groupId>NPanday.ITs.NPANDAY_480_CloudServiceWithMultipleRoles</groupId>
- <artifactId>NPANDAY_480_CloudServiceWithMultipleRoles-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>test-parent</artifactId>
+ <groupId>test.group</groupId>
+ <version>1.2.3-SNAPSHOT</version>
+ <relativePath>..\pom.xml</relativePath>
</parent>
-
- <artifactId>HelloWorld_CloudService</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>HelloWorld</artifactId>
<packaging>azure-cloud-service</packaging>
-
- <name>NPanday.ITs.NPANDAY_480_CloudServiceWithMultipleRoles :: Hello World
Cloud Service</name>
-
+ <name>test.group : HelloWorld</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.npanday.plugins</groupId>
+ <artifactId>azure-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
- <groupId>NPanday.ITs.NPANDAY_480_CloudServiceWithMultipleRoles</groupId>
+ <groupId>test.group</groupId>
<artifactId>HelloWorld_WebRole</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
<type>msdeploy-package</type>
</dependency>
<dependency>
- <groupId>NPanday.ITs.NPANDAY_480_CloudServiceWithMultipleRoles</groupId>
+ <groupId>test.group</groupId>
<artifactId>HelloWorld_WorkerRole</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
<type>dotnet-application</type>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.npanday.plugins</groupId>
- <artifactId>azure-maven-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-</project>
+</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WorkerRole/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WorkerRole/pom.test?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WorkerRole/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WorkerRole/pom.test
Mon Jan 2 04:41:43 2012
@@ -30,9 +30,9 @@
<artifactId>application-maven-plugin</artifactId>
<executions>
<execution>
+ <id>package-application</id>
<goals>
<goal>assemble-package-files</goal>
- <goal>process-app-config</goal>
<goal>package</goal>
</goals>
</execution>
@@ -43,24 +43,21 @@
<dependencies>
<dependency>
<groupId>Microsoft.WindowsAzure</groupId>
- <artifactId>Microsoft.WindowsAzure.StorageClient</artifactId>
- <version>1.1.0.0</version>
+ <artifactId>Microsoft.WindowsAzure.Diagnostics</artifactId>
+ <version>1.0.0.0</version>
<type>dotnet-library</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>Microsoft.WindowsAzure</groupId>
<artifactId>Microsoft.WindowsAzure.ServiceRuntime</artifactId>
<version>1.0.0.0</version>
<type>dotnet-library</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>Microsoft.WindowsAzure</groupId>
- <artifactId>Microsoft.WindowsAzure.Diagnostics</artifactId>
- <version>1.0.0.0</version>
+ <artifactId>Microsoft.WindowsAzure.StorageClient</artifactId>
+ <version>1.1.0.0</version>
<type>dotnet-library</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/pom.test?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/pom.test
Mon Jan 2 04:41:43 2012
@@ -7,8 +7,8 @@
<name>test.group : test-parent</name>
<version>1.2.3-SNAPSHOT</version>
<modules>
- <module>HelloWorld</module>
<module>HelloWorld_WorkerRole</module>
<module>HelloWorld_WebRole</module>
+ <module>HelloWorld</module>
</modules>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld/pom.test?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld/pom.test
Mon Jan 2 04:41:43 2012
@@ -1,57 +1,30 @@
<?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/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns="http://maven.apache.org/POM/4.0.0";>
<parent>
- <groupId>NPanday.ITs.NPANDAY_480_CloudServiceWithWorkerRole</groupId>
- <artifactId>NPANDAY_480_CloudServiceWithWorkerRole-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>test-parent</artifactId>
+ <groupId>test.group</groupId>
+ <version>1.2.3-SNAPSHOT</version>
+ <relativePath>..\pom.xml</relativePath>
</parent>
-
- <artifactId>HelloWorld_CloudService</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>HelloWorld</artifactId>
<packaging>azure-cloud-service</packaging>
-
- <name>NPanday.ITs.NPANDAY_480_CloudServiceWithWorkerRole :: Hello World
Cloud Service</name>
-
- <dependencies>
- <dependency>
- <groupId>NPanday.ITs.NPANDAY_480_CloudServiceWithWorkerRole</groupId>
- <artifactId>HelloWorld_WorkerRole</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <type>dotnet-application</type>
- </dependency>
- </dependencies>
-
+ <name>test.group : HelloWorld</name>
<build>
<plugins>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>azure-maven-plugin</artifactId>
<extensions>true</extensions>
- </plugin>
+ </plugin>
</plugins>
</build>
-</project>
+ <dependencies>
+ <dependency>
+ <groupId>test.group</groupId>
+ <artifactId>HelloWorld_WorkerRole</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <type>dotnet-application</type>
+ </dependency>
+ </dependencies>
+</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld_WorkerRole/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld_WorkerRole/pom.test?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld_WorkerRole/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld_WorkerRole/pom.test
Mon Jan 2 04:41:43 2012
@@ -30,9 +30,9 @@
<artifactId>application-maven-plugin</artifactId>
<executions>
<execution>
+ <id>package-application</id>
<goals>
<goal>assemble-package-files</goal>
- <goal>process-app-config</goal>
<goal>package</goal>
</goals>
</execution>
@@ -43,24 +43,21 @@
<dependencies>
<dependency>
<groupId>Microsoft.WindowsAzure</groupId>
- <artifactId>Microsoft.WindowsAzure.StorageClient</artifactId>
- <version>1.1.0.0</version>
+ <artifactId>Microsoft.WindowsAzure.Diagnostics</artifactId>
+ <version>1.0.0.0</version>
<type>dotnet-library</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>Microsoft.WindowsAzure</groupId>
<artifactId>Microsoft.WindowsAzure.ServiceRuntime</artifactId>
<version>1.0.0.0</version>
<type>dotnet-library</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>Microsoft.WindowsAzure</groupId>
- <artifactId>Microsoft.WindowsAzure.Diagnostics</artifactId>
- <version>1.0.0.0</version>
+ <artifactId>Microsoft.WindowsAzure.StorageClient</artifactId>
+ <version>1.1.0.0</version>
<type>dotnet-library</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/pom.test?rev=1226346&r1=1226345&r2=1226346&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/pom.test
Mon Jan 2 04:41:43 2012
@@ -7,7 +7,7 @@
<name>test.group : test-parent</name>
<version>1.2.3-SNAPSHOT</version>
<modules>
- <module>HelloWorld</module>
<module>HelloWorld_WorkerRole</module>
+ <module>HelloWorld</module>
</modules>
</project>
