[NPANDAY-488] MSDeploy packaging (without config transforms) git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/npanday-its/trunk@1220835 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/assembly.xml b/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/assembly.xml deleted file mode 100644 index 078c97d..0000000 --- a/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/assembly.xml +++ /dev/null
@@ -1,73 +0,0 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> - <id>assembled-package</id> - <baseDirectory>.</baseDirectory> - <formats> - <format>dir</format> - </formats> - <dependencySets> - <!-- factor this out to a reusable component xml --> - <dependencySet> - <useProjectArtifact>true</useProjectArtifact> - <useTransitiveDependencies>true</useTransitiveDependencies> - <scope>runtime</scope> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <outputDirectory>01-source-raw\bin</outputDirectory> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <!-- factor this out to "raw-contents.xml" --> - <directory>.</directory> - <outputDirectory>01-source-raw</outputDirectory> - <includes> - <!-- .NET specifics --> - <include>**/*.aspx</include> - <include>**/*.ascx</include> - <include>**/*.asax</include> - <include>**/*.config</include> - - <!-- web developers--> - <include>**/*.css</include> - <include>**/*.js</include> - <include>**/*.htm</include> - <include>**/*.html</include> - - <!-- graphics --> - <include>**/*.jpg</include> - <include>**/*.jpeg</include> - <include>**/*.png</include> - <include>**/*.gif</include> - - <!-- silverlight? --> - </includes> - <excludes> - <!-- exclude transformation files --> - <exclude>**/*.package.*</exclude> - <exclude>**/*.debug.*</exclude> - <exclude>**/*.release.*</exclude> - - <!-- .NET specific --> - <exclude>bin/</exclude> - <exclude>obj/</exclude> - </excludes> - </fileSet> - <fileSet> - <!-- factor this out to "transformations.xml" --> - <directory>.</directory> - <outputDirectory>01-source-transformations</outputDirectory> - <includes> - <!-- bring over the actual transformations --> - <include>**/*.package.*</include> - <include>**/*.debug.*</include> - <include>**/*.release.*</include> - </includes> - <excludes> - <!-- .NET specific --> - <exclude>bin/</exclude> - <exclude>obj/</exclude> - </excludes> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file
diff --git a/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.xml b/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.xml index 2c713a5..9c4468b 100644 --- a/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.xml +++ b/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.xml
@@ -12,13 +12,17 @@ <version>1-SNAPSHOT</version> </parent> - <groupId>NPANDAY_488_MSDeployPackageSimpleWebApp</groupId> + <groupId>NPanday.ITs.NPANDAY_488_MSDeployPackageSimpleWebApp</groupId> <artifactId>HelloWorld_WebRole</artifactId> <packaging>dotnet-library</packaging> <version>1.0.0-SNAPSHOT</version> <name>NPanday.ITs.NPANDAY_488_MSDeployPackageSimpleWebApp :: Hello World Web Role</name> + <properties> + <frameworkVersion>4.0</frameworkVersion> + </properties> + <profiles> <profile> <id>standalone</id> @@ -28,7 +32,7 @@ </property> </activation> <properties> - <npanday.version>1.5.0-azuresupport-SNAPSHOT</npanday.version> + <npanday.version>1.5.0-incubating-SNAPSHOT</npanday.version> </properties> <build> <pluginManagement> @@ -61,81 +65,30 @@ <extensions>true</extensions> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.1</version> + <groupId>org.apache.npanday.plugins</groupId> + <artifactId>aspnet-maven-plugin</artifactId> + <version>${npanday.version}</version> <executions> <execution> - <id>assemble</id> + <id>prepare-package</id> <phase>prepare-package</phase> <goals> - <goal>single</goal> + <goal>assemble-package-files</goal> </goals> - <configuration> - <finalName>prepare-package</finalName> - <appendAssemblyId>false</appendAssemblyId> - <attach>false</attach> - <descriptors> - <descriptor>assembly.xml</descriptor> - </descriptors> - </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> + <groupId>org.apache.npanday.plugins</groupId> + <artifactId>msdeploy-maven-plugin</artifactId> + <version>${npanday.version}</version> <executions> <execution> - <id>xdt-transform</id> - <phase>prepare-package</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>msbuild</executable> - <arguments> - <argument>copy-transformed.xml</argument> - <argument>/p:WorkDirectory=${build.directory}/prepare-package</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>msbuild</id> + <id>create-msdeploy-package</id> <phase>package</phase> <goals> - <goal>exec</goal> + <goal>create-package</goal> </goals> - <configuration> - <executable>msdeploy</executable> - <arguments> - <argument>-verb:sync</argument> - <argument>-source:dirPath=${build.directory}/prepare-package/03-transformed</argument> - <argument>-dest:package=${build.directory}/${artifactId}.msdeploy.zip</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <id>add-msdeploy-package</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${build.directory}/${artifactId}.msdeploy.zip</file> - <type>msdeploy-package</type> - </artifact> - </artifacts> - </configuration> </execution> </executions> </plugin>