You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2003/10/09 15:20:15 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt oscom-layout-2.xsl
michi 2003/10/09 06:20:15
Modified: src/webapp/lenya/pubs/oscom publication.xml sitemap.xmap
src/webapp/lenya/pubs/oscom/config/menus editor-overview.xsp
src/webapp/lenya/pubs/oscom/xslt oscom-layout-2.xsl
Log:
search authoring and live introduced
Revision Changes Path
1.12 +4 -4 cocoon-lenya/src/webapp/lenya/pubs/oscom/publication.xml
Index: publication.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/publication.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- publication.xml 23 Jul 2003 13:21:37 -0000 1.11
+++ publication.xml 9 Oct 2003 13:20:14 -0000 1.12
@@ -78,8 +78,8 @@
DocumentRoot /usr/local/apache/htdocs_oscom
ProxyPass /matrix/ http://oscom.wyona.org:18080/lenya/oscom/matrix/
ProxyPassReverse /matrix/ http://oscom.wyona.org:18080/lenya/oscom/matrix/
- ProxyPass /search/go http://oscom.wyona.org:18080/lenya/oscom/search-oscom/lucene
- ProxyPassReverse /search/go http://oscom.wyona.org:18080/lenya/oscom/search-oscom/lucene
+ ProxyPass /search/go http://oscom.wyona.org:18080/lenya/oscom/osearch-live/lucene
+ ProxyPassReverse /search/go http://oscom.wyona.org:18080/lenya/oscom/osearch-live/lucene
ErrorLog logs/oscom.wyona.org-error_log
CustomLog logs/oscom.wyona.org-access_log common
</VirtualHost>
@@ -99,7 +99,7 @@
<lenya:test>Check new CMF Project</lenya:test>
<lenya:test>Publish new CMF Project</lenya:test>
<lenya:test>Check published new CMF Project</lenya:test>
- <lenya:test>Check <a href="search-oscom/lucene">Search</a></lenya:test>
+ <lenya:test>Check <a href="osearch-live/lucene">Search</a></lenya:test>
<lenya:test>Check Mailing Lists Page</lenya:test>
</lenya:tests>
</lenya:publication>
1.31 +4 -4 cocoon-lenya/src/webapp/lenya/pubs/oscom/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/sitemap.xmap,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sitemap.xmap 1 Oct 2003 09:31:34 -0000 1.30
+++ sitemap.xmap 9 Oct 2003 13:20:14 -0000 1.31
@@ -64,7 +64,7 @@
<map:pipeline>
- <map:match pattern="search-oscom/lucene.xml">
+ <map:match pattern="osearch-*/lucene.xml">
<map:generate type="serverpages" src="../../content/search/search-and-results.xsp">
<map:parameter name="max-hits-per-page" value="5"/>
<map:parameter name="max-pages" value="7"/>
@@ -102,10 +102,10 @@
</map:pipeline>
<map:pipeline>
- <map:match pattern="search-oscom/lucene*">
+ <map:match pattern="osearch-*/lucene*">
<map:aggregate element="oscom" label="xml">
<map:part src="content/live/navigation.xml"/>
- <map:part src="cocoon:/search-oscom/lucene.xml{1}"/>
+ <map:part src="cocoon:/osearch-{1}/lucene.xml{2}"/>
</map:aggregate>
<!--
<map:transform src="../../xslt/search/sort.xsl"/>
1.10 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/editor-overview.xsp
Index: editor-overview.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/editor-overview.xsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- editor-overview.xsp 23 Jul 2003 13:21:24 -0000 1.9
+++ editor-overview.xsp 9 Oct 2003 13:20:14 -0000 1.10
@@ -52,7 +52,7 @@
</separator>
<block>
<item href="../../search/lucene?publication-id=oscom">Search within this Publication</item>
- <item href="../../search-oscom/lucene?publication-id=oscom">Search within this Publication 2</item>
+ <item href="../../osearch-live/lucene?publication-id=oscom">Search within this Publication 2</item>
<item>Index this Publication</item>
</block>
</menu>
1.18 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/oscom-layout-2.xsl
Index: oscom-layout-2.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/oscom-layout-2.xsl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- oscom-layout-2.xsl 2 Apr 2003 22:41:24 -0000 1.17
+++ oscom-layout-2.xsl 9 Oct 2003 13:20:14 -0000 1.18
@@ -14,7 +14,7 @@
<!--
<xsl:variable name="searchURL">/search/go</xsl:variable>
-->
-<xsl:variable name="searchURL">/lenya/oscom/search-oscom/lucene</xsl:variable>
+<xsl:variable name="searchURL">/lenya/oscom/osearch-live/lucene</xsl:variable>
<xsl:template match="oscom">
<html>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org