Author: taylor
Date: Fri May 15 06:47:18 2009
New Revision: 775032
URL: http://svn.apache.org/viewvc?rev=775032&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-389
https://issues.apache.org/jira/browse/JS2-989
Lots of reworking and reorganizing of Jetspeed-2.1.x and 2.2.x document branches
Moving docs out of both 2.1.3 and 2.2
New skin
Organized site into a more hierarchical structure:
site/
jetspeed/
jetspeed-2.1
jetspeed-2.2
tutorial contribution from Niels van Kampenout
also had to convert line feeds
Removed:
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/navigation.xml
Modified:
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/ (props changed)
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/pom.xml
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/site.xml
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/constraints.xml
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/search.xml
Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 15 06:47:18 2009
@@ -0,0 +1 @@
+target
Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/pom.xml
URL:
http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/pom.xml?rev=775032&r1=775031&r2=775032&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/pom.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/pom.xml Fri May 15
06:47:18 2009
@@ -27,17 +27,25 @@
<artifactId>jetspeed-guide-admin</artifactId>
<name>Jetspeed Admin Guide</name>
- <description>Jetspeed Administrators Guide</description>
- <!-- FIXME: this causes an NPE in maven dearest
+ <description>Jetspeed 2.2 Administrators Guide</description>
+ <packaging>pom</packaging>
<parent>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-docs</artifactId>
- <version>2.2</version>
+ <artifactId>jetspeed-site-docs</artifactId>
+ <groupId>org.apache.portals.site</groupId>
+ <version>2.2</version>
</parent>
- <packaging>pom</packaging>
- -->
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <version>2.2</version>
+
+ <!-- this is for a bug Maven, see http://jira.codehaus.org/browse/MSHARED-18
+ should be removed once Maven incorporates this bug in an official
release-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </build>
<reporting>
<plugins>
Modified:
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/site.xml?rev=775032&r1=775031&r2=775032&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/site.xml
(original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/site.xml
Fri May 15 06:47:18 2009
@@ -34,17 +34,10 @@
<links>
<item name="Home" href="../index.html"/>
- <item name="Build Guide" href="../build/guide/index.html"/>
+ <item name="Build Guide" href="../buildguide/index.html"/>
<item name="Deployers Guide" href="../deployguide/index.html"/>
<item name="Developer Guide" href="../devguide/index.html"/>
<item name="Users Guide" href="../usersguide/index.html" />
-
- <item name="Applications" href="http://portals.apache.org/applications/";
/>
- <item name="Portals" href="http://portals.apache.org/"; />
- <item name="Jetspeed-2.1.3"
href="http://portals.apache.org/jetspeed-2.1.3/"; />
- <!-- TODO: During build, pdf docs need to be generated.
- <item name="PDF Documentation" href="/jetspeed2.pdf"
img="images/pdf.gif" />
- -->
</links>
<menu name="Admin Guide">
Modified:
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/constraints.xml
URL:
http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/constraints.xml?rev=775032&r1=775031&r2=775032&view=diff
==============================================================================
---
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/constraints.xml
(original)
+++
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/constraints.xml
Fri May 15 06:47:18 2009
@@ -80,7 +80,7 @@
<li>2. Portlet Application Manager, to secure a Portlet Application or Portlet
Definition</li>
<li>3. Config Mode, if available for a portlet, you can secure a portlet
instance</li>
</ul>
-Additionally, portlets can be secured in the deployment descriptors. See the
<a href="">deployment</a> guide for more details.
+Additionally, portlets can be secured in the deployment descriptors. See the
<a href="../deployguide/index.html">deployment</a> guide for more details.
</p>
</subsection>
</section>
Modified:
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/search.xml
URL:
http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/search.xml?rev=775032&r1=775031&r2=775032&view=diff
==============================================================================
---
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/search.xml
(original)
+++
portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-admin/src/site/xdoc/search.xml
Fri May 15 06:47:18 2009
@@ -1,45 +1,45 @@
-<?xml version="1.0" ?>
-<!--
+<?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>Jetspeed-2 Search</title>
- <authors>
- <person name="David Le Strat" email="[email protected]" />
- </authors>
- </properties>
- <body>
- <section name="Using Jetspeed Search Engine">
- <p>
- Jetspeed-2 <code>SearchEngine</code> exposes a <code>search</code>
operation returning <code>SearchResults</code>.
- The <code>SearchResult</code> can be iterated through to display
the result of the search.
- </p>
- <subsection name="Portlet Search">
- <p>
- Jetspeed-2 <code>SearchEngine</code> is used by the
<code>PortletApplicationBrowser</code> portlet to search
- and retrieve portlet according to a given criteria.
- <br/>
- <img src="images/portlet-search.gif" border="0" />
- </p>
- <p>
- Performing a search for "security" returns all the
matching portlets and portlet definitions.
- </p>
- </subsection>
- </section>
- </body>
-</document>
-
+ 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>Jetspeed-2 Search</title>
+ <authors>
+ <person name="David Le Strat" email="[email protected]" />
+ </authors>
+ </properties>
+ <body>
+ <section name="Using Jetspeed Search Engine">
+ <p>
+ Jetspeed-2 <code>SearchEngine</code> exposes a <code>search</code>
operation returning <code>SearchResults</code>.
+ The <code>SearchResult</code> can be iterated through to display
the result of the search.
+ </p>
+ <subsection name="Portlet Search">
+ <p>
+ Jetspeed-2 <code>SearchEngine</code> is used by the
<code>PortletApplicationBrowser</code> portlet to search
+ and retrieve portlet according to a given criteria.
+ <br/>
+ <img src="images/portlet-search.gif" border="0" />
+ </p>
+ <p>
+ Performing a search for "security" returns all the
matching portlets and portlet definitions.
+ </p>
+ </subsection>
+ </section>
+ </body>
+</document>
+
