taylor      2004/04/08 22:42:48

  Modified:    tutorial/xdocs/2 index.xml
               tutorial/xdocs/1 index.xml skins.xml topnav.xml logo.xml
               tutorial/xdocs downloading.xml navigation.xml developing.xml
                        prerequisites.xml
  Added:       tutorial/xdocs/2 modules.xml bundles.xml deploy.xml psml.xml
               tutorial/xdocs/images image002.jpg
  Log:
  chapter 2 converted to xdoc

  

  PR:

  Obtained from:

  Submitted by: 

  Reviewed by:  

  CVS: ----------------------------------------------------------------------

  CVS: PR:

  CVS:   If this change addresses a PR in the problem report tracking

  CVS:   database, then enter the PR number(s) here.

  CVS: Obtained from:

  CVS:   If this change has been taken from another system, such as NCSA,

  CVS:   then name the system in this line, otherwise delete it.

  CVS: Submitted by:

  CVS:   If this code has been contributed to Apache by someone else; i.e.,

  CVS:   they sent us a patch or a new module, then include their name/email

  CVS:   address here. If this is your work then delete this line.

  CVS: Reviewed by:

  CVS:   If we are doing pre-commit code reviews and someone else has

  CVS:   reviewed your changes, include their name(s) here.

  CVS:   If you have not had it reviewed then delete this line.

  
  Revision  Changes    Path
  1.3       +4 -4      jakarta-jetspeed/tutorial/xdocs/2/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/2/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml 9 Apr 2004 00:51:29 -0000       1.2
  +++ index.xml 9 Apr 2004 05:42:47 -0000       1.3
  @@ -39,7 +39,7 @@
   <li>1. <a href='bundles.html'>Edit the resource files and change the Welcome string 
in two languages</a></li>
   <li>2. <a href='psml.html'>Learn about Turbine modules and localisation</a></li>
   <li>3. <a href='leftnav.html'>Review how Jetspeed finds PSML resources by language 
and country code</a></li>
  -<li>4. <a href='deploy.html'></a>Deploy</li>
  +<li>4. <a href='deploy.html'>Deploy</a></li>
   </ul>
   </p>
   <p>
  @@ -47,7 +47,7 @@
   </p>
   <hr/>
   <code>
  -     maven tutorial-2
  +     maven -Dtutorial=2 jetspeed:war
   </code>
   <hr/>
   <p>
  @@ -57,11 +57,11 @@
   <hr/>
   <code>
   <ul>
  -<li>1. tutorials/2/JPortalTurbine.properties</li>
  +<li>1. tutorials/2/TurbineResources.properties.merge</li>
   <li>2. 
src/java/org/apache/jetspeed/tutorial/modules/localization/JportalLocalization_en.properties</li>
   <li>3. 
src/java/org/apache/jetspeed/tutorial/modules/localization/JportalLocalization_fr.properties</li>
 
   <li>4. tutorials/2/templates/vm/navigations/htmlbottom-jportal.vm</li>
  -<li>5. tutorials/2/JPortalJetspeed.properties</li>
  +<li>5. tutorials/2/JetspeedResources.properties.merge</li>
   </ul>
   </code>
   <hr/>
  
  
  
  1.1                  jakarta-jetspeed/tutorial/xdocs/2/modules.xml
  
  Index: modules.xml
  ===================================================================
  <?xml version="1.0"?>
  <!--
  Copyright 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>
      <author email="[EMAIL PROTECTED]">David Sean Taylor</author>
      <title>Localisation Modules</title>
    </properties>
  
  <body>
  
  <section name="Localisation Modules">
  <p>
  Turbine has a concept called <a 
href='http://jakarta.apache.org/turbine/turbine-2.3/fsd.html'>modules</a>, 
  which is a special class loader path. 
  Multiple module class paths can be configured by simply adding a path to the root 
