Author: craigmcc
Date: Wed Jun 14 13:28:37 2006
New Revision: 414381
URL: http://svn.apache.org/viewvc?rev=414381&view=rev
Log:
Experimental assembly configuration for standalone packaging of the
shale-blank application. After verifying that the result is correct, it
will be possible to cut-n-paste this for the other webapps.
TODO: The dist.xml in shale-dist packages the pom.xml files at the
wrong level for all the framework modules. Needs to be split from
source copying.
Added:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/assembly/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/assembly/dep.xml
Modified:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml?rev=414381&r1=414380&r2=414381&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml Wed Jun 14
13:28:37 2006
@@ -19,13 +19,14 @@
-->
<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/maven-v4_0_0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.struts.shale</groupId>
<artifactId>shale-apps-parent</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>
+
<artifactId>shale-blank</artifactId>
<packaging>war</packaging>
<name>Shale Blank Sample App</name>
@@ -34,28 +35,21 @@
<dependencies>
<dependency>
- <groupId>org.apache.struts.shale</groupId>
- <artifactId>shale-core</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>${version}</version>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.8</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jsr173</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
</dependency>
<dependency>
@@ -65,16 +59,10 @@
</dependency>
<dependency>
- <groupId>htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.8</version>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.8</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -83,17 +71,37 @@
<version>0.8</version>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <version>0.8</version>
+ <groupId>org.apache.struts.shale</groupId>
+ <artifactId>shale-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
+
</dependencies>
<build>
<plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Added:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/assembly/dep.xml?rev=414381&view=auto
==============================================================================
---
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/assembly/dep.xml
(added)
+++
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/assembly/dep.xml
Wed Jun 14 13:28:37 2006
@@ -0,0 +1,63 @@
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ *
+ * $Id: pom.xml 414075 2006-06-14 05:06:06Z jmitchell $
+ */
+-->
+<assembly>
+
+ <id>dist</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <fileSets>
+
+ <!-- Include top level directory files in the assembly -->
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <!-- FIXME: README? LICENSE? NOTICE? -->
+ </includes>
+ </fileSet>
+
+ <!-- Include the source code in the assembly -->
+ <fileSet>
+ <directory>./src</directory>
+ <outputDirectory>src/</outputDirectory>
+ </fileSet>
+
+ <!-- Include the website docs in the assembly -->
+ <fileSet>
+ <directory>./target/site</directory>
+ <outputDirectory>docs/</outputDirectory>
+ </fileSet>
+
+ <!-- Include the web application in the assembly -->
+ <fileSet>
+ <directory>./target</directory>
+ <outputDirectory>dist/</outputDirectory>
+ <includes>
+ <include>*.war</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
\ No newline at end of file
