Author: ptahchiev
Date: Sat Jan 17 17:17:35 2009
New Revision: 735367
URL: http://svn.apache.org/viewvc?rev=735367&view=rev
Log:
Improved documentation. Added a page for the cactifyEar mojo.
Added:
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven2/cactifyear.xml
(with props)
Modified:
jakarta/cactus/trunk/cactus-site/pom.xml
jakarta/cactus/trunk/cactus-site/src/changes/changes.xml
jakarta/cactus/trunk/cactus-site/src/site/site.xml
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/task_cactifyear.xml
Modified: jakarta/cactus/trunk/cactus-site/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/pom.xml?rev=735367&r1=735366&r2=735367&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-site/pom.xml (original)
+++ jakarta/cactus/trunk/cactus-site/pom.xml Sat Jan 17 17:17:35 2009
@@ -53,7 +53,7 @@
<distributionManagement>
<site>
<id>cactus.apache.org</id>
-
<url>scp://people.apache.org/www/jakarta.apache.org/cactus/1.8.0</url>
+
<url>scp://people.apache.org/www/jakarta.apache.org/cactus/</url>
</site>
</distributionManagement>
<mailingLists>
@@ -128,8 +128,8 @@
<name>Petar Tahchiev</name>
<id>ptahchiev</id>
<email>ptahch...@apache.org</email>
- <url>http://phamola.com/</url>
- <organization>Phamola Inc.</organization>
+ <url>http://apache.org/</url>
+ <organization>Apache Software Foundation</organization>
<roles>
<role>Lead Developer</role>
<role>Release Manager</role>
Modified: jakarta/cactus/trunk/cactus-site/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/changes/changes.xml?rev=735367&r1=735366&r2=735367&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-site/src/changes/changes.xml (original)
+++ jakarta/cactus/trunk/cactus-site/src/changes/changes.xml Sat Jan 17
17:17:35 2009
@@ -83,24 +83,36 @@
changes page</a>.
</p>
- <release version="1.8" date="04 April 2008">
-
- <action dev="PTT" type="update">
- The new Cactus web-site is officially
launched. We have a new skin and the site is now build with the new Maven2
build system.
- </action>
- <action dev="PTT" type="add">
- Cactus is now integrated with Cargo.
- So from now on <b>Cargo</b> is
responsible for bringing up and shutting down the containers for
- Cactus.
- </action>
- <action dev="PTT" type="update">
- Cactus's build system is now moved to
Maven.
- </action>
- <action dev="VMA" type="update">
- Since version 1.7.1 of Cactus all
changes are now recorded using
- Apache's JIRA. The list of changes for
an unreleased version is available in the
- JIRA roadmap report and the
released version changes in the JIRA changelog report.
- </action>
+ <release version="1.8.1" date="18 January 2009">
+ <action dev="PTT" type="update">
+ Some issues have been fixed on the JIRA. Consult with
the JIRA report on exactly which ones
+ were fixed and what was the resolution.
+ </action>
+ <action dev="PTT" type="update">
+ Cactus documentation have been updated.
+ </action>
+ <action dev="PTT" type="add">
+ A cactus-maven2 plugin has been added for a better
integration with Maven2. The plugin allows you to
+ cactify your WAR and EAR applications.
+ </action>
+ </release>
+ <release version="1.8" date="04 April 2008">
+ <action dev="PTT" type="update">
+ The new Cactus web-site is officially launched. We have
a new skin and the site is now build with the new Maven2 build system.
+ </action>
+ <action dev="PTT" type="add">
+ Cactus is now integrated with Cargo.
+ So from now on <b>Cargo</b> is responsible for bringing
up and shutting down the containers for
+ Cactus.
+ </action>
+ <action dev="PTT" type="update">
+ Cactus's build system is now moved to Maven.
+ </action>
+ <action dev="VMA" type="update">
+ Since version 1.7.1 of Cactus all changes are now
recorded using
+ Apache's JIRA. The list of changes for an unreleased
version is available in the
+ JIRA roadmap report and the released version
changes in the JIRA changelog report.
+ </action>
</release>
<release version="1.7" date="28 Jan 2005">
Modified: jakarta/cactus/trunk/cactus-site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/site.xml?rev=735367&r1=735366&r2=735367&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-site/src/site/site.xml (original)
+++ jakarta/cactus/trunk/cactus-site/src/site/site.xml Sat Jan 17 17:17:35 2009
@@ -95,6 +95,7 @@
</item>
<item name="Maven2"
href="integration/maven2/index.html" collapse="true">
<item name="CactifyWar MOJO"
href="integration/maven2/cactifywar.html"/>
+ <item name="CactifyEar MOJO"
href="integration/maven2/cactifyear.html"/>
</item>
<item name="Jetty"
href="integration/integration_jetty.html"/>
<item name="Various IDEs"
href="integration/howto_ide.html"/>
Modified:
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/task_cactifyear.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/task_cactifyear.xml?rev=735367&r1=735366&r2=735367&view=diff
==============================================================================
---
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/task_cactifyear.xml
(original)
+++
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/ant/task_cactifyear.xml
Sat Jan 17 17:17:35 2009
@@ -62,7 +62,7 @@
<tr>
<td>addEjbReferences</td>
<td>
- Specifies if EJB references to all local EJB:s in the ear should
be added to the cactus war.
+ Specifies if EJB references to all local EJBs in the ear should
be added to the cactus war.
</td>
<td>No</td>
</tr>
Added:
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven2/cactifyear.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven2/cactifyear.xml?rev=735367&view=auto
==============================================================================
---
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven2/cactifyear.xml
(added)
+++
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven2/cactifyear.xml
Sat Jan 17 17:17:35 2009
@@ -0,0 +1,198 @@
+<?xml version="1.0"?>
+
+<!--
+ * ========================================================================
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ========================================================================
+-->
+
+<document id="mojo_cactifyear">
+
+ <properties>
+ <title>CactifyEar Maven2 MOJO</title>
+ </properties>
+
+ <body>
+
+ <section name="Parameters">
+
+ <table>
+ <tr>
+ <th>Name</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td><strong>srcFile</strong></td>
+ <td>
+ The original ear that is going
to be cactified.
+ </td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>destFile</td>
+ <td>
+ The output file of the
cactification process.
+ </td>
+ <td>No, the default is
${project.build.directory}/${project.artifactId}-cactified.ear</td>
+ </tr>
+ <tr>
+ <td>addEjbReferences</td>
+ <td>
+ Specifies if EJB references to
all local EJBs in the ear should be added to the cactus war.
+ </td>
+ <td>No</td>
+ </tr>
+ </table>
+
+ </section>
+
+ <section name="Nested Elements">
+
+
+ <section name="cactuswar">
+
+ <p>
+ The <strong>cactuswar</strong> element
configures everything that
+ has to do with the cactus web
application that will end up in the
+ ear. This element has all the
parameters of the
+ <a
href="cactifywar.html">cactifywar</a> task except
+ the <strong>destfile</strong>
parameter. The web application will
+ always be named cactus.war and be
placed in the root of the ear.
+ </p>
+
+ <section name="Parameters">
+
+ <table>
+ <tr>
+ <th>Name</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>context</td>
+ <td>
+ The context to
wich the cactified web application will be mapped to.
+ </td>
+ <td>No, the default is
<em>/cactus</em></td>
+ </tr>
+ <tr>
+ <td>redirectors</td>
+ <td>
+ The redirectors
to include in the web application. Redirectors should
+ be specified
specified in a list in this element.
+ </td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>libDependencies</td>
+ <td>
+ A list of
<dependency> elements to include in the web applpication's
+ WEB-INF/lib
folder.
+ </td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>testClasses</td>
+ <td>
+ An element
containing a <directory> and <includes> element to specify
+ which tests to
include in the war application.
+ </td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>version</td>
+ <td>
+ The version of
the web application archive to create if no source
+ archive has been specified with
the <em>srcFile</em> attribute.
+ Can be either <code>2.2</code> or
<code>2.3</code>.
+ </td>
+ <td>No, required is
only if not srcFile attribute is present</td>
+ </tr>
+ </table>
+
+ </section>
+
+ </section>
+
+ </section>
+
+ <section name="Examples">
+
+ <p>
+ The following example demonstrates how to use
the cactifyear mojol.
+ It will create a cactified archive from the
<code>target/cactus.samples.ejb-1.8.1-SNAPSHOT-bin.ear</code>
+ adding the listed redirectors and library
dependencies.
+ </p>
+
+ <source>
+ <![CDATA[
+<plugin>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>cactus.integration.maven2</artifactId>
+ <version>1.8.1-SNAPSHOT</version>
+ <configuration>
+ <srcFile>target/cactus.samples.ejb-1.8.1-SNAPSHOT-bin.ear</srcFile>
+ <cactusWar>
+ <context>/</context>
+ <redirectors>
+ <servletRedirector>
+ <name>ServletRedirectorSecure</name>
+ <mapping>/ServletRedirectorSecure</mapping>
+ <roles>test</roles>
+ </servletRedirector>
+ <servletRedirector/>
+ <filterRedirector>
+ <name>FilterRedirector</name>
+ <mapping>/test/filterRedirector</mapping>
+ </filterRedirector>
+ </redirectors>
+ <libDependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ </dependency>
+ </libDependencies>
+ <testClasses>
+ <directory>target/test-classes</directory>
+ <includes>
+ <include>**/*Test*.*</include>
+ </includes>
+ </testClasses>
+ <version>2.3</version>
+ </cactusWar>
+ </configuration>
+ <executions>
+ <execution>
+ <id>cactus-cactifyear</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>cactifyear</goal>
+ </goals>
+ </execution>
+ </executions>
+</plugin>
+ ]]>
+ </source>
+ </section>
+ </body>
+</document>
Propchange:
jakarta/cactus/trunk/cactus-site/src/site/xdoc/integration/maven2/cactifyear.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: cactus-dev-h...@jakarta.apache.org