directory of your modules. 
  Take a look at the TurbineResources.properties.merge:
  </p>
  <source>
  module.packages=org.apache.jetspeed.tutorial.modules
  </source>
  <p>
  Modules is made up of different kinds of modules: actions, layouts, screens, 
navigations, pages, and localisations. 
  Jetspeed uses the module path to find the resource bundles in the localisation 
modules.
  </p>
  <p>
  Resource bundles and the default language are also specified in 
<b>TurbineResources.properties.merge</b>. 
  Notice that the tutorial's resource bundle is listed first, overriding the Jetspeed 
resource bundle.
  </p>
  <source>
  locale.default.bundles = 
org.apache.jetspeed.tutorial.modules.localization.JPortalLocalization,
                           
org.apache.jetspeed.modules.localization.JetspeedLocalization
  locale.default.language=en
  locale.default.country=US
  </source>
  
  </section>
  </body>
  </document>
  
  
  1.1                  jakarta-jetspeed/tutorial/xdocs/2/bundles.xml
  
  Index: bundles.xml
  ===================================================================
  <?xml version="1.0"?>
  <!--
  Copyright 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>
      <author email="[EMAIL PROTECTED]">David Sean Taylor</author>
      <title>Localisation Bundles</title>
    </properties>
  
  <body>
  
  <section name="Localisation Bundles">
  <p>
  It is recommended that you use resource bundles for all of strings that will be 
displayed to the end user. 
  This is called 'localising' your application. 
  </p>
  <p>
  The tutorial comes with two sample resource files in English and French. Lets look 
at the English version:
  </p>
  <source>
  TOP_TITLE=Welcome to JPortal, the Jetspeed Tutorial
  
  CONTACT_US=Contact Us
  </source>
  <p>
  The first string, TOP_TITLE, replaces a resource string already defined in Jetspeed. 
  The second string, CONTACT_US is a new string that is referenced in the 
<b>bottom-jportal.vm</b> file. 
  </p>
  <p>
  Referencing localised strings in Velocity templates is accomplished with the 
localisation global tool, 
  with a rather odd name of <b>$l10n</b>. It stands for the word 'localisation', 
  where the 10 middle letters are cleverly (sic) represented by the number 10. 
  </p>
  <p>
  Any string in the resource bundle can be referenced as shown below:
  </p>
  <source>
  <![CDATA[
        <td align="center">
          <h2>$l10n.TOP_TITLE</h2>
        </td>
  ]]>
  </source>
  <p>
  In this tutorial, we will change the bottom navigation defined in the last tutorial, 
to use a localised string:
  </p>
  <source>
  <![CDATA[
       <td align="center">
         <a href="mailto:$config.getString("mail.support")">$l10n.CONTACT_US</a>
       </td>
  ]]>
  </source>
  <p>
  In the JPortalJetspeed.properties, setup your email support account:
  </p>
  <source>
  <![CDATA[
  [EMAIL PROTECTED]
  ]]>
  </source>
  </section>
  </body>
  </document>
  
  
  1.1                  jakarta-jetspeed/tutorial/xdocs/2/deploy.xml
  
  Index: deploy.xml
  ===================================================================
  <?xml version="1.0"?>
  <!--
  Copyright 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>
      <author email="[EMAIL PROTECTED]">David Sean Taylor</author>
      <title>Deploy</title>
    </properties>
  
  <body>
  
  <section name="Deploy">
  <p>
  To deploy the system type:
  </p>
  <source>
  maven deploy         
  -- or --
  maven hotdeploy
  </source>
  <p>
  Use hotdeploy if you have already deployed the system once. 
  This simply saves some time in packaging the JPortal deployment. 
  Next point your browser at:
  </p>
  <p>
  <a 
href='http://localhost:8080/jportal/portal'>http://localhost:8080/jportal/portal</a>
  </p>
  <p>
  You should see the new localised title. The portlets inside are still the same as 
