cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r406843 - in /cocoon/branches/BRANCH_2_1_X/src/blocks: html/WEB-INF/properties/ poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/ portal/conf/ portal/java/org/apache/cocoon/portal/impl/
Date Tue, 16 May 2006 05:28:13 GMT
Author: rgoers
Date: Mon May 15 22:28:12 2006
New Revision: 406843

URL: http://svn.apache.org/viewcvs?rev=406843&view=rev
Log:
      Portal: PageLabels can now be configured to be part of the url.
      Made the pool-max values in the html block's generators externally configurable. Made
sitemap
      reloading externally configurable. Made pipeline amd encodeURLTransformer pool-max values

      externally configurable.

Added:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkInfo.java
  (with props)
Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/html/WEB-INF/properties/sample-html.properties
  (props changed)
    cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/ConstraintType.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/projectpath.samplesxconf   (props
changed)

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/html/WEB-INF/properties/sample-html.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/ConstraintType.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/ConstraintType.java?rev=406843&r1=406842&r2=406843&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/ConstraintType.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/ConstraintType.java
Mon May 15 22:28:12 2006
@@ -22,7 +22,7 @@
  * Contraint codes
  *
  * @author Marc Johnson (marc_johnson27591@hotmail.com)
- * @version CVS $Id: ConstraintType.java 30932 2004-07-29 17:35:38Z vgritsenko $
+ * @version CVS $Id:ConstraintType.java 406833 2006-05-16 04:57:09Z rgoers $
  */
 public class ConstraintType
 {

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/projectpath.samplesxconf
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkInfo.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkInfo.java?rev=406843&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkInfo.java
(added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkInfo.java
Mon May 15 22:28:12 2006
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cocoon.portal.impl;
+
+import org.apache.cocoon.environment.Request;
+
+/**
+ * Helper class containing the information about common parts for each link that will be
generated
+ * in the portal page.
+ *
+ * @version $Id:  $
+ */
+public class PageLabelLinkInfo extends LinkInfo
+{
+
+    /**
+     * The label manager
+     */
+    protected PageLabelManager labelManager;
+
+    public PageLabelLinkInfo(PageLabelManager manager, Request request, int defaultPort,
int defaultSecurePort) {
+        super(request, defaultPort, defaultSecurePort);
+        this.labelManager = manager;
+    }
+
+    protected String getRelativeURI(Request request) {
+        if (labelManager == null) {
+            return super.getRelativeURI(request);
+        }
+        String sitemapURI = request.getSitemapURI();
+        if (labelManager.isLabel(sitemapURI)) {
+            return "";
+        }
+
+        return super.getRelativeURI(request);
+    }
+}

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message