Author: wsmoak
Date: Wed Apr 5 23:46:14 2006
New Revision: 391915
URL: http://svn.apache.org/viewcvs?rev=391915&view=rev
Log:
Configure the source and javadoc plugins for struts-core, and add a simple
assembly.
Run 'mvn install' from action/build, then 'mvn assembly:assembly' from
action/assembly.
Adapted from the Apache MyFaces build.
Added:
struts/action/trunk/assembly/
struts/action/trunk/assembly/pom.xml (with props)
struts/action/trunk/assembly/src/
struts/action/trunk/assembly/src/main/
struts/action/trunk/assembly/src/main/assembly/
struts/action/trunk/assembly/src/main/assembly/dep.xml (with props)
struts/action/trunk/assembly/src/main/resources/
struts/action/trunk/assembly/src/main/resources/LICENSE.txt
- copied unchanged from r391907, struts/action/trunk/build/LICENSE.txt
struts/action/trunk/assembly/src/main/resources/NOTICE.txt
- copied unchanged from r391907, struts/action/trunk/build/NOTICE.txt
Modified:
struts/action/trunk/core/pom.xml
Added: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=391915&view=auto
==============================================================================
--- struts/action/trunk/assembly/pom.xml (added)
+++ struts/action/trunk/assembly/pom.xml Wed Apr 5 23:46:14 2006
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2005-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:$
+ */
+-->
+
+<!--
+ Experimental Maven 2 Build for Apache Struts
+ ============================================
+
+To create the assembly:
+
+ $ mvn assembly:assembly
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+-->
+
+<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>
+ <artifactId>struts-action-assembly</artifactId>
+ <packaging>pom</packaging>
+ <name>Struts Action Assembly</name>
+ <description>
+ Struts Action Assembly
+ </description>
+
+ <parent>
+ <groupId>org.apache.struts.action</groupId>
+ <artifactId>struts-build</artifactId>
+ <version>1.3.2-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/action/trunk/assembly</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/action/trunk/assembly</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/struts/action/trunk/assembly</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.struts.action</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ <configuration>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ <finalName>struts-action-${version}</finalName>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.struts.action</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: struts/action/trunk/assembly/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/action/trunk/assembly/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/action/trunk/assembly/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/dep.xml?rev=391915&view=auto
==============================================================================
--- struts/action/trunk/assembly/src/main/assembly/dep.xml (added)
+++ struts/action/trunk/assembly/src/main/assembly/dep.xml Wed Apr 5 23:46:14
2006
@@ -0,0 +1,31 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/javadoc</directory>
+ <outputDirectory>javadoc</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: struts/action/trunk/assembly/src/main/assembly/dep.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/action/trunk/assembly/src/main/assembly/dep.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/action/trunk/core/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?rev=391915&r1=391914&r2=391915&view=diff
==============================================================================
--- struts/action/trunk/core/pom.xml (original)
+++ struts/action/trunk/core/pom.xml Wed Apr 5 23:46:14 2006
@@ -46,7 +46,7 @@
<artifactId>struts-core</artifactId>
<packaging>jar</packaging>
<version>1.3.2-SNAPSHOT</version>
- <name>Struts Action Framework</name>
+ <name>Struts Action - Core</name>
<url>http://struts.apache.org</url>
<scm>
@@ -115,6 +115,29 @@
</includes>
</testResource>
</testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <goals><goal>jar</goal></goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals><goal>jar</goal></goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