the default Jetspeed deployment. 
  </p>
  <p>
  <img border='0' width='553' height='79' src="../images/image002.jpg"/>
  </p>
  </section>
  </body>
  </document>
  
  
  
  1.1                  jakarta-jetspeed/tutorial/xdocs/2/psml.xml
  
  Index: psml.xml
  ===================================================================
  <?xml version="1.0"?>
  <!--
  Copyright 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>
      <author email="[EMAIL PROTECTED]">David Sean Taylor</author>
      <title>Localisation of PSML Resources</title>
    </properties>
  
  <body>
  
  <section name="Localisation of PSML Resources">
  <p>
  PSML resources may also be optionally localised. 
  PSML Resources are localized by placing them in sub-directories based on language 
and country code abbreviations. 
  The language-code sub-directory contains one or more country-code subdirectories. 
  </p>
  <p>
  The language-code directory name is specified with an ISO-639 standard two-character 
language abbreviation. 
  The country-code subdirectory is optional, and is specified with an IS0-3166 
standard two-character country code 
  abbreviation.
  </p>
  <p>
  An example:
  </p>
  <source>
  user
     |-- david
          |-- html
               |-- fr                          // french language 
                    |-- FR                     // France country-code
                    |-- BE                     // Belgium country-code
  </source>
  <p>
  <i>NOTE: The country codes must be in upper-case</i>
  </p>
  <p>
  For a given locale of fr_FR, the search order for the default accounting resource 
would be:
  </p>
  <source>
  groups/accounting/html/fr/FR/default.psml    
  groups/accounting/html/fr/default.psml       
  groups/accounting/html/default.psml   
  groups/accounting/default.psml
  </source>
  <p>
  The Jetspeed profiler looks at the "Content Language" HTML header for locale 
specific settings. 
  If there are multiple settings, all settings will be searched until the first 
resource is found. 
  (This is currently not supported)
  </p>
  <p>
  For a complete list of ISO-639 standard language abbreviations, see:
  </p>
  <p>
  <a 
href='http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt'>http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt</a>
  </p>
  <p>
  For a complete list of ISO-3166 standard country code abbreviations, see:
  </p>
  <p>
  <a 
href='http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html'>http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</a>
  </p>
  <p>
  In the JetspeedResources.properties.merge, you can enable or disable the usage of 
language and country codes 
  during PSML resource resolution with the following settings. 
  In the tutorial we choose to turn off both language and country code fallback. 
  </p>
  <source>
  # Consider the language as part of the fallback?
  services.Profiler.fallback.language=false
  
  # Consider the country code as part of the fallback?
  services.Profiler.fallback.country=false
  </source>
  </section>
  </body>
  </document>
  
  
  1.1                  jakarta-jetspeed/tutorial/xdocs/images/image002.jpg
  
        <<Binary file>>
  
  
  1.6       +3 -3      jakarta-jetspeed/tutorial/xdocs/1/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/1/index.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- index.xml 9 Apr 2004 00:38:58 -0000       1.5
  +++ index.xml 9 Apr 2004 05:42:47 -0000       1.6
  @@ -39,7 +39,7 @@
   <li>3. <a href='leftnav.html'>Remove the Left Navigation</a></li>
   <li>4. <a href='bottomnav.html'>Replace the Bottom Navigation</a></li>
   <li>5. <a href='skins.html'>Change the Skin, CSS</a></li>
  -<li>6. <a href='deploy.html'></a>Deploy</li>
  +<li>6. <a href='deploy.html'>Deploy</a></li>
   </ul>
   </p>
   <p>
  @@ -47,7 +47,7 @@
   </p>
   <hr/>
   <code>
  -     maven tutorial-1
  +     maven -Dtutorial=2 jetspeed:war
   </code>
   <hr/>
   <p>
  @@ -57,7 +57,7 @@
   <hr/>
   <code>
   <ul>
  -<li>1. tutorials/1/JPortalJetspeed.properties</li>
  +<li>1. tutorials/1/JetspeedResources.properties.merge</li>
   <li>2. tutorials/1/jportal-skins.xreg</li>
   <li>3. tutorials/1/templates/vm/navigations/html/bottom-jportal.vm</li> 
   <li>4. src/webapp/css/jportal.css</li>
  
  
  
  1.2       +2 -2      jakarta-jetspeed/tutorial/xdocs/1/skins.xml
  
  Index: skins.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/1/skins.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- skins.xml 9 Apr 2004 00:26:18 -0000       1.1
  +++ skins.xml 9 Apr 2004 05:42:47 -0000       1.2
  @@ -52,7 +52,7 @@
   ]]>
   </source>
   <p>
  -Then in the <b>JPortalJetspeed.properties</b>, the default skin for the portal site 
