Author: psmith
Date: Wed Jul 2 19:51:39 2008
New Revision: 673568
URL: http://svn.apache.org/viewvc?rev=673568&view=rev
Log:
Modified the bin.xml assembly so it doesn't get a 'name', and introduced a
standalone assembly
that is the packaged up bit of the appassembler plugin for ease of deployment.
this artifact
is also added to the list of published artifacts via the buildhelper plugin.
Finally worked out how to get Chainsaw to bundle the Receivers JavaDoc, and as
it turns out it's so
simple I can't believe it's taken me or anyone else this long to work out. The
JavaDoc, like the sources,
are simply classified artifacts of a project, so we just indicate a dependency
on log4j-receivers javadoc classified
artifact. Viola, packaged JavaDoc for the Receivers inside Chainsaw. Neat.
Added:
logging/chainsaw/trunk/src/assembly/standalone.xml
Modified:
logging/chainsaw/trunk/pom.xml
logging/chainsaw/trunk/src/assembly/bin.xml
Modified: logging/chainsaw/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/pom.xml?rev=673568&r1=673567&r2=673568&view=diff
==============================================================================
--- logging/chainsaw/trunk/pom.xml (original)
+++ logging/chainsaw/trunk/pom.xml Wed Jul 2 19:51:39 2008
@@ -4,7 +4,7 @@
<groupId>log4j</groupId>
<artifactId>apache-chainsaw</artifactId>
<name>Apache Chainsaw</name>
- <version>1.99.0</version>
+ <version>1.99.0-SNAPSHOT</version>
<description>Graphical Viewer for Logging events from a local or remote
log4j event system.</description>
<url>http://logging.apache.org:80/chainsaw</url>
<issueManagement>
@@ -179,6 +179,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
+ <phase>package</phase>
<goals>
<goal>assembly</goal>
</goals>
@@ -187,8 +188,11 @@
<configuration>
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/standalone.xml</descriptor>
</descriptors>
- <appendAssemblyId>false</appendAssemblyId>
+<!-- we append the assembly ID here,but note that the bin assembly does not
have an id specified
+ in its config, so it doesn't have a suffix -->
+ <appendAssemblyId>true</appendAssemblyId>
</configuration>
</plugin>
<plugin>
@@ -203,6 +207,28 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+
<file>target/${project.artifactId}-${project.version}-standalone.zip</file>
+ <type>zip</type>
+ <classifier>standalone</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -224,6 +250,7 @@
</execution>
</executions>
<configuration>
+ <showConsoleWindow>false</showConsoleWindow>
<programs>
<program>
<mainClass>${chainsaw.mainclass}</mainClass>
@@ -310,6 +337,12 @@
</dependency>
<dependency>
<groupId>log4j</groupId>
+ <artifactId>apache-log4j-receivers</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
<artifactId>apache-log4j-zeroconf</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
Modified: logging/chainsaw/trunk/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/assembly/bin.xml?rev=673568&r1=673567&r2=673568&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/assembly/bin.xml (original)
+++ logging/chainsaw/trunk/src/assembly/bin.xml Wed Jul 2 19:51:39 2008
@@ -16,12 +16,14 @@
-->
<assembly>
- <id>bin</id>
+<!-- We deliberately don't specify an ID here, because during the assembly
process we don't want the
+ bin assembly to have any suffix on its name. Other assemblies
need their Id suffixed, but this one
+ doesn't
+ <id>bin</id> -->
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-chainsaw-${project.version}</baseDirectory>
<includeSiteDirectory>true</includeSiteDirectory>
<dependencySets>
<dependencySet/>
Added: logging/chainsaw/trunk/src/assembly/standalone.xml
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/assembly/standalone.xml?rev=673568&view=auto
==============================================================================
--- logging/chainsaw/trunk/src/assembly/standalone.xml (added)
+++ logging/chainsaw/trunk/src/assembly/standalone.xml Wed Jul 2 19:51:39 2008
@@ -0,0 +1,38 @@
+<?xml version="1.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>standalone</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/appassembler/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/appassembler/repo</directory>
+ <outputDirectory>repo</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
