You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by th...@apache.org on 2007/01/28 23:09:27 UTC
svn commit: r500900 [1/12] - in /lenya/site: ./ 1_2_x/ 1_2_x/how-to/
community/ docs/1_2_x/ docs/1_2_x/components/accesscontrol/
docs/1_2_x/components/asset-management/ docs/1_2_x/components/authoring/
docs/1_2_x/components/deployment/ docs/1_2_x/compo...
Author: thorsten
Date: Sun Jan 28 14:09:21 2007
New Revision: 500900
URL: http://svn.apache.org/viewvc?view=rev&rev=500900
Log:
Automatic publish from forrestbot
Added:
lenya/site/1_2_x/
lenya/site/1_2_x/how-to/
lenya/site/1_2_x/how-to/search-and-results.xsp (with props)
lenya/site/1_2_x/how-to/searchfixer.xsl (with props)
lenya/site/1_2_x/how-to/typical-lenya-setup.pdf (with props)
lenya/site/1_2_x/how-to/usecase-search.xmap (with props)
lenya/site/docs/modules/notification.html (with props)
lenya/site/docs/modules/notification.pdf (with props)
lenya/site/svn-log/tlp-2006-08.svn.xml (with props)
lenya/site/svn-log/tlp-2006-09.svn.xml (with props)
lenya/site/svn-log/tlp-2006-10.svn.xml (with props)
lenya/site/svn-log/tlp-2006-11.svn.xml (with props)
lenya/site/svn-log/tlp-2006-12.svn.xml (with props)
lenya/site/svn-log/tlp-2007-01.svn.xml (with props)
lenya/site/tlp-2006-08.svn.html (with props)
lenya/site/tlp-2006-08.svn.pdf (with props)
lenya/site/tlp-2006-09.svn.html (with props)
lenya/site/tlp-2006-09.svn.pdf (with props)
lenya/site/tlp-2006-10.svn.html (with props)
lenya/site/tlp-2006-10.svn.pdf (with props)
lenya/site/tlp-2006-11.svn.html (with props)
lenya/site/tlp-2006-11.svn.pdf (with props)
lenya/site/tlp-2006-12.svn.html (with props)
lenya/site/tlp-2006-12.svn.pdf (with props)
Modified:
lenya/site/broken-links.xml
lenya/site/charter.html
lenya/site/community/acknowledgements.html
lenya/site/community/index.html
lenya/site/community/irc.html
lenya/site/community/live-sites.html
lenya/site/community/mailing-lists.html
lenya/site/community/translations.html
lenya/site/docs/1_2_x/components/accesscontrol/accesscontrollerresolvers.html
lenya/site/docs/1_2_x/components/accesscontrol/accesscontrollers.html
lenya/site/docs/1_2_x/components/accesscontrol/accreditablemanagers.html
lenya/site/docs/1_2_x/components/accesscontrol/authenticators.html
lenya/site/docs/1_2_x/components/accesscontrol/authorizers.html
lenya/site/docs/1_2_x/components/accesscontrol/policymanagers.html
lenya/site/docs/1_2_x/components/accesscontrol/ssl.html
lenya/site/docs/1_2_x/components/accesscontrol/terms.html
lenya/site/docs/1_2_x/components/asset-management/management.html
lenya/site/docs/1_2_x/components/authoring/adding-document-creator.html
lenya/site/docs/1_2_x/components/authoring/image-upload.html
lenya/site/docs/1_2_x/components/authoring/openoffice.html
lenya/site/docs/1_2_x/components/deployment/proxying.html
lenya/site/docs/1_2_x/components/editors/1form.html
lenya/site/docs/1_2_x/components/editors/bxe.html
lenya/site/docs/1_2_x/components/editors/htmlform.html
lenya/site/docs/1_2_x/components/editors/kupu.html
lenya/site/docs/1_2_x/components/editors/xopus.html
lenya/site/docs/1_2_x/components/layout/lenya-menubar.html
lenya/site/docs/1_2_x/components/layout/navigation.html
lenya/site/docs/1_2_x/components/layout/static-resources.html
lenya/site/docs/1_2_x/components/layout/xhtml-templating.html
lenya/site/docs/1_2_x/components/link-management/link-management.html
lenya/site/docs/1_2_x/components/metadata/metadata.html
lenya/site/docs/1_2_x/components/multilingual/multilingual.html
lenya/site/docs/1_2_x/components/publication/pageenvelopemodule.html
lenya/site/docs/1_2_x/components/publication/siteTree.html
lenya/site/docs/1_2_x/components/repository/index.html
lenya/site/docs/1_2_x/components/resource-types/resource-types.html
lenya/site/docs/1_2_x/components/revisioncontrol/checkin.html
lenya/site/docs/1_2_x/components/revisioncontrol/checkout.html
lenya/site/docs/1_2_x/components/revisioncontrol/rcml.html
lenya/site/docs/1_2_x/components/revisioncontrol/revisioncontroller.html
lenya/site/docs/1_2_x/components/revisioncontrol/rollback.html
lenya/site/docs/1_2_x/components/revisioncontrol/version.html
lenya/site/docs/1_2_x/components/search/lucene.html
lenya/site/docs/1_2_x/components/sitemanagement/archive.html
lenya/site/docs/1_2_x/components/sitemanagement/copy.html
lenya/site/docs/1_2_x/components/sitemanagement/deactivate.html
lenya/site/docs/1_2_x/components/sitemanagement/delete.html
lenya/site/docs/1_2_x/components/sitemanagement/deletetrash.html
lenya/site/docs/1_2_x/components/sitemanagement/move.html
lenya/site/docs/1_2_x/components/sitemanagement/moveupdown.html
lenya/site/docs/1_2_x/components/sitemanagement/rename.html
lenya/site/docs/1_2_x/components/sitemanagement/restore.html
lenya/site/docs/1_2_x/components/tasks/anttask.html
lenya/site/docs/1_2_x/components/tasks/concept.html
lenya/site/docs/1_2_x/components/tasks/defining.html
lenya/site/docs/1_2_x/components/tasks/development.html
lenya/site/docs/1_2_x/components/tasks/exporter.html
lenya/site/docs/1_2_x/components/tasks/mailtask.html
lenya/site/docs/1_2_x/components/tasks/publisher.html
lenya/site/docs/1_2_x/components/tasks/scheduling.html
lenya/site/docs/1_2_x/components/tasks/taskaction.html
lenya/site/docs/1_2_x/components/uri-handling/URIParametrizer.html
lenya/site/docs/1_2_x/components/uri-handling/standardURI.html
lenya/site/docs/1_2_x/components/uri-handling/usecases.html
lenya/site/docs/1_2_x/components/workflow/configuration.html
lenya/site/docs/1_2_x/components/workflow/implementation.html
lenya/site/docs/1_2_x/components/workflow/state-machine.html
lenya/site/docs/1_2_x/components/workflow/terms.html
lenya/site/docs/1_2_x/how-to/cms_menus.html
lenya/site/docs/1_2_x/how-to/cms_screens.html
lenya/site/docs/1_2_x/how-to/custom_resourcetype.html
lenya/site/docs/1_2_x/how-to/deploy_publication.html
lenya/site/docs/1_2_x/how-to/external_data.html
lenya/site/docs/1_2_x/how-to/faq.html
lenya/site/docs/1_2_x/how-to/ldap_authentication.html
lenya/site/docs/1_2_x/how-to/look_and_feel.html
lenya/site/docs/1_2_x/how-to/new_mime_type.html
lenya/site/docs/1_2_x/how-to/new_publication.html
lenya/site/docs/1_2_x/how-to/search.html
lenya/site/docs/1_2_x/how-to/site_navigation.html
lenya/site/docs/1_2_x/index.html
lenya/site/docs/1_2_x/installation/index.html
lenya/site/docs/1_2_x/installation/source_version.html
lenya/site/docs/1_2_x/installation/subversion.html
lenya/site/docs/1_2_x/misc/namespaces.html
lenya/site/docs/1_2_x/misc/reserved_names.html
lenya/site/docs/1_2_x/misc/xinclude-processor.html
lenya/site/docs/1_2_x/tutorial/anatomy_of_the_pipeline.html
lenya/site/docs/1_2_x/tutorial/custom_navigation.html
lenya/site/docs/1_2_x/tutorial/editing_in_lenya.html
lenya/site/docs/1_2_x/tutorial/index.html
lenya/site/docs/1_2_x/tutorial/installing_lenya.html
lenya/site/docs/1_2_x/tutorial/mod_proxy_and_lenya.html
lenya/site/docs/1_2_x/tutorial/mod_proxy_and_lenya_continued.html
lenya/site/docs/1_2_x/tutorial/understanding_lenya.html
lenya/site/docs/modules/index.html
lenya/site/docs/modules/webdav/index.html
lenya/site/docs/modules/webdav/monitoring.html
lenya/site/docs/modules/webdav/webdav.html
lenya/site/guidelines.html
lenya/site/history.html
lenya/site/incubator-2002-01-04.svn.html
lenya/site/incubator-2002-05-07.svn.html
lenya/site/incubator-2002-08-09.svn.html
lenya/site/incubator-2002-10-12.svn.html
lenya/site/incubator-2003-01-02.svn.html
lenya/site/incubator-2003-03.svn.html
lenya/site/incubator-2003-04.svn.html
lenya/site/incubator-2003-05.svn.html
lenya/site/incubator-2003-06.svn.html
lenya/site/incubator-2003-07.svn.html
lenya/site/incubator-2003-08.svn.html
lenya/site/incubator-2003-09.svn.html
lenya/site/incubator-2003-10.svn.html
lenya/site/incubator-2003-11-12.svn.html
lenya/site/incubator-2004-01-03.svn.html
lenya/site/incubator-2004-04-06.svn.html
lenya/site/incubator-2004-07-10.svn.html
lenya/site/index.html
lenya/site/license.html
lenya/site/related-projects.html
lenya/site/resolution.html
lenya/site/roadmap.html
lenya/site/screenshots.html
lenya/site/skin/screen.css
lenya/site/tlp-2004-11.svn.html
lenya/site/tlp-2004-12.svn.html
lenya/site/tlp-2005-01.svn.html
lenya/site/tlp-2005-02.svn.html
lenya/site/tlp-2005-03.svn.html
lenya/site/tlp-2005-04.svn.html
lenya/site/tlp-2005-05.svn.html
lenya/site/tlp-2005-06.svn.html
lenya/site/tlp-2005-07.svn.html
lenya/site/tlp-2005-08.svn.html
lenya/site/tlp-2005-09.svn.html
lenya/site/tlp-2005-10.svn.html
lenya/site/tlp-2005-11.svn.html
lenya/site/tlp-2005-12.svn.html
lenya/site/tlp-2006-01.svn.html
lenya/site/tlp-2006-02.svn.html
lenya/site/tlp-2006-03.svn.html
lenya/site/tlp-2006-04.svn.html
lenya/site/tlp-2006-05.svn.html
lenya/site/tlp-2006-06.svn.html
lenya/site/tlp-2006-07.svn.html
Added: lenya/site/1_2_x/how-to/search-and-results.xsp
URL: http://svn.apache.org/viewvc/lenya/site/1_2_x/how-to/search-and-results.xsp?view=auto&rev=500900
==============================================================================
--- lenya/site/1_2_x/how-to/search-and-results.xsp (added)
+++ lenya/site/1_2_x/how-to/search-and-results.xsp Sun Jan 28 14:09:21 2007
@@ -0,0 +1,656 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsp:page language="java"
+ xmlns:xsp="http://apache.org/xsp"
+ xmlns:util="http://apache.org/xsp/util/2.0"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
+>
+ <xsp:structure>
+ <xsp:include>java.io.FileNotFoundException</xsp:include>
+ <xsp:include>java.util.Enumeration</xsp:include>
+ <xsp:include>java.util.HashSet</xsp:include>
+ <xsp:include>java.util.Hashtable</xsp:include>
+ <xsp:include>java.util.Iterator</xsp:include>
+ <xsp:include>java.util.StringTokenizer</xsp:include>
+ <xsp:include>java.util.Vector</xsp:include>
+ <xsp:include>org.apache.avalon.framework.context.ContextException</xsp:include>
+ <xsp:include>org.apache.avalon.framework.component.ComponentException</xsp:include>
+ <xsp:include>org.apache.cocoon.environment.Session</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Accreditable</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Identifiable</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Identity</xsp:include>
+ <xsp:include>org.apache.lenya.lucene.ReTokenizeFile</xsp:include>
+ <xsp:include>org.apache.lenya.lucene.Publication</xsp:include>
+ <xsp:include>org.apache.lucene.analysis.Analyzer</xsp:include>
+ <xsp:include>org.apache.lucene.analysis.standard.StandardAnalyzer</xsp:include>
+ <xsp:include>org.apache.lucene.document.Document</xsp:include>
+ <xsp:include>org.apache.lucene.document.Field</xsp:include>
+ <xsp:include>org.apache.lucene.queryParser.QueryParser</xsp:include>
+ <xsp:include>org.apache.lucene.queryParser.MultiFieldQueryParser</xsp:include>
+ <xsp:include>org.apache.lucene.search.Hits</xsp:include>
+ <xsp:include>org.apache.lucene.search.IndexSearcher</xsp:include>
+ <xsp:include>org.apache.lucene.search.Query</xsp:include>
+ <xsp:include>org.apache.lucene.search.Searcher</xsp:include>
+ <xsp:include>org.apache.lucene.search.Sort</xsp:include>
+ </xsp:structure>
+
+<xsp:logic>
+ File workDir = null;
+ File indexDir=null;
+ File excerptDir=null;
+ String[] fields={"contents","title"};
+ String field = "contents";
+ Vector roles = new Vector();
+ Hashtable protectedAreas = new Hashtable();
+
+ /**
+ * Contextualize this class
+ */
+ public void contextualize(Context context) throws ContextException {
+ super.contextualize( context );
+ workDir = (File) context.get(Constants.CONTEXT_WORK_DIR);
+ }
+
+ /**
+ * Search index
+ */
+ Hits search(String query_string, String publication_id, String sortField, boolean sortReverse) throws ProcessingException, IOException{
+
+ // Load roles
+ Session session = request.getSession(true);
+ if(session != null){
+ Identity id=(Identity) session.getAttribute("org.apache.lenya.ac.Identity");
+ if(id != null){
+ Identifiable[] ids = id.getIdentifiables();
+ Accreditable[] acs =id.getAccreditables();
+ for (int ai = 0; ai < acs.length; ai++) {
+ boolean found = false;
+ for(int i = 0; i < ids.length; i++){
+ if(ids[i].toString().equals(acs[ai].toString())){ found = true;}
+ }
+ if(!found){
+ roles.add(acs[ai].toString());
+ }
+ }
+ } // id
+ } // session
+ hits=null;
+ try{
+ Searcher searcher=new IndexSearcher(indexDir.getAbsolutePath());
+ Analyzer l_analyzer=new StandardAnalyzer();
+
+ QueryParser l_queryParser = new QueryParser(field,l_analyzer); // Single field
+ l_queryParser.setOperator(QueryParser.DEFAULT_OPERATOR_AND);
+
+ getLogger().debug(query_string);
+ Query l_query = l_queryParser.parse(query_string); // Single field
+
+ if (sortField != null) {
+ Sort sort = new Sort(sortField, sortReverse);
+ hits = searcher.search(l_query, sort);
+ }else{
+ hits = searcher.search(l_query);
+ }
+ if(hits != null){
+ return hits;
+ }
+ }catch(IOException e){
+ System.err.println(".search(): EXCEPTION: "+e);
+ throw e;
+ }catch(Exception e){
+ System.err.println(".search(): EXCEPTION: "+e);
+ }
+ return null;
+ }
+
+ /**
+ *
+ */
+ String getPercent(float score){
+ return ""+java.lang.Math.round(score*100.0);
+ }
+
+ Hits hits;
+ int hits_length=-1;
+
+ String[] words=new String[0];
+
+ int hitsPerPage;
+ int maxPages;
+ int excerptOffset;
+ int start;
+ int end;
+
+</xsp:logic>
+
+ <search-and-results>
+<xsp:logic>
+ // ***********************
+ // *** Protected Areas ***
+ // ***********************
+ // DEFINITION: protectedAreas.add("/UrlStart", "group,group");
+ // UrlStart begins with / after .../live.
+ // There are no spaces between groups and commas.
+ protectedAreas.put("/employee", "employee");
+
+ // Get sitemap path
+ org.apache.excalibur.source.Source input_source=this.resolver.resolveURI("");
+ String sitemapPath=input_source.getURI();
+ sitemapPath=sitemapPath.substring(5); // Remove "file:" protocol
+
+ // Read parameters from sitemap
+ String numberOfPubs = parameters.getParameter("number-of-pubs", "1");
+ Publication[] pubs = new Publication[Integer.parseInt(numberOfPubs)];
+ for(int i = 0;i < pubs.length;i++) {
+ pubs[i] = new Publication();
+ pubs[i].id = parameters.getParameter("pub"+i+"-id","@ID@");
+ pubs[i].name = parameters.getParameter("pub"+i+"-name","@NAME@");
+ pubs[i].indexDir = parameters.getParameter("pub"+i+"-index-dir","@INDEX-DIR@");
+ pubs[i].searchFields = parameters.getParameter("pub"+i+"-search-fields","title,contents");
+ pubs[i].excerptDir = parameters.getParameter("pub"+i+"-excerpt-dir","@EXCERPT-DIR@");
+ pubs[i].prefix = parameters.getParameter("pub"+i+"-prefix","@PREFIX@");
+ }
+ String param_hits_per_page = parameters.getParameter("max-hits-per-page","13");
+ hitsPerPage = Integer.parseInt(param_hits_per_page);
+ String param_max_pages = parameters.getParameter("max-pages","5");
+ maxPages = Integer.parseInt(param_max_pages);
+ String param_excerpt_offset = parameters.getParameter("excerpt-offset","100");
+ excerptOffset = Integer.parseInt(param_excerpt_offset);
+
+ // Read parameters from query string
+ String urlQuerystring = <xsp-request:get-query-string />;
+ String query = <xsp-request:get-parameter name="query" default=""/>;
+ String publication_id = <xsp-request:get-parameter name="publication-id" default="phlburg"/>;
+ String sortBy = <xsp-request:get-parameter name="sortBy" default="score"/>;
+ String sortReverse = <xsp-request:get-parameter name="sortReverse" default="false"/>;
+
+ String language = "";
+ StringTokenizer qsTokens = new StringTokenizer(urlQuerystring, "&=", true);
+ String token = "";
+ HashSet languageSet = new HashSet();
+ if(qsTokens.hasMoreTokens()){ token = qsTokens.nextToken(); }
+ while(qsTokens.hasMoreTokens()){
+ if(token.equalsIgnoreCase("language")){
+ token = qsTokens.nextToken();
+ if(token.equals("=") && qsTokens.hasMoreTokens()){
+ languageSet.add(qsTokens.nextToken());
+ }
+ }else{
+ token = qsTokens.nextToken();
+ }
+ }
+ Iterator languageSetItems = languageSet.iterator();
+ if(languageSetItems.hasNext()){ language = languageSetItems.next().toString(); }
+ while(languageSetItems.hasNext()){ language += "," + languageSetItems.next().toString(); }
+ if(language.length() == 0) language = "en";
+
+ String startString = <xsp-request:get-parameter name="start" default="1"/>;
+ String endString = <xsp-request:get-parameter name="end" default="10"/>;
+ start=new Integer(startString).intValue();
+ if(endString == null){
+ end=hitsPerPage;
+ }else{
+ end=new Integer(endString).intValue();
+ }
+
+ // Find the number of the selected publication
+ int whichPublication=0;
+ for (int i = 0;i < pubs.length;i++) {
+ if (pubs[i].id.equals(publication_id)) {
+ whichPublication = i;
+ }
+ }
+
+ // Get all search fields
+ Vector twords = null;
+ Vector myFields = new Vector();
+ Enumeration parameterNames = request.getParameterNames();
+ while(parameterNames.hasMoreElements()){
+ String parameterName=(String)parameterNames.nextElement();
+ String value=request.getParameter(parameterName);
+
+ if (parameterName.indexOf(".fields") > 0) { // looking for field parameters
+ StringTokenizer st = new StringTokenizer(parameterName, ".");
+ int length = st.countTokens();
+ if(st.hasMoreTokens()){
+ String fieldPublicationId = st.nextToken();
+ if(st.hasMoreTokens()){
+ if(fieldPublicationId.equals(publication_id) || fieldPublicationId.equals("dummy-index-id")) {
+ st.nextToken(); // Ignore "fields" token
+ if(length == 2) { // radio or select
+ myFields.addElement(value);
+ }else if (length == 3) { // checkbox
+ myFields.addElement(st.nextToken());
+ }else{
+ // something is wrong
+ }
+ }
+ }
+ }
+ }
+ }
+ if(myFields.size() > 0) {
+ field = (String)myFields.elementAt(0);
+ fields = new String[myFields.size()];
+ for(int i = 0; i < myFields.size(); i++) {
+ fields[i] = (String)myFields.elementAt(i);
+ }
+ }
+ // Set index and excerpt dir
+ String param_index_dir=pubs[whichPublication].indexDir;
+ if(param_index_dir.charAt(0) == '/'){
+ indexDir=new File(param_index_dir);
+ }
+ else{
+ indexDir=new File(sitemapPath+File.separator+param_index_dir);
+ }
+ String param_excerpt_dir=pubs[whichPublication].excerptDir;
+ if(param_excerpt_dir.charAt(0) == '/'){
+ excerptDir=new File(param_excerpt_dir);
+ }else{
+ excerptDir=new File(sitemapPath+File.separator+param_excerpt_dir);
+ }
+</xsp:logic>
+ <configuration><xsp:attribute name="checked-pid"><xsp:expr>publication_id</xsp:expr></xsp:attribute>
+ <number-of-publications><xsp:expr>numberOfPubs</xsp:expr></number-of-publications>
+
+<xsp:logic>
+ for(int i = 0;i < pubs.length;i++) {
+</xsp:logic>
+ <publication><xsp:attribute name="pid"><xsp:expr>pubs[i].id</xsp:expr></xsp:attribute>
+ <name><xsp:expr>pubs[i].name</xsp:expr></name>
+ <index-dir><xsp:expr>pubs[i].indexDir</xsp:expr></index-dir>
+ <search-fields>
+<xsp:logic>
+ String[] searchFields = pubs[i].getFields();
+ if (searchFields != null) {
+ for (int k = 0; k < searchFields.length; k++) {
+ <field><xsp:expr>searchFields[k]</xsp:expr></field>
+ }
+ } else {
+</xsp:logic>
+ <xsp:content><xsp:expr>pubs[i].searchFields</xsp:expr></xsp:content><exception>.getFields() returned null</exception>
+<xsp:logic>
+ }
+</xsp:logic>
+ </search-fields>
+ <excerpt-dir><xsp:expr>pubs[i].excerptDir</xsp:expr></excerpt-dir>
+ <prefix><xsp:expr>pubs[i].prefix</xsp:expr></prefix>
+ </publication>
+<xsp:logic>
+ }
+</xsp:logic>
+ <hits-per-page><xsp:expr>hitsPerPage</xsp:expr></hits-per-page>
+ <max-pages><xsp:expr>maxPages</xsp:expr></max-pages>
+ <excerpt-offset><xsp:expr>excerptOffset</xsp:expr></excerpt-offset>
+ </configuration>
+
+<!-- Search Results -->
+ <search>
+<xsp:logic>
+ Enumeration para_names = request.getParameterNames();
+ if(para_names.hasMoreElements()){
+</xsp:logic>
+ <request-parameters>
+<xsp:logic>
+ while(para_names.hasMoreElements()){
+ String para_name=(String)para_names.nextElement();
+ String para_value=request.getParameter(para_name);
+</xsp:logic>
+ <parameter><xsp:attribute name="name"><xsp:expr>para_name</xsp:expr></xsp:attribute><xsp:attribute name="value"><xsp:expr>para_value</xsp:expr></xsp:attribute></parameter>
+ <xsp:element><xsp:param name="name"><xsp:expr>para_name</xsp:expr></xsp:param><xsp:expr>para_value</xsp:expr></xsp:element>
+<xsp:logic>
+ }
+</xsp:logic>
+ </request-parameters>
+<xsp:logic>
+ }
+ if(query != null && query.length() != 0 && publication_id != null && publication_id.length() > 0){
+
+ try {
+ if (sortBy.equals("score")) {
+ hits = search(query, publication_id, null, false);
+ } else {
+ if (sortReverse.equals("true")) {
+ hits = search(query, publication_id, sortBy, true);
+ } else {
+ hits = search(query, publication_id, sortBy, false);
+ }
+ }
+ } catch(Exception e) {
+</xsp:logic>
+ <exception><xsp:expr>e.toString()</xsp:expr></exception>
+<xsp:logic>
+ }
+ if(hits != null){
+ hits_length=hits.length();
+ }
+ else{
+ hits_length=-1;
+ hits=null;
+ }
+</xsp:logic>
+ <publication-id><xsp:expr>publication_id</xsp:expr></publication-id>
+ <publication-name><xsp:expr>pubs[whichPublication].name</xsp:expr></publication-name>
+ <publication-prefix><xsp:expr>pubs[whichPublication].prefix</xsp:expr></publication-prefix>
+ <sort-by><xsp:expr>sortBy</xsp:expr></sort-by>
+ <query><xsp:expr>query</xsp:expr></query>
+<xsp:logic>
+ if(query != null){
+ twords = new Vector();
+</xsp:logic>
+ <words>
+<xsp:logic>
+ StringTokenizer st=new StringTokenizer(query," ");
+ while(st.hasMoreTokens()){
+ String word=(String)st.nextElement();
+ if(!(word.equalsIgnoreCase("OR") || word.equalsIgnoreCase("AND"))){
+ <word><xsp:expr>word</xsp:expr></word>
+ twords.addElement(word);
+ }
+ }
+ words=new String[twords.size()];
+ for(int i=0;i<twords.size();i++){
+ words[i]=(String)twords.elementAt(i);
+ }
+</xsp:logic>
+ </words>
+<xsp:logic>
+ }
+</xsp:logic>
+ <start><xsp:expr>start</xsp:expr></start>
+ <end><xsp:expr>end</xsp:expr></end>
+ <language><xsp:expr>language</xsp:expr></language>
+ <fields>
+<xsp:logic>
+ for (int i = 0; i < fields.length; i++) {
+ <field><xsp:expr>fields[i]</xsp:expr></field>
+ }
+</xsp:logic>
+ </fields>
+<xsp:logic>
+ try{
+ Analyzer ll_analyzer=new StandardAnalyzer();
+ QueryParser queryParser = new QueryParser(field,ll_analyzer);
+ //MultiFieldQueryParser queryParser = new MultiFieldQueryParser("contents",ll_analyzer);
+ queryParser.setOperator(QueryParser.DEFAULT_OPERATOR_AND);
+ Query ll_query = queryParser.parse(query);
+ //Query ll_query = queryParser.parse(query,fields,ll_analyzer);
+ <query><xsp:expr>ll_query.toString("contents")</xsp:expr></query>
+ }
+ catch(Exception e){
+ <exception><xsp:expr>e.toString()</xsp:expr></exception>
+ }
+ }
+ else{
+ hits_length=-1;
+ hits=null;
+ }
+</xsp:logic>
+ </search>
+<xsp:logic>
+ if(hits != null){
+ int validCount = 0; //number of valid results
+</xsp:logic>
+ <results>
+<xsp:logic>
+ if(hits_length > 0){
+</xsp:logic>
+ <hits>
+<xsp:logic>
+// i = index of result. validCount = count valid results.
+for (int i = 0; (i < hits.length()); i++) {
+ Document ldoc=hits.doc(i);
+ Enumeration lfields = ldoc.fields();
+ String lpath=ldoc.get("path");
+
+ String lurl=ldoc.get("url");
+ String ltitle=ldoc.get("title");
+ String mime_type=ldoc.get("mime-type");
+ String docLanguage = "";
+ if(lpath != null){
+</xsp:logic>
+ <hit>
+ <score><xsp:attribute name="percent"><xsp:expr>getPercent(hits.score(i))</xsp:expr></xsp:attribute>
+ <xsp:expr>hits.score(i)</xsp:expr></score>
+ <path><xsp:expr>lpath</xsp:expr></path>
+ </hit>
+<xsp:logic>
+ }
+ else if(lurl != null){
+ // Check Language
+ // This also filters sitetree.xml since it has no language.
+ docLanguage = "";
+ while (lfields.hasMoreElements()) {
+ Field lfield = (Field)lfields.nextElement();
+ if(0 == lfield.name().compareTo("language")){
+ docLanguage = lfield.stringValue();
+ }
+ }
+</xsp:logic>
+<language><xsp:expr>language</xsp:expr></language>
+<language-check><xsp:attribute name="doc"><xsp:expr>docLanguage</xsp:expr></xsp:attribute></language-check>
+<xsp:logic>
+ if((docLanguage.length() > 0) && (language.indexOf(docLanguage) != -1)){
+</xsp:logic>
+<language-yes/>
+<xsp:logic>
+ // Get URL parts
+ String parent = "";
+ String filename = "";
+ String querystring = "";
+ if(lurl.lastIndexOf("/") > -1) {
+ parent = lurl.substring(0,lurl.lastIndexOf("/"));
+ filename = lurl.substring(lurl.lastIndexOf("/")+1);
+ }
+ if(lurl.indexOf("?") > -1) {
+ querystring = lurl.substring(lurl.indexOf("?"));
+ }
+ // Check Restricted
+ boolean restricted = false;
+ // Get list of restricted prefixes and check against roles.
+ Enumeration protectedArea = protectedAreas.keys();
+ while((!restricted) && protectedArea.hasMoreElements()){
+ String startUrl = (String) protectedArea.nextElement();
+ if(parent.startsWith(startUrl)){
+ StringTokenizer rolesAllowed = new StringTokenizer((String)protectedAreas.get(startUrl), ",");
+ restricted = true;
+ while(rolesAllowed.hasMoreElements()){
+ // Check roles
+ if(roles.contains(rolesAllowed.nextElement())){
+ restricted = false;
+ }
+ }
+ }
+ }
+ if(!restricted){
+ // Build hit
+ validCount++;
+ if((validCount >= start) && (validCount <= end)){
+</xsp:logic>
+ <hit><xsp:attribute name="pos"><xsp:expr>validCount</xsp:expr></xsp:attribute>
+ <fields>
+<xsp:logic>
+ lfields = ldoc.fields();
+ int first = -1;
+ while (lfields.hasMoreElements()) {
+ Field lfield = (Field)lfields.nextElement();
+ String slfield = lfield.stringValue();
+
+ if(lfield.name().equals("htmlbody")){
+ String tmphtmlbody = slfield;
+ String upperhtmlbody = tmphtmlbody.toUpperCase();
+ if(twords != null){
+ Enumeration twordsE = twords.elements();
+ while(twordsE.hasMoreElements()){
+ int last = 0;
+ String word = twordsE.nextElement().toString();
+ String upperword = word.toUpperCase();
+ int wordLen = word.length();
+ StringBuffer sb = new StringBuffer();
+ int current = upperhtmlbody.indexOf(upperword);
+ if((current < first) || (first == -1)) first = current;
+ while(current > last){
+ sb.append(tmphtmlbody.substring(last, current));
+ sb.append("~").append(tmphtmlbody.substring(current, current + wordLen)).append("~");
+ last = current + wordLen;
+ current = upperhtmlbody.indexOf(upperword, last);
+ }
+ sb.append(tmphtmlbody.substring(last));
+ tmphtmlbody = sb.toString();
+ upperhtmlbody = tmphtmlbody.toUpperCase();
+ }
+ }
+ if(slfield.length() > excerptOffset){
+ int start = 0;
+ int end = excerptOffset;
+ int half = excerptOffset/2;
+ if(first < half){
+ end = tmphtmlbody.indexOf(' ', excerptOffset);
+ }else{
+ start = tmphtmlbody.indexOf(' ', first - half);
+ end = tmphtmlbody.indexOf(' ', start + excerptOffset);
+ }
+ tmphtmlbody = tmphtmlbody.substring(start, end);
+ }
+ StringTokenizer tokens = new StringTokenizer(tmphtmlbody, "~");
+ boolean needCloseHtmlBody = false;
+ if(tokens.hasMoreTokens()){
+ needCloseHtmlBody = true;
+</xsp:logic>
+ <htmlbody><xsp:expr>tokens.nextToken()</xsp:expr>
+<xsp:logic>
+ }
+ while(tokens.hasMoreTokens()){
+</xsp:logic>
+ <word><xsp:expr>tokens.nextToken()</xsp:expr></word>
+<xsp:logic>
+ if(tokens.hasMoreTokens()){
+</xsp:logic>
+ <xsp:expr>tokens.nextToken()</xsp:expr>
+<xsp:logic>
+ }
+ }
+ if(needCloseHtmlBody){
+</xsp:logic>
+ </htmlbody>
+<xsp:logic>
+ }
+ }else{
+
+</xsp:logic>
+ <xsp:element><xsp:param name="name"><xsp:expr>lfield.name()</xsp:expr></xsp:param><xsp:expr>slfield</xsp:expr></xsp:element>
+<xsp:logic>
+ }
+ }
+
+</xsp:logic>
+ </fields>
+ <score><xsp:attribute name="percent"><xsp:expr>getPercent(hits.score(i))</xsp:expr></xsp:attribute><xsp:expr>hits.score(i)</xsp:expr></score>
+ <uri>
+ <xsp:attribute name="parent"><xsp:expr>parent</xsp:expr></xsp:attribute>
+ <xsp:attribute name="filename"><xsp:expr>filename</xsp:expr></xsp:attribute>
+ <xsp:attribute name="querystring"><xsp:expr>querystring</xsp:expr></xsp:attribute>
+ <xsp:expr>lurl</xsp:expr>
+ </uri>
+<xsp:logic>
+ File excerptFile=new File(excerptDir+File.separator+lurl);
+ if((ltitle != null) && (ltitle.length() > 0)){
+ <title><xsp:expr>ltitle</xsp:expr></title>
+ }else{
+ <title><xsp:expr>excerptFile.getName()</xsp:expr></title>
+ <no-title/>
+ }
+ if((mime_type != null) && (mime_type.length() > 0)){
+ <mime-type><xsp:expr>mime_type</xsp:expr></mime-type>
+ }else{
+ <no-mime-type/>
+ }
+ try{
+ ReTokenizeFile rtf=new ReTokenizeFile();
+ rtf.setOffset(excerptOffset);
+ String excerpt=rtf.getExcerpt(excerptFile,words);
+ if(excerpt != null){
+ excerpt=rtf.emphasizeAsXML(rtf.tidy(excerpt),words);
+ <util:include-expr><util:expr><xsp:expr>excerpt</xsp:expr></util:expr></util:include-expr>
+ }else{
+ throw new Exception("excerpt == null. Maybe file does not contain the words!");
+ }
+ }
+ catch(FileNotFoundException e){
+</xsp:logic>
+ <no-excerpt>
+ <file><xsp:attribute name="src"><xsp:expr>excerptFile.getAbsolutePath()+" "+words[0]+" "+e</xsp:expr></xsp:attribute></file>
+ </no-excerpt>
+<xsp:logic>
+ }
+ catch(Exception e){
+ <excerpt-exception><xsp:expr>""+e</xsp:expr></excerpt-exception>
+ }
+</xsp:logic>
+ </hit>
+<xsp:logic>
+ }
+} // END - Within range (start-end)
+} // END - Check Restricted
+} // END - Check Language
+ }
+</xsp:logic>
+ </hits>
+<xsp:logic>
+ }else{
+</xsp:logic>
+ <no-hits/>
+<xsp:logic>
+ }
+ int number_of_pages=(validCount/hitsPerPage);
+ if(number_of_pages*hitsPerPage != validCount){
+ number_of_pages=number_of_pages+1;
+ }
+ if(number_of_pages > maxPages){
+ number_of_pages=maxPages;
+ }
+ if(validCount == 0){
+ number_of_pages=0;
+ <no-pages/>
+ }
+ else{
+</xsp:logic>
+ <pages>
+<xsp:logic>
+ for(int i=0;i<number_of_pages;i++){
+ int pstart=i*hitsPerPage+1;
+ int pend=(i+1)*hitsPerPage;
+ if(validCount < pend){
+ pend=validCount;
+ }
+ String type="other";
+ if(pstart == start){
+ type="current";
+ }
+ else if(pstart == start-hitsPerPage){
+ type="previous";
+ }
+ else if(pstart == start+hitsPerPage){
+ type="next";
+ }
+</xsp:logic>
+ <page>
+ <xsp:attribute name="start"><xsp:expr>pstart</xsp:expr></xsp:attribute>
+ <xsp:attribute name="end"><xsp:expr>pend</xsp:expr></xsp:attribute>
+ <xsp:attribute name="type"><xsp:expr>type</xsp:expr></xsp:attribute>
+ </page>
+<xsp:logic>
+ }
+</xsp:logic>
+ </pages>
+<xsp:logic>
+ }
+</xsp:logic>
+<total-hits><xsp:expr>validCount</xsp:expr></total-hits>
+ </results>
+<xsp:logic>
+ }
+</xsp:logic>
+ </search-and-results>
+</xsp:page>
+
Propchange: lenya/site/1_2_x/how-to/search-and-results.xsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: lenya/site/1_2_x/how-to/searchfixer.xsl
URL: http://svn.apache.org/viewvc/lenya/site/1_2_x/how-to/searchfixer.xsl?view=auto&rev=500900
==============================================================================
--- lenya/site/1_2_x/how-to/searchfixer.xsl (added)
+++ lenya/site/1_2_x/how-to/searchfixer.xsl Sun Jan 28 14:09:21 2007
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+ xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+ xmlns:session="http://www.apache.org/xsp/session/2.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+>
+ <xsl:param name="area" select="'live'"/>
+
+<xsl:variable name="pubid">
+<xsl:value-of select="search-and-results/configuration/publication/name" />
+</xsl:variable>
+
+
+ <xsl:template match="search-results">
+ <xsl:apply-templates select="search-and-results"/>
+ </xsl:template>
+
+ <xsl:template match="search-and-results">
+ <search-and-results>
+ <configuration>
+ <xsl:apply-templates select="configuration"/>
+ </configuration>
+ <xsl:apply-templates select="search"/>
+ <xsl:apply-templates select="results"/>
+ </search-and-results>
+ </xsl:template>
+
+ <xsl:template match="configuration">
+ <xsl:apply-templates/>
+ <xsl:apply-templates select="//search-results/publication/languages" />
+ </xsl:template>
+
+ <xsl:template match="languages">
+ <languages>
+ <xsl:apply-templates select="language"/>
+ </languages>
+ </xsl:template>
+
+ <xsl:template match="results">
+ <results total-hits="{total-hits}">
+ <xsl:apply-templates select="pages"/>
+ <xsl:apply-templates select="hits"/>
+ </results>
+ </xsl:template>
+
+ <xsl:template match="hits">
+ <hits>
+ <xsl:apply-templates select="hit"/>
+ </hits>
+ </xsl:template>
+
+ <xsl:template match="hit">
+ <xsl:if test="uri[@filename != 'sitetree.xml']">
+ <hit pos="{@pos}">
+ <xsl:apply-templates select="score"/>
+ <xsl:apply-templates select="uri"/>
+<title>
+<xsl:choose>
+<xsl:when test="string-length(fields/title) > 0"><xsl:value-of select="fields/title"/></xsl:when>
+<xsl:when test="string-length(fields/htmltitle) > 0"><xsl:value-of select="fields/htmltitle"/></xsl:when>
+<xsl:when test="string-length(title) > 0"><xsl:value-of select="title"/></xsl:when>
+<xsl:otherwise>Untitled</xsl:otherwise>
+</xsl:choose>
+</title>
+
+<!-- <xsl:apply-templates select="excerpt"/> Lucene Excerpt -->
+<!-- <xsl:apply-templates select="fields/description"/> Lenya Description -->
+ <xsl:apply-templates select="fields/htmlbody"/> <!-- HTML Body -->
+ </hit>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template match="uri">
+ <uri><xsl:value-of select="$pubid"/><xsl:value-of select="@parent"/>_<xsl:value-of select="../fields/language"/>.html</uri>
+ </xsl:template>
+
+ <xsl:template match="description">
+ <excerpt><xsl:value-of select="."/></excerpt>
+ </xsl:template>
+ <xsl:template match="htmlbody">
+ <excerpt><xsl:apply-templates/></excerpt>
+ </xsl:template>
+
+ <xsl:template match="@*|node()" priority="-1">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
Propchange: lenya/site/1_2_x/how-to/searchfixer.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Added: lenya/site/1_2_x/how-to/typical-lenya-setup.pdf
URL: http://svn.apache.org/viewvc/lenya/site/1_2_x/how-to/typical-lenya-setup.pdf?view=auto&rev=500900
==============================================================================
Binary file - no diff available.
Propchange: lenya/site/1_2_x/how-to/typical-lenya-setup.pdf
------------------------------------------------------------------------------
svn:mime-type = application/pdf
Added: lenya/site/1_2_x/how-to/usecase-search.xmap
URL: http://svn.apache.org/viewvc/lenya/site/1_2_x/how-to/usecase-search.xmap?view=auto&rev=500900
==============================================================================
--- lenya/site/1_2_x/how-to/usecase-search.xmap (added)
+++ lenya/site/1_2_x/how-to/usecase-search.xmap Sun Jan 28 14:09:21 2007
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+<!-- =========================== Components ================================ -->
+ <map:components>
+ <map:generators default="file"/>
+ <map:transformers default="xalan"/>
+ <map:readers default="resource"/>
+ <map:serializers default="xhtml"/>
+ <map:matchers default="wildcard"/>
+ <map:actions/>
+ <map:selectors>
+ <map:selector name="request-method" logger="sitemap.selector.request-method" src="org.apache.cocoon.selection.RequestMethodSelector"/>
+ </map:selectors>
+ </map:components>
+
+ <map:resources>
+ <map:resource name="finish">
+ <map:transform type="i18n">
+ <map:parameter name="locale" value="{page-envelope:document-language}"/>
+ </map:transform>
+ <map:transform src="../../xslt/util/strip_namespaces.xsl"/>
+ <map:select type="parameter">
+ <map:parameter name="statusCode" value="{statusCode}"/>
+ <map:when test="">
+ <map:serialize type="html" />
+ </map:when>
+ <map:otherwise>
+ <map:serialize type="html" status-code="{statusCode}"/>
+ </map:otherwise>
+ </map:select>
+ </map:resource>
+
+ <map:resource name="page-xhtml">
+ <map:transform src="xslt/page2xhtml.xsl">
+ <map:parameter name="root" value="/{page-envelope:publication-id}/live"/>
+ <map:parameter name="document-id" value="/index"/>
+ <map:parameter name="url" value="live/index.html"/>
+ <map:parameter name="language" value="{page-envelope:document-language}"/>
+ <map:parameter name="showLogin" value="1"/>
+ <map:parameter name="showFav" value="0"/>
+ <map:parameter name="querystring" value="{request:queryString}"/>
+ </map:transform>
+ </map:resource>
+ </map:resources>
+
+<!-- =========================== Pipelines ================================ -->
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="*/search-*/lucene.xml">
+ <map:generate type="serverpages" src="lenya/content/search/search-and-results.xsp" label="xml">
+ <map:parameter name="max-hits-per-page" value="10"/>
+ <map:parameter name="max-pages" value="10"/>
+ <map:parameter name="excerpt-offset" value="150"/>
+ <map:parameter name="number-of-pubs" value="1"/>
+ <map:parameter name="pub0-id" value="{page-envelope:publication-id}"/>
+ <map:parameter name="pub0-name" value="{page-envelope:publication}"/>
+ <map:parameter name="pub0-index-dir" value="./work/search/lucene/index/{2}/index"/>
+ <map:parameter name="pub0-search-fields" value="contents,title"/>
+ <map:parameter name="pub0-excerpt-dir" value="./content/{2}"/>
+ <map:parameter name="pub0-prefix" value=""/>
+ </map:generate>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ <map:match pattern="search-page">
+ <map:aggregate element="search-results">
+ <map:part src="./config/publication.xconf"/>
+ <map:part src="cocoon:/{page-envelope:publication-id}/search-live/lucene.xml?{request:queryString}"/>
+ </map:aggregate>
+ <map:transform src="xslt/search/searchfixer.xsl">
+ <map:parameter name="area" value="live"/>
+ </map:transform>
+ <map:transform src="xslt/search/sort.xsl"/>
+ <map:act type="resource-exists" src="xslt/search/search-and-results-body.xsl">
+ <map:transform src="lenya/xslt/search/search-and-results-body.xsl">
+ <map:parameter name="contextprefix" value="{request:contextPath}"/>
+ <map:parameter name="publicationid" value="{page-envelope:publication-id}"/>
+ <map:parameter name="area" value="live"/>
+ </map:transform>
+ </map:act>
+ <map:transform src="xslt/search/search-and-results.xsl">
+ <map:parameter name="contextprefix" value="{request:contextPath}"/>
+ <map:parameter name="publicationid" value="{page-envelope:publication-id}"/>
+ <map:parameter name="area" value="live"/>
+ </map:transform>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ <map:match type="usecase" pattern="search">
+ <map:aggregate element="cmsbody">
+ <map:part src="cocoon://navigation/{page-envelope:publication-id}/live/breadcrumb/live/index.xml"/>
+ <map:part src="cocoon://navigation/{page-envelope:publication-id}/live/tabs/index.xml"/>
+ <map:part src="cocoon://navigation/{page-envelope:publication-id}/live/menu/index.xml" prefix="xhtml"/>
+ <map:part src="cocoon://navigation/{page-envelope:publication-id}/live/search/index.xml"/>
+ <map:part src="cocoon:/search-page"/>
+ </map:aggregate>
+ <map:call resource="page-xhtml"/>
+ <map:call resource="finish"/>
+ </map:match>
+
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
Propchange: lenya/site/1_2_x/how-to/usecase-search.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Modified: lenya/site/broken-links.xml
URL: http://svn.apache.org/viewvc/lenya/site/broken-links.xml?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/broken-links.xml (original)
+++ lenya/site/broken-links.xml Sun Jan 28 14:09:21 2007
@@ -1,2 +1,169 @@
<broken-links>
+ <link message="Premature end of file." uri="tlp-HEAD.svn.html">
+ <referrer uri="linkmap.html"/>
+ <referrer uri="tlp-2006-08.svn.html"/>
+ <referrer uri="incubator-2003-03.svn.html"/>
+ <referrer uri="incubator-2003-06.svn.html"/>
+ <referrer uri="tlp-2005-04.svn.html"/>
+ <referrer uri="incubator-2003-08.svn.html"/>
+ <referrer uri="tlp-2006-04.svn.html"/>
+ <referrer uri="tlp-2005-03.svn.html"/>
+ <referrer uri="tlp-2005-05.svn.html"/>
+ <referrer uri="incubator-2003-10.svn.html"/>
+ <referrer uri="guidelines.html"/>
+ <referrer uri="incubator-2003-11-12.svn.html"/>
+ <referrer uri="tlp-2006-02.svn.html"/>
+ <referrer uri="incubator-2002-01-04.svn.html"/>
+ <referrer uri="incubator-2004-07-10.svn.html"/>
+ <referrer uri="tlp-2006-11.svn.html"/>
+ <referrer uri="index.html"/>
+ <referrer uri="history.html"/>
+ <referrer uri="tlp-2005-09.svn.html"/>
+ <referrer uri="tlp-2004-11.svn.html"/>
+ <referrer uri="incubator-2003-01-02.svn.html"/>
+ <referrer uri="tlp-2005-06.svn.html"/>
+ <referrer uri="tlp-2006-03.svn.html"/>
+ <referrer uri="tlp-2004-12.svn.html"/>
+ <referrer uri="tlp-2006-06.svn.html"/>
+ <referrer uri="tlp-2005-02.svn.html"/>
+ <referrer uri="tlp-2005-11.svn.html"/>
+ <referrer uri="tlp-2006-05.svn.html"/>
+ <referrer uri="incubator-2002-05-07.svn.html"/>
+ <referrer uri="tlp-2006-07.svn.html"/>
+ <referrer uri="incubator-2004-04-06.svn.html"/>
+ <referrer uri="related-projects.html"/>
+ <referrer uri="incubator-2003-09.svn.html"/>
+ <referrer uri="charter.html"/>
+ <referrer uri="resolution.html"/>
+ <referrer uri="incubator-2003-07.svn.html"/>
+ <referrer uri="tlp-2006-09.svn.html"/>
+ <referrer uri="license.html"/>
+ <referrer uri="roadmap.html"/>
+ <referrer uri="tlp-2006-10.svn.html"/>
+ <referrer uri="tlp-2005-10.svn.html"/>
+ <referrer uri="incubator-2002-10-12.svn.html"/>
+ <referrer uri="tlp-2005-01.svn.html"/>
+ <referrer uri="incubator-2002-08-09.svn.html"/>
+ <referrer uri="tlp-2005-12.svn.html"/>
+ <referrer uri="incubator-2003-04.svn.html"/>
+ <referrer uri="tlp-2006-12.svn.html"/>
+ <referrer uri="incubator-2004-01-03.svn.html"/>
+ <referrer uri="screenshots.html"/>
+ <referrer uri="tlp-2006-01.svn.html"/>
+ <referrer uri="tlp-2005-08.svn.html"/>
+ <referrer uri="incubator-2003-05.svn.html"/>
+ <referrer uri="tlp-2005-07.svn.html"/>
+ </link>
+ <link message="Premature end of file." uri="tlp-HEAD.svn-sh.xml">
+ <referrer uri="linkmap.html"/>
+ <referrer uri="tlp-2006-08.svn.html"/>
+ <referrer uri="incubator-2003-03.svn.html"/>
+ <referrer uri="incubator-2003-06.svn.html"/>
+ <referrer uri="tlp-2005-04.svn.html"/>
+ <referrer uri="incubator-2003-08.svn.html"/>
+ <referrer uri="tlp-2006-04.svn.html"/>
+ <referrer uri="tlp-2005-03.svn.html"/>
+ <referrer uri="tlp-2005-05.svn.html"/>
+ <referrer uri="incubator-2003-10.svn.html"/>
+ <referrer uri="guidelines.html"/>
+ <referrer uri="incubator-2003-11-12.svn.html"/>
+ <referrer uri="tlp-2006-02.svn.html"/>
+ <referrer uri="incubator-2002-01-04.svn.html"/>
+ <referrer uri="incubator-2004-07-10.svn.html"/>
+ <referrer uri="tlp-2006-11.svn.html"/>
+ <referrer uri="index.html"/>
+ <referrer uri="history.html"/>
+ <referrer uri="tlp-2005-09.svn.html"/>
+ <referrer uri="tlp-2004-11.svn.html"/>
+ <referrer uri="incubator-2003-01-02.svn.html"/>
+ <referrer uri="tlp-2005-06.svn.html"/>
+ <referrer uri="tlp-2006-03.svn.html"/>
+ <referrer uri="tlp-2004-12.svn.html"/>
+ <referrer uri="tlp-2006-06.svn.html"/>
+ <referrer uri="tlp-2005-02.svn.html"/>
+ <referrer uri="tlp-2005-11.svn.html"/>
+ <referrer uri="tlp-2006-05.svn.html"/>
+ <referrer uri="incubator-2002-05-07.svn.html"/>
+ <referrer uri="tlp-2006-07.svn.html"/>
+ <referrer uri="incubator-2004-04-06.svn.html"/>
+ <referrer uri="related-projects.html"/>
+ <referrer uri="incubator-2003-09.svn.html"/>
+ <referrer uri="charter.html"/>
+ <referrer uri="docs/website-update.html"/>
+ <referrer uri="resolution.html"/>
+ <referrer uri="incubator-2003-07.svn.html"/>
+ <referrer uri="tlp-2006-09.svn.html"/>
+ <referrer uri="license.html"/>
+ <referrer uri="roadmap.html"/>
+ <referrer uri="tlp-2006-10.svn.html"/>
+ <referrer uri="tlp-2005-10.svn.html"/>
+ <referrer uri="incubator-2002-10-12.svn.html"/>
+ <referrer uri="tlp-2005-01.svn.html"/>
+ <referrer uri="incubator-2002-08-09.svn.html"/>
+ <referrer uri="tlp-2005-12.svn.html"/>
+ <referrer uri="incubator-2003-04.svn.html"/>
+ <referrer uri="tlp-2006-12.svn.html"/>
+ <referrer uri="incubator-2004-01-03.svn.html"/>
+ <referrer uri="screenshots.html"/>
+ <referrer uri="tlp-2006-01.svn.html"/>
+ <referrer uri="tlp-2005-08.svn.html"/>
+ <referrer uri="incubator-2003-05.svn.html"/>
+ <referrer uri="tlp-2005-07.svn.html"/>
+ </link>
+ <link message="Premature end of file." uri="tlp-HEAD.svn-revision.xml">
+ <referrer uri="linkmap.html"/>
+ <referrer uri="tlp-2006-08.svn.html"/>
+ <referrer uri="incubator-2003-03.svn.html"/>
+ <referrer uri="incubator-2003-06.svn.html"/>
+ <referrer uri="tlp-2005-04.svn.html"/>
+ <referrer uri="incubator-2003-08.svn.html"/>
+ <referrer uri="tlp-2006-04.svn.html"/>
+ <referrer uri="tlp-2005-03.svn.html"/>
+ <referrer uri="tlp-2005-05.svn.html"/>
+ <referrer uri="incubator-2003-10.svn.html"/>
+ <referrer uri="guidelines.html"/>
+ <referrer uri="incubator-2003-11-12.svn.html"/>
+ <referrer uri="tlp-2006-02.svn.html"/>
+ <referrer uri="incubator-2002-01-04.svn.html"/>
+ <referrer uri="incubator-2004-07-10.svn.html"/>
+ <referrer uri="tlp-2006-11.svn.html"/>
+ <referrer uri="index.html"/>
+ <referrer uri="history.html"/>
+ <referrer uri="tlp-2005-09.svn.html"/>
+ <referrer uri="tlp-2004-11.svn.html"/>
+ <referrer uri="incubator-2003-01-02.svn.html"/>
+ <referrer uri="tlp-2005-06.svn.html"/>
+ <referrer uri="tlp-2006-03.svn.html"/>
+ <referrer uri="tlp-2004-12.svn.html"/>
+ <referrer uri="tlp-2006-06.svn.html"/>
+ <referrer uri="tlp-2005-02.svn.html"/>
+ <referrer uri="tlp-2005-11.svn.html"/>
+ <referrer uri="tlp-2006-05.svn.html"/>
+ <referrer uri="incubator-2002-05-07.svn.html"/>
+ <referrer uri="tlp-2006-07.svn.html"/>
+ <referrer uri="incubator-2004-04-06.svn.html"/>
+ <referrer uri="related-projects.html"/>
+ <referrer uri="incubator-2003-09.svn.html"/>
+ <referrer uri="charter.html"/>
+ <referrer uri="docs/website-update.html"/>
+ <referrer uri="resolution.html"/>
+ <referrer uri="incubator-2003-07.svn.html"/>
+ <referrer uri="tlp-2006-09.svn.html"/>
+ <referrer uri="license.html"/>
+ <referrer uri="roadmap.html"/>
+ <referrer uri="tlp-2006-10.svn.html"/>
+ <referrer uri="tlp-2005-10.svn.html"/>
+ <referrer uri="incubator-2002-10-12.svn.html"/>
+ <referrer uri="tlp-2005-01.svn.html"/>
+ <referrer uri="incubator-2002-08-09.svn.html"/>
+ <referrer uri="tlp-2005-12.svn.html"/>
+ <referrer uri="incubator-2003-04.svn.html"/>
+ <referrer uri="tlp-2006-12.svn.html"/>
+ <referrer uri="incubator-2004-01-03.svn.html"/>
+ <referrer uri="screenshots.html"/>
+ <referrer uri="tlp-2006-01.svn.html"/>
+ <referrer uri="tlp-2005-08.svn.html"/>
+ <referrer uri="incubator-2003-05.svn.html"/>
+ <referrer uri="tlp-2005-07.svn.html"/>
+ </link>
</broken-links>
Modified: lenya/site/charter.html
URL: http://svn.apache.org/viewvc/lenya/site/charter.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/charter.html (original)
+++ lenya/site/charter.html Sun Jan 28 14:09:21 2007
@@ -119,6 +119,21 @@
<a href="tlp-HEAD.svn.html">log HEAD</a>
</div>
<div class="menuitem">
+<a href="tlp-2006-12.svn.html">log 2006-12</a>
+</div>
+<div class="menuitem">
+<a href="tlp-2006-11.svn.html">log 2006-11</a>
+</div>
+<div class="menuitem">
+<a href="tlp-2006-10.svn.html">log 2006-10</a>
+</div>
+<div class="menuitem">
+<a href="tlp-2006-09.svn.html">log 2006-09</a>
+</div>
+<div class="menuitem">
+<a href="tlp-2006-08.svn.html">log 2006-08</a>
+</div>
+<div class="menuitem">
<a href="tlp-2006-07.svn.html">log 2006-07</a>
</div>
<div class="menuitem">
@@ -265,7 +280,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/community/acknowledgements.html
URL: http://svn.apache.org/viewvc/lenya/site/community/acknowledgements.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/community/acknowledgements.html (original)
+++ lenya/site/community/acknowledgements.html Sun Jan 28 14:09:21 2007
@@ -153,7 +153,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/community/index.html
URL: http://svn.apache.org/viewvc/lenya/site/community/index.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/community/index.html (original)
+++ lenya/site/community/index.html Sun Jan 28 14:09:21 2007
@@ -150,7 +150,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/community/irc.html
URL: http://svn.apache.org/viewvc/lenya/site/community/irc.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/community/irc.html (original)
+++ lenya/site/community/irc.html Sun Jan 28 14:09:21 2007
@@ -139,7 +139,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/community/live-sites.html
URL: http://svn.apache.org/viewvc/lenya/site/community/live-sites.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/community/live-sites.html (original)
+++ lenya/site/community/live-sites.html Sun Jan 28 14:09:21 2007
@@ -139,7 +139,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/community/mailing-lists.html
URL: http://svn.apache.org/viewvc/lenya/site/community/mailing-lists.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/community/mailing-lists.html (original)
+++ lenya/site/community/mailing-lists.html Sun Jan 28 14:09:21 2007
@@ -153,7 +153,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/community/translations.html
URL: http://svn.apache.org/viewvc/lenya/site/community/translations.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/community/translations.html (original)
+++ lenya/site/community/translations.html Sun Jan 28 14:09:21 2007
@@ -156,7 +156,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/accesscontrol/accesscontrollerresolvers.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/accesscontrol/accesscontrollerresolvers.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/accesscontrol/accesscontrollerresolvers.html (original)
+++ lenya/site/docs/1_2_x/components/accesscontrol/accesscontrollerresolvers.html Sun Jan 28 14:09:21 2007
@@ -473,7 +473,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/accesscontrol/accesscontrollers.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/accesscontrol/accesscontrollers.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/accesscontrol/accesscontrollers.html (original)
+++ lenya/site/docs/1_2_x/components/accesscontrol/accesscontrollers.html Sun Jan 28 14:09:21 2007
@@ -473,7 +473,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/accesscontrol/accreditablemanagers.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/accesscontrol/accreditablemanagers.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/accesscontrol/accreditablemanagers.html (original)
+++ lenya/site/docs/1_2_x/components/accesscontrol/accreditablemanagers.html Sun Jan 28 14:09:21 2007
@@ -470,7 +470,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/accesscontrol/authenticators.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/accesscontrol/authenticators.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/accesscontrol/authenticators.html (original)
+++ lenya/site/docs/1_2_x/components/accesscontrol/authenticators.html Sun Jan 28 14:09:21 2007
@@ -467,7 +467,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/accesscontrol/authorizers.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/accesscontrol/authorizers.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/accesscontrol/authorizers.html (original)
+++ lenya/site/docs/1_2_x/components/accesscontrol/authorizers.html Sun Jan 28 14:09:21 2007
@@ -467,7 +467,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/accesscontrol/policymanagers.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/accesscontrol/policymanagers.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/accesscontrol/policymanagers.html (original)
+++ lenya/site/docs/1_2_x/components/accesscontrol/policymanagers.html Sun Jan 28 14:09:21 2007
@@ -473,7 +473,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/accesscontrol/ssl.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/accesscontrol/ssl.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/accesscontrol/ssl.html (original)
+++ lenya/site/docs/1_2_x/components/accesscontrol/ssl.html Sun Jan 28 14:09:21 2007
@@ -461,7 +461,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/accesscontrol/terms.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/accesscontrol/terms.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/accesscontrol/terms.html (original)
+++ lenya/site/docs/1_2_x/components/accesscontrol/terms.html Sun Jan 28 14:09:21 2007
@@ -473,7 +473,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/asset-management/management.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/asset-management/management.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/asset-management/management.html (original)
+++ lenya/site/docs/1_2_x/components/asset-management/management.html Sun Jan 28 14:09:21 2007
@@ -473,7 +473,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/authoring/adding-document-creator.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/authoring/adding-document-creator.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/authoring/adding-document-creator.html (original)
+++ lenya/site/docs/1_2_x/components/authoring/adding-document-creator.html Sun Jan 28 14:09:21 2007
@@ -467,7 +467,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/authoring/image-upload.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/authoring/image-upload.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/authoring/image-upload.html (original)
+++ lenya/site/docs/1_2_x/components/authoring/image-upload.html Sun Jan 28 14:09:21 2007
@@ -453,7 +453,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/authoring/openoffice.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/authoring/openoffice.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/authoring/openoffice.html (original)
+++ lenya/site/docs/1_2_x/components/authoring/openoffice.html Sun Jan 28 14:09:21 2007
@@ -470,7 +470,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/deployment/proxying.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/deployment/proxying.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/deployment/proxying.html (original)
+++ lenya/site/docs/1_2_x/components/deployment/proxying.html Sun Jan 28 14:09:21 2007
@@ -464,7 +464,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/editors/1form.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/editors/1form.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/editors/1form.html (original)
+++ lenya/site/docs/1_2_x/components/editors/1form.html Sun Jan 28 14:09:21 2007
@@ -464,7 +464,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/editors/bxe.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/editors/bxe.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/editors/bxe.html (original)
+++ lenya/site/docs/1_2_x/components/editors/bxe.html Sun Jan 28 14:09:21 2007
@@ -476,7 +476,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/editors/htmlform.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/editors/htmlform.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/editors/htmlform.html (original)
+++ lenya/site/docs/1_2_x/components/editors/htmlform.html Sun Jan 28 14:09:21 2007
@@ -464,7 +464,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/editors/kupu.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/editors/kupu.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/editors/kupu.html (original)
+++ lenya/site/docs/1_2_x/components/editors/kupu.html Sun Jan 28 14:09:21 2007
@@ -464,7 +464,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/editors/xopus.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/editors/xopus.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/editors/xopus.html (original)
+++ lenya/site/docs/1_2_x/components/editors/xopus.html Sun Jan 28 14:09:21 2007
@@ -476,7 +476,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/layout/lenya-menubar.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/layout/lenya-menubar.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/layout/lenya-menubar.html (original)
+++ lenya/site/docs/1_2_x/components/layout/lenya-menubar.html Sun Jan 28 14:09:21 2007
@@ -464,7 +464,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/layout/navigation.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/layout/navigation.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/layout/navigation.html (original)
+++ lenya/site/docs/1_2_x/components/layout/navigation.html Sun Jan 28 14:09:21 2007
@@ -467,7 +467,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: lenya/site/docs/1_2_x/components/layout/static-resources.html
URL: http://svn.apache.org/viewvc/lenya/site/docs/1_2_x/components/layout/static-resources.html?view=diff&rev=500900&r1=500899&r2=500900
==============================================================================
--- lenya/site/docs/1_2_x/components/layout/static-resources.html (original)
+++ lenya/site/docs/1_2_x/components/layout/static-resources.html Sun Jan 28 14:09:21 2007
@@ -453,7 +453,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+<a href="http://apachecon.com/2007/EU/"><img border="0" title="ApacheCon Europe 2007" alt="ApacheCon Europe 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-europe-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://people.apache.org/calendar.html#200711"><img border="0" title="ApacheCon US 2007" alt="ApacheCon US 2007 - logo" src="http://apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org