is defined:
  +Then in the <b>JetspeedResources.properties.merge</b>, the default skin for the 
portal site is defined:
   </p>
   <source>
   services.PortalToolkit.default.skin=jportal-skin
  @@ -71,7 +71,7 @@
   defined as a standard by the <a href='http://www.w3.org/'>World Wide Web 
Consortium</a> (W3C).  
   </p>
   <p>
  -In the JPortalJetspeed.properties, the portal site stylesheet is defined:
  +In the JetspeedResources.properties.merge, the portal site stylesheet is defined:
   </p>
   <source>
   site.stylesheet=css/jportal.css
  
  
  
  1.2       +1 -1      jakarta-jetspeed/tutorial/xdocs/1/topnav.xml
  
  Index: topnav.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/1/topnav.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- topnav.xml        9 Apr 2004 00:26:18 -0000       1.1
  +++ topnav.xml        9 Apr 2004 05:42:47 -0000       1.2
  @@ -30,7 +30,7 @@
    A website generally has a top and bottom navigation scheme. 
    This is generally defined as the header and footer of the website. 
    Jetspeed allows three navigations: top, bottom, and left. 
  - For JPortal, we override navigation properties in 
<b>JPortalJetspeed.properties</b>.
  + For JPortal, we override navigation properties in 
<b>JetspeedResources.properties.merge</b>.
    Here are the top navigation settings:
    </p>
   <source>
  
  
  
  1.3       +1 -1      jakarta-jetspeed/tutorial/xdocs/1/logo.xml
  
  Index: logo.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/1/logo.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- logo.xml  8 Apr 2004 18:13:45 -0000       1.2
  +++ logo.xml  9 Apr 2004 05:42:47 -0000       1.3
  @@ -25,7 +25,7 @@
   
   <section name="Change the Portal Logo">
   <p>
  -Looking at <b>JPortalJetspeed.properties</b>:
  +Looking at <b>JetspeedResources.properties.merge</b>:
   </p>
   <hr/>
   <code>
  
  
  
  1.3       +2 -2      jakarta-jetspeed/tutorial/xdocs/downloading.xml
  
  Index: downloading.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/downloading.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- downloading.xml   8 Apr 2004 18:13:45 -0000       1.2
  +++ downloading.xml   9 Apr 2004 05:42:48 -0000       1.3
  @@ -33,13 +33,13 @@
   <br/><br/>
   <a href='http://jakarta.apache.org/jetspeed/site/install.html'>CVS Head</a>
   <br/><br/>
  -and then build the war target (ant war).
  +and then build the distribution target (maven dist:install).
   <br/><br/>
   To download the source code to an official release from the Apache website, go here:
   <br/><br/>
   <a href='http://jakarta.apache.org/site/sourceindex.cgi'>Download 1.5 Source 
