Menu
▾
▴
maven-plugins-cvs — CVS Commits - Maven Plugins
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(37) |
Oct
(12) |
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(9) |
Feb
(6) |
Mar
(1) |
Apr
(85) |
May
(9) |
Jun
|
Jul
(6) |
Aug
(85) |
Sep
(42) |
Oct
(27) |
Nov
(15) |
Dec
(27) |
| 2004 |
Jan
(39) |
Feb
(52) |
Mar
(43) |
Apr
(32) |
May
(18) |
Jun
(5) |
Jul
(63) |
Aug
(69) |
Sep
(12) |
Oct
(80) |
Nov
(55) |
Dec
(30) |
| 2005 |
Jan
(27) |
Feb
(6) |
Mar
(43) |
Apr
(5) |
May
(48) |
Jun
(48) |
Jul
(100) |
Aug
(16) |
Sep
(43) |
Oct
(25) |
Nov
(249) |
Dec
(2) |
| 2006 |
Jan
(9) |
Feb
(2) |
Mar
|
Apr
(26) |
May
(21) |
Jun
(8) |
Jul
(14) |
Aug
(104) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(32) |
Feb
|
Mar
(2) |
Apr
|
May
(38) |
Jun
(2) |
Jul
(9) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eric G. <ri...@us...> - 2005-05-12 19:56:06
|
rikgig 05/05/12 12:55:58
Modified: uberdist/xdocs changes.xml faq.fml goals.xml index.xml
navigation.xml properties.xml tags.xml
Log:
Update doc for version 1.0.11
Update copyright.
Revision Changes Path
1.2 +13 -4 maven-plugins/uberdist/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/uberdist/xdocs/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 2 Mar 2005 17:46:46 -0000 1.1
+++ changes.xml 12 May 2005 19:55:58 -0000 1.2
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2004-2005 Eric Giguère.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,10 +23,20 @@
<author email="ri...@us...">Eric Giguere</author>
</properties>
<body>
+
+ <release version="1.0.11" date="2005-05-12">
+ <action dev="rikgig" type="remove">Project registration mic-mac removed. No custom multiproject support included now in the plugin, use the Reactor instead.</action>
+ <action dev="rikgig" type="add">Goal uber-dist:copy-deps is now executable on its own.</action>
+ <action dev="rikgig" type="add">New tag in the tag lib: getArtifacts accepts a Map as argument which gets
+ filled by the list of project artifacts to be deployed (see artifact deployment properties).<br/>
+ The Map contains the artifact as key and the deployment relative path for it including jar renaming if used.</action>
+ <action dev="rikgig" type="add">New token for scripts: pom-artifacts that gets replaced by a an entry to be
+ included in a -cp or -classpath entry to be used by the java tools (java, javac, etc.).</action>
+ </release>
+
<release version="1.0.10" date="2005-01-03">
<action dev="rikgig" type="add">First public version of the plugin</action>
</release>
-
<!-- -->
<release version="1.0.4" date="2004-09-10">
<action dev="rikgig" type="add">Starting from this one, uber-dist now take full control on dependencies deployment.
1.3 +30 -13 maven-plugins/uberdist/xdocs/faq.fml
Index: faq.fml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/uberdist/xdocs/faq.fml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- faq.fml 3 Mar 2005 03:36:25 -0000 1.2
+++ faq.fml 12 May 2005 19:55:58 -0000 1.3
@@ -1,36 +1,53 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2004-2005 Eric Giguère.
+ *
+ * Licensed 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.
+ */
+ -->
+
<faqs title="Frequently Asked Questions">
<part id="General">
<title>General</title>
+
<faq id="register-project">
<question>How do I register my project with UberDist to get my distribution goal called?</question>
<answer>
-Until a custom tag is integrated in the plugin (like report plugin for example), you must call
-the registerProject tag from the UberDist taglib. The snippit below shows an example:<br/>
-Note that the property gets are "optionnal" at this point but doing it there allows you to use them freely in your maven script while building
-your distribution.<br/>
+ Starting with version 1.0.11, you just have to include in your project a goal named: 'project.id':prepared-dist-filesystem.<br/>
+<strong>The older way things with uberdist is deprecated. Do not use project register tag anymore<br/>
+The tags remains for another version and will be phased out after.</strong><br/>
+<br/>
<source>
<![CDATA[
<postGoal name="uber-dist:init">
- <udist:registerProject name="${pom.artifactId}" description="My distribution"/>
- <maven:get plugin="maven-uberdist-plugin"
- property="maven.uber.dist.assembly.dir" var="dist.assembly.dir" />
- <maven:get plugin="maven-uberdist-plugin"
- property="maven.uber.dist.dir" var="distribution_dir" />
+ <udist:registerProject name="${pom.id}" description="My distribution"/>
+ <maven:get plugin="maven-uberdist-plugin"
+ property="maven.uber.dist.assembly.dir" var="dist.assembly.dir" />
+ <maven:get plugin="maven-uberdist-plugin"
+ property="maven.uber.dist.dir" var="distribution_dir" />
</postGoal>]]>
</source><br/>
-Using the ${pom.id} is a very good practice. This is the value that will be used as default when the tag will be available.
-This name is then used as
</answer>
</faq>
<faq id="create-distribution">
<question>How do I create my distribution with UberDist?</question>
<answer>
- You have to add a goal in your project named: [registered_name]:prepare-dist-filesystem.
- where [registered_name] is the name you supplied when registering with the plugin.
+ You have to add a goal in your project named: 'pom.artifactId':prepare-dist-filesystem.<br/>
+ Otherwise, the plugin will call the standard dist:build-bin offered by the maven-dist-plugin.
</answer>
</faq>
1.2 +161 -27 maven-plugins/uberdist/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/uberdist/xdocs/goals.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- goals.xml 2 Mar 2005 17:46:46 -0000 1.1
+++ goals.xml 12 May 2005 19:55:58 -0000 1.2
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2004-2005 Eric Giguère.
+ *
+ * Licensed 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.
+ */
+ -->
+
<document>
<properties>
@@ -7,14 +25,26 @@
</properties>
<body>
+ <section name="Plugin goals">
+ <p>
+ The plugin offers many goals. Some of these goals uses plugin properties but others make use
+ of Custom properties that can be supplied in the project.xml file. Some examples of these custom
+ properties used by the plugin can be found in the section <a href="#Code_extracts">Code extracts</a> of this page.
+ </p>
<goals>
<goal>
<name>uber-dist:init</name>
<description>
- This goal is provided to give a hook on project developpers to add a preGoal so that<br/>
- the project registers itself with the plugin.<br/>
- It also checks for make an OS check to to customize the tar call so that<br/>
- file access rights are kept in the tarball if building un Unix or Solaris<br/>
+ This goal makes an OS check to to customize some operations based on the
+ nature of the OS where the distribution is created. If on Unix-like (Unix, Solaris, Linux, etc), it will
+ set the property: isOnUnix<br/>
+ Examples of operations that are tailored to the OS are:
+ <ul><li>customization of the tar call
+ so that the file access rights are kept in the tarball if building on
+ Unix or Solaris</li>
+ <li>The classpath entries created for launch scripts are also tailored to the right OS
+ (different entries in the list seperated by a colon (:) on Unix, semi-colon (;) on Windows.</li>
+ </ul>
</description>
</goal>
@@ -37,59 +67,163 @@
<goal>
<name>uber-dist:prepare-dist-filesystem</name>
<description>
- TBD
+ This goal is responsible for creating the content of the distribution.<br/>
+ It first creates the necessary directories, then will call the custom goal of the calling project
+ ('pom.artifactId':prepare-dist-filesystem). Once this goal completes, other internal goals gets called
+ to finalize the distribution, goals like:
+ <ul>
+ <li><a href="#uber-dist:copy-deps">uber-dist:copy-deps</a></li>
+ <li><a href="#uber-dist:copy-scripts">uber-dist:copy-scripts</a></li>
+ <li><a href="#uber-dist:make-executable">uber-dist:make-executable</a></li>
+ </ul>
</description>
</goal>
<goal>
<name>uber-dist:clean-dist-filesystem</name>
<description>
- TBD
+ This goal, like its name suggests, deletes the distribution assembly directory and also deletes
+ the distribution file (in the distribution directory) if it is found.
</description>
</goal>
<goal>
<name>uber-dist:create-distrib</name>
<description>
- TBD
+ This goal is responsible for creating the distribution out of the distribution assembly. Its is automatically
+ called as part of both the uber-dist:make and uber-dist:build process.
</description>
</goal>
<goal>
- <name>uber-dist:dist-setup</name>
- <description>
- TBD
- </description>
- </goal>
-
- <goal>
- <name>uber-dist:clean-dist</name>
- <description>
- TBD
- </description>
- </goal>
-
- <goal>
<name>uber-dist:copy-deps</name>
<description>
- TBD
+ This goal is used to copy all project dependencies marked for deployment. This goal uses some plugin custom
+ properties to control which, how and where the dependencies gets deployed.<br/>
+ The available properties must be supplied inside the properties tag in the maven project.xml file.
+ The list of properties goes as follow:<br/>
+ <ul>
+ <li>jar.dependency.dist.dir:<br/>
+ Specifies in which sub-directory the deplendencies must be published.
+ This property can be supplied at the project level or overriden at the dependency level. The project level
+ definition is used as the default value for all deployed dependencies except if the dependency states
+ differently.<br/></li>
+ <li>'pom.artifactId'.deploy.<br/>
+ This property must be added to each dependency defined your project.xml if you want it to be deployed in
+ the system's distribution. The example above is valid for a project with id: myproject.</li>
+ <li>jar.dependency.dist.name<br/>
+ This property allows changing the name of the dependency as it gets deployed. This is very usefull
+ especially if your system is deployed as part of a framework that may use your dependencies but without the
+ version number as part of the jar file name.</li>
+ </ul>
</description>
</goal>
<goal>
<name>uber-dist:make-executable</name>
<description>
- TBD
+ This goal run the chmod program on files to make launch scripts executable under Unix.<br/>
+ The goal will use the value of the property: <a href="./properties.html#maven.uber.dist.executable.permission">maven.uber.dist.executable.permission</a>
+ for the permissions to pass chmod. If the property is empty, the value: gu+x will be used.<br/>
+ The files on which those rights will be applied are specified using the property: <a href="./properties.html#maven.uber.dist.executable.includes">maven.uber.dist.executable.includes</a>
</description>
</goal>
<goal>
<name>uber-dist:copy-scripts</name>
<description>
- TBD
- </description>
- </goal>
+ This is a very usefull goal. It is used to copy launch scripts (bash, DOS batch, etc) with some automatic
+ filtering happenning while doing so. The goal always copy the scripts in the root of the distribution assembly
+ along with the project's artifact (if there is one).<br/>
+ The goal uses 3 properties to complete the work, see those for more details:
+ <ul>
+ <li><a href="./properties.html#maven.uber.dist.scripts.dir">maven.uber.dist.scripts.dir</a></li>
+ <li><a href="./properties.html#maven.uber.dist.assembly.dir">maven.uber.dist.assembly.dir</a></li>
+ <li><a href="./properties.html#maven.uber.dist.launch.scripts">maven.uber.dist.launch.scripts</a></li>
+ </ul>
+ As of today, 2 tokens are automatically replaced by Uberdist while copying scripts:
+ <ul>
+ <li>@artifact_id@: Gets replace by the expression: ${maven.final.name}.jar</li>
+ <li>@pom-artifacts@: Gets replace by the list of all deployed dependencies where each element
+ are seperated between them the the OS specific classpath entry separator.</li>
+ </ul><br/>
+ So with a single property to set, you get a fully configured launch script for your application. It is true
+ that other mechanism can be used like the Class-Path manifest entry along with the Main-Class but if your
+ jar holds many executable classes, multiple launch scripts will be necessary. Uberdist makes this
+ script configuring operation transparent as long as you tell it where your scripts are.<br/>
+ An example of a bash launch scripts before and after running uber-dist is supplied in
+ the section <a href="#Launch_scripts">Launch scripts</a> of this page.
+ </description>
+ </goal>
+
+ </goals>
+ <subsection name="Code extracts">
+ <subsection name="project.xml">
+ <p>
+ Example of a project level entry for the default dependency deployment directory in the project.xml file:
+ <source>Ex:<![CDATA[
+...
+ </versions>
+
+ <properties>
+ <jar.dependency.dist.dir>lib</jar.dependency.dist.dir>
+ </properties>]]>
+...
+</source>
+ </p>
+
+ <p>
+ This example shows how to configure a dependency in the project.xml file so that the Uberdist plugin
+ will publish it under a specific directory and with its name overriden (version removed).<br/>
+ <strong>NOTE: In the following example, the project id is : myproject.</strong> See its usage in the
+ 'projectId.deploy' property to indicate that this dependency must be deployed in the distribution.
+<source>
+<![CDATA[
+...
+<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <url>http://jakarta.apache.org/commons/logging.html</url>
+ <properties>
+ <myproject.deploy>true</myproject.deploy>
+ <jar.manifest.classpath>true</jar.manifest.classpath>
+ <jar.dependency.dist.dir>lib/3rdparty</jar.dependency.dist.dir>
+ <jar.dependency.dist.name>commons-logging.jar</jar.dependency.dist.name>
+ </properties>
+</dependency>
+...
+]]>
+</source><br/></p>
+ </subsection>
+ <subsection name="Launch scripts">
+ <p>
+ This example shows the content of a launch script with the tokens that uber-dist will replace while it
+ creates the distribution. All necessary properties must be set accordingly before.<br/>
+ <source>
+#!/bin/sh
+
+# Need native library path
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib
+export LD_LIBRARY_PATH
+
+$JAVA_HOME/bin/java -cp .:@artifact_id@:@pom-artifacts@ test.com.MyClassToRun
+ </source>
+ This same script, after being copied by Uberdist, could look like this:
+<source>
+#!/bin/sh
+
+# Need native library path
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib
+export LD_LIBRARY_PATH
+
+$JAVA_HOME/bin/java -cp .:myproject-1.0.jar:lib/commons-logging.jar:lib/commons-beanutils.jar test.com.MyClassToRun
+</source>
+ </p>
+ </subsection>
+ </subsection>
+ </section>
- </goals>
+
</body>
</document>
\ No newline at end of file
1.3 +41 -22 maven-plugins/uberdist/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/uberdist/xdocs/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 3 Mar 2005 03:36:25 -0000 1.2
+++ index.xml 12 May 2005 19:55:58 -0000 1.3
@@ -1,4 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2004-2005 Eric Giguère.
+ *
+ * Licensed 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.
+ */
+-->
+
<document>
<properties>
@@ -12,20 +30,20 @@
Why another distribution plugin?
</p>
<p>
- Some software systems are made of many artifacts and may require an aggregation of many <br/>
+ Some software systems are made of many artifacts and may require an aggregation of many
"external" components or third parties to have a complete distribution.<br/>
- In a production environment, deployment rules may be very strict and software teams may have<br/>
- to follow prescribe procedures on how and where their system should be installed, especially<br/>
+ In a production environment, deployment rules may be very strict and software teams may have
+ to follow script prescribe procedures on how and where their system should be installed, especially
on Unix environments where proper file rights attribution are crucial.<br/>
- The one fits all rule doesn't apply here and building the distribution becomes an complex task in itself.<br/>
+ This work environment being very specific in nature, the one fits all rule doesn't apply here and building
+ the distribution becomes an complex task in itself.<br/>
</p>
<p>
- The goal of the UberDist plugin is to integrate the basic mechanism of having a custom goal called to<br/>
- build this project specific complex distribution. In other words, use the full power of maven to build your distribution<br/>
- using a project specific goal you write. But, it also automates some recurring tasks and most of all leverages<br/>
- the enormous amout of available facilities provided by the Maven build environment to give better control<br/>
+ The goal of the UberDist plugin is to integrate the basic mechanism of having a custom goal called to
+ build this specific complex distribution. But, it also automates some recurring tasks and most of all leverages
+ the enormous amout of available facilities provided by the Maven build environment to give better control
on the deployment file structure.
- </p>
+ </p>
<table>
<tr><th>Document</th><th>Description</th></tr>
<tr><td><a href="goals.html">Goals</a></td>
@@ -56,7 +74,7 @@
</subsection>
<subsection name="UberDist Process">
<p>
- UberDist with results of maven a project compilation but not in the location they are generated at.<br/>
+ UberDist, like all plugins, works with the results of a maven project compilation but not from the bare results from the target directory.
The plugin uses 2 directories that are defined by properties:
<ul>
<li>Distribution-assembly directory: Where the distribution is built: <a href="./properties.html#maven.uber.dist.assembly.dir">maven.uber.dist.assembly.dir</a></li>
@@ -65,25 +83,26 @@
</p>
<p>
When one of the distribution building goal is called (either one of <a href="./goals.html#uber-dist:make">uber-dist:make</a>, <a href="./goals.html#uber-dist:build">build</a> or <a href="./goals.html#uber-dist:prepare-dist-filesystem">prepare-dist-filesystem</a>),
- the plugin will call its internal init goal ( uber-dist:init ), this is when you register your project with a postGoal. See <a href="./tags.html#uber-dist:registerProject">uber-dist:registerProject tag</a><br/>
- See also FAQ: <a href="./faq.html#register-project">register-project</a>
- </p>
- <p>
- Once your project is registered, UberDist prepares the necessary directories, based on its property values.<br/>
- Now comes the time to copy all necessary files in the distribution assembly. UberDist will first call YOUR
- distribution goal.<br/>
- Ex.: For a a maven project with id: <strong>myproject</strong>, the goal <strong>myproject:prepare-dist-filesystem</strong> will be called.
+ the plugin will call some internal initialization goal, then try to call a custom goal supplied in your project to build the distribution files.
+ This is where Uberdist is different from to the original dist plugin. When the time comes to copy all necessary files in the distribution assembly,
+ instead of copying the project artifact (which may even be missing for 'non-standard' maven projects, UberDist will call YOUR
+ custom distribution goal. To do this, it uses the artifactId of your project appended with ':prepare-dist-filesystem'.<br/>
+ Ex.: For a a maven project with id: <strong>myproject</strong>, the goal <strong>myproject:prepare-dist-filesystem</strong> will be called.<br/>
+ When this custom goal is missing, Uberdist will fall back to the original dist plugin calling its binary distribution construction goal.
</p>
<p>
- Then, the plugin will call a list of internal goals designed to help you building your distribution with minimum
- jelly code added in your project.<br/>
+ If you did supply your 'uberdist custom goal' the plugin will then call some utility goals to perform common operations when preparing a distribution.
+ These are supplied to help you building your distribution with minimum jelly code added in your project.<br/>
+ Uberdist offers those goals:
<ol>
<li><a href="./goals.html#uber-dist:copy-deps">uber-dist:copy-deps</a> : to copy project dependencies like artifact does but with a little more control</li>
- <li><a href="./goals.html#uber-dist:copy-scripts">uber-dist:copy-scripts</a> : to copy launch scripts (batch file, bash,etc) with filtering</li>
+ <li><a href="./goals.html#uber-dist:copy-scripts">uber-dist:copy-scripts</a> : to copy launch scripts (batch file, bash,etc) with token filtering</li>
<li><a href="./goals.html#uber-dist:make-executable">uber-dist:make-executable</a> : For Unix platforms, to make some files executable</li>
</ol>
+
And final step, creating the tarball (Unix) or the zip file (Windows).<br/>
For more details, please see the Goals, Properties and FAQ pages.<br/>
+
Happy Distributing!
</p>
1.2 +18 -0 maven-plugins/uberdist/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/uberdist/xdocs/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Mar 2005 17:46:46 -0000 1.1
+++ navigation.xml 12 May 2005 19:55:58 -0000 1.2
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2004-2005 Eric Giguère.
+ *
+ * Licensed 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.
+ */
+-->
<project name="Maven uberdist Plugin">
@@ -9,6 +26,7 @@
<item name="Maven" href="http://maven.apache.org/"/>
</links>
<menu name="Overview">
+ <item name="Description" href="/index.html"/>
<item name="Goals" href="/goals.html"/>
<item name="Tags" href="/tags.html" />
<item name="Properties" href="/properties.html"/>
1.3 +79 -28 maven-plugins/uberdist/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/uberdist/xdocs/properties.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- properties.xml 3 Mar 2005 03:36:25 -0000 1.2
+++ properties.xml 12 May 2005 19:55:58 -0000 1.3
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2004-2005 Eric Giguère.
+ *
+ * Licensed 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.
+ */
+-->
<document>
@@ -15,54 +32,88 @@
<th>Optional?</th>
</tr>
<tr>
- <td>maven.uber.dist.assembly.root</td>
+ <td><a name="maven.uber.dist.assembly.root"/>maven.uber.dist.assembly.root</td>
<td>
- The directory where the distribution is built (under the project's target).<br/>
- It is also called the distribution assembly dir.<br/>
+ The directory under the project's target dir under which the files that builds<br/>
+ up the distribution should be copied to. It is also called the distribution<br/>
+ assembly dir.<br/>
<i>maven.uber.dist.assembly.root=${maven.build.dir}/dist-assembly</i>
<br/>
</td>
- <td>No</td>
+ <td>Yes</td>
</tr>
<tr>
- <td>maven.uber.dist.dir</td>
+ <td><a name="maven.uber.dist.dir"/>maven.uber.dist.dir</td>
<td>
- The directory under the project's target dir <br/>
- where the plugin puts the final distribution: tarball or zip<br/>
- files based on the OS under which it is created.<br/>
+ The directory under the project's target dir where the plugin puts the final<br/>
+ distribution: tarball or zip files based on the OS under which it is created.<br/>
<i>maven.uber.dist.dir=${maven.build.dir}/distributions</i>
<br/>
</td>
- <td>No</td>
+ <td>Yes</td>
</tr>
<tr>
- <td>maven.uber.dist.proj.subdir</td>
+ <td><a name="maven.uber.dist.proj.subdir"/>maven.uber.dist.proj.subdir</td>
<td>
- Specifies the sub-directory under the distribution assembly<br/>
- dir where the files for this project should be kept.<br/>
- This is necessary only if you are in a multiproject<br/>
- environment with seperate distributions.<br/>
+ Specifies the sub-directory under the distribution assembly dir where the files<br/>
+ for this project should be kept. This is necessary only if you are in a multiproject<br/>
+ environment with seperate distributions under the same root target.<br/>
</td>
- <td>No</td>
+ <td>Yes</td>
</tr>
<tr>
- <td><a name="maven.uber.dist.assembly.dir">maven.uber.dist.assembly.dir</a></td>
+ <td><a name="maven.uber.dist.assembly.dir"/>maven.uber.dist.assembly.dir</td>
<td>
- This property holds the directory where the distribution assembly is.<br/>
- By default, it is made of the concatenation of root dir followed <br/>
- by project sub-dir if any.<br/>
- <i>maven.uber.dist.assembly.dir=${maven.uber.dist.assembly.root}/<br/>
- ${maven.uber.dist.proj.subdir}</i>
+ This property holds the directory where the distribution assembly is. By default,<br/>
+ it is made of the concatenation of root dir followed by project sub-dir if any.<br/>
+ <i>maven.uber.dist.assembly.dir=${maven.uber.dist.assembly.root}/${maven.uber.dist.proj.subdir}</i>
</td>
- <td>No</td>
+ <td>Yes</td>
</tr>
- <tr><td>Autres a finir:</td>
- <td>maven.uber.dist.assembly.dep.subdir=
-maven.uber.dist.executable.permission=gu+x
-maven.uber.dist.executable.includes=**/*.sh,**/*.so
-maven.uber.dist.launch.scripts=*.sh,*.cmd,*.bat
-</td></tr>
+
+ <tr>
+ <td><a name="maven.uber.dist.executable.permission"/>maven.uber.dist.executable.permission</td>
+ <td>
+ This property holds the rights supplied to chmod command when running the goal:<a href="./goals.html#uber-dist:make-executable">uber-dist:make-executable</a><br/>
+ This property uses the default value:<br/>
+ <i>maven.uber.dist.executable.permission=gu+x</i>
+ </td>
+ <td>Yes</td>
+ </tr>
+
+ <tr>
+ <td><a name="maven.uber.dist.executable.includes"/>maven.uber.dist.executable.includes</td>
+ <td>
+ This property holds a pattern that allow the goal <a href="./goals.html#uber-dist:make-executable">uber-dist:make-executable</a> to recognize on which files<br/>
+ the chmod command should be run.<br/>
+ <i>maven.uber.dist.executable.includes=**/*.sh,**/*.so</i>
+ </td>
+ <td>Yes</td>
+ </tr>
+
+ <tr>
+ <td><a name="maven.uber.dist.scripts.dir"/>maven.uber.dist.scripts.dir</td>
+ <td>
+ This property holds the path to the root directory where execution scripts for<br/>
+ the project are kept. These are copied (with token filtering) by the goal:<a href="./goals.html#uber-dist:copy-scripts">uber-dist:copy-scripts</a><br/>
+ This property does NOT have a default value so if you want some scripts to be copied,<br/>
+ a value must be supplied otherwise, the copy-scripts goal is skipped.<br/>
+ <i>maven.uber.dist.scripts.dir=''</i>
+ </td>
+ <td>Yes</td>
+ </tr>
+
+ <tr>
+ <td><a name="maven.uber.dist.launch.scripts"/>maven.uber.dist.launch.scripts</td>
+ <td>
+ This property holds the pattern that identify a file as a script to be copied with<br/>
+ token filtering while executing the goal:<a href="./goals.html#uber-dist:copy-scripts">uber-dist:copy-scripts</a><br/>
+ <i>maven.uber.dist.launch.scripts=*.sh,*.cmd,*.bat</i>
+ </td>
+ <td>Yes</td>
+ </tr>
+
</table>
</section>
1.3 +67 -11 maven-plugins/uberdist/xdocs/tags.xml
Index: tags.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/uberdist/xdocs/tags.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tags.xml 3 Mar 2005 03:36:25 -0000 1.2
+++ tags.xml 12 May 2005 19:55:58 -0000 1.3
@@ -1,4 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2004-2005 Eric Giguère.
+ *
+ * Licensed 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.
+ */
+-->
<document>
@@ -24,27 +41,39 @@
<td>Copies launch scripts to a specified directory</td>
</tr>
<tr>
+ <td><a href="#uber-dist:getArtifacts">uber-dist:getArtifacts</a></td>
+ <td>Retreives the list of project artifacts (dependencies) along with their deploy directory in a Map supplied by the caller</td>
+ </tr>
+ <tr>
<td><a href="#uber-dist:registerProject">uber-dist:registerProject</a></td>
- <td>Add a project to the distribution list to be built.</td>
+ <td>Add a project to the distribution list to be built.
+ <strong>Deprecated, do not use anymore</strong>
+ </td>
</tr>
<tr>
<td><a href="#uber-dist:deregisterProject">uber-dist:deregisterProject</a></td>
- <td>Removes a project from the distribution list to build</td>
+ <td>Removes a project from the distribution list to build
+ <strong>Deprecated, do not use anymore</strong>
+ </td>
</tr>
+
+
</table>
<subsection name="uber-dist:copyScripts">
<p>
- Copies launch scripts to a specified directory.<br/>
+ Copies launch scripts to a specified directory.
+ <br/>
The files located in directory with matching pattern as described by
- property <a href="./properties.html#maven.uber.dist.launch.scripts">maven.uber.dist.launch.scripts</a>
- are copied using Ant filtering mechanism with default @artifact_id@
- token replaced by the current's project artifact id.<br/>
+ property <a href="./properties.html#maven.uber.dist.launch.scripts">
+ maven.uber.dist.launch.scripts</a> are copied<br/>
+ using Ant filtering mechanism. See the goal: <a href="./goals.html#uber-dist:copy-scripts">uber-dist:copy-scripts</a>
+ for the list of tokens that Uberdist replaces while copying the scripts.<br/>
The default value for the file pattern is: <code>*.sh,*.cmd,*.bat</code>
</p>
<table>
<tr>
- <th>Attribute Name</th><th>Description</th><th>Optional?</th>
+ <th>Parameter Name</th><th>Description</th><th>Optional?</th>
</tr>
<tr>
<td>scriptsDirectory</td>
@@ -53,9 +82,35 @@
</tr>
</table>
</subsection>
+
+ <subsection name="uber-dist:getArtifacts">
+ <p>
+ Retreives the list of project artifacts (dependencies) along with their
+ deploy directory in a Map supplied by the caller.
+ <br/>
+ The list of dependencies published by the project bean is filtered as described
+ by the Uberdist custom distribution properties.
+ See the goal: <a href="./goals.html#uber-dist:copy-scripts">uber-dist:copy-scripts</a>
+ for more details on the properties and their effect on deployed dependencies.<br/>
+ The list is then returned in the parameter: depArtifacts
+ </p>
+ <table>
+ <tr>
+ <th>Parameter Name</th><th>Description</th><th>Optional?</th>
+ </tr>
+ <tr>
+ <td>depArtifacts</td>
+ <td>A Java Map object that will hold all deployable dependencies.
+ The dependency object returned by the pom.artifacts list are used as keys,
+ deployment sub-directory as value.</td>
+ <td>No</td>
+ </tr>
+ </table>
+ </subsection>
<subsection name="uber-dist:registerProject">
<p>
+ <strong>Deprecated, do not use anymore</strong>
Register a project with uberdist plugin to get the complex distribution built.
<br/>
NOTE: It is necessary to use this tag before calling any distribution goal so that<br/>
@@ -64,23 +119,24 @@
<table>
<tr>
- <th>Attribute Name</th><th>Description</th><th>Optional?</th>
+ <th>Parameter Name</th><th>Description</th><th>Optional?</th>
</tr>
<tr>
<td>name</td>
- <td>The name of the distribution to build. </td>
+ <td>The name of the distribution to build</td>
<td>No</td>
</tr>
</table>
</subsection>
<subsection name="uber-dist:deregisterProject">
<p>
+ <strong>Deprecated, do not use anymore</strong>
Removes a project from the list of distribution to be built.
<br/>
</p>
<table>
<tr>
- <th>Attribute Name</th><th>Description</th><th>Optional?</th>
+ <th>Parameter Name</th><th>Description</th><th>Optional?</th>
</tr>
<tr>
<td>name</td>
|
|
From: Eric G. <ri...@us...> - 2005-05-12 19:49:52
|
rikgig 05/05/12 12:49:46
Modified: uberdist plugin.properties
Log:
Removed useless old property
Revision Changes Path
1.2 +0 -1 maven-plugins/uberdist/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/uberdist/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 2 Mar 2005 17:45:38 -0000 1.1
+++ plugin.properties 12 May 2005 19:49:46 -0000 1.2
@@ -22,7 +22,6 @@
maven.uber.dist.dir=${maven.build.dir}/distributions
maven.uber.dist.proj.subdir=
-maven.uber.dist.assembly.dep.subdir=
maven.uber.dist.assembly.dir=${maven.uber.dist.assembly.root}/${maven.uber.dist.proj.subdir}
maven.uber.dist.executable.permission=gu+x
|
|
From: Eric G. <ri...@us...> - 2005-05-12 19:49:20
|
rikgig 05/05/12 12:49:13
Modified: uberdist plugin.jelly
Log:
Add a new tag to get filtered project dependencies.
Make fallback on dist plugin work.
Removed useless goals.
Simplified some code in there.
Deprecated the register-deregister mechanism. Now uberdist works only for one project at a time.
Revision Changes Path
1.2 +107 -104 maven-plugins/uberdist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/uberdist/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 2 Mar 2005 17:45:38 -0000 1.1
+++ plugin.jelly 12 May 2005 19:49:13 -0000 1.2
@@ -16,26 +16,26 @@
* limitations under the License.
*/
-->
-
<project
xmlns:define="jelly:define"
xmlns:j="jelly:core"
xmlns:util="jelly:util"
xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven">
+ xmlns:maven="jelly:maven"
+ xmlns:uber-dist="uber-dist">
<!-- Variable that will hold the list of projects that are part of the distribution to be built -->
<j:new var="projects" className="java.util.ArrayList"/>
<!-- Tag lib for the plugin -->
<define:taglib uri="uber-dist">
+<!-- This Tag is deprecated. Do not use it anymore -->
<define:tag name="deregisterProject">
- <!-- @name : Project to deregister, must be same as name used to register -->
-
+ <!--
+ @name : Project to deregister, must be same as name used to register
+ -->
<maven:pluginVar var="projects" plugin="maven-uberdist-plugin" property="projects" />
-
-
<j:set var="removeProject" value="null"/>
<j:forEach var="proj" items="${projects}">
<j:if test="${proj.get('name').equals(name)}">
@@ -46,7 +46,7 @@
<j:set var="dummy" value="${projects.remove(removeProject)}"/>
</j:if>
</define:tag>
-
+<!-- This Tag is deprecated. Do not use it anymore -->
<define:tag name="registerProject">
<!--
@name the name of this project.
@@ -81,30 +81,66 @@
<attainGoal name="uber-dist:copy-scripts"/>
</define:tag>
-
+ <define:tag name="getArtifacts">
+ <!--
+ @depArtifacts : Map of artifacts to deploy. Supplied by the caller
+ -->
+ <ant:echo message="Getting project dependencies to be deployed..."/>
+ <j:if test="${pom.getProperty('jar.dependency.dist.dir')!=null}">
+ <j:set var="projectDepDeployDir" value="${pom.getProperty('jar.dependency.dist.dir')}${'/'}"/>
+ </j:if>
+ <j:set var="projectId" value="${pom.artifactId}.deploy"/>
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:if test="${lib.dependency.getProperty(projectId)=='true'}">
+ <j:set var="depDeployDir" value="${projectDepDeployDir}"/>
+ <!-- Check to see if the jar.dependency.deploy.dir was overriden at the dependency level -->
+ <j:if test="${dep.dependency.getProperty('jar.dependency.dist.dir')!=null}">
+ <j:set var="depDeployDir" value="${dep.dependency.getProperty('jar.dependency.dist.dir')}${'/'}"/>
+ </j:if>
+ <!-- Here check if the deploy name for the dependency must be overriden to satisfy
+ either plateform requirement or libraries manifest sepecifications -->
+ <j:choose>
+ <j:when test="${dep.dependency.getProperty('jar.dependency.dist.name')!=null}">
+ <j:set var="depDeployName" value="${dep.dependency.getProperty('jar.dependency.dist.name')}"/>
+ <echo message="Deploying dependency: ${dep.file.name} under overriden name: ${depDeployName}"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="depDeployName" value="${lib.file.name}"/>
+ </j:otherwise>
+ </j:choose>
+ <j:set var="fname" value="${depDeployDir}${depDeployName}"/>
+ <j:set var="dummy">
+ ${depArtifacts.put(lib,fname)}
+ </j:set>
+ </j:if>
+ </j:forEach>
+ </define:tag>
+
</define:taglib>
<goal name="uber-dist:init"
- description="This goal is provided to give a hook on project developpers to add a preGoal so that
- the project registers itself with the plugin. It also checks for os and set a property
- if it is found to be running on Solaris to customize tar call on Unix (to keep
- right on the files in the tarball)">
-
+ description="Checks for os and set properties for OS specific tasks.">
<condition property="isOnUnix">
<or>
<os family="unix"/>
<os name="SunOS"/>
</or>
</condition>
- <j:if test="${isOnUnix == 'true'}">
+ <j:choose>
+ <j:when test="${isOnUnix == 'true'}">
+ <j:set var="osCPSeparator" value=":"/>
<echo message="Building distribution from a Unix based box"/>
- </j:if>
+ </j:when>
+ <j:otherwise>
+ <j:set var="osCPSeparator" value=";"/>
+ </j:otherwise>
+ </j:choose>
</goal>
<goal name="uber-dist:clean-dist-filesystem"
description="Delete existing distribution directories to build a new distribution"
- prereqs="uber-dist:dist-setup">
+ prereqs="uber-dist:init">
<j:choose>
<j:when test="${maven.uber.dist.assembly.dir.length()!=0}">
@@ -131,7 +167,8 @@
<!-- Create a tar.gz file and zip distribution -->
- <goal name="uber-dist:create-distrib">
+ <goal name="uber-dist:create-distrib"
+ prereqs="uber-dist:init">
<ant:echo>Creating tarball on dir:${maven.uber.dist.assembly.dir}</ant:echo>
<j:choose>
@@ -159,56 +196,32 @@
</j:otherwise>
</j:choose>
</goal>
-
-
- <goal name="uber-dist:dist-setup"
- description="This goal checks for registered projects. If none are found then we fail the build">
-
- <j:if test="${projects.isEmpty()}">
- <fail>No projects registered with uber-dist</fail>
- </j:if>
- </goal>
-
- <goal name="uber-dist:clean-dist"
- description="Goal that cleans the distributions and dist-assembly directory for the project"
- prereqs="uber-dist:init">
-
- <attainGoal name="uber-dist:clean-dist-filesystem"/>
- </goal>
-
-
+
<goal name="uber-dist:prepare-dist-filesystem"
prereqs="uber-dist:init">
- <ant:mkdir dir="${maven.uber.dist.assembly.dir}" />
- <ant:mkdir dir="${maven.uber.dist.dir}" />
-
- <j:if test="${!projects.isEmpty()}">
- <j:forEach var="project" items="${projects}">
- <j:set var="goalName" value="${project.get('name')}:prepare-dist-filesystem"/>
- <j:catch var="ex">
- <echo message="calling goal : ${goalName}"/>
- <attainGoal name="${goalName}"/>
- </j:catch>
- <j:if test="${ex != null}">
- <j:if test="${ex.getMessage().indexOf('No goal') == (1) }">
- <echo message="The goal : ${goalName} is not defined in your project"/>
- </j:if>
- <!-- TODO: Replace this fail command with a fallback on the maven-dist-plugin -->
- <fail>Exception caught while running goal [${goalName}] Details: ${ex}</fail>
- </j:if>
+ <ant:mkdir dir="${maven.uber.dist.assembly.dir}" />
+ <ant:mkdir dir="${maven.uber.dist.dir}" />
- </j:forEach>
-
+ <j:set var="goalName" value="${pom.artifactId}:prepare-dist-filesystem"/>
+ <j:catch var="ex">
+ <echo message="calling goal : ${goalName}"/>
+ <attainGoal name="${goalName}"/>
+ </j:catch>
+ <j:choose>
+ <j:when test="${ex != null}">
+ <echo message="Exception caught: ${ex.getMessage()}"/>
+ <echo message="The goal : ${goalName} is not defined in your project, using maven-dist-plugin fallback!"/>
+ <maven:set plugin="maven-dist-plugin" property="maven.dist.bin.assembly.dir" value="${maven.uber.dist.assembly.dir}"/>
+ <maven:set plugin="maven-dist-plugin" property="maven.dist.dir" value="${maven.uber.dist.dir}"/>
+ <attainGoal name="dist:build-bin"/>
+ </j:when>
+ <j:otherwise>
<attainGoal name="uber-dist:copy-deps"/>
<attainGoal name="uber-dist:copy-scripts"/>
<attainGoal name="uber-dist:make-executable"/>
- </j:if>
-
-
- <j:if test="${projects.isEmpty()}">
- <echo>No projects registered with uber-dist</echo>
- </j:if>
+ </j:otherwise>
+ </j:choose>
</goal>
<goal name="uber-dist:build"
@@ -234,50 +247,19 @@
<goal name="uber-dist:copy-deps"
description="To copy only the specially marked dependencies of a sub-project, ones with an attribute
- name like the pom.artifactId-deploy and with a value 'true'">
+ name like the pom.artifactId-deploy and with a value 'true'"
+ prereqs="uber-dist:init">
+
<!-- Go get all dependencies that are marked by the project id (way to exclude master project's dependencies -->
- <j:new var="deps" className="java.util.Vector"/>
- <j:set var="projectId" value="${pom.artifactId}.deploy"/>
- <j:forEach var="lib" items="${pom.artifacts}">
- <j:if test="${lib.dependency.getProperty(projectId)=='true'}">
- <echo>adding dep: ${lib.file.name}</echo>
- <j:set var="dummy">
- ${deps.add(lib)}
- </j:set>
- </j:if>
- </j:forEach>
+ <j:new var="projArtifacts" className="java.util.HashMap"/>
+ <uber-dist:getArtifacts depArtifacts="${projArtifacts}"/>
<!-- Copy child dependencies if there is at least one entry because an empty ant:copy
generates an error if no files are in the copy definition -->
- <j:if test="${!deps.isEmpty()}">
-
- <!-- Get the project level deployment sub-directory if it exists -->
- <j:if test="${pom.getProperty('jar.dependency.dist.dir')!=null}">
- <j:set var="projectDepDeployDir" value="${pom.getProperty('jar.dependency.dist.dir')}${'/'}"/>
- </j:if>
-
- <j:forEach var="dep" items="${deps}">
- <!-- Set default deploy sub-dir for dependencies to project level property value -->
- <j:set var="depDeployDir" value="${projectDepDeployDir}"/>
- <!-- Check to see if the jar.dependency.deploy.dir was overriden at the dependency level -->
- <j:if test="${dep.dependency.getProperty('jar.dependency.dist.dir')!=null}">
- <j:set var="depDeployDir" value="${dep.dependency.getProperty('jar.dependency.dist.dir')}${'/'}"/>
- </j:if>
-
- <!-- Here check if the deploy name for the dependency must be overriden to satisfy
- either plateform requirement or libraries manifest sepecifications -->
- <j:choose>
- <j:when test="${dep.dependency.getProperty('jar.dependency.dist.name')!=null}">
- <j:set var="depDeployName" value="${dep.dependency.getProperty('jar.dependency.dist.name')}"/>
- <echo message="Deploying dependency: ${dep.file.name} under overriden name: ${depDeployName}"/>
- </j:when>
- <j:otherwise>
- <j:set var="depDeployName" value="${dep.file.name}"/>
- </j:otherwise>
- </j:choose>
-
- <ant:copy tofile="${maven.uber.dist.assembly.dir}/${depDeployDir}/${depDeployName}">
- <ant:fileset dir="${dep.file.parent}">
- <ant:include name="${dep.file.name}"/>
+ <j:if test="${!projArtifacts.isEmpty()}">
+ <j:forEach var="dep" items="${projArtifacts}">
+ <ant:copy tofile="${maven.uber.dist.assembly.dir}/${dep.getValue()}" verbose="true">
+ <ant:fileset dir="${dep.getKey().file.parent}">
+ <ant:include name="${dep.getKey().file.name}"/>
</ant:fileset>
</ant:copy>
</j:forEach>
@@ -304,7 +286,8 @@
<goal name="uber-dist:copy-scripts"
description="This goal copies batch command scripts (*.cmd, *.bat, *.sh, and so on...) using a filter.
- The default filtering criteria is artifact_id. This token will be replaced by the ant:copy tag automatically">
+ The default filtering criteria is artifact_id. This token will be replaced by the ant:copy tag automatically"
+ prereqs="uber-dist:init">
<maven:get var="scripts_dir" plugin="maven-uberdist-plugin" property="maven.uber.dist.scripts.dir"/>
<maven:get var="dest_dir" plugin="maven-uberdist-plugin" property="maven.uber.dist.assembly.dir"/>
@@ -330,10 +313,30 @@
Copying filtered launch scripts using pattern: ${maven.uber.dist.launch.scripts}
From dir: ${scripts_dir}
To dir: ${maven.uber.dist.assembly.dir}
- </echo>
- <ant:copy todir="${maven.uber.dist.assembly.dir}" filtering="true" verbose="true" >
+ </echo>
+
+<!-- Here, we build the classpath entry from all the deployed dependencies. -->
+ <!-- get dependencies to deploy -->
+ <j:new var="myartifacts" className="java.util.HashMap"/>
+ <uber-dist:getArtifacts depArtifacts="${myartifacts}"/>
+
+ <j:set var="completecp" value=""/>
+ <j:if test="${!myartifacts.isEmpty()}">
+ <j:forEach var="dep" items="${myartifacts}">
+ <j:if test="${completecp.length() gt 0}">
+ <j:set var="completecp" value="${completecp}${osCPSeparator}${dep.getValue()}"/>
+ </j:if>
+ <j:if test="${completecp.length() == 0}">
+ <j:set var="completecp" value="${dep.getValue()}"/>
+ </j:if>
+ </j:forEach>
+ </j:if>
+ <ant:echo message="Complete classpath is:[${completecp}]"/>
+
+ <ant:copy todir="${maven.uber.dist.assembly.dir}" filtering="true" >
<ant:filterset id="arifact_id.filter">
<ant:filter token="artifact_id" value="${maven.final.name}.jar"/>
+ <ant:filter token="pom-artifacts" value="${completecp}"/>
</ant:filterset>
<ant:fileset dir="${scripts_dir}" includes="${maven.uber.dist.launch.scripts}">
<exclude name="target/**,${maven.src.dir}/**"/>
|
|
From: Eric P. <de...@us...> - 2005-05-12 14:39:11
|
dep4b 05/05/12 07:39:04
Modified: . maven.xml project.properties
Log:
Sort out fake jars, use new dependencies deployed for Macker.
Revision Changes Path
1.29 +1 -11 maven-plugins/maven.xml
Index: maven.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/maven.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- maven.xml 12 May 2005 01:02:18 -0000 1.28
+++ maven.xml 12 May 2005 14:39:03 -0000 1.29
@@ -19,11 +19,6 @@
<!-- for the sdocbook plugin -->
<ant:mkdir dir="${maven.repo.local}/jimi/jars/"/>
<ant:touch file="${maven.repo.local}/jimi/jars/jimi-1.0.jar"/>
-
- <!-- for the jpox plugin -->
- <ant:mkdir dir="${maven.repo.local}/jpox/jars/"/>
- <ant:touch file="${maven.repo.local}/jpox/jars/jpox-1.0.0.jar"/>
- <ant:touch file="${maven.repo.local}/jpox/jars/jpox-enhancer-1.0.0.jar"/>
<!-- for the jdo plugin -->
<ant:mkdir dir="${maven.repo.local}/jdo/jars/"/>
@@ -45,12 +40,7 @@
<ant:touch file="${maven.repo.local}/middlegen/jars/middlegen-2.0-vo.jar"/>
<ant:touch file="${maven.repo.local}/middlegen/jars/middlegen-hibernate-plugin-2.0-vo.jar"/>
<ant:touch file="${maven.repo.local}/hibernate/jars/hibernate-tools-2.1.2.jar"/>
-
- <!-- for the macker plugin -->
- <ant:mkdir dir="${maven.repo.local}/innig/jars/"/>
- <ant:touch file="${maven.repo.local}/innig/jars/innig-util-0.4.2.jar"/>
- <ant:touch file="${maven.repo.local}/innig/jars/macker-0.4.2.jar"/>
-
+
<!-- for the dotuml plugin -->
<ant:mkdir dir="${maven.repo.local}/umlgraph/jars/"/>
<ant:touch file="${maven.repo.local}/umlgraph/jars/umlgraph-2.8.jar"/>
1.12 +6 -1 maven-plugins/project.properties
Index: project.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/project.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.properties 1 Jan 2005 20:40:28 -0000 1.11
+++ project.properties 12 May 2005 14:39:03 -0000 1.12
@@ -6,13 +6,15 @@
maven.license.licenseFile=${basedir}/LICENSE.txt
# Multiproject Plugin
-maven.multiproject.excludes=project.xml
maven.multiproject.overviewPage.create=true
maven.multiproject.overviewPage.title=Overview of Plugins
maven.multiproject.overviewPage.link=projects-overview
maven.multiproject.overviewPage.linkTitle=Overview of Plugins
maven.multiproject.aggregateDir=
+#If you don't have a working Graphviz install, springgraph fails to build
+maven.multiproject.excludes=project.xml,springgraph/project.xml
+
# WebSite definition
maven.xdoc.date=left
maven.ui.body.background=white
@@ -28,3 +30,6 @@
# set these yourself
#maven.repo.maven-plugins-sf.username=
#maven.repo.maven-plugins-sf.privatekey=
+
+#facililitate downloading dependencies
+maven.repo.remot=http://www.ibiblio.org/maven,http://maven-plugins.sourceforge.net/repository
|
|
From: Eric P. <de...@us...> - 2005-05-12 01:02:30
|
dep4b 05/05/11 18:02:19
Modified: . maven.xml
Log:
add various jars that are required but not on ibiblio.
Revision Changes Path
1.28 +10 -3 maven-plugins/maven.xml
Index: maven.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/maven.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- maven.xml 1 Jan 2005 20:44:02 -0000 1.27
+++ maven.xml 12 May 2005 01:02:18 -0000 1.28
@@ -8,13 +8,13 @@
</preGoal>
<goal name="create-fake-artifacts">
- <!-- Faking any non-free runtime dependencies -->
+ <!-- Faking any non-free or not on ibiblio runtime dependencies -->
<ant:echo>Creating empty files for non-free runtime dependencies</ant:echo>
<!-- for the kodo plugin -->
<ant:mkdir dir="${maven.repo.local}/kodo/jars/"/>
- <ant:touch file="${maven.repo.local}/kodo/jars/kodo-jdo-3.2.3.jar"/>
- <ant:touch file="${maven.repo.local}/kodo/jars/kodo-jdo-runtime-3.2.3.jar"/>
+ <ant:touch file="${maven.repo.local}/kodo/jars/kodo-jdo-3.2.4.jar"/>
+ <ant:touch file="${maven.repo.local}/kodo/jars/kodo-jdo-runtime-3.2.4.jar"/>
<!-- for the sdocbook plugin -->
<ant:mkdir dir="${maven.repo.local}/jimi/jars/"/>
@@ -51,6 +51,13 @@
<ant:touch file="${maven.repo.local}/innig/jars/innig-util-0.4.2.jar"/>
<ant:touch file="${maven.repo.local}/innig/jars/macker-0.4.2.jar"/>
+ <!-- for the dotuml plugin -->
+ <ant:mkdir dir="${maven.repo.local}/umlgraph/jars/"/>
+ <ant:touch file="${maven.repo.local}/umlgraph/jars/umlgraph-2.8.jar"/>
+
+ <!-- for the strutsdoc plugin -->
+ <ant:mkdir dir="${maven.repo.local}/strutsdoc/jars/"/>
+ <ant:touch file="${maven.repo.local}/strutsdoc/jars/strutsdoc-0.5.jar"/>
</goal>
|
|
From: Eric P. <de...@us...> - 2005-05-12 00:11:03
|
dep4b 05/05/11 17:10:52
Modified: findbugs plugin.properties plugin.jelly
findbugs/xdocs changes.xml
Log:
1194218 Work with larger projects better, use workHard=true and find low medium and high bugs
Revision Changes Path
1.4 +9 -2 maven-plugins/findbugs/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/findbugs/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 7 Sep 2004 09:17:18 -0000 1.3
+++ plugin.properties 12 May 2005 00:10:52 -0000 1.4
@@ -5,8 +5,15 @@
# -------------------------------------------------------------------
# enable/disable findbugs
-
maven.findbugs.enable = true
-maven.findbugs.detail = medium
+
+# lowest priority level of potential bugs to report
+# high = only high priority
+# medium = medium and high
+# low = low, medium and high bugs.
+maven.findbugs.detail = low
maven.findbugs.conserveSpace = false
maven.findbugs.debug = false
+maven.findbugs.workHard = true
+maven.findbugs.jvmargs = -Xmx256m
+
1.11 +7 -1 maven-plugins/findbugs/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/findbugs/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 6 May 2005 22:05:01 -0000 1.10
+++ plugin.jelly 12 May 2005 00:10:52 -0000 1.11
@@ -92,6 +92,7 @@
reportLevel="${maven.findbugs.detail}"
conserveSpace="${maven.findbugs.conserveSpace}"
debug="${maven.findbugs.debug}"
+ workHard="${maven.findbugs.workHard}"
output="xdocs"
outputFile="${maven.build.dir}/findbugs-raw-report.xml">
@@ -106,7 +107,12 @@
<j:if test="${context.getVariable('maven.findbugs.includeFilter') != null}">
<ant:setProperty name="includeFilter" value="${maven.findbugs.includeFilter}" />
</j:if>
-
+ <j:forEach var="artifact" items="${pom.artifacts}">
+ <j:set var="dep" value="${artifact.dependency}"/>
+ <j:if test="${dep.type =='jar'}">
+ <auxClasspath path="${artifact.path}"/>
+ </j:if>
+ </j:forEach>
<j:forEach var="lib" items="${pom.artifacts}">
<j:if test="${lib.dependency.type =='jar'}">
<auxClasspath path="${lib.path}"/>
1.17 +4 -0 maven-plugins/findbugs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/findbugs/xdocs/changes.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- changes.xml 6 May 2005 22:05:01 -0000 1.16
+++ changes.xml 12 May 2005 00:10:52 -0000 1.17
@@ -7,6 +7,10 @@
<body>
<release version="0.8.8" date="in CVS">
+ <action dev="dep4b" type="add" due-to="Jon Chrisiansen" issue="1194218">
+ add workHard option, set to true by default. Set VM to use 256 mb of memory and find
+ low, medium, and high bugs instead of just medium and high by default.
+ </action>
<action dev="gleclaire" type="add">
Added maven.findbugs.debug property.
</action>
|
|
From: Eric P. <de...@us...> - 2005-05-09 12:26:51
|
dep4b 05/05/09 05:26:45
Modified: dbunit/src/main/net/sourceforge/mavenplugins/dbunit
DataSetTool.java
dbunit/xdocs changes.xml
Log:
Support mssql operations and warning for invalid values
Revision Changes Path
1.5 +18 -13 maven-plugins/dbunit/src/main/net/sourceforge/mavenplugins/dbunit/DataSetTool.java
Index: DataSetTool.java
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dbunit/src/main/net/sourceforge/mavenplugins/dbunit/DataSetTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DataSetTool.java 5 Aug 2004 00:48:44 -0000 1.4
+++ DataSetTool.java 9 May 2005 12:26:44 -0000 1.5
@@ -61,6 +61,7 @@
import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.DataSetException;
import org.dbunit.dataset.IDataSet;
+import org.dbunit.ext.mssql.InsertIdentityOperation;
import org.dbunit.operation.DatabaseOperation;
import java.io.IOException;
@@ -80,7 +81,7 @@
private static final String EXPORT = "EXPORT";
/** format for excel files */
private static final String EXCEL = "EXCEL";
-
+
/**
* @return the format of the data set.
*/
@@ -88,9 +89,9 @@
{
return dataSetFormat;
}
-
+
/**
- * TODO better document this
+ * TODO better document this
* Set the format of the dataset, e.g. EXCEL
* @param name the dbunit dataset format
*/
@@ -108,7 +109,7 @@
{
return operation;
}
-
+
/**
* @return the operation to perform on a dataset
* @see #getOperation()
@@ -120,20 +121,21 @@
if (operation.equalsIgnoreCase("CLEAN_INSERT")) dbOperation = DatabaseOperation.CLEAN_INSERT;
if (operation.equalsIgnoreCase("DELETE")) dbOperation = DatabaseOperation.DELETE;
if (operation.equalsIgnoreCase("INSERT")) dbOperation = DatabaseOperation.INSERT;
+ if (operation.equalsIgnoreCase("MSSQL_CLEAN_INSERT")) dbOperation = InsertIdentityOperation.CLEAN_INSERT;
}
-
+
/**
* @return a comma separated list of table names
- */
+ */
public String getExportTables()
{
return exportTables;
}
-
+
/**
* set the list of tables to be exported
* @param tables a comma separated list of table names
- */
+ */
public void setExportTables(String tables)
{
exportTables = tables;
@@ -145,9 +147,9 @@
private IDataSet getDataSet(IDatabaseConnection connection) throws SQLException
{
if (getExportTables() == null) return connection.createDataSet();
- else return connection.createDataSet(StringUtils.split(getExportTables(), ","));
+ return connection.createDataSet(StringUtils.split(getExportTables(), ","));
}
-
+
/**
* Process a dataset using a DbUnit operation
*/
@@ -155,10 +157,9 @@
{
if (getOperation().equalsIgnoreCase(EXPORT))
{
- // database connection - close?
- IDatabaseConnection connection = getConnection();
- // write file
+ IDatabaseConnection connection= getConnection();
writeDataSetToFile(getFileName(), getDataSetFormat(), getDataSet(connection));
+ connection.close();
}
else if (dbOperation != null)
{
@@ -166,6 +167,10 @@
IDataSet dataset = getDataSetFromFile(getFileName(), getDataSetFormat());
dbOperation.execute(getConnection(), dataset);
}
+ else
+ {
+ throw new IllegalArgumentException("Invalid value for maven.dbunit.importType");
+ }
}
}
\ No newline at end of file
1.18 +3 -0 maven-plugins/dbunit/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dbunit/xdocs/changes.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- changes.xml 26 Aug 2004 23:38:06 -0000 1.17
+++ changes.xml 9 May 2005 12:26:45 -0000 1.18
@@ -6,6 +6,9 @@
<author email="dio...@so...">dIon Gillard</author>
</properties>
<body>
+ <release version="1.6" data="in cvs">
+ <action dev="dep4b" type="fix" due-to="Fabrizio Giustina" issue="1159028">Support mssql operations and warning for invalid values</action>
+ </release>
<release version="1.5" date="2004-08-27">
<action dev="diongillard" type="fix">Use version of POI used with dbunit 2.1</action>
<action dev="diongillard" type="add">Add xml2xls dataset conversion goal</action>
|
|
From: Eric P. <de...@us...> - 2005-05-09 12:26:35
|
dep4b 05/05/09 05:26:24
Modified: dbunit project.xml
Log:
add myself, prep for next version
Revision Changes Path
1.33 +10 -1 maven-plugins/dbunit/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dbunit/project.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- project.xml 15 Oct 2004 11:17:31 -0000 1.32
+++ project.xml 9 May 2005 12:26:23 -0000 1.33
@@ -8,7 +8,7 @@
<name>Dbunit Plug-in</name>
<!-- groupId is in parent -->
- <currentVersion>1.5</currentVersion>
+ <currentVersion>1.6-SNAPSHOT</currentVersion>
<!-- organization is in parent -->
<inceptionYear>2003</inceptionYear>
@@ -64,6 +64,15 @@
<role>Developer</role>
</roles>
</developer>
+ <developer>
+ <name>Eric Pugh</name>
+ <id>dep4b</id>
+ <email>de...@us...</email>
+ <organization>OpenSource Connections</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
</developers>
<!-- no contributors -->
<!-- licenses section not done yet -->
|
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-08 20:57:47
|
ge0ffrey 05/05/08 13:57:29
Modified: izpack project.xml
Log:
site deployment
Revision Changes Path
1.4 +0 -1 maven-plugins/izpack/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/izpack/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 8 May 2005 19:50:25 -0000 1.3
+++ project.xml 8 May 2005 20:57:29 -0000 1.4
@@ -31,7 +31,6 @@
</description>
<shortDescription>IzPack Plugin for Maven</shortDescription>
<url>http://maven-plugins.sourceforge.net/maven-izpack-plugin</url>
- <siteDirectory>/home/groups/m/ma/maven-plugins/htdocs/izpack/</siteDirectory>
<repository>
<connection>scm:cvs:pserver:ano...@cv...:/cvsroot/maven-plugins:maven-plugins/izpack</connection>
<developerConnection>scm:cvs:ssh:use...@cv...:/cvsroot/maven-plugins:maven-plugins/izpack</developerConnection>
|
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-08 20:10:45
|
ge0ffrey 05/05/08 13:10:38
Modified: izpack/xdocs/templates application.xml
Log:
typo
Revision Changes Path
1.2 +1 -1 maven-plugins/izpack/xdocs/templates/application.xml
Index: application.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/izpack/xdocs/templates/application.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- application.xml 7 May 2005 18:02:22 -0000 1.1
+++ application.xml 8 May 2005 20:10:38 -0000 1.2
@@ -26,7 +26,7 @@
<section name="The template application">
<p>
This template creates a installer for an executable jar.
- The following shorcuts are created:
+ The following shortcuts are created:
</p>
<ul>
<li>A desktop and programs shortcut to <code>javaw -jar <MY_ARTIFACT>.jar</code></li>
|
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-08 19:50:36
|
ge0ffrey 05/05/08 12:50:25
Modified: izpack project.xml
Log:
for site deployment
Revision Changes Path
1.3 +7 -7 maven-plugins/izpack/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/izpack/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 8 May 2005 19:27:16 -0000 1.2
+++ project.xml 8 May 2005 19:50:25 -0000 1.3
@@ -26,16 +26,16 @@
<description>
A plugin to generate installers using IzPack.
The basic installer is a platform independend installer jar
- which requires a JVM on the destination machine.
- That platform independend installer can be bundled with a JVM into a Win32 installer exe.
+ which requires a JRE on the destination machine.
+ That platform independend installer can be bundled with a JRE into a Win32 installer exe.
</description>
<shortDescription>IzPack Plugin for Maven</shortDescription>
- <url>http://maven.apache.org/reference/plugins/izpack/</url>
- <issueTrackingUrl>http://jira.codehaus.org/browse/MPIZPACK</issueTrackingUrl>
+ <url>http://maven-plugins.sourceforge.net/maven-izpack-plugin</url>
+ <siteDirectory>/home/groups/m/ma/maven-plugins/htdocs/izpack/</siteDirectory>
<repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/izpack/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/izpack/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/izpack/</url>
+ <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/maven-plugins:maven-plugins/izpack</connection>
+ <developerConnection>scm:cvs:ssh:use...@cv...:/cvsroot/maven-plugins:maven-plugins/izpack</developerConnection>
+ <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/maven-plugins/maven-plugins/izpack/</url>
</repository>
<developers>
<developer>
|
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-08 19:27:53
|
ge0ffrey 05/05/08 12:27:16
Modified: izpack/xdocs goals.xml
izpack plugin.jelly plugin.properties project.xml
Log:
cleaning up project.xml and goal descriptions and comments
Revision Changes Path
1.3 +3 -5 maven-plugins/izpack/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/izpack/xdocs/goals.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- goals.xml 7 May 2005 18:02:23 -0000 1.2
+++ goals.xml 8 May 2005 19:27:15 -0000 1.3
@@ -31,21 +31,19 @@
<goal>
<name>izpack:configure</name>
<description>
- Create the IzPack configuration file
+ Create or copy the IzPack configuration file.
</description>
</goal>
<goal>
<name>izpack:jar-installer</name>
<description>
- Generate a IzPack platform independ installer jar.
- By default it will package the files generated by the maven distribution plugin.
+ Generate a IzPack platform independ installer jar. By default it will package the files generated by the maven distribution plugin.
</description>
</goal>
<goal>
<name>izpack:win-installer</name>
<description>
- Generate a IzPack windows installer exe. It can optionally bundle a JRE.
- Requires an installation of the IzPack native launcher and the 7-Zip tool.
+ Generate a IzPack windows installer exe. It can optionally bundle a JRE. Requires an installation of the IzPack native launcher and the 7-Zip tool.
</description>
</goal>
</goals>
1.2 +4 -4 maven-plugins/izpack/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/izpack/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 6 May 2005 23:34:42 -0000 1.1
+++ plugin.jelly 8 May 2005 19:27:16 -0000 1.2
@@ -38,7 +38,7 @@
<goal name="izpack:configure"
prereqs="izpack:init"
- description="Create or copy the IzPack configuration file">
+ description="Create or copy the IzPack configuration file.">
<j:choose>
<j:when test="${maven.izpack.use.template}">
<maven:get var="maven.license.licenseFile" plugin="maven-license-plugin"
@@ -80,7 +80,7 @@
<goal name="izpack:jar-installer"
prereqs="izpack:init, izpack:configure"
- description="Generate a IzPack platform independ installer jar">
+ description="Generate a IzPack platform independ installer jar. By default it will package the files generated by the maven distribution plugin.">
<ant:taskdef name="izpackTask"
classpath="${plugin.getDependencyPath('izpack:izpack-standalone-compiler')}"
@@ -94,7 +94,7 @@
<!-- TODO the native launcher should be in the maven repo somehow -->
<goal name="izpack:launcher"
prereqs="izpack:init, izpack:configure, izpack:jar-installer"
- description="Generate a IzPack native launcher">
+ description="Generate a IzPack native launcher exe. It can optionally bundle a JRE. Requires an installation of the IzPack native launcher.">
<ant:mkdir dir="${maven.izpack.build.launcher.dir}"/>
<util:file var="launcherDistDir" name="${maven.izpack.launcher.install.dir}/dist" />
@@ -128,7 +128,7 @@
<!-- todo the 7-zip tool should not be called natively -->
<goal name="izpack:win-installer"
prereqs="izpack:init, izpack:configure, izpack:jar-installer, izpack:launcher"
- description="Generate a IzPack Windows installer exe">
+ description="Generate a IzPack windows installer exe. It can optionally bundle a JRE. Requires an installation of the IzPack native launcher and the 7-Zip tool.">
<ant:mkdir dir="${maven.izpack.build.installer.win.dir}"/>
<util:file var="sevenzipFile" name="${maven.izpack.sevenzip.install.dir}/7zS.sfx" />
1.2 +2 -2 maven-plugins/izpack/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/izpack/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 6 May 2005 23:34:42 -0000 1.1
+++ plugin.properties 8 May 2005 19:27:16 -0000 1.2
@@ -42,7 +42,7 @@
maven.izpack.use.template = true
-# if use.template is false
+# Static config file (if use.template is false)
maven.izpack.config.file = ${maven.izpack.src.dir}/jarInstallerConfig.xml
# Template properties (if use.template is true)
@@ -82,7 +82,7 @@
maven.izpack.installer.win.bundle.jre = false
maven.izpack.installer.win.bundle.jre.dir =
-maven.izpack.installer.win.bundle.jre.filename =
+maven.izpack.installer.win.bundle.jre.filename =
maven.izpack.installer.win.config.template.file = ${plugin.resources}/win-installer/zip-config.jsl
1.2 +0 -10 maven-plugins/izpack/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/izpack/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 6 May 2005 23:34:42 -0000 1.1
+++ project.xml 8 May 2005 19:27:16 -0000 1.2
@@ -32,21 +32,11 @@
<shortDescription>IzPack Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/izpack/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPIZPACK</issueTrackingUrl>
- <siteDirectory>/www/maven.apache.org/reference/plugins/izpack/</siteDirectory>
<repository>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/izpack/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/izpack/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/izpack/</url>
</repository>
- <versions>
-<!-- <version>-->
-<!-- <id>0.1</id>-->
-<!-- <name>0.1</name>-->
-<!-- <tag>MAVEN_IZPACK_0_1</tag>-->
-<!-- </version>-->
- </versions>
- <branches/>
- <mailingLists/>
<developers>
<developer>
<name>Geoffrey De Smet</name>
|
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-07 18:02:30
|
ge0ffrey 05/05/07 11:02:23
Modified: izpack/xdocs goals.xml navigation.xml
Added: izpack/xdocs/templates application.xml
izpack/xdocs index.xml
Log:
improved docs
Revision Changes Path
1.1 maven-plugins/izpack/xdocs/templates/application.xml
Index: application.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
-->
<document>
<properties>
<title>The template application</title>
</properties>
<body>
<section name="The template application">
<p>
This template creates a installer for an executable jar.
The following shorcuts are created:
</p>
<ul>
<li>A desktop and programs shortcut to <code>javaw -jar <MY_ARTIFACT>.jar</code></li>
<li>A programs shortcut to the uninstaller</li>
</ul>
</section>
</body>
</document>
1.2 +14 -2 maven-plugins/izpack/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/izpack/xdocs/goals.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- goals.xml 6 May 2005 23:34:42 -0000 1.1
+++ goals.xml 7 May 2005 18:02:23 -0000 1.2
@@ -30,11 +30,23 @@
</goal>
<goal>
<name>izpack:configure</name>
- <description>Create the IzPack configuration file</description>
+ <description>
+ Create the IzPack configuration file
+ </description>
</goal>
<goal>
<name>izpack:jar-installer</name>
- <description>Generate a IzPack platform independ installer jar</description>
+ <description>
+ Generate a IzPack platform independ installer jar.
+ By default it will package the files generated by the maven distribution plugin.
+ </description>
+ </goal>
+ <goal>
+ <name>izpack:win-installer</name>
+ <description>
+ Generate a IzPack windows installer exe. It can optionally bundle a JRE.
+ Requires an installation of the IzPack native launcher and the 7-Zip tool.
+ </description>
</goal>
</goals>
</body>
1.2 +8 -4 maven-plugins/izpack/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/izpack/xdocs/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 6 May 2005 23:34:42 -0000 1.1
+++ navigation.xml 7 May 2005 18:02:23 -0000 1.2
@@ -18,16 +18,20 @@
-->
-<project name="Maven NSIS Plug-in">
- <title>Maven NSIS Plug-in</title>
+<project name="Maven IzPack Plug-in">
+ <title>Maven IzPack Plug-in</title>
<body>
<links>
<item href="http://maven.apache.org/" name="Maven"/>
<item href="http://www.izforge.com/izpack/" name="IzPack"/>
</links>
<menu name="Overview">
- <item href="/goals.html" name="Goals"/>
- <item href="/properties.html" name="Properties"/>
+ <item name="Home" href="/index.html"/>
+ <item name="Goals" href="/goals.html"/>
+ <item name="Properties" href="/properties.html"/>
+ </menu>
+ <menu name="Templates">
+ <item name="application" href="/templates/application.html" />
</menu>
</body>
</project>
\ No newline at end of file
1.1 maven-plugins/izpack/xdocs/index.xml
Index: index.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
-->
<document>
<properties>
<title>Maven IzPack Plug-in</title>
</properties>
<body>
<section name="Maven IzPack Plug-in">
<p>
A plugin to generate installers using IzPack.
The basic installer is a platform independend installer jar
which requires a JVM on the destination machine.
That platform independend installer can be bundled with a JVM into a Win32 installer exe.
</p>
</section>
<section name="Special installation instructions">
<p>
Download and install IzPack 3.7.2 from
<a href="http://www.izforge.com/izpack">http://www.izforge.com/izpack</a>.
Copy <code>IZPACK_HOME/lib/standalone-compiler.jar</code> to
<code>LOCAL_REPO/izpack/jars/izpack-standalone-compiler-3.7.2.jar</code>.
</p>
<p>
For the goals <code>izpack:launcher</code> and <code>izpack:win-installer</code>
you also need to isntall the IzPack native launcher 1.2 from
<a href="http://www.izforge.com/izpack">http://www.izforge.com/izpack</a> and
the 7-Zip tool from
<a href="http://www.7-zip.org/">http://www.7-zip.org/</a>.
</p>
</section>
</body>
</document>
|
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-07 17:57:58
|
ge0ffrey 05/05/07 10:57:52 maven-plugins/izpack/xdocs/templates - New directory |
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-06 23:34:50
|
ge0ffrey 05/05/06 16:34:42
Added: izpack/src/plugin-resources/images main.ico main.png
uninstaller.ico uninstaller.png
izpack/src/plugin-resources/launcher launcher.jsl
izpack/src/plugin-resources/templates/application
jar-installer-config.jsl shortcut-spec-unix.jsl
shortcut-spec-win.jsl
izpack/src/plugin-resources/win-installer zip-config.jsl
izpack/xdocs goals.xml navigation.xml properties.xml
izpack .cvsignore plugin.jelly plugin.properties
project.xml
Log:
initial commit
Revision Changes Path
1.1 maven-plugins/izpack/src/plugin-resources/images/main.ico
<<Binary file>>
1.1 maven-plugins/izpack/src/plugin-resources/images/main.png
<<Binary file>>
1.1 maven-plugins/izpack/src/plugin-resources/images/uninstaller.ico
<<Binary file>>
1.1 maven-plugins/izpack/src/plugin-resources/images/uninstaller.png
<<Binary file>>
1.1 maven-plugins/izpack/src/plugin-resources/launcher/launcher.jsl
Index: launcher.jsl
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
* ========================================================================
*
* Copyright 2004-2005 The Apache Software Foundation.
*
* Licensed 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.
*
* ========================================================================
-->
<jsl:stylesheet select="$doc"
xmlns:j="jelly:core"
xmlns:jsl="jelly:jsl"
xmlns:maven="jelly:maven"
xmlns:x="jelly:xml"
xmlns:util="jelly:util"
xmlns="dummy">
# Global entries, can be overriden by specific ones
jar = ${maven.izpack.installer.final.name}
download = http://www.java.com/
<j:if test="${maven.izpack.installer.win.bundle.jre}">
# Win32 specific entries
[win32]
jre = jre/${maven.izpack.installer.win.bundle.jre.filename}
</j:if>
</jsl:stylesheet>
1.1 maven-plugins/izpack/src/plugin-resources/templates/application/jar-installer-config.jsl
Index: jar-installer-config.jsl
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
* ========================================================================
*
* Copyright 2004-2005 The Apache Software Foundation.
*
* Licensed 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.
*
* ========================================================================
-->
<jsl:stylesheet select="$doc"
xmlns:j="jelly:core"
xmlns:jsl="jelly:jsl"
xmlns:maven="jelly:maven"
xmlns:x="jelly:xml"
xmlns:util="jelly:util"
xmlns="dummy" trim="true">
<j:set var="installer.path" value="$INSTALL_PATH"/>
<installation version="1.0">
<info>
<appname>${pom.name}</appname>
<appversion>${pom.currentVersion}</appversion>
<appsubpath>${maven.final.name}</appsubpath>
<authors>
<j:set var="developers" value="${pom.developers}"/>
<j:if test="${!empty(developers)}">
<j:forEach var="developer" items="${pom.developers}">
<author name="${developer.name}" email="${developer.email}"/>
</j:forEach>
</j:if>
</authors>
<url>${pom.url}</url>
<javaversion>1.4</javaversion>
</info>
<guiprefs width="800" height="600" resizable="yes">
<laf name="looks">
<os family="unix"/>
<os family="windows"/>
<os family="mac"/>
</laf>
</guiprefs>
<locale>
<langpack iso3="eng"/>
</locale>
<!-- For Windows shortcuts -->
<native type="izpack" name="ShellLink.dll"/>
<resources>
<res id="LicencePanel.licence" src="${maven.license.licenseFile}"/>
<res id="Unix_shortcutSpec.xml" src="${maven.izpack.build.shortcut.unix.file}"/>
<res id="shortcutSpec.xml" src="${maven.izpack.build.shortcut.win.file}"/>
</resources>
<panels>
<panel classname="HelloPanel"/>
<panel classname="LicencePanel"/>
<panel classname="TargetPanel"/>
<panel classname="PacksPanel"/>
<panel classname="InstallPanel"/>
<panel classname="ShortcutPanel"/>
<panel classname="FinishPanel"/>
</panels>
<packs>
<pack name="${pom.name}" required="yes">
<description>${pom.description}</description>
<singlefile src="${maven.izpack.template.shortcut.unix.main.icon.file}" target="${installer.path}/${maven.izpack.template.shortcut.build.unix.app.icon.filename}"/>
<singlefile src="${maven.izpack.template.shortcut.win.main.icon.file}" target="${installer.path}/${maven.izpack.template.shortcut.build.win.app.icon.filename}"/>
<singlefile src="${maven.izpack.template.shortcut.unix.uninstaller.icon.file}" target="${installer.path}/${maven.izpack.template.shortcut.build.unix.uninstaller.icon.filename}"/>
<singlefile src="${maven.izpack.template.shortcut.win.uninstaller.icon.file}" target="${installer.path}/${maven.izpack.template.shortcut.build.win.uninstaller.icon.filename}"/>
<fileset dir="${maven.izpack.template.pack.core.dir}" targetdir="${installer.path}"/>
</pack>
</packs>
</installation>
</jsl:stylesheet>
1.1 maven-plugins/izpack/src/plugin-resources/templates/application/shortcut-spec-unix.jsl
Index: shortcut-spec-unix.jsl
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
* ========================================================================
*
* Copyright 2004-2005 The Apache Software Foundation.
*
* Licensed 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.
*
* ========================================================================
-->
<jsl:stylesheet select="$doc"
xmlns:j="jelly:core"
xmlns:jsl="jelly:jsl"
xmlns:maven="jelly:maven"
xmlns:x="jelly:xml"
xmlns:util="jelly:util"
xmlns="dummy" trim="true">
<shortcuts>
<programGroup defaultName="${pom.name} ${pom.currentVersion}" location="applications"/>
<skipIfNotSupported/>
<!-- maven.jar.final.name doesn't exist (war, ejb, ear do have it) -->
<j:set var="installer.path" value="$INSTALL_PATH"/>
<shortcut
name="${pom.name} ${pom.currentVersion}"
programGroup='yes'
desktop='yes'
applications='no'
startMenu='no'
startup='no'
type='Application'
encoding='UTF-8'
target='java'
commandLine='-jar "${installer.path}/${maven.final.name}.jar"'
workingDirectory="${installer.path}"
description="${pom.shortDescription}"
iconIndex="0"
iconFile="${installer.path}/${maven.izpack.template.shortcut.build.unix.app.icon.filename}"
initialState="noShow">
</shortcut>
<j:if test="${!empty(pom.url)}">
<shortcut
name="${pom.name} website"
programGroup='yes'
desktop='no'
applications='no'
startMenu='no'
startup='no'
type='Application'
encoding='UTF-8'
target="${pom.url}"
workingDirectory="${installer.path}"
description="Open the ${pom.name} website in your browser"
initialState="normal">
</shortcut>
</j:if>
<shortcut
name="Uninstall ${pom.name} ${pom.currentVersion}"
programGroup='yes'
desktop='no'
applications='no'
startMenu='no'
startup='no'
type='Application'
encoding='UTF-8'
target='java'
commandLine='-jar "${installer.path}/Uninstaller/uninstaller.jar"'
workingDirectory=""
description="Uninstall ${pom.name} ${pom.currentVersion}"
iconIndex="0"
iconFile="${installer.path}/${maven.izpack.template.shortcut.build.unix.uninstaller.icon.filename}"
initialState="noShow">
</shortcut>
</shortcuts>
</jsl:stylesheet>
1.1 maven-plugins/izpack/src/plugin-resources/templates/application/shortcut-spec-win.jsl
Index: shortcut-spec-win.jsl
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
* ========================================================================
*
* Copyright 2004-2005 The Apache Software Foundation.
*
* Licensed 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.
*
* ========================================================================
-->
<jsl:stylesheet select="$doc"
xmlns:j="jelly:core"
xmlns:jsl="jelly:jsl"
xmlns:maven="jelly:maven"
xmlns:x="jelly:xml"
xmlns:util="jelly:util"
xmlns="dummy" trim="true">
<shortcuts>
<programGroup defaultName="${pom.name} ${pom.currentVersion}" location="applications"/>
<!-- maven.jar.final.name doesn't exist (war, ejb, ear do have it) -->
<j:set var="installer.path" value="$INSTALL_PATH"/>
<shortcut
name="${pom.name} ${pom.currentVersion}"
programGroup="yes"
desktop="yes"
applications="no"
startMenu="no"
startup="no"
target="javaw"
commandLine='-jar "${installer.path}/${maven.final.name}.jar"'
workingDirectory="${installer.path}"
description="${pom.shortDescription}"
iconIndex="0"
iconFile="${installer.path}/${maven.izpack.template.shortcut.build.win.app.icon.filename}"
initialState="noShow">
</shortcut>
<!-- todo currently this link is not generated because of ignoring in izpack -->
<j:if test="${!empty(pom.url)}">
<shortcut
name="${pom.name} website"
programGroup="yes"
desktop="yes"
applications="no"
startMenu="no"
startup="no"
target="${pom.url}"
workingDirectory="${installer.path}"
description="Open the ${pom.name} website in your browser"
initialState="normal">
</shortcut>
</j:if>
<shortcut
name="Uninstall ${pom.name} ${pom.currentVersion}"
programGroup="yes"
desktop="no"
applications="no"
startMenu="no"
startup="no"
target="javaw"
commandLine='-jar "${installer.path}/Uninstaller/uninstaller.jar"'
workingDirectory=""
description="Uninstall ${pom.name} ${pom.currentVersion}"
iconIndex="0"
iconFile="${installer.path}/${maven.izpack.template.shortcut.build.win.uninstaller.icon.filename}"
initialState="noShow">
</shortcut>
</shortcuts>
</jsl:stylesheet>
1.1 maven-plugins/izpack/src/plugin-resources/win-installer/zip-config.jsl
Index: zip-config.jsl
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
* ========================================================================
*
* Copyright 2004-2005 The Apache Software Foundation.
*
* Licensed 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.
*
* ========================================================================
-->
<jsl:stylesheet select="$doc"
xmlns:j="jelly:core"
xmlns:jsl="jelly:jsl"
xmlns:maven="jelly:maven"
xmlns:x="jelly:xml"
xmlns:util="jelly:util"
xmlns="dummy">
;!@Install@!UTF-8!
Title="${pom.name} ${pom.currentVersion}"
BeginPrompt="Do you want to install ${pom.name} ${pom.currentVersion}?"
RunProgram="launcher-Win32.exe"
;!@InstallEnd@!
</jsl:stylesheet>
1.1 maven-plugins/izpack/xdocs/goals.xml
Index: goals.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
-->
<document>
<properties>
<title>Maven IzPack Plug-in Goals</title>
</properties>
<body>
<goals>
<goal>
<name>izpack</name>
<description>Calls izpack:jar-installer and pre-requires the dist:prepare-bin-filesystem</description>
</goal>
<goal>
<name>izpack:configure</name>
<description>Create the IzPack configuration file</description>
</goal>
<goal>
<name>izpack:jar-installer</name>
<description>Generate a IzPack platform independ installer jar</description>
</goal>
</goals>
</body>
</document>
1.1 maven-plugins/izpack/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
-->
<project name="Maven NSIS Plug-in">
<title>Maven NSIS Plug-in</title>
<body>
<links>
<item href="http://maven.apache.org/" name="Maven"/>
<item href="http://www.izforge.com/izpack/" name="IzPack"/>
</links>
<menu name="Overview">
<item href="/goals.html" name="Goals"/>
<item href="/properties.html" name="Properties"/>
</menu>
</body>
</project>
1.1 maven-plugins/izpack/xdocs/properties.xml
Index: properties.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
-->
<document>
<properties>
<title>Maven IzPack Plug-in Properties</title>
</properties>
<body>
<section name="Maven IzPack Plug-in Settings">
<table>
<tr>
<th>Property</th>
<th>Optional?</th>
<th>Description</th>
</tr>
<!-- <tr>-->
<!-- <td>maven.izpack.src.dir</td>-->
<!-- <td>Yes</td>-->
<!-- <td>-->
<!-- <p>Default value is-->
<!-- <code>-->
<!-- </code>.</p>-->
<!-- </td>-->
<!-- </tr>-->
</table>
</section>
</body>
</document>
1.1 maven-plugins/izpack/.cvsignore
Index: .cvsignore
===================================================================
target
*.log
*.log.*
*.iml
*.ipr
*.iws
1.1 maven-plugins/izpack/plugin.jelly
Index: plugin.jelly
===================================================================
<?xml version="1.0"?>
<!--
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed 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.
*/
-->
<project
xmlns:j="jelly:core"
xmlns:util="jelly:util"
xmlns:x="jelly:xml"
xmlns:ant="jelly:ant"
xmlns:doc="doc"
xmlns:maven="jelly:maven">
<goal name="izpack" prereqs="dist:prepare-bin-filesystem, izpack:jar-installer"/>
<goal name="izpack:init">
<maven:get var="maven.izpack.bin.assembly.dir" plugin="maven-dist-plugin"
property="maven.izpack.bin.assembly.dir"/>
<ant:mkdir dir="${maven.izpack.build.dir}"/>
<ant:mkdir dir="${maven.izpack.build.config.dir}"/>
<ant:mkdir dir="${maven.izpack.build.installer.dir}"/>
</goal>
<goal name="izpack:configure"
prereqs="izpack:init"
description="Create or copy the IzPack configuration file">
<j:choose>
<j:when test="${maven.izpack.use.template}">
<maven:get var="maven.license.licenseFile" plugin="maven-license-plugin"
property="maven.license.licenseFile"/>
<!-- maven.jar.final.name doesn't exist (war, ejb, ear do have it) -->
<!-- <maven:get var="maven.jar.final.name" plugin="maven-jar-plugin"-->
<!-- property="maven.jar.final.name"/>-->
<x:parse var="doc"/>
<!-- todo question: Why not file://${maven.izpack.template} with 2 //? -->
<ant:echo>Generating ${maven.izpack.build.config.file} ...</ant:echo>
<!-- <j:set-->
<!-- var="stylesheet"-->
<!-- value="file:${maven.izpack.template.file}" />-->
<!-- <j:file name="${maven.izpack.build.config.file}" outputMode="xml" prettyPrint="yes">-->
<!-- <j:include uri="${stylesheet.toString()}" />-->
<!-- </j:file>-->
<j:file name="${maven.izpack.build.config.file}" outputMode="xml" prettyPrint="yes" xmlns="dummy">
<j:include uri="file:${maven.izpack.template.file}" />
</j:file>
<ant:echo>Generating ${maven.izpack.build.shortcut.unix.file} ...</ant:echo>
<j:file name="${maven.izpack.build.shortcut.unix.file}" outputMode="xml" prettyPrint="yes" xmlns="dummy">
<j:include uri="file:${maven.izpack.template.shortcut.unix.file}" />
</j:file>
<ant:echo>Generating ${maven.izpack.build.shortcut.win.file} ...</ant:echo>
<j:file name="${maven.izpack.build.shortcut.win.file}" outputMode="xml" prettyPrint="yes" xmlns="dummy">
<j:include uri="file:${maven.izpack.template.shortcut.win.file}" />
</j:file>
</j:when>
<j:otherwise>
<util:file var="izpackConfigFile" name="${maven.izpack.config.file}" />
<j:if test="${!izpackConfigFile.exists()}">
<fail>The IzPack configuration file '${izpackConfigFile}' could not be found.</fail>
</j:if>
<ant:copy file="${izpackConfigFile}" tofile="${maven.izpack.build.config.file}" overwite="true"/>
</j:otherwise>
</j:choose>
</goal>
<goal name="izpack:jar-installer"
prereqs="izpack:init, izpack:configure"
description="Generate a IzPack platform independ installer jar">
<ant:taskdef name="izpackTask"
classpath="${plugin.getDependencyPath('izpack:izpack-standalone-compiler')}"
classname="com.izforge.izpack.ant.IzPackTask"/>
<ant:izpackTask input="${maven.izpack.build.config.file}"
output="${maven.izpack.build.installer.file}"
installerType="${maven.izpack.installer.type}"
basedir="${basedir}"/>
</goal>
<!-- TODO the native launcher should be in the maven repo somehow -->
<goal name="izpack:launcher"
prereqs="izpack:init, izpack:configure, izpack:jar-installer"
description="Generate a IzPack native launcher">
<ant:mkdir dir="${maven.izpack.build.launcher.dir}"/>
<util:file var="launcherDistDir" name="${maven.izpack.launcher.install.dir}/dist" />
<j:if test="${!launcherDistDir.exists()}">
<fail>The IzPack launcher dist directory '${launcherDistDir}' could not be found.</fail>
</j:if>
<ant:copy todir="${maven.izpack.build.launcher.dir}" overwite="true">
<ant:fileset dir="${launcherDistDir}"/>
</ant:copy>
<ant:copy file="${maven.izpack.build.installer.file}" tofile="${maven.izpack.build.launcher.dir}/${maven.izpack.installer.final.name}" overwite="true"/>
<j:if test="${maven.izpack.installer.win.bundle.jre}">
<ant:mkdir dir="${maven.izpack.build.launcher.dir}/jre"/>
<util:file var="jreFile" name="${maven.izpack.installer.win.bundle.jre.dir}/${maven.izpack.installer.win.bundle.jre.filename}" />
<j:if test="${!jreFile.isFile()}">
<fail>The JRE file '${jreFile}' could not be found.</fail>
</j:if>
<ant:copy file="${jreFile}" tofile="${maven.izpack.build.launcher.dir}/jre/${maven.izpack.installer.win.bundle.jre.filename}"/>
</j:if>
<x:parse var="doc"/>
<util:file var="launcherConfigFile" name="${maven.izpack.build.launcher.dir}/launcher.ini" />
<ant:echo>Generating ${launcherConfigFile} ...</ant:echo>
<j:file name="${launcherConfigFile}" prettyPrint="false" xmlns="dummy" omitXmlDeclaration="true" escapeText="false">
<j:include uri="file:${maven.izpack.launcher.template.file}" />
</j:file>
</goal>
<!-- todo the 7-zip tool should be in the maven repo somehow -->
<!-- todo the 7-zip tool should not be called natively -->
<goal name="izpack:win-installer"
prereqs="izpack:init, izpack:configure, izpack:jar-installer, izpack:launcher"
description="Generate a IzPack Windows installer exe">
<ant:mkdir dir="${maven.izpack.build.installer.win.dir}"/>
<util:file var="sevenzipFile" name="${maven.izpack.sevenzip.install.dir}/7zS.sfx" />
<j:if test="${!sevenzipFile.exists()}">
<fail>The 7-Zip file '${sevenzipFile}' could not be found.</fail>
</j:if>
<ant:copy file="${sevenzipFile}" tofile="${maven.izpack.build.installer.win.dir}/7zS.sfx"/>
<util:file var="zipConfigFile" name="${maven.izpack.build.installer.win.dir}/config.txt" />
<ant:echo>Generating ${zipConfigFile} ...</ant:echo>
<j:file name="${zipConfigFile}" prettyPrint="false" xmlns="dummy" omitXmlDeclaration="true" escapeText="false">
<j:include uri="file:${maven.izpack.installer.win.config.template.file}" />
</j:file>
<ant:delete file="${maven.izpack.build.installer.win.dir}/files.7z"/>
<util:file var="sevenzipApp" name="${maven.izpack.sevenzip.install.dir}/7z.exe" />
<j:if test="${!sevenzipApp.exists()}">
<fail>The 7-Zip application '${sevenzipApp}' could not be found.</fail>
</j:if>
<ant:echo>Compressing with 7-Zip ...</ant:echo>
<ant:exec executable="${sevenzipApp}" dir="${maven.izpack.build.launcher.dir}">
<ant:arg line='a -t7z "${maven.izpack.build.installer.win.dir}/files.7z" "*" -r'/>
</ant:exec>
<ant:concat destfile="${maven.izpack.build.installer.win.file}" binary="yes">
<ant:fileset file="${maven.izpack.build.installer.win.dir}/7zS.sfx"/>
<ant:fileset file="${maven.izpack.build.installer.win.dir}/config.txt"/>
<ant:fileset file="${maven.izpack.build.installer.win.dir}/files.7z"/>
</ant:concat>
</goal>
</project>
1.1 maven-plugins/izpack/plugin.properties
Index: plugin.properties
===================================================================
# -------------------------------------------------------------------
# Copyright 2001-2004 The Apache Software Foundation.
#
# Licensed 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.
# -------------------------------------------------------------------
# -------------------------------------------------------------------
# P L U G I N P R O P E R I E S
# -------------------------------------------------------------------
# IzPack plugin.
# -------------------------------------------------------------------
# Source of extra configuration files for izpack
maven.izpack.src.dir = ${basedir}/src/izpack
# The IzPack build directory
maven.izpack.build.dir = ${maven.build.dir}/izpack
# IzPack configuration
maven.izpack.build.config.dir = ${maven.izpack.build.dir}/config
maven.izpack.build.config.file = ${maven.izpack.build.config.dir}/izpack-config.xml
maven.izpack.build.shortcut.unix.file = ${maven.izpack.build.config.dir}/shortcutSpecUnix.xml
maven.izpack.build.shortcut.win.file = ${maven.izpack.build.config.dir}/shortcutSpecWin.xml
maven.izpack.installer.type = standard
maven.izpack.build.installer.dir = ${maven.izpack.build.dir}/installer
maven.izpack.installer.final.name = ${maven.final.name}-installer.jar
maven.izpack.build.installer.file = ${maven.izpack.build.installer.dir}/${maven.izpack.installer.final.name}
maven.izpack.use.template = true
# if use.template is false
maven.izpack.config.file = ${maven.izpack.src.dir}/jarInstallerConfig.xml
# Template properties (if use.template is true)
maven.izpack.template = application
maven.izpack.template.file = ${plugin.resources}/templates/${maven.izpack.template}/jar-installer-config.jsl
maven.izpack.template.shortcut.unix.file = ${plugin.resources}/templates/${maven.izpack.template}/shortcut-spec-unix.jsl
maven.izpack.template.shortcut.win.file = ${plugin.resources}/templates/${maven.izpack.template}/shortcut-spec-win.jsl
### application template (default)
# Directory containing contents to be installed
maven.izpack.template.pack.core.dir = ${maven.dist.bin.assembly.dir}
maven.izpack.template.shortcut.unix.main.icon.file = ${plugin.resources}/images/main.png
maven.izpack.template.shortcut.win.main.icon.file = ${plugin.resources}/images/main.ico
maven.izpack.template.shortcut.unix.uninstaller.icon.file = ${plugin.resources}/images/uninstaller.png
maven.izpack.template.shortcut.win.uninstaller.icon.file = ${plugin.resources}/images/uninstaller.ico
maven.izpack.template.shortcut.build.unix.app.icon.filename = ${pom.name}.png
maven.izpack.template.shortcut.build.win.app.icon.filename = ${pom.name}.ico
maven.izpack.template.shortcut.build.unix.uninstaller.icon.filename = uninstaller.png
maven.izpack.template.shortcut.build.win.uninstaller.icon.filename = uninstaller.ico
### Native launcher
maven.izpack.launcher.install.dir = C:/Program Files/izpack-launcher-1.2
maven.izpack.build.launcher.dir = ${maven.izpack.build.installer.dir}/launcher
maven.izpack.launcher.template.file = ${plugin.resources}/launcher/launcher.jsl
### Win installer
maven.izpack.sevenzip.install.dir = C:/Program Files/7-Zip
maven.izpack.build.installer.win.dir = ${maven.izpack.build.installer.dir}/win-installer
maven.izpack.installer.win.bundle.jre = false
maven.izpack.installer.win.bundle.jre.dir =
maven.izpack.installer.win.bundle.jre.filename =
maven.izpack.installer.win.config.template.file = ${plugin.resources}/win-installer/zip-config.jsl
maven.izpack.installer.win.final.name = ${maven.final.name}-win-installer.exe
maven.izpack.build.installer.win.file = ${maven.izpack.build.installer.dir}/${maven.izpack.installer.win.final.name}
1.1 maven-plugins/izpack/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed 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.
*/
-->
<project>
<extend>${basedir}/../plugin-project.xml</extend>
<!--<extend>../plugin-parent/project.xml</extend>-->
<pomVersion>3</pomVersion>
<artifactId>maven-izpack-plugin</artifactId>
<name>Maven IzPack Plugin</name>
<currentVersion>0.3.0</currentVersion>
<description>
A plugin to generate installers using IzPack.
The basic installer is a platform independend installer jar
which requires a JVM on the destination machine.
That platform independend installer can be bundled with a JVM into a Win32 installer exe.
</description>
<shortDescription>IzPack Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/izpack/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPIZPACK</issueTrackingUrl>
<siteDirectory>/www/maven.apache.org/reference/plugins/izpack/</siteDirectory>
<repository>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/izpack/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/izpack/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/izpack/</url>
</repository>
<versions>
<!-- <version>-->
<!-- <id>0.1</id>-->
<!-- <name>0.1</name>-->
<!-- <tag>MAVEN_IZPACK_0_1</tag>-->
<!-- </version>-->
</versions>
<branches/>
<mailingLists/>
<developers>
<developer>
<name>Geoffrey De Smet</name>
<id>ge0ffrey</id>
<email>ge0ffrey_AT_users_DOT_sourceforge_DOT_net</email>
<roles>
<role>Java Developer</role>
</roles>
<url>http://users.pandora.be/geoffrey</url>
<timezone>+1</timezone>
</developer>
<developer>
<name>Philip Dodds</name>
<id>pdodds</id>
<email>pdodds_AT_unity-systems.com</email>
<organization>Unity Systems</organization>
<timezone>0</timezone>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/libs/jsl/</url>
</dependency>
<dependency>
<groupId>izpack</groupId>
<artifactId>izpack-standalone-compiler</artifactId>
<version>3.7.2</version>
<url>http://www.izforge.com/izpack/</url>
</dependency>
</dependencies>
</project>
|
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-06 23:33:47
|
ge0ffrey 05/05/06 16:33:41 maven-plugins/izpack/src/plugin-resources/templates/application - New directory |
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-06 23:33:44
|
ge0ffrey 05/05/06 16:33:37 maven-plugins/izpack/src/plugin-resources/templates - New directory |
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-06 23:33:44
|
ge0ffrey 05/05/06 16:33:37 maven-plugins/izpack/src/plugin-resources/win-installer - New directory |
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-06 23:33:43
|
ge0ffrey 05/05/06 16:33:37 maven-plugins/izpack/src/plugin-resources/launcher - New directory |
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-06 23:33:43
|
ge0ffrey 05/05/06 16:33:37 maven-plugins/izpack/src/plugin-resources/images - New directory |
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-06 23:33:39
|
ge0ffrey 05/05/06 16:33:33 maven-plugins/izpack/src/plugin-resources - New directory |
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-06 23:33:34
|
ge0ffrey 05/05/06 16:33:28 maven-plugins/izpack/src - New directory |
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-06 23:33:34
|
ge0ffrey 05/05/06 16:33:28 maven-plugins/izpack/xdocs - New directory |
|
From: Geoffrey De S. <ge0...@us...> - 2005-05-06 23:33:28
|
ge0ffrey 05/05/06 16:33:21 maven-plugins/izpack - New directory |
|
From: Eric P. <de...@us...> - 2005-05-06 22:05:07
|
dep4b 05/05/06 15:05:01
Modified: findbugs/xdocs properties.xml changes.xml
findbugs plugin.jelly project.xml
Log:
add include/exclude filters for what bug patterns to match.
Revision Changes Path
1.5 +18 -0 maven-plugins/findbugs/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/findbugs/xdocs/properties.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- properties.xml 7 Sep 2004 09:17:19 -0000 1.4
+++ properties.xml 6 May 2005 22:05:00 -0000 1.5
@@ -58,6 +58,24 @@
</p>
</td>
</tr>
+ <tr>
+ <td>maven.findbugs.excludeFilter</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Report all bug instances except those matching the filter specified in the xml Filter file. See http://findbugs.sourceforge.net for more information.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>maven.findbugs.includeFilter</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Only report bug instances that match the filter specified in the xml Filter file. See http://findbugs.sourceforge.net for more information.
+ </p>
+ </td>
+ </tr>
</table>
</section>
1.16 +18 -1 maven-plugins/findbugs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/findbugs/xdocs/changes.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- changes.xml 18 Mar 2005 22:49:57 -0000 1.15
+++ changes.xml 6 May 2005 22:05:01 -0000 1.16
@@ -6,7 +6,24 @@
</properties>
<body>
- <release version="0.8.6" date="s">
+ <release version="0.8.8" date="in CVS">
+ <action dev="gleclaire" type="add">
+ Added maven.findbugs.debug property.
+ </action>
+ <action dev="gleclaire" type="add">
+ Added maven.findbugs.jvmargs property.
+ </action>
+ <action dev="gleclaire" type="add">
+ Added maven.findbugs.excludeFilter property.
+ </action>
+ <action dev="gleclaire" type="add">
+ Added maven.findbugs.includeFilter property.
+ </action>
+ <action dev="epugh" type="update">
+ Use findbugs version 0.8.8.
+ </action>
+ </release>
+ <release version="0.8.6" date="">
<action dev="epugh" type="update">
Use findbugs version 0.8.6. Jar's are included as part of the plugin.
</action>
1.10 +174 -166 maven-plugins/findbugs/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/findbugs/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 18 Mar 2005 22:49:57 -0000 1.9
+++ plugin.jelly 6 May 2005 22:05:01 -0000 1.10
@@ -1,166 +1,174 @@
-<?xml version="1.0"?>
-
-<!--
- =============================================================================
- FindBugs Plugin. Generate FindBugs reports using the FindBugs framework.
- =============================================================================
--->
-<project xmlns:j="jelly:core" xmlns:doc="doc" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" >
-
- <!--
- ========================================================================
- Register a FindBugs report.
- ========================================================================
- -->
- <goal name="maven-findbugs-plugin:register">
- <j:if test="${sourcesPresent}">
- <doc:registerReport
- name="FindBugs Report"
- pluginName="maven-findbugs-plugin"
- description="Verification of coding rules."
- link="findbugs-report"/>
- </j:if>
- </goal>
-
- <!--
- ========================================================================
- Deregister a FindBugs report.
- ========================================================================
- -->
- <goal name="maven-findbugs-plugin:deregister">
- <j:if test="${sourcesPresent}">
- <doc:deregisterReport name="FindBugs Report"/>
- </j:if>
- </goal>
-
- <!--
- ========================================================================
- Main FindBugs plugin goal.
- ========================================================================
- -->
- <goal name="findbugs" description="Static Code Analyzer">
-
- <!-- Only run FindBugs if it is enabled -->
- <j:set var="enable" value="${maven.findbugs.enable}"/>
-
- <j:if test="${enable == 'true'}">
- <attainGoal name="maven-findbugs-plugin:report"/>
- </j:if>
-
- </goal>
-
- <!--
- ========================================================================
- Generate the FindBugs report.
- ========================================================================
- -->
- <goal name="maven-findbugs-plugin:report"
- description="Generate source code report with FindBugs">
-
- <attainGoal name="java:compile"/>
-
- <!-- Create the dirs if we start from a previously cleaned project -->
- <mkdir dir="${maven.build.dir}"/>
- <mkdir dir="${maven.docs.dest}"/>
-
- <!-- Define a FindBugs task with the rulesets and all jars in the
- classpath -->
- <path id="findbugs.classpath">
- <fileset dir="${plugin.resources}/jars">
- <include name="**/*.jar"/>
- <!--exclude name="**/*plugin*.jar"/-->
- </fileset>
- <pathelement location="${plugin.getDependencyPath('dom4j:dom4j')}" />
- </path>
-
- <path id="findbugs.pluginlist">
- <fileset dir="${plugin.resources}/jars">
- <include name="**/*plugin*.jar"/>
- </fileset>
- </path>
-
- <ant:taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
- <classpath refid="findbugs.classpath"/>
- </ant:taskdef>
-
- <!-- Run the FindBugs task - need a way to define the rulesets dynamically -->
- <echo>Running the FindBugs task...</echo>
-
-
- <findbugs classpathref="findbugs.classpath"
- pluginlistref="findbugs.pluginlist"
- reportLevel="${maven.findbugs.detail}"
- conserveSpace="${maven.findbugs.conserveSpace}"
- debug="${maven.findbugs.debug}"
- output="xdocs"
- outputFile="${maven.build.dir}/findbugs-raw-report.xml">
-
- <j:if test="${context.getVariable('maven.findbugs.jvmargs') != null}">
- <ant:setProperty name="jvmargs" value="${maven.findbugs.jvmargs}" />
- </j:if>
-
- <j:forEach var="lib" items="${pom.artifacts}">
- <j:if test="${lib.dependency.type =='jar'}">
- <auxClasspath path="${lib.path}"/>
- </j:if>
- </j:forEach>
- <sourcePath path="${basedir}/src/java" />
- <j:if test="${sourcesPresent}">
- <j:set var="srcDir" value="${pom.build.sourceDirectory}"/>
- <j:if test="${ srcDir.startsWith( basedir ) }">
-
- <j:set var="srcDir" value="${srcDir.substring(basedir.length())}"/>
- <!--
- cut off also slash or backslash from basedir.
- Is there a way to make it in one step in Jelly?
- -->
- <j:set var="srcDir" value="${srcDir.substring(1)}"/>
- </j:if>
- <sourcePath path="${srcDir}"/>
- </j:if>
- <!--class location="${maven.build.dir}/${maven.final.name}.jar" /-->
- <class location="${maven.build.dest}" />
- </findbugs>
-
- <!-- Run JSL to transform the report into XDOC -->
-
- <echo>Converting the FindBugs report to xdoc ...</echo>
-
- <doc:jsl
- input="${maven.build.dir}/findbugs-raw-report.xml"
- output="findbugs-report.xml"
- stylesheet="${plugin.resources}/findbugs.jsl"
- outputMode="xml"
- prettyPrint="true"
- />
-
- </goal>
-
- <!--
- ========================================================================
- Register the FindBugs report to the "site" plugin.
- ========================================================================
- -->
- <goal name="maven-findbugs-plugin:register">
- <j:if test="${sourcesPresent == 'true'}">
- <doc:registerReport
- name="FindBugs"
- pluginName="maven-findbugs-plugin"
- link="findbugs"
- description="Report on bug patterns found in compiled code."/>
- </j:if>
- </goal>
-
- <!--
- ========================================================================
- Deregister the FindBugs report from the "site" plugin.
- ========================================================================
- -->
- <goal name="maven-findbugs-plugin:deregister">
- <j:if test="${sourcesPresent == 'true'}">
- <doc:deregisterReport name="FindBugs"/>
- </j:if>
- </goal>
-
-
-</project>
+<?xml version="1.0"?>
+
+<!--
+ =============================================================================
+ FindBugs Plugin. Generate FindBugs reports using the FindBugs framework.
+ =============================================================================
+-->
+<project xmlns:j="jelly:core" xmlns:doc="doc" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" >
+
+ <!--
+ ========================================================================
+ Register a FindBugs report.
+ ========================================================================
+ -->
+ <goal name="maven-findbugs-plugin:register">
+ <j:if test="${sourcesPresent}">
+ <doc:registerReport
+ name="FindBugs Report"
+ pluginName="maven-findbugs-plugin"
+ description="Verification of coding rules."
+ link="findbugs-report"/>
+ </j:if>
+ </goal>
+
+ <!--
+ ========================================================================
+ Deregister a FindBugs report.
+ ========================================================================
+ -->
+ <goal name="maven-findbugs-plugin:deregister">
+ <j:if test="${sourcesPresent}">
+ <doc:deregisterReport name="FindBugs Report"/>
+ </j:if>
+ </goal>
+
+ <!--
+ ========================================================================
+ Main FindBugs plugin goal.
+ ========================================================================
+ -->
+ <goal name="findbugs" description="Static Code Analyzer">
+
+ <!-- Only run FindBugs if it is enabled -->
+ <j:set var="enable" value="${maven.findbugs.enable}"/>
+
+ <j:if test="${enable == 'true'}">
+ <attainGoal name="maven-findbugs-plugin:report"/>
+ </j:if>
+
+ </goal>
+
+ <!--
+ ========================================================================
+ Generate the FindBugs report.
+ ========================================================================
+ -->
+ <goal name="maven-findbugs-plugin:report"
+ description="Generate source code report with FindBugs">
+
+ <attainGoal name="java:compile"/>
+
+ <!-- Create the dirs if we start from a previously cleaned project -->
+ <mkdir dir="${maven.build.dir}"/>
+ <mkdir dir="${maven.docs.dest}"/>
+
+ <!-- Define a FindBugs task with the rulesets and all jars in the
+ classpath -->
+ <path id="findbugs.classpath">
+ <fileset dir="${plugin.resources}/jars">
+ <include name="**/*.jar"/>
+ <!--exclude name="**/*plugin*.jar"/-->
+ </fileset>
+ <pathelement location="${plugin.getDependencyPath('dom4j:dom4j')}" />
+ </path>
+
+ <path id="findbugs.pluginlist">
+ <fileset dir="${plugin.resources}/jars">
+ <include name="**/*plugin*.jar"/>
+ </fileset>
+ </path>
+
+ <ant:taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
+ <classpath refid="findbugs.classpath"/>
+ </ant:taskdef>
+
+ <!-- Run the FindBugs task - need a way to define the rulesets dynamically -->
+ <echo>Running the FindBugs task...</echo>
+
+
+ <findbugs classpathref="findbugs.classpath"
+ pluginlistref="findbugs.pluginlist"
+ reportLevel="${maven.findbugs.detail}"
+ conserveSpace="${maven.findbugs.conserveSpace}"
+ debug="${maven.findbugs.debug}"
+ output="xdocs"
+ outputFile="${maven.build.dir}/findbugs-raw-report.xml">
+
+ <j:if test="${context.getVariable('maven.findbugs.jvmargs') != null}">
+ <ant:setProperty name="jvmargs" value="${maven.findbugs.jvmargs}" />
+ </j:if>
+
+ <j:if test="${context.getVariable('maven.findbugs.excludeFilter') != null}">
+ <ant:setProperty name="excludeFilter" value="${maven.findbugs.excludeFilter}" />
+ </j:if>
+
+ <j:if test="${context.getVariable('maven.findbugs.includeFilter') != null}">
+ <ant:setProperty name="includeFilter" value="${maven.findbugs.includeFilter}" />
+ </j:if>
+
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:if test="${lib.dependency.type =='jar'}">
+ <auxClasspath path="${lib.path}"/>
+ </j:if>
+ </j:forEach>
+ <sourcePath path="${basedir}/src/java" />
+ <j:if test="${sourcesPresent}">
+ <j:set var="srcDir" value="${pom.build.sourceDirectory}"/>
+ <j:if test="${ srcDir.startsWith( basedir ) }">
+
+ <j:set var="srcDir" value="${srcDir.substring(basedir.length())}"/>
+ <!--
+ cut off also slash or backslash from basedir.
+ Is there a way to make it in one step in Jelly?
+ -->
+ <j:set var="srcDir" value="${srcDir.substring(1)}"/>
+ </j:if>
+ <sourcePath path="${srcDir}"/>
+ </j:if>
+ <!--class location="${maven.build.dir}/${maven.final.name}.jar" /-->
+ <class location="${maven.build.dest}" />
+ </findbugs>
+
+ <!-- Run JSL to transform the report into XDOC -->
+
+ <echo>Converting the FindBugs report to xdoc ...</echo>
+
+ <doc:jsl
+ input="${maven.build.dir}/findbugs-raw-report.xml"
+ output="findbugs-report.xml"
+ stylesheet="${plugin.resources}/findbugs.jsl"
+ outputMode="xml"
+ prettyPrint="true"
+ />
+
+ </goal>
+
+ <!--
+ ========================================================================
+ Register the FindBugs report to the "site" plugin.
+ ========================================================================
+ -->
+ <goal name="maven-findbugs-plugin:register">
+ <j:if test="${sourcesPresent == 'true'}">
+ <doc:registerReport
+ name="FindBugs"
+ pluginName="maven-findbugs-plugin"
+ link="findbugs"
+ description="Report on bug patterns found in compiled code."/>
+ </j:if>
+ </goal>
+
+ <!--
+ ========================================================================
+ Deregister the FindBugs report from the "site" plugin.
+ ========================================================================
+ -->
+ <goal name="maven-findbugs-plugin:deregister">
+ <j:if test="${sourcesPresent == 'true'}">
+ <doc:deregisterReport name="FindBugs"/>
+ </j:if>
+ </goal>
+
+
+</project>
1.21 +2 -2 maven-plugins/findbugs/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/findbugs/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 18 Mar 2005 22:49:57 -0000 1.20
+++ project.xml 6 May 2005 22:05:01 -0000 1.21
@@ -6,14 +6,14 @@
<id>maven-findbugs-plugin</id>
<name>FindBugs Plug-in</name>
<!-- groupId is in parent -->
- <currentVersion>0.8.6-SNAPSHOT</currentVersion>
+ <currentVersion>0.8.8-SNAPSHOT</currentVersion>
<!-- organization is in parent -->
<inceptionYear>2003</inceptionYear>
<!-- package, logo are in parent. no gumpRepositoryId -->
<description>A plugin to automate FindBugs tasks</description>
<shortDescription>Findbugs tasks</shortDescription>
<!-- issue tracking url, siteAddress are in parent -->
- <siteDirectory>/home/groups/m/ma/maven-plugins/htdocs/findbugs/</siteDirectory>
+ <siteDirectory>/home/groups/m/ma/maven-plugins/htdocs/maven-findbugs-plugin/</siteDirectory>
<repository>
<connection>scm:cvs:pserver:ano...@cv...:/cvsroot/maven-plugins:maven-plugins/findbugs</connection>
|
5 messages has been excluded from this view by a project administrator.
