Author: ate
Date: Tue Nov 4 22:41:18 2008
New Revision: 711520
URL: http://svn.apache.org/viewvc?rev=711520&view=rev
Log:
Fixing some maven plugin links and dropping some obsolete (maven-1)
documentation
Removed:
portals/jetspeed-2/portal/trunk/src/site/xdoc/j2-maven-plugin.xml
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven-2-custom.xml
Modified:
portals/jetspeed-2/portal/trunk/src/site/site.xml
portals/jetspeed-2/portal/trunk/src/site/xdoc/getting-started-source.xml
portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/index.xml
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/index.xml
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/jetspeed-portal-resources.xml
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/project-structure.xml
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/the-need-for-a-custom-lifecycle.xml
Modified: portals/jetspeed-2/portal/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/site.xml?rev=711520&r1=711519&r2=711520&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/site.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/site.xml Tue Nov 4 22:41:18 2008
@@ -46,7 +46,6 @@
</menu>
<menu name="Building">
<item name="From Source with Maven-2" href="maven-2-build.html" />
- <item name="From Maven-2 Plugin" href="maven-2-custom.html" />
<item name="From Eclipse" href="jetspeed-eclipse.html" />
</menu>
<menu name="Configuring Jetspeed-2">
@@ -61,7 +60,6 @@
<item name="Jetspeed Tutorial - Maven-2 Custom Build"
href="http://portals.apache.org/tutorials/jetspeed-2/" />
<item name="Jetspeed Tutorial - Ant Custom Build (incomplete)"
href="http://portals.apache.org/tutorials/jetspeed-2-ant/" />
<item name="Jetspeed-2 API"
href="http://portals.apache.org/jetspeed-2/multiproject/jetspeed-api/apidocs/index.html"
/>
- <item name="Jetspeed-2 Plugin" href="j2-maven-plugin.html" />
</menu>
<menu name="About Jetspeed-2">
<item name="For Jetspeed-1 Users" href="j1-users.html" />
Modified:
portals/jetspeed-2/portal/trunk/src/site/xdoc/getting-started-source.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/getting-started-source.xml?rev=711520&r1=711519&r2=711520&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/getting-started-source.xml
(original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/getting-started-source.xml
Tue Nov 4 22:41:18 2008
@@ -159,14 +159,6 @@
<![CDATA[
mvn archetype:generate -DarchetypeGroupId=org.apache.portals.jetspeed-2
-DarchetypeArtifactId=jetspeed-archetype -DarchetypeVersion=2.2-SNAPSHOT
-DgroupId=org.apache.portals.tutorials -DartifactId=express-demo
-Dversion=1.0]]>
</source>
- <i>
- This maven goal actually
executes several
- subgoals which are further
described in the
- <a href="j2-maven-plugin.html">
- maven-plugin
documentation
- </a>
- itself.
- </i>
</p>
</subsection>
<subsection
@@ -347,12 +339,12 @@
console:
<source>
<![CDATA[
- mvn jetspeed:mvn -Dtarget=proddb
+ mvn jetspeed:mvn -Dtarget=demo
]]>
</source>
<i>
Note: the
- <a href="j2-maven-plugin.html">
+ <a href="maven-2-build.html">
maven-plugin
documentation
</a>
described other goals you can
use to customize
Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/index.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/index.xml?rev=711520&r1=711519&r2=711520&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/index.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/index.xml Tue Nov 4
22:41:18 2008
@@ -29,8 +29,6 @@
<ul>
<li><a href="../getting-started.html">Getting started
guide</a></li>
<li><a href="../getting-started-source.html">Getting
started with Jetspeed-2 source guide</a></li>
- <li><a href="../getting-started-binary.html">Getting
started with Jetspeed-2 binaries guide</a></li>
- <li><a href="../getting-started-installer.html">Getting
started with Jetspeed-2 installer</a></li>
</ul>
</subsection>
<subsection name="Guides to Portal Concepts">
@@ -42,9 +40,6 @@
</subsection>
<subsection name="Configuration Guides">
<ul>
- <li><a href="guide-properties.html">Guide to
configuration properties</a></li>
- <li><a href="guide-database.html">Guide to database
configuration</a></li>
- <li><a href="guide-app-servers.html">Guide to
application servers configuration</a></li>
<li><a href="guide-security.html">Guide to configuring
Jetspeed-2 security</a></li>
<li><a href="guide-sso.html">Guide to using Jetspeed-2
single sign-on</a></li>
<li><a href="guide-ntlm.html">Guide to using NTLM
Authentication</a></li>
@@ -82,7 +77,7 @@
<ul>
<li><a href="guide-jpt.html">Guide to Jetspeed-2 Power
Tools</a></li>
<li><a
href="../components/jetspeed-deploy-tools/index.html">Guide to Jetspeed-2
Portlet Application Deployment</a></li>
- <li><a href="../j2-maven-plugin.html">Guide to
Jetspeed-2 Maven Plugin</a></li>
+ <li><a href="../maven/index.html">Guide to Jetspeed-2
Maven Plugins</a></li>
</ul>
</subsection>
<subsection name="Components Guides">
Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/index.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/index.xml?rev=711520&r1=711519&r2=711520&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/index.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/index.xml Tue Nov 4
22:41:18 2008
@@ -82,7 +82,7 @@
coordinates of the intended plugin goal.
</p>
<p>
- For the Jetspeed-2 Maven Plugins, this would mean for example for
invoking the <a href="jetspeed-mvn-plugin.html">jetspeed:mvn</a> plugin
something like:
+ For the Jetspeed-2 Maven Plugins, this would mean for example for
invoking the <a href="jetspeed-maven-plugins.html">jetspeed:mvn</a> plugin
something like:
<source>$mvn org.apache.portals.jetspeed-2:jetspeed:mvn
-Dtarget=demo</source>
</p>
<p>
Modified:
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/jetspeed-portal-resources.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/jetspeed-portal-resources.xml?rev=711520&r1=711519&r2=711520&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/jetspeed-portal-resources.xml
(original)
+++
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/jetspeed-portal-resources.xml
Tue Nov 4 22:41:18 2008
@@ -49,7 +49,7 @@
</ul>
</p>
<p>
- Both the <a
href="jetspeed-unpack-plugin.html">jetspeed-unpack:unpack</a> and <a
href="jetspeed-db-init-plugin.html">jetspeed-db:init</a> plugin can unpack
selected resources
+ Both the <a
href="jetspeed-maven-plugins.html">jetspeed-unpack:unpack</a> and <a
href="jetspeed-maven-plugins.html">jetspeed-db:init</a> plugin can unpack
selected resources
from resource archives for which commonly the
jetspeed-portal-resources artifact is used.
</p>
</section>
Modified:
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/project-structure.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/project-structure.xml?rev=711520&r1=711519&r2=711520&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/project-structure.xml
(original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/project-structure.xml
Tue Nov 4 22:41:18 2008
@@ -48,7 +48,7 @@
<p>
This root project will contain one or more modules, defined as
subprojects, which in turn will have this root project defined as their parent
project. This way, all artifacts will be buildable and installable
as a whole directly from the root project, and (Jetspeed) integration tasks
- can be executed from anywhere within this project structure (using
the <a href="jetspeed-mvn-plugin.html">jetspeed:mvn plugin</a>).
+ can be executed from anywhere within this project structure (using
the <a href="jetspeed-maven-plugins.html">jetspeed:mvn plugin</a>).
</p>
<p>
In addition to the "standard" pom.xml, one or more custom
jetspeed-mvn-(target name)-pom.xml Maven project files can be defined for the
super project,
@@ -57,7 +57,7 @@
<p>
The custom jetspeed property files and custom jetspeed-settings.xml
will serve a default and fallback configuration which will be automatically
looked up through the project parent chain if a sub project doesn't
provide these by itself when performing sub project specific integration tasks
- using the <a href="jetspeed-mvn-plugin.html">jetspeed:mvn</a> Maven
plugin.
+ using the <a href="jetspeed-maven-plugins.html">jetspeed:mvn</a>
Maven plugin.
</p>
</subsection>
<subsection name="The portal sub project">
@@ -73,7 +73,7 @@
</p>
<p>
Custom jetspeed property files and a custom jetspeed-settings.xml
defined within a subproject can be used to override other defined files higher
up
- the project parent chain when performing sub project specific
integration tasks using the <a href="jetspeed-mvn-plugin.hyml">jetspeed:mvn</a>
Maven plugin.
+ the project parent chain when performing sub project specific
integration tasks using the <a
href="jetspeed-maven-plugins.html">jetspeed:mvn</a> Maven plugin.
</p>
<p>
For building the custom Jetspeed Portal war artifact, the war
overlay mechanism is used in the pom.xml, using the Jetspeed-2 provided
jetspeed application
@@ -103,8 +103,8 @@
<p>
One typical use-case where additional integration tasks might be
needed is when the portlet application defines and makes use of a custom
database
backend (or likewise: ldap, JCR etc.) which might need to be
setup/created/upgraded or whatever. If an appropriate Maven plugin is available
for performing
- such an integration task (e.g. like the <a
href="jetspeed-db-init-plugin.html">jetspeed-db:init plugin</a>), standardizing
and automating the execution of such
- tasks using the <a href="jetspeed-mvn-plugin.html">jetspeed:mvn
plugin</a> will be very easy.
+ such an integration task (e.g. like the <a
href="jetspeed-maven-plugins.html">jetspeed-db:init plugin</a>), standardizing
and automating the execution of such
+ tasks using the <a href="jetspeed-maven-plugins.html">jetspeed:mvn
plugin</a> will be very easy.
</p>
<p>
Like with the portal project, custom jetspeed property files and a
custom jetspeed-settings.xml defined within a subproject can be used to
override other defined
Modified:
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/the-need-for-a-custom-lifecycle.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/the-need-for-a-custom-lifecycle.xml?rev=711520&r1=711519&r2=711520&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/the-need-for-a-custom-lifecycle.xml
(original)
+++
portals/jetspeed-2/portal/trunk/src/site/xdoc/maven/the-need-for-a-custom-lifecycle.xml
Tue Nov 4 22:41:18 2008
@@ -256,7 +256,7 @@
compared to the standard Maven Invoker Plugin and uses the same
Maven API and components (the shared maven-invoker component).
</p>
<p>
- A full description and configuration definition for the jetspeed:mvn
plugin is provided on the <a href="jetspeed-mvn-plugin.html">Using
jetspeed:mvn</a>
+ A full description and configuration definition for the jetspeed:mvn
plugin is provided on the <a href="jetspeed-maven-plugins.html">Using
jetspeed:mvn</a>
page. And example usages are also available from the "Examples" menu
item to the left.
</p>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]