Release</a>
   <br/><br/>
  -Unzip it and build the war target (maven war).
  +Unzip it and build the distribution target (maven dist:install).
   </p>
   </section>
   </body>
  
  
  
  1.9       +1 -1      jakarta-jetspeed/tutorial/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/navigation.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- navigation.xml    9 Apr 2004 03:36:55 -0000       1.8
  +++ navigation.xml    9 Apr 2004 05:42:48 -0000       1.9
  @@ -30,7 +30,7 @@
           <item name="Welcome"                         href="/index.html"/>    
           <item name="Prerequisites"                         
href="/prerequisites.html"/>            
           <item name="Downloading Jetspeed"              href="/downloading.html"/>
  -        <item name="Development Cycle"       href="/developing.html"/>
  +        <item name="The Jetspeed Plugin"       href="/developing.html"/>
           <item name="Planning for Your Portal Site"       href="/planning.html"/>
           <item name="The Jetspeed Portlet API"       href="/portlet-api.html"/>
       </menu>
  
  
  
  1.3       +52 -67    jakarta-jetspeed/tutorial/xdocs/developing.xml
  
  Index: developing.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/developing.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- developing.xml    8 Apr 2004 18:13:45 -0000       1.2
  +++ developing.xml    9 Apr 2004 05:42:48 -0000       1.3
  @@ -22,25 +22,39 @@
     </properties>
   
   <body>
  -<section name="Building with Maven">
  +<section name="Building with Maven and the Jetspeed Plugin">
   <p>
   To build Jetspeed and the tutorial, you must install <a 
href='http://maven.apache.org/'>Maven</a>.
  -Please download and install Maven before continuing.
  +Please download and install Maven before continuing. All the examples below will 
assume 
  +you are running from a command line in the /tutorial directory of the jetspeed 
distribution.
   </p>
   <p>
  -Depending on where Jetspeed and Tomcat are installed, 
  -you may need to edit a few of the properties in the build.properties of your home 
directory:
  +The <a href='http://portals.apache.org/jetspeed-1/plugin'>Jetspeed Plugin</a> is 
used manage building a 
  +portal site. We <b>strongly</b> recommend using the Jetspeed Plugin and Maven to 
build your portal site.
  +We <b>strongly</b> recommend NOT editing any of the source files in the Jetspeed 
source tree unless you
  +plan to contribute your changes back. The important point here is that for the 
health and maintainability
  +of your portal, you should keep your source files and resources separate from 
Jetspeed. By doing so,
  +you can manage your source code in your CVS, and let the community manage the core 
Jetspeed source code and resources.
  +As new releases of Jetspeed come out, you will always be ready to integrate without 
having to figure out
  +what changes you made to the core code.
  +</p>
  +<p>
  +The <b>Jetspeed Plugin</b> builds your portal by merging the content and source 
files from your portal project
  +with a distribution of Jetspeed. Property files, portal resources, PSML, Java code 
are all merged into a new 
  +WAR file ready to be distributed to an application server. This tutorial will walk 
you through how to use the Plugin and Maven
  +to build and maintain your portal.
  +</p>
  +<p>
  +The Jetspeed Plugin doesn't require many properties. You can set the properties in 
