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 lc...@apache.org on 2011/12/27 16:47:45 UTC

svn commit: r1224945 - in /incubator/npanday/npanday-its/trunk/src/test: java/npanday/its/ resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/

Author: lcorneliussen
Date: Tue Dec 27 16:47:45 2011
New Revision: 1224945

URL: http://svn.apache.org/viewvc?rev=1224945&view=rev
Log:
[NPANDAY-480] Support Windows Azure Cloud Service Project and Packaging (CCPack)

o testing, that attaching separate Package cscfg file works

Added:
    incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/ServiceConfiguration.Package.cscfg
Modified:
    incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java
    incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/HelloWorld.ccproj
    incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.xml

Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java?rev=1224945&r1=1224944&r2=1224945&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java Tue Dec 27 16:47:45 2011
@@ -44,7 +44,13 @@ public class NPANDAY_480_AzureSupportOne
 
         verifier.assertFilePresent(
             verifier.getArtifactPath(
-                context.getGroupId(), a, v, "cscfg", "configtemplate"
+                context.getGroupId(), a, v, "cscfg", "generated"
+            )
+        );
+
+        verifier.assertFilePresent(
+            verifier.getArtifactPath(
+                context.getGroupId(), a, v, "cscfg", "package"
             )
         );
 

Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/HelloWorld.ccproj
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/HelloWorld.ccproj?rev=1224945&r1=1224944&r2=1224945&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/HelloWorld.ccproj (original)
+++ incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/HelloWorld.ccproj Tue Dec 27 16:47:45 2011
@@ -31,6 +31,7 @@
   </PropertyGroup>
   <!-- Items for the project -->
   <ItemGroup>
+    <ServiceConfiguration Include="ServiceConfiguration.Package.cscfg" />
     <ServiceDefinition Include="ServiceDefinition.csdef" />
     <ServiceConfiguration Include="ServiceConfiguration.cscfg" />
   </ItemGroup>

Added: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/ServiceConfiguration.Package.cscfg
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/ServiceConfiguration.Package.cscfg?rev=1224945&view=auto
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/ServiceConfiguration.Package.cscfg (added)
+++ incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/ServiceConfiguration.Package.cscfg Tue Dec 27 16:47:45 2011
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<ServiceConfiguration serviceName="HelloWorld" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration">
+  <Role name="HelloWorld_WebRole">
+    <Instances count="1" />
+    <ConfigurationSettings>
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
+    </ConfigurationSettings>
+  </Role>
+</ServiceConfiguration>
\ No newline at end of file

Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.xml?rev=1224945&r1=1224944&r2=1224945&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.xml (original)
+++ incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/HelloWorld/pom.xml Tue Dec 27 16:47:45 2011
@@ -71,11 +71,16 @@
       <plugin>
         <groupId>org.apache.npanday.plugins</groupId>
         <artifactId>azure-maven-plugin</artifactId>
-        <configuration>
-
-        </configuration>
         <executions>
           <execution>
+            <id>default-process-cloud-service-configuration</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>process-cloud-service-configuration</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-create-cloud-service-package</id>
             <phase>package</phase>
             <goals>
               <goal>create-cloud-service-package</goal>