Author: tv
Date: Thu Mar 24 17:59:42 2011
New Revision: 1085055
URL: http://svn.apache.org/viewvc?rev=1085055&view=rev
Log:
First draft of assembly descriptors for a binary and a source distribution
Added:
turbine/core/trunk/src/assembly/
turbine/core/trunk/src/assembly/binaries.xml (with props)
turbine/core/trunk/src/assembly/source.xml (with props)
Modified:
turbine/core/trunk/NOTICE
turbine/core/trunk/pom.xml
Modified: turbine/core/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/NOTICE?rev=1085055&r1=1085054&r2=1085055&view=diff
==============================================================================
--- turbine/core/trunk/NOTICE (original)
+++ turbine/core/trunk/NOTICE Thu Mar 24 17:59:42 2011
@@ -1,5 +1,5 @@
Apache Turbine
-Copyright 2001-2009 The Apache Software Foundation.
+Copyright 2001-2011 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1085055&r1=1085054&r2=1085055&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Thu Mar 24 17:59:42 2011
@@ -542,7 +542,8 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
@@ -595,7 +596,7 @@
</goals>
<configuration>
<tasks>
- <copy todir="${project.build.directory}/apidocs/META-INF">
+ <copy todir="${project.build.directory}/site/apidocs/META-INF">
<fileset dir="${basedir}">
<include name="LICENSE.txt" />
<include name="NOTICE" />
@@ -606,17 +607,44 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <!-- build the ssite during packaging -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>make-site</id>
+ <phase>package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<!-- build the source and binary distribution packages -->
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
<configuration>
- <descriptorRefs>
- <descriptorRef>bin</descriptorRef>
- <descriptorRef>project</descriptorRef>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>src/assembly/binaries.xml</descriptor>
+ <descriptor>src/assembly/source.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
Added: turbine/core/trunk/src/assembly/binaries.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/assembly/binaries.xml?rev=1085055&view=auto
==============================================================================
--- turbine/core/trunk/src/assembly/binaries.xml (added)
+++ turbine/core/trunk/src/assembly/binaries.xml Thu Mar 24 17:59:42 2011
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>true</includeSiteDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange: turbine/core/trunk/src/assembly/binaries.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: turbine/core/trunk/src/assembly/source.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/assembly/source.xml?rev=1085055&view=auto
==============================================================================
--- turbine/core/trunk/src/assembly/source.xml (added)
+++ turbine/core/trunk/src/assembly/source.xml Thu Mar 24 17:59:42 2011
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>source</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>pom.xml</include>
+ </includes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>java/**/*</include>
+ <include>test/**/*</include>
+ <include>changes/*</include>
+ <include>site/**/*</include>
+ <include>templates/**/*</include>
+ <include>torque/**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/conf</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>view</exclude>
+ <exclude>CodeWrestler.*</exclude>
+ <exclude>cw.sh</exclude>
+ <exclude>build.xml</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/xdocs</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange: turbine/core/trunk/src/assembly/source.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