your home directory's 
  +build.properties or in your project's project.properties:
   </p>
   <hr/>
   <code>
  -jetspeed_home=/apache/jakarta-jetspeed<br/>
  -catalina_home=/apache/catalina<br/>
  -portlet_app_name=jportal<br/>
  -company=com.bluesunrise.jportal<br/>
  -jetspeed_jar=/bin/jetspeed-1.5.jar<br/>
  -jetspeed_war=/bin/jetspeed.war<br/>
  -jetspeed_lib=/lib<br/>
  -jetspeed_conf=/webapp/WEB-INF/conf/<br/>
  +# Tell the Plugin which property files to merge
  +maven.merge.properties = JetspeedResources,JetspeedSecurity,TurbineResources,Torque
  +
  +# tell the plugin which version of Jetspeed distribution we are merging with
  +jetspeed.dist.version = 1.5
   </code>
   <hr/>
   <p>
  @@ -51,10 +65,10 @@
   <table>
   <tr>
   <td>
  -all
  +jetspeed:war
   </td>
   <td>
  -Clean build and dist, then compile
  +Build all tutorials and create a distribution WAR file
   </td>
   </tr>
   <tr>
  @@ -67,7 +81,7 @@
   </tr>
   <tr>
   <td>
  -compile      
  +java:compile      
   </td>
   <td>
   Compile Java sources
  @@ -75,7 +89,7 @@
   </tr>
   <tr>
   <td>
  -deploy
  +jetspeed:deploy
   </td>
   <td>
   Deploy application to servlet container
  @@ -91,7 +105,7 @@
   </tr>
   <tr>
   <td>
  -hotdeploy
  +jetspeed:hotdeploy
   </td>
   <td>
   Hot Deploy application to portlet container
  @@ -107,7 +121,7 @@
   </tr>
   <tr>
   <td>
  -om
  +torque:om
   </td>
   <td>
   Generate Object Model sources
  @@ -115,53 +129,31 @@
   </tr>
   <tr>
   <td>
  -war
  -</td>
  -<td>
  -Create merged war
  -</td>
  -</tr>
  -<tr>
  -<td>
  -tutorial-0
  +-Dtutorial=0
   </td>
   <td>
  -Resets the web application.
  +Resets the tutorials
   </td>
   </tr>
   <tr>
   <td>
  -tutorial-n
  +tutorial-n [1-9] jetspeed:war
   </td>
   <td>
   Configure the distribution for the nth tutorial examples.
   </td>
   </tr>
  -<tr>
  -<td>
  -tutorial-all
  -</td>
  -<td>
  -Configurations the distribution to include all tutorials.
  -</td>
  -</tr>
   </table>
   </code>
   <hr/>
   <p>
   To build the examples for a specific tutorial example, type:
   </p>
  -<hr/>
  -<code>
  -maven tutorial-n     (where n = the number of the tutorial)<br/>
  -maven deploy        (first time, and then)<br/>
  -maven hotdeploy<br/>
  -</code>
  -<hr/>
  -<p>
  -These commands build and deploy the examples to your Catalina distribution as a web 
application. 
  -NOTE: this process will also work with Tomcat. 
  -</p>
  +<source>
  +maven -Dtutorial=[n] jetspeed:war   (where n = the number of the tutorial)<br/>
  +maven jetspeed:deploy        (first time, and then)<br/>
  +maven jetspeed:hotdeploy<br/>
  +</source>
   <p>
   The tutorials must be run in order. 
   If you want to deploy tutorial-5, you must first run tutorial-1 thru tutorial-4.
  @@ -185,7 +177,6 @@
   <p>
   NOTE:  you should shutdown Catalina before invoking the deploy target.
   </p>
  -
   </section>
   <section name="Development Cycle">
   <p>
  @@ -194,11 +185,11 @@
   This is accomplished with the maven goals provided with the tutorial.
   A Jetspeed portal is distributed as a Java standard WAR file.
   To creates the entire portal war file which you can manually copy to your 
application server, 
  -build the 'maven war' goal. The <b>war</b> goal is the default goal for the 
tutorial.
  -This war file is a combination of the Jetspeed distribution with your example code. 
  -The war file combines the Jetspeed container with the example portlets and their 
configuration. 
  +build the 'maven jetspeed:war' goal. The <b>jetspeed:war</b> goal is the default 
goal for the tutorial.
  +This war file contains a combination of the Jetspeed distribution with your example 
code. 
  +The war file combines the Jetspeed core portal with the example portlets and their 
