You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ws...@apache.org on 2006/06/11 20:30:58 UTC
svn commit: r413500 - in /struts/shale/branches/mvn_reorg: pom.xml
shale-dist/ shale-dist/pom.xml shale-dist/src/ shale-dist/src/assemble/
shale-dist/src/assemble/dist.xml
Author: wsmoak
Date: Sun Jun 11 11:30:58 2006
New Revision: 413500
URL: http://svn.apache.org/viewvc?rev=413500&view=rev
Log:
Maven 2 reorg - Added the beginnings of an assembly containing jars, sources and website docs.
To build the assembly: 'mvn site -P myfaces; cd shale-dist; mvn assembly:assembly -P myfaces'
TODO: Add the rest of the modules. Determine how to distribute the example apps.
Added:
struts/shale/branches/mvn_reorg/shale-dist/
struts/shale/branches/mvn_reorg/shale-dist/pom.xml (with props)
struts/shale/branches/mvn_reorg/shale-dist/src/
struts/shale/branches/mvn_reorg/shale-dist/src/assemble/
struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml (with props)
Modified:
struts/shale/branches/mvn_reorg/pom.xml
Modified: struts/shale/branches/mvn_reorg/pom.xml
URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/pom.xml?rev=413500&r1=413499&r2=413500&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/pom.xml Sun Jun 11 11:30:58 2006
@@ -133,6 +133,7 @@
<module>shale-tiger</module>
<module>shale-tiles</module>
<module>shale-apps</module>
+ <module>shale-dist</module>
</modules>
<repositories>
Added: struts/shale/branches/mvn_reorg/shale-dist/pom.xml
URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-dist/pom.xml?rev=413500&view=auto
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-dist/pom.xml (added)
+++ struts/shale/branches/mvn_reorg/shale-dist/pom.xml Sun Jun 11 11:30:58 2006
@@ -0,0 +1,87 @@
+<!--
+/*
+ * 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$
+ */
+-->
+<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-parent</artifactId>
+ <version>1.0.3-SNAPSHOT</version>
+ </parent>
+ <artifactId>shale-dist</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Shale Framework - Distribution</name>
+ <url>http://struts.apache.org/struts-shale</url>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.0.1</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/dist.xml</descriptor>
+ </descriptors>
+ <finalName>shale-framework-${version}</finalName>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.struts.shale</groupId>
+ <artifactId>shale-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <!-- Exclude transitive dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.0.b2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: struts/shale/branches/mvn_reorg/shale-dist/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/shale/branches/mvn_reorg/shale-dist/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: struts/shale/branches/mvn_reorg/shale-dist/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml
URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml?rev=413500&view=auto
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml (added)
+++ struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml Sun Jun 11 11:30:58 2006
@@ -0,0 +1,46 @@
+<assembly>
+ <id>dist</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+
+ <!-- Include the source code in the assembly -->
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>src/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../shale-core</directory>
+ <outputDirectory>src/shale-core</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ <!-- Include the website docs in the assembly -->
+ <fileSet>
+ <directory>../target/site</directory>
+ <outputDirectory>docs/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../shale-core/target/site</directory>
+ <outputDirectory>docs/shale-core</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange: struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL