[maven-scm] copy for tag tiles-2.0.1
git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-2.0.1@509292 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml
index 2a85e78..8912191 100644
--- a/tiles-api/pom.xml
+++ b/tiles-api/pom.xml
@@ -40,9 +40,13 @@
<resources>
<resource>
<directory>src/main/resources</directory>
+ <excludes>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ </excludes>
</resource>
<resource>
- <directory>.</directory>
+ <directory>src/main/resources</directory>
<includes>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
@@ -66,7 +70,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
diff --git a/tiles-api/src/main/assembly/bin.xml b/tiles-api/src/main/assembly/bin.xml
deleted file mode 100644
index 79914a3..0000000
--- a/tiles-api/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- 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>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <includeSiteDirectory>false</includeSiteDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/site/apidocs</directory>
- <outputDirectory>apidocs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/tiles-api/src/main/assembly/src.xml b/tiles-api/src/main/assembly/src.xml
index 18db69c..fb7264f 100644
--- a/tiles-api/src/main/assembly/src.xml
+++ b/tiles-api/src/main/assembly/src.xml
@@ -23,11 +23,19 @@
<fileSets>
<fileSet>
<includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
<include>pom.xml</include>
</includes>
</fileSet>
+
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+
<fileSet>
<directory>src</directory>
</fileSet>
diff --git a/tiles-api/LICENSE.txt b/tiles-api/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-api/LICENSE.txt
rename to tiles-api/src/main/resources/LICENSE.txt
diff --git a/tiles-api/NOTICE.txt b/tiles-api/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-api/NOTICE.txt
rename to tiles-api/src/main/resources/NOTICE.txt
diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml
index de83313..6267b8b 100644
--- a/tiles-core/pom.xml
+++ b/tiles-core/pom.xml
@@ -24,228 +24,258 @@
-->
<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">
- <parent>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-parent</artifactId>
- <version>2.0.1</version>
- </parent>
+ <parent>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-parent</artifactId>
+ <version>2.0.1</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>tiles-core</artifactId>
- <packaging>jar</packaging>
- <name>Tiles - Core Library</name>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>tiles-core</artifactId>
+ <packaging>jar</packaging>
+ <name>Tiles - Core Library</name>
- <build>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>.</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- <targetPath>META-INF</targetPath>
- </resource>
- </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
+ </build>
+
+ <profiles>
+
+ <profile>
+ <id>release</id>
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
+ <plugin>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
</plugins>
+ </build>
+ </profile>
- </build>
- <profiles>
- <profile>
- <!--
- Run the translator for Java 1.4 compatiblity
+ <profile>
+ <!--
+ Run the translator for Java 1.4 compatiblity
- Sample:
- $ cd struts/struts2/
- $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
+ Sample:
+ $ cd struts/struts2/
+ $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
- -->
- <id>j4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>retrotranslate</id>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-j4-jar</id>
- <goals><goal>jar</goal></goals>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
- <classifier>j4</classifier>
- <archive>
- <manifestEntries>
- <Extension-Name>${project.artifactId}-j4</Extension-Name>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <!-- path to rt.jar (on OSX, it's classes.jar) -->
- <systemPath>${java14.jar}</systemPath>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.0.8</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <reporting>
+ -->
+ <id>j4</id>
+ <build>
<plugins>
- <plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>net.sf.dtddoc</groupId>
- <artifactId>dtddoc-maven-plugin</artifactId>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>retrotranslate</id>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-j4-jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
<configuration>
- <docTitle>Tiles Definition File</docTitle>
+ <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+ <classifier>j4</classifier>
+ <archive>
+ <manifestEntries>
+ <Extension-Name>${project.artifactId}-j4</Extension-Name>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ <Implementation-Title>${project.description}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Revision>${scm.revision}</Revision>
+ </manifestEntries>
+ </archive>
</configuration>
- </plugin>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </reporting>
-
-
- <dependencies>
+ </build>
+ <dependencies>
<dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- <version>${pom.version}</version>
+ <groupId>sun.jdk</groupId>
+ <artifactId>rt</artifactId>
+ <version>1.4.0</version>
+ <scope>system</scope>
+ <!-- path to rt.jar (on OSX, it's classes.jar) -->
+ <systemPath>${java14.jar}</systemPath>
</dependency>
-
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-runtime</artifactId>
+ <version>1.0.8</version>
</dependency>
+ </dependencies>
+ </profile>
+ </profiles>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
- </dependency>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>net.sf.dtddoc</groupId>
+ <artifactId>dtddoc-maven-plugin</artifactId>
+ <configuration>
+ <docTitle>Tiles Definition File</docTitle>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
- <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>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>strutstestcase</groupId>
- <artifactId>strutstestcase</artifactId>
- <version>2.1.2-1.1-2.3</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
- </dependencies>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
- <repositories>
- <repository>
- <id>dtddoc</id>
- <url>http://dtddoc.sf.net/maven2</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>dtddoc</id>
- <url>http://dtddoc.sf.net/maven2</url>
- </pluginRepository>
- </pluginRepositories>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>strutstestcase</groupId>
+ <artifactId>strutstestcase</artifactId>
+ <version>2.1.2-1.1-2.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>dtddoc</id>
+ <url>http://dtddoc.sf.net/maven2</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>dtddoc</id>
+ <url>http://dtddoc.sf.net/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
</project>
diff --git a/tiles-core/src/main/assembly/bin.xml b/tiles-core/src/main/assembly/bin.xml
index 614e524..2e71d9c 100644
--- a/tiles-core/src/main/assembly/bin.xml
+++ b/tiles-core/src/main/assembly/bin.xml
@@ -49,6 +49,8 @@
<fileSets>
<fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
diff --git a/tiles-core/src/main/assembly/src.xml b/tiles-core/src/main/assembly/src.xml
index 18db69c..fed85f0 100644
--- a/tiles-core/src/main/assembly/src.xml
+++ b/tiles-core/src/main/assembly/src.xml
@@ -22,12 +22,20 @@
</formats>
<fileSets>
<fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <includes>
<include>pom.xml</include>
</includes>
</fileSet>
+
<fileSet>
<directory>src</directory>
</fileSet>
diff --git a/tiles-core/LICENSE.txt b/tiles-core/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-core/LICENSE.txt
rename to tiles-core/src/main/resources/LICENSE.txt
diff --git a/tiles-core/NOTICE.txt b/tiles-core/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-core/NOTICE.txt
rename to tiles-core/src/main/resources/NOTICE.txt
diff --git a/tiles-test/LICENSE.txt b/tiles-test/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-test/LICENSE.txt
rename to tiles-test/src/main/resources/LICENSE.txt
diff --git a/tiles-test/NOTICE.txt b/tiles-test/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-test/NOTICE.txt
rename to tiles-test/src/main/resources/NOTICE.txt
