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/01 16:04:39 UTC

svn commit: r1209131 - in /incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src: it/IT001_AssembleWithZeroConfig/ it/IT002_UserDefinedAssemblyDescriptor/ it/IT003_AdditionalComponents/ main/resources/assemblies/components/

Author: lcorneliussen
Date: Thu Dec  1 16:04:38 2011
New Revision: 1209131

URL: http://svn.apache.org/viewvc?rev=1209131&view=rev
Log:
[NPANDAY-488] MSDeploy Packaging for Web Applications (also Azure Web Roles)

o Fixed excludes for target, bin and obj
o Improved integration tests

Modified:
    incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt
    incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt
    incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt
    incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml
    incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy
    incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-contents.xml

Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt?rev=1209131&r1=1209130&r2=1209131&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt Thu Dec  1 16:04:38 2011
@@ -1 +1 @@
-prepare-package
+clean prepare-package

Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt?rev=1209131&r1=1209130&r2=1209131&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt Thu Dec  1 16:04:38 2011
@@ -1 +1 @@
-prepare-package
+clean prepare-package

Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt?rev=1209131&r1=1209130&r2=1209131&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt Thu Dec  1 16:04:38 2011
@@ -1 +1 @@
-prepare-package
+clean prepare-package

Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml?rev=1209131&r1=1209130&r2=1209131&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml Thu Dec  1 16:04:38 2011
@@ -22,7 +22,7 @@ under the License.
          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>
   <groupId>@project.groupId@.@project.artifactId@-its</groupId>
-  <artifactId>IT002_UserDefinedAssemblyDescriptor</artifactId>
+  <artifactId>IT003_AdditionalComponents</artifactId>
   <version>@project.version@</version>
   <packaging>pom</packaging>
   <build>

Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy?rev=1209131&r1=1209130&r2=1209131&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy Thu Dec  1 16:04:38 2011
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-def packageDir = new File(basedir, "target\\packages\\IT002_UserDefinedAssemblyDescriptor")
+def packageDir = new File(basedir, "target\\packages\\IT003_AdditionalComponents")
 assert packageDir.exists()
 assert new File(packageDir, "copy-anyway.aspx").exists();
 assert new File(packageDir, "copy-also.txt").exists();

Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-contents.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-contents.xml?rev=1209131&r1=1209130&r2=1209131&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-contents.xml (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-contents.xml Thu Dec  1 16:04:38 2011
@@ -36,9 +36,9 @@
         <include>crossdomain.xml</include>
       </includes>
       <excludes>
-        <exclude>bin/</exclude>
-        <exclude>obj/</exclude>
-        <exclude>target/</exclude>
+        <exclude>bin/**/*.*</exclude>
+        <exclude>obj/**/*.*</exclude>
+        <exclude>target/**/*.*</exclude>
       </excludes>
     </fileSet>
   </fileSets>