You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/10/27 04:22:10 UTC
svn commit: rev 55662 - in incubator/lenya/branches/BRANCH_1_2_X/src: targets webapp/WEB-INF webapp/lenya/content/util webapp/lenya/pubs/blog/config/menus webapp/lenya/pubs/default webapp/lenya/pubs/default/config/menus webapp/lenya/pubs/default/resources/misc webapp/lenya/pubs/oscom/config/menus webapp/lenya/xslt/util
Author: gregor
Date: Tue Oct 26 19:22:09 2004
New Revision: 55662
Removed:
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/util/redirect-document.xsp
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/resources/misc/upload.js
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/usecase-uploaddocument.xmap
Modified:
incubator/lenya/branches/BRANCH_1_2_X/src/targets/export-build.xml
incubator/lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
incubator/lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml
incubator/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/cocoon-xconf.xsl
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/archive.xsp
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/entry.xsp
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/feed.xsp
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/menus/generic.xsp
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/menus/links.xsp
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/oscom/config/menus/matrix.xsp
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/util/publication.xsl
Log:
delete docs-new and point to the live documentation for now
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/targets/export-build.xml
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/targets/export-build.xml (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/targets/export-build.xml Tue Oct 26 19:22:09 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: export-build.xml,v 1.6 2004/05/16 10:45:40 gregor Exp $ -->
+<!-- $Id$ -->
<project name="export">
@@ -26,39 +26,6 @@
<!-- ============================================================ -->
<!-- Produce the webapp -->
<!-- ============================================================ -->
-
- <!--
- This target exports a specified Forrest-based publication as static HTML.
- -->
- <target name="export-forrest" depends="webapp" description="Exports a forrest-based publication to static HTML.">
-
- <property name="publication" value="docs-new"/>
- <property name="publication.dir" value="${build.webapp}/lenya/pubs/${publication}"/>
- <property name="export.dir" value="${build.dir}/export/${publication}"/>
- <property environment="env" />
- <property name="forrest.home" value="${env.FORREST_HOME}" />
-
- <!-- Copy publication to new directory -->
- <echo>INFO: Copy publication from ${publication.dir} to ${export.dir}</echo>
-
- <copy todir="${export.dir}">
- <fileset dir="${publication.dir}">
- <exclude name="skins/cocooncenter/**"/>
- <exclude name="*.xmap"/>
- </fileset>
- </copy>
-
- <move file="${publication.dir}/forrest-sitemap.xmap" tofile="${export.dir}/sitemap.xmap"/>
- <move file="${publication.dir}/raw.xmap" tofile="${export.dir}/raw.xmap"/>
- <!--
- <move file="${export.dir}/forrest-sitemap.xmap" tofile="${export.dir}/sitemap.xmap"/>
- <move file="${export.dir}/sitemap.xmap" tofile="${export.dir}/sitemap.xmap.bak"/>
- -->
-
- <ant antfile="${forrest.home}/forrest.antproxy.xml" dir="${export.dir}"/>
-
- </target>
-
<target name="export" depends="webapp" description="Exports a publication to static HTML.">
<property name="publication" value=""/>
<property name="publication.dir" value="${build.webapp}/lenya/pubs/${publication}"/>
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml Tue Oct 26 19:22:09 2004
@@ -99,13 +99,6 @@
<exclude name="**/javac.jar"/>
</fileset>
</copy>
-
- <!-- copy forrest and default libraries -->
- <!-- FIXME: shouldn't be publication specific -->
- <echo>Copy forrest libraries</echo>
- <copy todir="${build.webapp}/WEB-INF/lib" filtering="off">
- <fileset dir="src/webapp/lenya/pubs/docs-new/WEB-INF/lib"/>
- </copy>
<!-- patch cocoon.xconf -->
<echo>INFO: patching cocoon.xconf with XSLT stylesheet</echo>
@@ -114,7 +107,6 @@
out="${build.webapp}/WEB-INF/cocoon.xconf"
style="${src.webapp.dir}/WEB-INF/cocoon-xconf.xsl"
>
- <param name="forrest-publication" expression="/lenya/pubs/docs-new"/>
<param name="hsqldb-server-port" expression="${hsqldb-server.port}"/>
<param name="xopus-context" expression="${xopus.context}"/>
<outputproperty name="indent" value="yes"/>
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml Tue Oct 26 19:22:09 2004
@@ -74,7 +74,7 @@
<property name="dist.bin.dir" value="${dist.root}/${distname}-bin"/>
<!-- The javadoc destination directory -->
- <property name="dist.bin.javadocs" value="${build.webapp}/lenya/pubs/docs-new/resources/html/apidocs"/>
+ <property name="dist.bin.javadocs" value="${build.webapp}/site/apidocs"/>
<!-- The filename of the final end-user war package -->
<property name="dist.bin.warfile" value="${dist.bin.dir}/${ant.project.name}.war"/>
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml Tue Oct 26 19:22:09 2004
@@ -67,12 +67,6 @@
<copyPubs todir="${build.webapp}/lenya/pubs" pubsrootdirs="${pubs.root.dirs}" excludes="CVS,.svn">
</copyPubs>
- <echo>INFO: Patch documentation ${src.documentation.dir}/content to ${build.webapp}/lenya/pubs/docs-new/content</echo>
- <copy todir="${build.webapp}/lenya/pubs/docs-new/content">
- <fileset dir="${src.documentation.dir}/content">
- </fileset>
- </copy>
-
<!-- Patch cocoon.xconf -->
<echo>INFO: Patch cocoon.xconf</echo>
<xpatch file="${build.webapp}/WEB-INF/cocoon.xconf"
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/cocoon-xconf.xsl
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/cocoon-xconf.xsl (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/cocoon-xconf.xsl Tue Oct 26 19:22:09 2004
@@ -15,12 +15,11 @@
limitations under the License.
-->
-<!-- $Id: cocoon-xconf.xsl,v 1.47 2004/08/09 10:28:38 andreas Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:param name="forrest-publication"/>
<xsl:param name="hsqldb-server-port"/>
<xsl:param name="xopus-context"/>
@@ -51,10 +50,6 @@
<component-instance name="defaults" class="org.apache.cocoon.components.modules.input.DefaultsMetaModule">
<values>
<skin>lenya-site</skin>
- <!--
- <skin-docs>lenya-site</skin-docs>
- <skin>forrest-site</skin>
- -->
</values>
</component-instance>
@@ -150,12 +145,6 @@
|
| <parameter name="verbosity" value="2"/>
+-->
- <entity-resolver class="org.apache.cocoon.components.resolver.ResolverImpl" logger="core.resolver">
- <parameter name="catalog" value="{$forrest-publication}/resources/schema/catalog.xcat"/>
- <parameter name="verbosity" value="1"/>
- </entity-resolver>
-
- <xsl:apply-templates select="*[local-name() != 'entity-resolver']"/>
<accreditable-managers>
<component-instance logger="lenya.ac.accreditablemanager"
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/archive.xsp
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/archive.xsp (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/archive.xsp Tue Oct 26 19:22:09 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: archive.xsp,v 1.8 2004/09/01 23:25:32 michi Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -52,8 +52,8 @@
<menu name="Help" label="Help">
<block>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/docs-new/docs/index.html</xsp:attribute>Documentation</item>
- <item href="http://wiki.cocoondev.org/Wiki.jsp?page=Lenya">Wiki Documentation</item>
+ <item><xsp:attribute name="href">http://cocoon.apache.org/lenya/docs/index.html</xsp:attribute>Documentation</item>
+ <item href="http://wiki.apache.org/cocoon-lenya/">Wiki Documentation</item>
</block>
<block>
<item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute>Apache Lenya Start Page</item>
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/entry.xsp
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/entry.xsp (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/entry.xsp Tue Oct 26 19:22:09 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: entry.xsp,v 1.27 2004/09/01 23:25:32 michi Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -70,8 +70,8 @@
<menu name="Help" label="Help">
<block>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/docs-new/docs/index.html</xsp:attribute>Documentation</item>
- <item href="http://wiki.cocoondev.org/Wiki.jsp?page=Lenya">Wiki Documentation</item>
+ <item><xsp:attribute name="href">http://cocoon.apache.org/lenya/docs/index.html</xsp:attribute>Documentation</item>
+ <item href="http://wiki.apache.org/cocoon-lenya">Wiki Documentation</item>
</block>
<block>
<item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute>Apache Lenya Start Page</item>
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/feed.xsp
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/feed.xsp (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/blog/config/menus/feed.xsp Tue Oct 26 19:22:09 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: feed.xsp,v 1.16 2004/09/01 23:25:32 michi Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -59,8 +59,8 @@
<menu name="Help" label="Help">
<block>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/docs-new/docs/index.html</xsp:attribute>Documentation</item>
- <item href="http://wiki.cocoondev.org/Wiki.jsp?page=Lenya">Wiki Documentation</item>
+ <item><xsp:attribute name="href">http://cocoon.apache.org/lenya/docs/index.html</xsp:attribute>Documentation</item>
+ <item href="http://wiki.apache.org/cocoon-lenya">Wiki Documentation</item>
</block>
<block>
<item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute>Apache Lenya Start Page</item>
@@ -72,9 +72,6 @@
<block>
<item href="index.xml">Feed</item>
<item href="lenya-page-body.xml">Body</item>
- </block>
- <block>
- <item><xsp:attribute name="href">http://www.feedvalidator.org/check.cgi?url=http://127.0.0.1:8080<xsp-request:get-context-path/>/blog/live/feeds/all/index.xml</xsp:attribute>Validate Live Feed</item>
</block>
<block>
<item href="/lenya/blog/atomapi/">introspection</item>
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/menus/generic.xsp
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/menus/generic.xsp (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/menus/generic.xsp Tue Oct 26 19:22:09 2004
@@ -273,9 +273,8 @@
<menu i18n:attr="name" name="Help" label="Debug">
<block>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/docs-new/docs/index.html</xsp:attribute><i18n:text>User Documentation</i18n:text></item>
- <item><i18n:text>System Documentation</i18n:text></item>
- <item><i18n:text>Support</i18n:text></item>
+ <item><xsp:attribute name="href">http://cocoon.apache.org/lenya/docs/index.html</xsp:attribute><i18n:text>User Documentation</i18n:text></item>
+ <item href="http://wiki.apache.org/cocoon-lenya/"><i18n:text>Wiki</i18n:text></item>
</block>
<block>
<item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute><i18n:text>Apache Lenya Homepage</i18n:text></item>
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/menus/links.xsp
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/menus/links.xsp (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/menus/links.xsp Tue Oct 26 19:22:09 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: links.xsp,v 1.1 2004/08/17 21:56:15 michi Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -94,7 +94,7 @@
<menu i18n:attr="name" name="Help" label="Debug">
<block>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/docs-new/docs/index.html</xsp:attribute><i18n:text>System Documentation</i18n:text></item>
+ <item><xsp:attribute name="href">http://cocoon.apache.org/lenya/docs/index.html</xsp:attribute><i18n:text>System Documentation</i18n:text></item>
<item href="http://wiki.apache.org/cocoon-lenya/"><i18n:text>Wiki</i18n:text></item>
</block>
<block>
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/oscom/config/menus/matrix.xsp
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/oscom/config/menus/matrix.xsp (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/oscom/config/menus/matrix.xsp Tue Oct 26 19:22:09 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: matrix.xsp,v 1.42 2004/08/02 00:23:43 michi Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -71,7 +71,7 @@
<menu name="Help" label="Help">
<block>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/docs-new/docs/index.html</xsp:attribute>Documentation</item>
+ <item><xsp:attribute name="href">http://cocoon.apache.org/lenya/docs/index.html</xsp:attribute>Documentation</item>
</block>
<block>
<item><xsp:attribute name="href"><xsp-request:get-context-path/>/index.html</xsp:attribute>Apache Lenya Start Page</item>
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/util/publication.xsl
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/util/publication.xsl (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/util/publication.xsl Tue Oct 26 19:22:09 2004
@@ -39,8 +39,8 @@
<li><a href="authoring/">Login as Editor</a></li>
</ul>
<div class="lenya-publication-item"><a href="../index.html">Other Publications</a></div>
-<div class="lenya-publication-item"><a href="../docs-new/docs/index.html">Documentation</a></div>
-<div class="lenya-publication-item"><a href="http://wiki.cocoondev.org/Wiki.jsp?page=Lenya">Wiki Documentation</a></div>
+<div class="lenya-publication-item"><a href="http://cocoon.apache.org/lenya/docs/index.html">Documentation</a></div>
+<div class="lenya-publication-item"><a href="http://wiki.apache.org/cocoon-lenya">Wiki Documentation</a></div>
</div>
<div class="lenya-frontpage">
@@ -56,7 +56,6 @@
<h2><xsl:value-of select="../lenya:name"/></h2>
<xsl:apply-templates select="../lenya:pub-version"/>
(Based on
-<xsl:apply-templates select="../lenya:version"/> <!-- DEPRECATED: replaced by lenya:lenya-version -->
<xsl:apply-templates select="../lenya:lenya-version"/>
<xsl:apply-templates select="../lenya:cocoon-version"/>
)
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org