You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2009/04/24 00:28:39 UTC

svn commit: r768082 [8/8] - in /portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs: ./ adminguide/ adminguide/images/ deployguide/ deployguide/images/ devguide/ usersguide/

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/license.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/license.xml?rev=768082&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/license.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/license.xml Thu Apr 23 22:28:35 2009
@@ -0,0 +1,218 @@
+<?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>
+	<properties>
+		<title>Apache License, version 2.0</title>
+	</properties>
+	<body>
+		<section name="Apache License, version 2.0">
+			<pre>
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following
+boilerplate notice, with the fields enclosed by brackets "[]"
+replaced with your own identifying information. (Don't include
+the brackets!)  The text should be enclosed in the appropriate
+comment syntax for the file format. We also recommend that a
+file or class name and description of purpose be included on the
+same "printed page" as the copyright notice for easier
+identification within third-party archives.
+
+Copyright 2004 The Apache Software Foundation
+			</pre>
+		</section>
+	</body>
+</document>
+

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/license.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/license.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/navigation.xml?rev=768082&r1=768081&r2=768082&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/navigation.xml Thu Apr 23 22:28:35 2009
@@ -18,10 +18,16 @@
 <project>
     <body>
         <links>
+            <item name="Users Guide" href="usersguide/index.html" />
+            <item name="Admin Guide" href="adminguide/index.html"/>
+            <item name="Deployers Guide" href="deployguide/index.html"/>
+            <item name="Developers Guide" href="devguide/index.html"/>
+            <!--
         	<item name="Jetspeed-1" href="http://portals.apache.org/jetspeed-1" target="_nw"/>
         	<item name="Jetspeed-2.2" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
         	<item name="Bridges" href="http://portals.apache.org/bridges" target="_nw"/>
-            <item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />
+        	-->
+            <!--<item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />-->
         </links>
         <menu name="Essentials">
             <item name="Welcome" href="index.html" />
@@ -42,9 +48,9 @@
     		<item name="Migration Guide" href="guide-migration.html" />
     	</menu>
     	<menu name="APIs">
-    		<item name="Jetspeed-2 Java API" href="jetspeed-api/apidocs/index.html" />
+    		<item name="Jetspeed-2 Java API" href="multiproject/jetspeed-api/apidocs/index.html" />
     		<item name="Jetspeed-2 AJAX API" href="devguide/guide-ajax-api.html" />
-    		<item name="Jetspeed-2 Maven-2 Plugin" href="devguide/m2-build/j2-maven-plugin.html" />    		
+    		<item name="Jetspeed-2 Maven-2 Plugin" href="devguide/j2-maven-plugin.html" />    		
     	</menu>
     	<menu name="Tutorials">
     	    <item name="Jetspeed Tutorial - Maven-2 Custom Build" href="tutorials/maven-2/index.html" />
@@ -64,7 +70,7 @@
             <item name="Mailing List" href="mail-lists.html" />
             <item name="Bug Database" href="issue-tracking.html" />
             <item name="Wiki" href="http://wiki.apache.org/portals/Jetspeed2" />
-            <item name="Quality Testing" href="quality-testing.html" />
+            <!--<item name="Quality Testing" href="quality-testing.html" />-->
             <item name='FAQ' href='faq.html'/>
         </menu>
         <menu name="Translation"> 	

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/supporting-projects.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/supporting-projects.xml?rev=768082&r1=768081&r2=768082&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/supporting-projects.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/supporting-projects.xml Thu Apr 23 22:28:35 2009
@@ -35,8 +35,8 @@
             <td><a href="http://db.apache.org/derby/">Derby</a> provides Jetspeed-2 default embedded database engine.</td>
           </tr>
           <tr>