configuration. 
   The war file is written to the file /target/jportal.war.
  -The 'war' goal is the default goal, so just typing 'maven' will execute it:
  +The 'jetspeed:war' goal is the default goal, so just typing 'maven' will execute it:
   </p>
   <p>
   <hr/>
  @@ -211,7 +202,7 @@
   </p>
   <p>
   <hr/>
  -<code>maven tutorial [n]</code>
  +<code>maven -Dtutorial=[n]</code>
   <hr/>
   </p>
   <p>
  @@ -219,24 +210,20 @@
   </p>
   <p>
   <hr/>
  -<code>maven deploy</code>
  +<code>maven jetspeed:deploy</code>
   <hr/>
   </p>
   <p>
  -The deploy goal is dependent on the war target. 
  +The deploy goal is dependent on the jetspeed:war target. 
   After building the war file, it automatically deploys the war file into the 
application server of your choice. 
   For this tutorial, Jakarta Tomcat 4 or 5 is required. 
   NOTE:  you should shutdown Catalina before invoking the deploy goal.
   You will need to setup the location of Tomcat in your build.properties in your home 
directory using the
   <b>tomcat.root</b> property.
   </p>
  +<source>maven jetspeed:hotdeploy</source>
   <p>
  -<hr/>
  -<code>maven hotdeploy</code>
  -<hr/>
  -</p>
  -<p>
  -The <b>hotdeploy</b> goal is a quicker version of deploy. 
  +The <b>jetspeed:hotdeploy</b> goal is a quicker version of deploy. 
   It only deploys classes and configuration files that are newer than the files in 
the deployed web application. 
   Requires that deploy target is ran once, since it will not expand the entire 
application to the web application directory. 
   This target is used most often in the everyday development routine.
  @@ -245,12 +232,10 @@
   <p>
   If you would like to clean up the JPortal Tutorial examples and reset to a default 
Jetspeed deployment, type:
   </p>
  -<hr/>
  -<code>
  +<source>
        maven clean<br/>
  -     maven deploy<br/>
  -</code>
  -<hr/>
  +     maven jetspeed:deploy<br/>
  +</source>
   <p>
   The clean maven goal removes all classes and configuration files from the 
deployment, 
   leaving you with a web application that is exactly the same as the Jetspeed web 
application. 
  
  
  
  1.3       +5 -3      jakarta-jetspeed/tutorial/xdocs/prerequisites.xml
  
  Index: prerequisites.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/prerequisites.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- prerequisites.xml 8 Apr 2004 18:13:45 -0000       1.2
  +++ prerequisites.xml 9 Apr 2004 05:42:48 -0000       1.3
  @@ -32,9 +32,11 @@
   <li>3. Install <a href='http://maven.apache.org'>Maven</a></li>
   <li>4. Install <a 
href='http://jakarta.apache.org/tomcat/tomcat-4.1-doc/index.html'>Tomcat 4</a> (4.1.12 
or higher (last tested on 4.1.30)) 
                   or <a 
href='http://jakarta.apache.org/tomcat/tomcat-5.0-doc/index.html'>Tomcat 5</a></li>
  -<li>5. Install <a href='http://portals.apache.org/jetspeed-1/'>Jetspeed</a> (1.5 
release or higher). Release 1.5 includes the tutorial and examples.
  -       You can also checkout Jetspeed from the CVS head to get the tutorial.</li>
  -<li>6. Build Jetspeed. From the root jetspeed directory, type <b>maven war</b></li> 
    
  +<li>5. Install the <a href='http://db.apache.org/torque/maven-plugin/'>Torque Maven 
Plugin 3.2 or higher</a></li>
  +<li>6. Install <a href='http://portals.apache.org/jetspeed-1/'>Jetspeed</a> (1.5 
release or higher). Release 1.5 includes the tutorial and examples.
  +       You can also checkout Jetspeed from the CVS head to get the tutorial.</li>   
    
  +<li>7. Build Jetspeed. From the root jetspeed directory, type <b>maven 
dist:install</b></li>     
  +<li>8. Build and install the Jetspeed Plugin. From the /plugin directory, type 
<b>maven plugin:install</b></li>     
   </ul>
   </p>
   </section>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to