taylor 2005/04/18 23:41:15 Modified: tutorial/xdocs/1 index.xml bottomnav.xml tutorial/tutorials/1/templates/vm/navigations/html bottom-jportal.vm tutorial/xdocs downloading.xml portlet-api.xml index.xml developing.xml prerequisites.xml tutorial/xdocs/6 mediatypes.xml tutorial project.xml project.properties tutorial/tutorials/2/templates/vm/navigations/html bottom-jportal.vm Added: tutorial/xdocs README.txt Removed: tutorial README.txt Log: tutorial now seems to run still needs a bit more cleanup and documentation, and testing by others... Revision Changes Path 1.10 +1 -1 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- index.xml 22 Apr 2004 05:14:57 -0000 1.9 +++ index.xml 19 Apr 2005 06:41:15 -0000 1.10 @@ -27,7 +27,7 @@ <p> Tutorial 1 shows you how to tailor the web design of the JPortal portal. This is accomplished by overriding and merging the Jetspeed portal configuration property files -using the Jetspeed 1.5 Maven Plugin. +using the Jetspeed 1.6 Maven Plugin. </p> <p> In this tutorial, we will: 1.2 +1 -1 jakarta-jetspeed/tutorial/xdocs/1/bottomnav.xml Index: bottomnav.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/1/bottomnav.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bottomnav.xml 9 Apr 2004 00:26:18 -0000 1.1 +++ bottomnav.xml 19 Apr 2005 06:41:15 -0000 1.2 @@ -48,7 +48,7 @@ <tr> <td align="left"> <small> - JPortal Tutorial for Jetspeed - Version 1.4b4<br/> + JPortal Tutorial for Jetspeed - Version 1.6<br/> </small> </td> #if ($config.getString("mail.support")) 1.2 +1 -1 jakarta-jetspeed/tutorial/tutorials/1/templates/vm/navigations/html/bottom-jportal.vm Index: bottom-jportal.vm =================================================================== RCS file: /home/cvs/jakarta-jetspeed/tutorial/tutorials/1/templates/vm/navigations/html/bottom-jportal.vm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bottom-jportal.vm 8 Apr 2004 19:05:37 -0000 1.1 +++ bottom-jportal.vm 19 Apr 2005 06:41:15 -0000 1.2 @@ -4,7 +4,7 @@ <tr>
<td align="left"> <small> - JPortal Tutorial for Jetspeed - Version 1.4b4<br/> + JPortal Tutorial for Jetspeed - Version 1.6<br/> </small> </td> #if ($config.getString("mail.support")) 1.5 +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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- downloading.xml 9 Apr 2004 18:54:13 -0000 1.4 +++ downloading.xml 19 Apr 2005 06:41:15 -0000 1.5 @@ -25,7 +25,7 @@ <section name="Downloading Jetspeed"> <p> -This tutorial comes with the Source Code release of Jetspeed 1.5 or greater. +This tutorial comes with the Source Code release of Jetspeed 1.6 or greater. If you check out Jetspeed from the CVS head, the tutorial is included under the /tutorial directory. You can get Jetspeed from the Apache CVS, or from the Apache website. <br/><br/> @@ -37,7 +37,7 @@ <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> +<a href='http://jakarta.apache.org/site/sourceindex.cgi'>Download 1.6 Source Release</a> <br/><br/> Unzip it and build the distribution target (maven dist:install). </p> 1.3 +5 -2 jakarta-jetspeed/tutorial/xdocs/portlet-api.xml Index: portlet-api.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/portlet-api.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- portlet-api.xml 8 Apr 2004 18:13:45 -0000 1.2 +++ portlet-api.xml 19 Apr 2005 06:41:15 -0000 1.3 @@ -28,10 +28,13 @@ The Jetspeed Portal API is a set of interfaces describing how a portlet interacts with a portlet container. The Jetspeed Portal API is not to confused with <a href='http://www.jcp.org/en/jsr/detail?id=168'>Java Standard Portlet API</a>. -The next version of Jetspeed, <a href='http://portals.apache.org/jetspeed-2/'>Jetspeed 2.0</a> supports the Java standard. +The latest version of Jetspeed, <a href='http://portals.apache.org/jetspeed-2/'>Jetspeed 2.0</a> fully supports the Java standard. +Also, Jetspeed Fusion, which runs Portlet API portlet applications inside of Jetspeed 1.6, also supports the standard: +<a href='http://portals.apache.org/jetspeed-1/fusion.html'> +However Fusion is not covered in this tutorial. </p> <p> -With Jetspeed 1.5, every portlet has to implement the Portlet interface: +With Jetspeed 1.6, every portlet has to implement the Jetspeed-1 Portlet interface: </p> <hr/> <code> 1.4 +2 -2 jakarta-jetspeed/tutorial/xdocs/index.xml Index: index.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/index.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.xml 8 Apr 2004 18:13:45 -0000 1.3 +++ index.xml 19 Apr 2005 06:41:15 -0000 1.4 @@ -18,7 +18,7 @@ <properties> <author email="[EMAIL PROTECTED]">David Sean Taylor</author> - <title>Jetspeed Portal Tutorial 1.5</title> + <title>Jetspeed Portal Tutorial 1.6</title> </properties> <body> @@ -28,7 +28,7 @@ <p> The Jetspeed Portal Tutorial, <b>JPortal</b> is a hands on tutorial for learning how to develop portlets and administer the portal with Jetspeed. This tutorial is specifically written - for version 1.5 of Jetspeed. To summarize, this tutorial teaches how to: + for version 1.6 of Jetspeed. To summarize, this tutorial teaches how to: <ul> <li>Download and Build Jetspeed</li> <li>Setup your own Portal project</li> 1.5 +1 -1 jakarta-jetspeed/tutorial/xdocs/developing.xml Index: developing.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/developing.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- developing.xml 22 Apr 2004 05:29:19 -0000 1.4 +++ developing.xml 19 Apr 2005 06:41:15 -0000 1.5 @@ -54,7 +54,7 @@ maven.merge.properties = JetspeedResources,JetspeedSecurity,TurbineResources,Torque # tell the plugin which version of Jetspeed distribution we are merging with -jetspeed.dist.version = 1.5 +jetspeed.dist.version = 1.6 </code> <hr/> <p> 1.5 +1 -1 jakarta-jetspeed/tutorial/xdocs/prerequisites.xml Index: prerequisites.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/prerequisites.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- prerequisites.xml 21 Apr 2004 19:00:42 -0000 1.4 +++ prerequisites.xml 19 Apr 2005 06:41:15 -0000 1.5 @@ -32,7 +32,7 @@ <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. +<li>5. Install <a href='http://portals.apache.org/jetspeed-1/'>Jetspeed</a> (1.6 release or higher). Release 1.6 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 dist:install</b><br/> To build quicker, without the unit tests,type <b>maven -Dmaven.test.skip=true dist:install</b></li> 1.1 jakarta-jetspeed/tutorial/xdocs/README.txt Index: README.txt =================================================================== 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. $Id: README.txt,v 1.1 2005/04/19 06:41:15 taylor Exp $ The Jetspeed Tutorial Build Instructions ---------------------------------------- The Jetspeed Tutorial web site is based on .xml files which are transformed into .html files using Maven. http://maven.apache.org/ Once you have the site checked out locally, cd into your portals-site directory and execute: maven site This will build the documentation into the target/docs/ directory. The output will show you which files got re-generated. If you would like to make modifications to the web site documents, you simply need to edit the files in the xdocs/ directory. Once you have built your documentation and confirmed that your changes are ok, you can check your .xml files back into CVS. To deploy the site execute: maven site:deploy To do this you need an account on the Apache.org machine!! 1.4 +1 -1 jakarta-jetspeed/tutorial/xdocs/6/mediatypes.xml Index: mediatypes.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/6/mediatypes.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mediatypes.xml 22 Apr 2004 05:14:57 -0000 1.3 +++ mediatypes.xml 19 Apr 2005 06:41:15 -0000 1.4 @@ -84,7 +84,7 @@ </description> </meta-info> <classname>org.apache.jetspeed.tutorial.portal.portlets.HelloPortletInterface</classname> - <parameter name="version" value="1.5" hidden="false"/> + <parameter name="version" value="1.6" hidden="false"/> <media-type ref="html"/> <media-type ref="wml"/> <category>tutorial</category> 1.16 +50 -224 jakarta-jetspeed/tutorial/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/tutorial/project.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- project.xml 4 Jan 2005 17:10:11 -0000 1.15 +++ project.xml 19 Apr 2005 06:41:15 -0000 1.16 @@ -27,10 +27,10 @@ <inceptionYear>2004</inceptionYear> <package>org.apache.jetspeed.tutorial</package> <logo>/images/jportal.gif</logo> - <shortDescription>Jetspeed 1.5 Portal Tutorial.</shortDescription> + <shortDescription>Jetspeed 1.6 Portal Tutorial.</shortDescription> <description> <b>Jetspeed Portal Tutorial</b> is a hands on tutorial for learning how to develop portlets in - Jetspeed 1.5. The tutorial also demonstrates how to create your own project based on Jetspeed + Jetspeed 1.6. The tutorial also demonstrates how to create your own project based on Jetspeed without mixing the core source with your application code and resources. </description> <url>http://portals.apache.org/jetspeed-1/tutorial/</url> @@ -118,269 +118,95 @@ </properties> <url>http://portals.apache.org/jetspeed-1/</url> </dependency> - </dependencies> - <dependencies> - <!--Jetspeed--> - <dependency> - <id>activation</id> - <version>1.0.1</version> - <properties> - <war.bundle.jar>true</war.bundle.jar> - </properties> - </dependency> - <dependency> - <id>ant</id> - <version>1.5</version> - </dependency> - <dependency> - <id>castor</id> - <version>0.9.3</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>commons-beanutils</id> - <version>1.4.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>commons-collections</id> - <version>2.0</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>commons-configuration</id> - <version>1.0-dev</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>commons-dbcp</id> - <version>1.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>commons-httpclient</id> - <version>1.0</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>commons-lang</id> - <version>1.0</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>commons-logging</id> - <version>1.0.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>commons-pool</id> - <version>1.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> + <dependency> + <groupId>jetspeed</groupId> + <artifactId>jetspeed-torque-om</artifactId> + <version>${jetspeed.dist.version}</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> <dependency> <id>ecs</id> <version>1.4.1</version> <properties> - <war.bundle>true</war.bundle> + <war.bundle>false</war.bundle> </properties> </dependency> <dependency> <id>fulcrum</id> <version>3.0-b2-dev</version> <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>hsqldb</id> - <version>1.7.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>oro</id> - <version>2.0.6</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>regexp</id> - <version>1.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>javamail</id> - <version>1.2</version> - </dependency> - <dependency> - <id>jaxp</id> - <version>1.2</version> - </dependency> - <dependency> - <id>jcs</id> - <version>1.0-dev</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>jdbc</id> - <version>2.0</version> - </dependency> - <dependency> - <id>jndi</id> - <version>1.2.1</version> - </dependency> - <dependency> - <id>log4j</id> - <version>1.2.8</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>lucene</id> - <version>1.3-rc1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>ojb</id> - <version>0.7.343</version> - <properties> <war.bundle>false</war.bundle> </properties> </dependency> <dependency> - <id>servletapi</id> - <version>2.2</version> - </dependency> - <dependency> - <id>soap</id> - <version>2.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>stratum</id> - <version>1.0-b4-dev</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> <id>torque</id> <version>3.1</version> <properties> - <war.bundle>true</war.bundle> + <war.bundle>false</war.bundle> </properties> </dependency> <dependency> <id>turbine</id> <version>2.2</version> <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>uddi4j</id> - <version>1.0</version> - <properties> - <war.bundle>true</war.bundle> + <war.bundle>false</war.bundle> </properties> </dependency> + <dependency> + <id>village</id> + <version>2.0-dev-20030625</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + + <dependency> <id>velocity</id> - <version>1.3</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>village</id> - <version>2.0-dev-20030625</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>xalan</id> - <version>2.3.1</version> + <version>1.4</version> <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>xerces</id> - <version>2.0.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - <jar>xercesImpl-2.0.2.jar</jar> - </dependency> - <dependency> - <id>xml-apis</id> - <version>2.0.2</version> - <properties> - <war.bundle>true</war.bundle> + <war.bundle>false</war.bundle> </properties> </dependency> + <dependency> <groupId>maven-plugins</groupId> <artifactId>maven-torque-plugin</artifactId> <version>3.2</version> <type>plugin</type> - </dependency> + </dependency> <dependency> <groupId>maven-plugins</groupId> <artifactId>maven-jetspeed-plugin</artifactId> <version>1.2</version> <type>plugin</type> </dependency> - <!-- ********************************** --> - <!-- THESE DEPENDENCIES ARE FOR TESTING --> - <!-- ********************************** --> - <dependency> - <id>commons-httpclient</id> - <version>1.0</version> - </dependency> - <dependency> - <id>cactus</id> - <version>13-1.4.1</version> - </dependency> - <dependency> - <groupId>cactus</groupId> - <artifactId>cactus-ant</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <id>junit</id> - <version>3.7</version> - </dependency> + + <dependency> + <id>servletapi</id> + <version>2.3</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + + <dependency> + <id>commons-lang</id> + <version>2.0</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-logging</id> + <version>1.0.3</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + </dependencies> <build> <sourceDirectory>src/java</sourceDirectory> 1.13 +1 -2 jakarta-jetspeed/tutorial/project.properties Index: project.properties =================================================================== RCS file: /home/cvs/jakarta-jetspeed/tutorial/project.properties,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- project.properties 15 Jun 2004 04:25:08 -0000 1.12 +++ project.properties 19 Apr 2005 06:41:15 -0000 1.13 @@ -57,8 +57,7 @@ war.stage.dir = ${basedir}/stage maven.war.src = ${war.stage.dir}/webapp -# maven.merge.properties = JetspeedResources,JetspeedSecurity,TurbineResources,Torque -maven.war.appserver.home = /bluesunrise/apache/catalina +maven.merge.properties = JetspeedResources,JetspeedSecurity,TurbineResources,Torque jetspeed.dist.version = 1.6-dev # jetspeed.dist.version = 1.5 1.3 +1 -1 jakarta-jetspeed/tutorial/tutorials/2/templates/vm/navigations/html/bottom-jportal.vm Index: bottom-jportal.vm =================================================================== RCS file: /home/cvs/jakarta-jetspeed/tutorial/tutorials/2/templates/vm/navigations/html/bottom-jportal.vm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bottom-jportal.vm 22 Apr 2004 05:14:56 -0000 1.2 +++ bottom-jportal.vm 19 Apr 2005 06:41:15 -0000 1.3 @@ -4,7 +4,7 @@ <tr> <td align="left"> <small> - JPortal Tutorial for Jetspeed - Version 1.5<br/> + JPortal Tutorial for Jetspeed - Version 1.6<br/> </small> </td> #if ($config.getString("mail.support")) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]