Author: apetrelli
Date: Sun Nov 25 07:31:56 2007
New Revision: 598003
URL: http://svn.apache.org/viewvc?rev=598003&view=rev
Log:
WW-2259
Added configuration to create "backport" and "docs" assemblies.
It must be corrected when the XWork backported artifacts will be available.
Added:
struts/struts2/trunk/assembly/src/main/assembly/docs.xml (with props)
struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml (with
props)
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/assembly/src/main/assembly/lib.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=598003&r1=598002&r2=598003&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Sun Nov 25 07:31:56 2007
@@ -140,8 +140,10 @@
<descriptors>
<descriptor>src/main/assembly/all.xml</descriptor>
<descriptor>src/main/assembly/lib.xml</descriptor>
+
<descriptor>src/main/assembly/lib-backport.xml</descriptor>
<descriptor>src/main/assembly/apps.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/main/assembly/docs.xml</descriptor>
</descriptors>
<finalName>struts-${version}</finalName>
<outputDirectory>target/assembly/out</outputDirectory>
@@ -164,6 +166,30 @@
<version>${version}</version>
</dependency>
+ <!-- Enable when XW-585 is resolved and XWork 2.1.1-SNAPSHOT is
published.
+ See: http://jira.opensymphony.com/browse/XW-585
+
+ <dependency>
+ <groupId>com.opensymphony</groupId>
+ <artifactId>xwork</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <classifier>backport</classifier>
+ <scope>runtime</scope>
+ </dependency> -->
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-api</artifactId>
+ <version>${version}</version>
+ <classifier>backport</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>${version}</version>
+ <classifier>backport</classifier>
+ </dependency>
+
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-config-browser-plugin</artifactId>
@@ -228,6 +254,20 @@
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>2.0.5</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-runtime</artifactId>
+ <version>1.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.0</version>
<scope>runtime</scope>
</dependency>
Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=598003&r1=598002&r2=598003&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Sun Nov 25 07:31:56
2007
@@ -28,6 +28,7 @@
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<excludes>
+ <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
<exclude>*:backport</exclude>
</excludes>
</dependencySet>
@@ -84,10 +85,18 @@
</fileSet>
-->
<fileSet>
+ <directory>../plugins/codebehind/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../plugins/config-browser/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../plugins/dojo/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-dojo-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../plugins/jasperreports/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin</outputDirectory>
</fileSet>
@@ -108,12 +117,24 @@
<outputDirectory>docs/struts2-plugins/struts2-plexus-plugin</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../plugins/portlet/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-portlet-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/rest/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-rest-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../plugins/struts1/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-struts1-plugin</outputDirectory>
</fileSet>
<fileSet>
<directory>../plugins/sitegraph/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/spring/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-spring-plugin</outputDirectory>
</fileSet>
<fileSet>
<directory>../plugins/sitemesh/target/site</directory>
Added: struts/struts2/trunk/assembly/src/main/assembly/docs.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/docs.xml?rev=598003&view=auto
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/docs.xml (added)
+++ struts/struts2/trunk/assembly/src/main/assembly/docs.xml Sun Nov 25
07:31:56 2007
@@ -0,0 +1,117 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
+
+<assembly>
+ <id>docs</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+
+ <!-- Include the XWork Javadoc in the assembly -->
+ <fileSet>
+ <directory>target/xwork-apidocs</directory>
+ <outputDirectory>docs/xwork-apidocs</outputDirectory>
+ </fileSet>
+
+ <!-- Include the website in the assembly -->
+ <fileSet>
+ <directory>../target/site</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../api/target/site</directory>
+ <outputDirectory>docs/struts2-api</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../core/target/site</directory>
+ <outputDirectory>docs/struts2-core</outputDirectory>
+ </fileSet>
+
+ <!-- Include the Confluence docs in the assembly -->
+ <fileSet>
+ <directory>target/cwiki</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+
+ <!-- Plugins -->
+ <fileSet>
+ <directory>../plugins/codebehind/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/config-browser/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/dojo/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-dojo-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/jasperreports/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/jfreechart/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/jsf/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-jsf-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/pell-multipart/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/plexus/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-plexus-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/portlet/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-portlet-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/rest/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-rest-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/struts1/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-struts1-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/sitegraph/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/spring/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-spring-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/sitemesh/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/tiles/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-tiles-plugin</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+</assembly>
Propchange: struts/struts2/trunk/assembly/src/main/assembly/docs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/src/main/assembly/docs.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml?rev=598003&view=auto
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml (added)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml Sun Nov 25
07:31:56 2007
@@ -0,0 +1,59 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
+
+<assembly>
+ <id>lib-backport</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>backport</outputDirectory>
+
<outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>
+ <includes>
+ <include>net.sf.retrotranslator:retrotranslator-runtime</include>
+ <include>backport-util-concurrent:backport-util-concurrent</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>backport</outputDirectory>
+
<outputFileNameMapping>${artifactId}-${version}-backport.${extension}</outputFileNameMapping>
+ <includes>
+ <include>org.apache.struts:struts2-api:jar:backport</include>
+ <include>org.apache.struts:struts2-core:jar:backport</include>
+ <include>com.opensymphony:xwork:jar:backport</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>../backport</directory>
+ <outputDirectory>backport</outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>*LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ <excludes>
+ <exclude>ASM-*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=598003&r1=598002&r2=598003&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Sun Nov 25 07:31:56
2007
@@ -28,6 +28,7 @@
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<excludes>
+ <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
<exclude>*:backport</exclude>
</excludes>
</dependencySet>