-            <td><a href="http://directory.apache.org/subprojects/apacheds/index.html"><img src="images/supporters/directory.gif" border="0" /></a></td>
-            <td>Apache <a href="http://directory.apache.org/subprojects/apacheds/index.html">Directory Server</a> provides Jetspeed-2 default embedded LDAP engine.</td>
+            <td><a href="http://directory.apache.org/apacheds/1.5/"><img src="images/supporters/directory.gif" border="0" /></a></td>
+            <td>Apache <a href="http://directory.apache.org/apacheds/1.5/">Directory Server</a> provides Jetspeed-2 default embedded LDAP engine.</td>
           </tr>
           <tr>
             <td><a href="http://lucene.apache.org/"><img src="images/supporters/lucene.gif" border="0" /></a></td>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/usersguide/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/usersguide/navigation.xml?rev=768082&r1=768081&r2=768082&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/usersguide/navigation.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/usersguide/navigation.xml Thu Apr 23 22:28:35 2009
@@ -18,11 +18,11 @@
 <project>
     <body>
         <links>
-        	<item name="Home" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
-        	<item name="Admin Guide" href="http://portals.apache.org/jetspeed-2/adminguide/" target="_nw"/>
-        	<item name="Deployers Guide" href="http://portals.apache.org/jetspeed-2/deployersguide/" target="_nw"/>
-        	<item name="Developers Guide" href="http://portals.apache.org/jetspeed-2/devguide/" target="_nw"/>
-            <item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />
+        	<item name="Main Docs" href="index.html"/>
+        	<item name="Admin Guide" href="adminguide/index.html"/>
+        	<item name="Deployement Guide" href="deployguide/index.html"/>
+        	<item name="Developers Guide" href="devguide/index.html"/>
+            <!--<item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />-->
         </links>
         <menu name="Introduction">
             <item name="Welcome" href="usersguide/index.html" />
@@ -42,14 +42,14 @@
     	    <item name="Menu" href="usersguide/menu.html" />  
     	    <item name="Desktop" href="usersguide/desktop.html" />
     	</menu>
-    	<menu name="Reference">
+    <!--  	<menu name="Reference">
     		<item name="QuickRef : Option Locations" href="usersguide/options.html" />
-    	</menu>
+    	</menu> -->
         <menu name="Support"> 	
             <item name="Mailing List" href="mail-lists.html" />
             <item name="Bug Database" href="issue-tracking.html" />
             <item name="Wiki" href="http://wiki.apache.org/portals/Jetspeed2" />
-            <item name="Quality Testing" href="quality-testing.html" />
+            <!--<item name="Quality Testing" href="quality-testing.html" />-->
             <item name='FAQ' href='faq.html'/>
         </menu>
     </body>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/usersguide/portlets.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/usersguide/portlets.xml?rev=768082&r1=768081&r2=768082&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/usersguide/portlets.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/usersguide/portlets.xml Thu Apr 23 22:28:35 2009
@@ -63,6 +63,7 @@
 				To remove a portlet from your window, click on the <img align="top" src="images/xicon.png"/> icon of the portlet you wish to remove.  The remaining portlets
 				will adjust to fill the space if any are lower in the same column.
 			</p>
+			<a name="adding_portlets"></a>
 			</subsection>
 			<subsection name="Adding Portlets">
 			<p>	

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/who-uses-j2.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/who-uses-j2.xml?rev=768082&r1=768081&r2=768082&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/who-uses-j2.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/who-uses-j2.xml Thu Apr 23 22:28:35 2009
@@ -108,8 +108,8 @@
             enviromental data.</td>
           </tr>            
           <tr>
-            <td><a href="http://wfmopen.sf.net">WfMOpen</a></td>
-            <td>In its 1.4 version, <a href="http://wfmopen.sf.net">WfMOpen</a> provides resource management for the 
+            <td><a href="http://wfmopen.sourceforge.net/">WfMOpen</a></td>
+            <td>In its 1.4 version, <a href="http://wfmopen.sourceforge.net/">WfMOpen</a> provides resource management for the 
 			workflow engines (BPE) and uses Jetspeed-2 as a container for the engine's administrative portlets.</td>
           </tr>
 		</table>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org