Author: apetrelli
Date: Tue Sep 22 18:29:41 2009
New Revision: 817752
URL: http://svn.apache.org/viewvc?rev=817752&view=rev
Log:
TILES-465
Removed the tiles-test.war from the binary assembly, it will be released as a
WAR file.
Documentation is separated from the binary assembly.
Fixed source assembly, added new modules.
Added:
tiles/framework/trunk/assembly/src/main/assembly/docs.xml (with props)
Modified:
tiles/framework/trunk/assembly/pom.xml
tiles/framework/trunk/assembly/src/main/assembly/bin.xml
tiles/framework/trunk/assembly/src/main/assembly/src.xml
Modified: tiles/framework/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?rev=817752&r1=817751&r2=817752&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Tue Sep 22 18:29:41 2009
@@ -48,6 +48,7 @@
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/docs.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<finalName>tiles-${version}</finalName>
@@ -79,6 +80,7 @@
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/docs.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
Modified: tiles/framework/trunk/assembly/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/bin.xml?rev=817752&r1=817751&r2=817752&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin.xml Tue Sep 22
18:29:41 2009
@@ -53,13 +53,6 @@
<exclude>org.apache.tiles:tiles-test</exclude>
</excludes>
</dependencySet>
- <dependencySet>
- <outputDirectory>/examples</outputDirectory>
-
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.tiles:tiles-test</include>
- </includes>
- </dependencySet>
</dependencySets>
<fileSets>
@@ -71,17 +64,5 @@
<include>NOTICE.txt</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../target/site/apidocs</directory>
- <outputDirectory>apidocs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../tiles-core/target/site/dtddoc</directory>
- <outputDirectory>dtddoc</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../tiles-jsp/target/site/tlddoc</directory>
- <outputDirectory>tlddoc</outputDirectory>
- </fileSet>
</fileSets>
</assembly>
Added: tiles/framework/trunk/assembly/src/main/assembly/docs.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/docs.xml?rev=817752&view=auto
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/docs.xml (added)
+++ tiles/framework/trunk/assembly/src/main/assembly/docs.xml Tue Sep 22
18:29:41 2009
@@ -0,0 +1,49 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <dependencySets>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles-core/target/site/dtddoc</directory>
+ <outputDirectory>dtddoc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles-jsp/target/site/tlddoc</directory>
+ <outputDirectory>tlddoc</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: tiles/framework/trunk/assembly/src/main/assembly/docs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/assembly/src/main/assembly/docs.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/src.xml?rev=817752&r1=817751&r2=817752&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/src.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/src.xml Tue Sep 22
18:29:41 2009
@@ -62,6 +62,14 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../tiles-servlet-wildcard</directory>
+ <outputDirectory>src/tiles-servlet-wildcard</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../tiles-jsp</directory>
<outputDirectory>src/tiles-jsp</outputDirectory>
<includes>
@@ -70,6 +78,30 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../tiles-el</directory>
+ <outputDirectory>src/tiles-el</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles-mvel</directory>
+ <outputDirectory>src/tiles-mvel</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles-ognl</directory>
+ <outputDirectory>src/tiles-ognl</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../tiles-template</directory>
<outputDirectory>src/tiles-template</outputDirectory>
<includes>
@@ -110,6 +142,14 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../tiles-portlet-wildcard</directory>
+ <outputDirectory>src/tiles-portlet-wildcard</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../tiles-compat</directory>
<outputDirectory>src/tiles-compat</outputDirectory>
<includes>
