Author: simonetripodi
Date: Sat Jan 14 01:47:21 2012
New Revision: 1231430
URL: http://svn.apache.org/viewvc?rev=1231430&view=rev
Log:
[ANY23-32] replace hardcoded bash script with generated via appassembler
Added:
incubator/any23/trunk/core/src/main/assembly/
incubator/any23/trunk/core/src/main/assembly/README.txt (with props)
incubator/any23/trunk/core/src/main/assembly/bin.xml (with props)
Removed:
incubator/any23/trunk/core/bin/
Modified:
incubator/any23/trunk/core/pom.xml
incubator/any23/trunk/pom.xml
incubator/any23/trunk/src/changes/changes.xml
Modified: incubator/any23/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/any23/trunk/core/pom.xml?rev=1231430&r1=1231429&r2=1231430&view=diff
==============================================================================
--- incubator/any23/trunk/core/pom.xml (original)
+++ incubator/any23/trunk/core/pom.xml Sat Jan 14 01:47:21 2012
@@ -148,14 +148,55 @@
</resources>
<plugins>
- <!-- Generates a self-contained JAR. -->
+ <!-- generates the bin launchers -->
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ <configuration>
+ <repositoryLayout>flat</repositoryLayout>
+ <repositoryName>lib</repositoryName>
+ <extraJvmArguments>-Xms500m -Xmx500m -XX:PermSize=128m
-XX:-UseGCOverheadLimit</extraJvmArguments>
+ <programs>
+ <program>
+ <mainClass>org.apache.any23.cli.Rover</mainClass>
+ <name>any23</name>
+ </program>
+ <program>
+ <mainClass>org.deri.any23.cli.ToolRunner</mainClass>
+ <name>any23tools</name>
+ </program>
+ </programs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Generates the distribution package -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
+ <attach>false</attach>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
+ </descriptors>
</configuration>
</plugin>
</plugins>
Added: incubator/any23/trunk/core/src/main/assembly/README.txt
URL:
http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/assembly/README.txt?rev=1231430&view=auto
==============================================================================
--- incubator/any23/trunk/core/src/main/assembly/README.txt (added)
+++ incubator/any23/trunk/core/src/main/assembly/README.txt Sat Jan 14 01:47:21
2012
@@ -0,0 +1,83 @@
+ 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.
+
+Apache Any23 (${implementation.build}; ${maven.build.timestamp})
+
+ What is it?
+ -----------
+
+ ${project.description}
+
+ Documentation
+ -------------
+
+ The most up-to-date documentation can be found at ${project.parent.url}.
+
+ Release Notes
+ -------------
+
+ The full list of changes can be found at
${project.parent.url}/changes-report.html.
+
+ System Requirements
+ -------------------
+
+ JDK:
+ ${javac.target.version} or above.
+ Memory:
+ No minimum requirement.
+ Disk:
+ No minimum requirement.
+ Operating System:
+ No minimum requirement. On Windows, Windows NT and above or Cygwin is
required for
+ the startup scripts. Tested on Windows XP, Fedora Core and Mac OS X.
+
+ Installing Apache Any23
+ ----------------
+
+ 1) Unpack the archive where you would like to store the binaries, eg:
+
+ Unix-based Operating Systems (Linux, Solaris and Mac OS X)
+ tar zxvf ${project.build.finalName}.tar.gz
+ Windows 2000/XP
+ unzip ${project.build.finalName}.zip
+
+ 2) A directory called "apache-${project.build.finalName}" will be created.
+
+ 3) Add the bin directory to your PATH, eg:
+
+ Unix-based Operating Systems (Linux, Solaris and Mac OS X)
+ export PATH=/usr/local/apache-${project.build.finalName}/bin:$PATH
+ Windows 2000/XP
+ set PATH="c:\program files\apache-${project.build.finalName}\bin";%PATH%
+
+ 4) Make sure JAVA_HOME is set to the location of your JDK
+
+ 5) Run "any23 --version" to verify that it is correctly installed.
+
+ Licensing
+ ---------
+
+ Please see the file called LICENSE.TXT
+
+ Apache Any23 URLS
+ ----------
+
+ Home Page: ${project.parent.url}/
+ Downloads: ${project.parent.url}/download.html
+ Release Notes: ${project.parent.url}/changes-report.html
+ Mailing Lists: ${project.parent.url}/mail-lists.html
+ Source Code: ${project.parent.scm.url}
+ Issue Tracking: ${project.issueManagement.url}
+ Available Plugins: ${project.parent.url}/plugins.html
Propchange: incubator/any23/trunk/core/src/main/assembly/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/any23/trunk/core/src/main/assembly/README.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/any23/trunk/core/src/main/assembly/README.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/any23/trunk/core/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/assembly/bin.xml?rev=1231430&view=auto
==============================================================================
--- incubator/any23/trunk/core/src/main/assembly/bin.xml (added)
+++ incubator/any23/trunk/core/src/main/assembly/bin.xml Sat Jan 14 01:47:21
2012
@@ -0,0 +1,60 @@
+<?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.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>apache-${project.build.finalName}</baseDirectory>
+
+ <files>
+ <file>
+ <source>${basedir}/src/main/assembly/README.txt</source>
+ <filtered>true</filtered>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>666</fileMode>
+ </file>
+ </files>
+
+ <fileSets>
+ <!--
+ | shell scripts
+ -->
+ <fileSet>
+ <directory>${project.build.directory}/appassembler/bin/</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <fileMode>755</fileMode>
+ </fileSet>
+
+ <!--
+ | core libraries
+ -->
+ <fileSet>
+ <directory>${project.build.directory}/appassembler/lib/</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <excludes>
+ <exclude>*.xml</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
Propchange: incubator/any23/trunk/core/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/any23/trunk/core/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/any23/trunk/core/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/any23/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/any23/trunk/pom.xml?rev=1231430&r1=1231429&r2=1231430&view=diff
==============================================================================
--- incubator/any23/trunk/pom.xml (original)
+++ incubator/any23/trunk/pom.xml Sat Jan 14 01:47:21 2012
@@ -476,6 +476,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.2</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.2.1</version>
<configuration>
Modified: incubator/any23/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/incubator/any23/trunk/src/changes/changes.xml?rev=1231430&r1=1231429&r2=1231430&view=diff
==============================================================================
--- incubator/any23/trunk/src/changes/changes.xml (original)
+++ incubator/any23/trunk/src/changes/changes.xml Sat Jan 14 01:47:21 2012
@@ -42,6 +42,9 @@ The <action> type attribute can be add,u
<body>
<release version="0.6.2" description="First Apache release">
+ <action dev="simonetripodi" type="add" issue="ANY23-32">
+ replace hardcoded bash script with generated via appassembler
+ </action>
<action dev="simonetripodi" type="update" issue="ANY23-29">
Update all Maven POM's in trunk
</action>