cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ralph Goers <Ralph.Go...@dslextreme.com>
Subject Re: svn commit: r232855 - in /cocoon: blocks/portal/trunk/WEB-INF/xconf/ blocks/portal/trunk/java/org/apache/cocoon/portal/bridges/ blocks/portal/trunk/samples/ blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/ws/ blocks/scratchpad/trunk/java...
Date Mon, 15 Aug 2005 20:42:05 GMT
Is there something more detailed about what this enhancement provides?  
It sounds interesting.

Ralph

cziegeler@apache.org wrote:

>Author: cziegeler
>Date: Mon Aug 15 11:57:55 2005
>New Revision: 232855
>
>URL: http://svn.apache.org/viewcvs?rev=232855&view=rev
>Log:
>Portal block: Add support for portal bridges and add CoWarp for authentication.
>Code cleanup in scratchpad
>
>Added:
>    cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal-cowarp.xconf   (with props)
>    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/bridges/
>    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java
  (with props)
>    cocoon/blocks/portal/trunk/samples/sitemap-auth.xmap
>      - copied unchanged from r232836, cocoon/blocks/portal/trunk/samples/sitemap.xmap
>    cocoon/trunk/legal/cowarp-0.3.jar.license.txt   (with props)
>    cocoon/trunk/legal/portals-bridges-common-0.4-20050815.jar.license.txt   (with props)
>    cocoon/trunk/lib/optional/cowarp-0.3.jar   (with props)
>    cocoon/trunk/lib/optional/portals-bridges-common-0.4-20050815.jar   (with props)
>Removed:
>    cocoon/blocks/portal/trunk/samples/sitemap.xmap
>Modified:
>    cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf
>    cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/ws/EndpointDefinition.java
>    cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/generation/RequestParameterGenerator.java
>    cocoon/blocks/scratchpad/trunk/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java
>    cocoon/trunk/gump.xml
>    cocoon/trunk/lib/jars.xml
>    cocoon/trunk/status.xml
>
>Added: cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal-cowarp.xconf
>URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal-cowarp.xconf?rev=232855&view=auto
>==============================================================================
>--- cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal-cowarp.xconf (added)
>+++ cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal-cowarp.xconf Mon Aug 15 11:57:55
2005
>@@ -0,0 +1,50 @@
>+<?xml version="1.0"?>
>+<!--
>+  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.
>+-->
>+<!--+
>+    |
>+    | SVN $Id:$
>+    +-->
>+<components>
>+  <component role="org.osoco.cowarp.ApplicationManager"
>+             class="org.osoco.cowarp.impl.StandardApplicationManager"/>
>+  <component role="org.osoco.cowarp.SecurityHandler/portal" 
>+             class="org.osoco.cowarp.impl.PipelineSecurityHandler">
>+    <authentication-resource>cocoon:raw:/sunrise-authuser</authentication-resource>
>+  </component>
>+  <component role="org.osoco.cowarp.Application/portal" 
>+             class="org.osoco.cowarp.portal.StandardPortalApplication" 
>+             security-handler="portal">
>+                  <profiles>
>+                    <copletbasedata-global-load uri="cocoon:raw:/load-global-profile?profile=copletbasedata"/>
>+                    <copletdata-global-load uri="cocoon:raw:/load-global-profile?profile=copletdata"/>
>+                    <copletdata-role-load uri="cocoon:raw:/load-role-profile?profile=copletdata"/>
>+                    <copletdata-user-load uri="cocoon:raw:/load-user-profile?profile=copletdata"/>
>+                    <copletinstancedata-global-load uri="cocoon:raw:/load-global-profile?profile=copletinstancedata"/>
>+                    <copletinstancedata-role-load uri="cocoon:raw:/load-role-profile?profile=copletinstancedata"/>
>+                    <copletinstancedata-user-load uri="cocoon:raw:/load-user-profile?profile=copletinstancedata"/>
>+                    <copletinstancedata-user-save uri="cocoon:raw:/save-user-profile?profile=copletinstancedata"/>
>+                    <layout-global-load uri="cocoon:raw:/load-global-profile?profile=layout"/>
>+                    <layout-role-load uri="cocoon:raw:/load-role-profile?profile=layout"/>
>+                    <layout-user-load uri="cocoon:raw:/load-user-profile?profile=layout"/>
>+                    <layout-user-save uri="cocoon:raw:/save-user-profile?profile=layout"/>
>+                  </profiles>
>+  </component>
>+  <component class="org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager"
logger="portal" role="org.apache.cocoon.portal.profile.ProfileManager/Cowarp">
>+    <parameter name="userinfo-provider" value="org.osoco.cowarp.portal.UserInfoProviderImpl"/>
>+  </component>
>+
>+</components>
>
>Propchange: cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal-cowarp.xconf
>------------------------------------------------------------------------------
>    svn:eol-style = native
>
>Propchange: cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal-cowarp.xconf
>------------------------------------------------------------------------------
>    svn:keywords = Id
>
>Modified: cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf
>URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf?rev=232855&r1=232854&r2=232855&view=diff
>==============================================================================
>--- cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf (original)
>+++ cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf Mon Aug 15 11:57:55
2005
>@@ -21,6 +21,8 @@
> <components>
>   <!-- Include dependencies -->
>   <include src="context://WEB-INF/xconf/cocoon-portal.xconf"/>
>+  <!-- If you're not using cowarp, you can remove this include: -->
>+  <include src="context://WEB-INF/xconf/cocoon-portal-cowarp.xconf"/>
> 
>  <!-- THIS IS A SAMPLE PORTAL
>       It demonstrates several features of the portal engine,
>@@ -31,11 +33,14 @@
>   <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal"
role="org.apache.cocoon.portal.PortalService">
>    <portals>
>      <portal name="portal">
>-       <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Auth</profile-manager>
>        <!-- This is the sample portal: 
>-            - we use the auth profile manager
>+            - we use the cowarp profile manager
>+       -->
>+       <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Cowarp</profile-manager>
>+       <!-- If you want to use the authentication framework, comment out the above
line
>+            and uncomment the following line:
>+         <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Auth</profile-manager>
>        -->
>-       <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Auth</profile-manager>
>        <!-- These are the skins the user can choose from: -->
>        <skins>
>          <skin name="basic" base-path="context://samples/blocks/portal/skins/basic">
>
>Added: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java
>URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java?rev=232855&view=auto
>==============================================================================
>--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java
(added)
>+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java
Mon Aug 15 11:57:55 2005
>@@ -0,0 +1,58 @@
>+/*
>+ * 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.bridges;
>+
>+import javax.portlet.GenericPortlet;
>+import javax.portlet.PortletRequest;
>+import javax.portlet.PortletResponse;
>+import javax.servlet.ServletContext;
>+import javax.servlet.http.HttpServletRequest;
>+import javax.servlet.http.HttpServletRequestWrapper;
>+import javax.servlet.http.HttpServletResponse;
>+import javax.servlet.http.HttpServletResponseWrapper;
>+
>+import org.apache.pluto.core.impl.PortletContextImpl;
>+import org.apache.portals.bridges.common.ServletContextProvider;
>+
>+/**
>+ * This is the "bridge" to the bridges project.
>+ *
>+ * @version CVS $Id:$
>+ */
>+public class ServletContextProviderImpl implements ServletContextProvider {
>+
>+    /**
>+     * @see org.apache.portals.bridges.common.ServletContextProvider#getHttpServletRequest(javax.portlet.GenericPortlet,
javax.portlet.PortletRequest)
>+     */
>+    public HttpServletRequest getHttpServletRequest(GenericPortlet portlet, PortletRequest
request) {
>+        return (HttpServletRequest) ((HttpServletRequestWrapper) request).getRequest();
>+    }
>+
>+    /**
>+     * @see org.apache.portals.bridges.common.ServletContextProvider#getHttpServletResponse(javax.portlet.GenericPortlet,
javax.portlet.PortletResponse)
>+     */
>+    public HttpServletResponse getHttpServletResponse(GenericPortlet portlet, PortletResponse
response) {
>+        return (HttpServletResponse) ((HttpServletResponseWrapper) response).getResponse();
>+    }
>+
>+    /**
>+     * @see org.apache.portals.bridges.common.ServletContextProvider#getServletContext(javax.portlet.GenericPortlet)
>+     */
>+    public ServletContext getServletContext(GenericPortlet portlet) {
>+        return ((PortletContextImpl)portlet.getPortletContext()).getServletContext();
>+    }
>+
>+}
>
>Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java
>------------------------------------------------------------------------------
>    svn:eol-style = native
>
>Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java
>------------------------------------------------------------------------------
>    svn:keywords = Id
>
>Modified: cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/ws/EndpointDefinition.java
>URL: http://svn.apache.org/viewcvs/cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/ws/EndpointDefinition.java?rev=232855&r1=232854&r2=232855&view=diff
>==============================================================================
>--- cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/ws/EndpointDefinition.java
(original)
>+++ cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/ws/EndpointDefinition.java
Mon Aug 15 11:57:55 2005
>@@ -18,7 +18,6 @@
> import java.util.Iterator;
> import java.util.Map;
> 
>-import javax.wsdl.Binding;
> import javax.wsdl.Definition;
> import javax.wsdl.Port;
> import javax.wsdl.Service;
>@@ -214,7 +213,6 @@
>      * @return
>      */
>     private boolean hasSoapBinding(Port port) {
>-        Binding binding = port.getBinding();
>         Iterator it = port.getExtensibilityElements().iterator();
>         while (it.hasNext()) {
>             Object element = it.next();
>
>Modified: cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/generation/RequestParameterGenerator.java
>URL: http://svn.apache.org/viewcvs/cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/generation/RequestParameterGenerator.java?rev=232855&r1=232854&r2=232855&view=diff
>==============================================================================
>--- cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/generation/RequestParameterGenerator.java
(original)
>+++ cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/generation/RequestParameterGenerator.java
Mon Aug 15 11:57:55 2005
>@@ -155,15 +155,15 @@
>         /* Retrieve the parameters object and "parse" it, sending elements */
>         char parameters[] = ((Parameters)this.getValidity()).array;
>         int offset = 0;
>-        int chunks = (int)parameters[offset++];
>+        int chunks = parameters[offset++];
>         for (int chunk = 0; chunk < chunks; chunk++) {
> 
>             /* How many strings do we have in this chunk? */
>-            int strings = (int)parameters[offset++];
>+            int strings = parameters[offset++];
>             if (strings == 0) continue;
> 
>             /* Dump the parameter element with the name attribute */
>-            int length = (int)parameters[offset++];
>+            int length = parameters[offset++];
>             String name = new String(parameters, offset, length);
>             attributes.addAttribute("","name","name","CDATA", name);
>             this.xmlConsumer.startElement(URI, E_PARAM_L, E_PARAM_Q, attributes);
>@@ -172,7 +172,7 @@
> 
>             /* Dump out every remaining string in the chunk as a value element */
>             for (int string = 1; string < strings; string++) {
>-                length = (int)parameters[offset++];
>+                length = parameters[offset++];
>                 this.xmlConsumer.startElement(URI, E_VALUE_L, E_VALUE_Q, attributes);
>                 this.xmlConsumer.characters(parameters, offset, length);
>                 this.xmlConsumer.endElement(URI, E_VALUE_L, E_VALUE_Q);
>
>Modified: cocoon/blocks/scratchpad/trunk/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java
>URL: http://svn.apache.org/viewcvs/cocoon/blocks/scratchpad/trunk/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java?rev=232855&r1=232854&r2=232855&view=diff
>==============================================================================
>--- cocoon/blocks/scratchpad/trunk/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java
(original)
>+++ cocoon/blocks/scratchpad/trunk/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java
Mon Aug 15 11:57:55 2005
>@@ -71,8 +71,8 @@
>         TraversableCachingSource child = (TraversableCachingSource) source;
>         assertEquals("test",child.getName());
>         
>+        assertTrue( child.getParent() instanceof TraversableCachingSource);
>         TraversableCachingSource parent = (TraversableCachingSource) child.getParent();
>-        assertTrue(parent instanceof TraversableCachingSource);
>         assertEquals("temp",parent.getName());
>         //assertEquals(parentURI, parent.getSourceURI());
>         assertTrue(parent.isCollection());
>
>Modified: cocoon/trunk/gump.xml
>URL: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?rev=232855&r1=232854&r2=232855&view=diff
>==============================================================================
>--- cocoon/trunk/gump.xml (original)
>+++ cocoon/trunk/gump.xml Mon Aug 15 11:57:55 2005
>@@ -923,13 +923,17 @@
>     <depend project="jtidy"/>
>     <depend project="castor"/>
>     <depend project="commons-collections"/>
>-    <depend project="jakarta-pluto" inherit="runtime"/>
>+    <depend project="portals-pluto" inherit="runtime"/>
>+    <depend project="portals-bridges-common"/>
>+    <depend project="cowarp"/>
> 
>     <library name="jtidy"/>
>     <library name="castor"/>
>     <library name="commons-collections"/>
>     <library name="pluto"/>
>     <library name="portlet-api"/>
>+    <library name="portals-bridges-common"/>
>+    <library name="cowarp"/>
> 
>     <work nested="tools/anttasks"/>
>     <home nested="build/cocoon-@@DATE@@"/>
>@@ -1550,6 +1554,12 @@
>     <url href="http://incubator.apache.org/jackrabbit"/>
>     <package>org.apache.jackrabbit</package>
>     <jar name="lib/optional/jackrabbit-20050422T153417.jar"/>
>+  </project>
>+
>+  <project name="cowarp">
>+    <url href="http://osoco.sourceforge.net/cowarp/"/>
>+    <package>org.osoco.cowarp</package>
>+    <jar name="lib/optional/cowarp-0.3.jar"/>
>   </project>
> 
>   <project name="garbage">
>
>Added: cocoon/trunk/legal/cowarp-0.3.jar.license.txt
>URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/cowarp-0.3.jar.license.txt?rev=232855&view=auto
>==============================================================================
>--- cocoon/trunk/legal/cowarp-0.3.jar.license.txt (added)
>+++ cocoon/trunk/legal/cowarp-0.3.jar.license.txt Mon Aug 15 11:57:55 2005
>@@ -0,0 +1,201 @@
>+                                 Apache License
>+                           Version 2.0, January 2004
>+                        http://www.apache.org/licenses/
>+
>+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>+
>+   1. Definitions.
>+
>+      "License" shall mean the terms and conditions for use, reproduction,
>+      and distribution as defined by Sections 1 through 9 of this document.
>+
>+      "Licensor" shall mean the copyright owner or entity authorized by
>+      the copyright owner that is granting the License.
>+
>+      "Legal Entity" shall mean the union of the acting entity and all
>+      other entities that control, are controlled by, or are under common
>+      control with that entity. For the purposes of this definition,
>+      "control" means (i) the power, direct or indirect, to cause the
>+      direction or management of such entity, whether by contract or
>+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
>+      outstanding shares, or (iii) beneficial ownership of such entity.
>+
>+      "You" (or "Your") shall mean an individual or Legal Entity
>+      exercising permissions granted by this License.
>+
>+      "Source" form shall mean the preferred form for making modifications,
>+      including but not limited to software source code, documentation
>+      source, and configuration files.
>+
>+      "Object" form shall mean any form resulting from mechanical
>+      transformation or translation of a Source form, including but
>+      not limited to compiled object code, generated documentation,
>+      and conversions to other media types.
>+
>+      "Work" shall mean the work of authorship, whether in Source or
>+      Object form, made available under the License, as indicated by a
>+      copyright notice that is included in or attached to the work
>+      (an example is provided in the Appendix below).
>+
>+      "Derivative Works" shall mean any work, whether in Source or Object
>+      form, that is based on (or derived from) the Work and for which the
>+      editorial revisions, annotations, elaborations, or other modifications
>+      represent, as a whole, an original work of authorship. For the purposes
>+      of this License, Derivative Works shall not include works that remain
>+      separable from, or merely link (or bind by name) to the interfaces of,
>+      the Work and Derivative Works thereof.
>+
>+      "Contribution" shall mean any work of authorship, including
>+      the original version of the Work and any modifications or additions
>+      to that Work or Derivative Works thereof, that is intentionally
>+      submitted to Licensor for inclusion in the Work by the copyright owner
>+      or by an individual or Legal Entity authorized to submit on behalf of
>+      the copyright owner. For the purposes of this definition, "submitted"
>+      means any form of electronic, verbal, or written communication sent
>+      to the Licensor or its representatives, including but not limited to
>+      communication on electronic mailing lists, source code control systems,
>+      and issue tracking systems that are managed by, or on behalf of, the
>+      Licensor for the purpose of discussing and improving the Work, but
>+      excluding communication that is conspicuously marked or otherwise
>+      designated in writing by the copyright owner as "Not a Contribution."
>+
>+      "Contributor" shall mean Licensor and any individual or Legal Entity
>+      on behalf of whom a Contribution has been received by Licensor and
>+      subsequently incorporated within the Work.
>+
>+   2. Grant of Copyright License. Subject to the terms and conditions of
>+      this License, each Contributor hereby grants to You a perpetual,
>+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>+      copyright license to reproduce, prepare Derivative Works of,
>+      publicly display, publicly perform, sublicense, and distribute the
>+      Work and such Derivative Works in Source or Object form.
>+
>+   3. Grant of Patent License. Subject to the terms and conditions of
>+      this License, each Contributor hereby grants to You a perpetual,
>+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>+      (except as stated in this section) patent license to make, have made,
>+      use, offer to sell, sell, import, and otherwise transfer the Work,
>+      where such license applies only to those patent claims licensable
>+      by such Contributor that are necessarily infringed by their
>+      Contribution(s) alone or by combination of their Contribution(s)
>+      with the Work to which such Contribution(s) was submitted. If You
>+      institute patent litigation against any entity (including a
>+      cross-claim or counterclaim in a lawsuit) alleging that the Work
>+      or a Contribution incorporated within the Work constitutes direct
>+      or contributory patent infringement, then any patent licenses
>+      granted to You under this License for that Work shall terminate
>+      as of the date such litigation is filed.
>+
>+   4. Redistribution. You may reproduce and distribute copies of the
>+      Work or Derivative Works thereof in any medium, with or without
>+      modifications, and in Source or Object form, provided that You
>+      meet the following conditions:
>+
>+      (a) You must give any other recipients of the Work or
>+          Derivative Works a copy of this License; and
>+
>+      (b) You must cause any modified files to carry prominent notices
>+          stating that You changed the files; and
>+
>+      (c) You must retain, in the Source form of any Derivative Works
>+          that You distribute, all copyright, patent, trademark, and
>+          attribution notices from the Source form of the Work,
>+          excluding those notices that do not pertain to any part of
>+          the Derivative Works; and
>+
>+      (d) If the Work includes a "NOTICE" text file as part of its
>+          distribution, then any Derivative Works that You distribute must
>+          include a readable copy of the attribution notices contained
>+          within such NOTICE file, excluding those notices that do not
>+          pertain to any part of the Derivative Works, in at least one
>+          of the following places: within a NOTICE text file distributed
>+          as part of the Derivative Works; within the Source form or
>+          documentation, if provided along with the Derivative Works; or,
>+          within a display generated by the Derivative Works, if and
>+          wherever such third-party notices normally appear. The contents
>+          of the NOTICE file are for informational purposes only and
>+          do not modify the License. You may add Your own attribution
>+          notices within Derivative Works that You distribute, alongside
>+          or as an addendum to the NOTICE text from the Work, provided
>+          that such additional attribution notices cannot be construed
>+          as modifying the License.
>+
>+      You may add Your own copyright statement to Your modifications and
>+      may provide additional or different license terms and conditions
>+      for use, reproduction, or distribution of Your modifications, or
>+      for any such Derivative Works as a whole, provided Your use,
>+      reproduction, and distribution of the Work otherwise complies with
>+      the conditions stated in this License.
>+
>+   5. Submission of Contributions. Unless You explicitly state otherwise,
>+      any Contribution intentionally submitted for inclusion in the Work
>+      by You to the Licensor shall be under the terms and conditions of
>+      this License, without any additional terms or conditions.
>+      Notwithstanding the above, nothing herein shall supersede or modify
>+      the terms of any separate license agreement you may have executed
>+      with Licensor regarding such Contributions.
>+
>+   6. Trademarks. This License does not grant permission to use the trade
>+      names, trademarks, service marks, or product names of the Licensor,
>+      except as required for reasonable and customary use in describing the
>+      origin of the Work and reproducing the content of the NOTICE file.
>+
>+   7. Disclaimer of Warranty. Unless required by applicable law or
>+      agreed to in writing, Licensor provides the Work (and each
>+      Contributor provides its Contributions) on an "AS IS" BASIS,
>+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>+      implied, including, without limitation, any warranties or conditions
>+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>+      PARTICULAR PURPOSE. You are solely responsible for determining the
>+      appropriateness of using or redistributing the Work and assume any
>+      risks associated with Your exercise of permissions under this License.
>+
>+   8. Limitation of Liability. In no event and under no legal theory,
>+      whether in tort (including negligence), contract, or otherwise,
>+      unless required by applicable law (such as deliberate and grossly
>+      negligent acts) or agreed to in writing, shall any Contributor be
>+      liable to You for damages, including any direct, indirect, special,
>+      incidental, or consequential damages of any character arising as a
>+      result of this License or out of the use or inability to use the
>+      Work (including but not limited to damages for loss of goodwill,
>+      work stoppage, computer failure or malfunction, or any and all
>+      other commercial damages or losses), even if such Contributor
>+      has been advised of the possibility of such damages.
>+
>+   9. Accepting Warranty or Additional Liability. While redistributing
>+      the Work or Derivative Works thereof, You may choose to offer,
>+      and charge a fee for, acceptance of support, warranty, indemnity,
>+      or other liability obligations and/or rights consistent with this
>+      License. However, in accepting such obligations, You may act only
>+      on Your own behalf and on Your sole responsibility, not on behalf
>+      of any other Contributor, and only if You agree to indemnify,
>+      defend, and hold each Contributor harmless for any liability
>+      incurred by, or claims asserted against, such Contributor by reason
>+      of your accepting any such warranty or additional liability.
>+
>+   END OF TERMS AND CONDITIONS
>+
>+   APPENDIX: How to apply the Apache License to your work.
>+
>+      To apply the Apache License to your work, attach the following
>+      boilerplate notice, with the fields enclosed by brackets "[]"
>+      replaced with your own identifying information. (Don't include
>+      the brackets!)  The text should be enclosed in the appropriate
>+      comment syntax for the file format. We also recommend that a
>+      file or class name and description of purpose be included on the
>+      same "printed page" as the copyright notice for easier
>+      identification within third-party archives.
>+
>+   Copyright [yyyy] [name of copyright owner]
>+
>+   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.
>\ No newline at end of file
>
>Propchange: cocoon/trunk/legal/cowarp-0.3.jar.license.txt
>------------------------------------------------------------------------------
>    svn:eol-style = native
>
>Propchange: cocoon/trunk/legal/cowarp-0.3.jar.license.txt
>------------------------------------------------------------------------------
>    svn:keywords = Id
>
>Added: cocoon/trunk/legal/portals-bridges-common-0.4-20050815.jar.license.txt
>URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/portals-bridges-common-0.4-20050815.jar.license.txt?rev=232855&view=auto
>==============================================================================
>--- cocoon/trunk/legal/portals-bridges-common-0.4-20050815.jar.license.txt (added)
>+++ cocoon/trunk/legal/portals-bridges-common-0.4-20050815.jar.license.txt Mon Aug 15
11:57:55 2005
>@@ -0,0 +1,190 @@
>+                                 Apache License
>+                           Version 2.0, January 2004
>+                        http://www.apache.org/licenses/
>+
>+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>+
>+   1. Definitions.
>+
>+      "License" shall mean the terms and conditions for use, reproduction,
>+      and distribution as defined by Sections 1 through 9 of this document.
>+
>+      "Licensor" shall mean the copyright owner or entity authorized by
>+      the copyright owner that is granting the License.
>+
>+      "Legal Entity" shall mean the union of the acting entity and all
>+      other entities that control, are controlled by, or are under common
>+      control with that entity. For the purposes of this definition,
>+      "control" means (i) the power, direct or indirect, to cause the
>+      direction or management of such entity, whether by contract or
>+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
>+      outstanding shares, or (iii) beneficial ownership of such entity.
>+
>+      "You" (or "Your") shall mean an individual or Legal Entity
>+      exercising permissions granted by this License.
>+
>+      "Source" form shall mean the preferred form for making modifications,
>+      including but not limited to software source code, documentation
>+      source, and configuration files.
>+
>+      "Object" form shall mean any form resulting from mechanical
>+      transformation or translation of a Source form, including but
>+      not limited to compiled object code, generated documentation,
>+      and conversions to other media types.
>+
>+      "Work" shall mean the work of authorship, whether in Source or
>+      Object form, made available under the License, as indicated by a
>+      copyright notice that is included in or attached to the work
>+      (an example is provided in the Appendix below).
>+
>+      "Derivative Works" shall mean any work, whether in Source or Object
>+      form, that is based on (or derived from) the Work and for which the
>+      editorial revisions, annotations, elaborations, or other modifications
>+      represent, as a whole, an original work of authorship. For the purposes
>+      of this License, Derivative Works shall not include works that remain
>+      separable from, or merely link (or bind by name) to the interfaces of,
>+      the Work and Derivative Works thereof.
>+
>+      "Contribution" shall mean any work of authorship, including
>+      the original version of the Work and any modifications or additions
>+      to that Work or Derivative Works thereof, that is intentionally
>+      submitted to Licensor for inclusion in the Work by the copyright owner
>+      or by an individual or Legal Entity authorized to submit on behalf of
>+      the copyright owner. For the purposes of this definition, "submitted"
>+      means any form of electronic, verbal, or written communication sent
>+      to the Licensor or its representatives, including but not limited to
>+      communication on electronic mailing lists, source code control systems,
>+      and issue tracking systems that are managed by, or on behalf of, the
>+      Licensor for the purpose of discussing and improving the Work, but
>+      excluding communication that is conspicuously marked or otherwise
>+      designated in writing by the copyright owner as "Not a Contribution."
>+
>+      "Contributor" shall mean Licensor and any individual or Legal Entity
>+      on behalf of whom a Contribution has been received by Licensor and
>+      subsequently incorporated within the Work.
>+
>+   2. Grant of Copyright License. Subject to the terms and conditions of
>+      this License, each Contributor hereby grants to You a perpetual,
>+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>+      copyright license to reproduce, prepare Derivative Works of,
>+      publicly display, publicly perform, sublicense, and distribute the
>+      Work and such Derivative Works in Source or Object form.
>+
>+   3. Grant of Patent License. Subject to the terms and conditions of
>+      this License, each Contributor hereby grants to You a perpetual,
>+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>+      (except as stated in this section) patent license to make, have made,
>+      use, offer to sell, sell, import, and otherwise transfer the Work,
>+      where such license applies only to those patent claims licensable
>+      by such Contributor that are necessarily infringed by their
>+      Contribution(s) alone or by combination of their Contribution(s)
>+      with the Work to which such Contribution(s) was submitted. If You
>+      institute patent litigation against any entity (including a
>+      cross-claim or counterclaim in a lawsuit) alleging that the Work
>+      or a Contribution incorporated within the Work constitutes direct
>+      or contributory patent infringement, then any patent licenses
>+      granted to You under this License for that Work shall terminate
>+      as of the date such litigation is filed.
>+
>+   4. Redistribution. You may reproduce and distribute copies of the
>+      Work or Derivative Works thereof in any medium, with or without
>+      modifications, and in Source or Object form, provided that You
>+      meet the following conditions:
>+
>+      (a) You must give any other recipients of the Work or
>+          Derivative Works a copy of this License; and
>+
>+      (b) You must cause any modified files to carry prominent notices
>+          stating that You changed the files; and
>+
>+      (c) You must retain, in the Source form of any Derivative Works
>+          that You distribute, all copyright, patent, trademark, and
>+          attribution notices from the Source form of the Work,
>+          excluding those notices that do not pertain to any part of
>+          the Derivative Works; and
>+
>+      (d) If the Work includes a "NOTICE" text file as part of its
>+          distribution, then any Derivative Works that You distribute must
>+          include a readable copy of the attribution notices contained
>+          within such NOTICE file, excluding those notices that do not
>+          pertain to any part of the Derivative Works, in at least one
>+          of the following places: within a NOTICE text file distributed
>+          as part of the Derivative Works; within the Source form or
>+          documentation, if provided along with the Derivative Works; or,
>+          within a display generated by the Derivative Works, if and
>+          wherever such third-party notices normally appear. The contents
>+          of the NOTICE file are for informational purposes only and
>+          do not modify the License. You may add Your own attribution
>+          notices within Derivative Works that You distribute, alongside
>+          or as an addendum to the NOTICE text from the Work, provided
>+          that such additional attribution notices cannot be construed
>+          as modifying the License.
>+
>+      You may add Your own copyright statement to Your modifications and
>+      may provide additional or different license terms and conditions
>+      for use, reproduction, or distribution of Your modifications, or
>+      for any such Derivative Works as a whole, provided Your use,
>+      reproduction, and distribution of the Work otherwise complies with
>+      the conditions stated in this License.
>+
>+   5. Submission of Contributions. Unless You explicitly state otherwise,
>+      any Contribution intentionally submitted for inclusion in the Work
>+      by You to the Licensor shall be under the terms and conditions of
>+      this License, without any additional terms or conditions.
>+      Notwithstanding the above, nothing herein shall supersede or modify
>+      the terms of any separate license agreement you may have executed
>+      with Licensor regarding such Contributions.
>+
>+   6. Trademarks. This License does not grant permission to use the trade
>+      names, trademarks, service marks, or product names of the Licensor,
>+      except as required for reasonable and customary use in describing the
>+      origin of the Work and reproducing the content of the NOTICE file.
>+
>+   7. Disclaimer of Warranty. Unless required by applicable law or
>+      agreed to in writing, Licensor provides the Work (and each
>+      Contributor provides its Contributions) on an "AS IS" BASIS,
>+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>+      implied, including, without limitation, any warranties or conditions
>+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>+      PARTICULAR PURPOSE. You are solely responsible for determining the
>+      appropriateness of using or redistributing the Work and assume any
>+      risks associated with Your exercise of permissions under this License.
>+
>+   8. Limitation of Liability. In no event and under no legal theory,
>+      whether in tort (including negligence), contract, or otherwise,
>+      unless required by applicable law (such as deliberate and grossly
>+      negligent acts) or agreed to in writing, shall any Contributor be
>+      liable to You for damages, including any direct, indirect, special,
>+      incidental, or consequential damages of any character arising as a
>+      result of this License or out of the use or inability to use the
>+      Work (including but not limited to damages for loss of goodwill,
>+      work stoppage, computer failure or malfunction, or any and all
>+      other commercial damages or losses), even if such Contributor
>+      has been advised of the possibility of such damages.
>+
>+   9. Accepting Warranty or Additional Liability. While redistributing
>+      the Work or Derivative Works thereof, You may choose to offer,
>+      and charge a fee for, acceptance of support, warranty, indemnity,
>+      or other liability obligations and/or rights consistent with this
>+      License. However, in accepting such obligations, You may act only
>+      on Your own behalf and on Your sole responsibility, not on behalf
>+      of any other Contributor, and only if You agree to indemnify,
>+      defend, and hold each Contributor harmless for any liability
>+      incurred by, or claims asserted against, such Contributor by reason
>+      of your accepting any such warranty or additional liability.
>+
>+   END OF TERMS AND CONDITIONS
>+
>+   APPENDIX: How to apply the Apache License to your work.
>+
>+      To apply the Apache License to your work, attach the following
>+      boilerplate notice, with the fields enclosed by brackets "[]"
>+      replaced with your own identifying information. (Don't include
>+      the brackets!)  The text should be enclosed in the appropriate
>+      comment syntax for the file format. We also recommend that a
>+      file or class name and description of purpose be included on the
>+      same "printed page" as the copyright notice for easier
>+      identification within third-party archives.
>+
>+   Copyright 2004 The Apache Software Foundation
>+
>
>Propchange: cocoon/trunk/legal/portals-bridges-common-0.4-20050815.jar.license.txt
>------------------------------------------------------------------------------
>    svn:eol-style = native
>
>Propchange: cocoon/trunk/legal/portals-bridges-common-0.4-20050815.jar.license.txt
>------------------------------------------------------------------------------
>    svn:keywords = Id
>
>Modified: cocoon/trunk/lib/jars.xml
>URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/jars.xml?rev=232855&r1=232854&r2=232855&view=diff
>==============================================================================
>--- cocoon/trunk/lib/jars.xml (original)
>+++ cocoon/trunk/lib/jars.xml Mon Aug 15 11:57:55 2005
>@@ -1058,6 +1058,26 @@
>     <lib>optional/pluto-1.0.1-rc2.jar</lib>
>     <homepage>http://portals.apache.org/pluto/</homepage>
>   </file>
>+  <file id="portals-bridges-common">
>+    <title>Portals Bridges</title>
>+    <description>
>+      Portals Bridges provides support for JSR-168 compliant Portlet development
>+      using common web frameworks like Struts, JSF, PHP, Perl and Velocity. 
>+    </description>
>+    <used-by>Portal</used-by>
>+    <lib>optional/portals-bridges-common-0.4-20050815.jar</lib>
>+    <homepage>http://portals.apache.org/bridges/</homepage>
>+  </file>
>+  <file id="cowarp">
>+    <title>CoWarp</title>
>+    <description>
>+      A web application framework for Cocoon providing an authentication mechanism
>+      with special support for the portal.
>+    </description>
>+    <used-by>Portal</used-by>
>+    <lib>optional/cowarp-0.3.jar</lib>
>+    <homepage>http://osoco.sourceforge.net/cowarp/</homepage>
>+  </file>
> 
>   <file id="jakarta-bcel">
>     <title>Jakarta BCEL</title>
>
>Added: cocoon/trunk/lib/optional/cowarp-0.3.jar
>URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/cowarp-0.3.jar?rev=232855&view=auto
>==============================================================================
>Binary file - no diff available.
>
>Propchange: cocoon/trunk/lib/optional/cowarp-0.3.jar
>------------------------------------------------------------------------------
>    svn:mime-type = application/octet-stream
>
>Added: cocoon/trunk/lib/optional/portals-bridges-common-0.4-20050815.jar
>URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/portals-bridges-common-0.4-20050815.jar?rev=232855&view=auto
>==============================================================================
>Binary file - no diff available.
>
>Propchange: cocoon/trunk/lib/optional/portals-bridges-common-0.4-20050815.jar
>------------------------------------------------------------------------------
>    svn:mime-type = application/octet-stream
>
>Modified: cocoon/trunk/status.xml
>URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=232855&r1=232854&r2=232855&view=diff
>==============================================================================
>--- cocoon/trunk/status.xml (original)
>+++ cocoon/trunk/status.xml Mon Aug 15 11:57:55 2005
>@@ -197,6 +197,9 @@
> 
>   <changes>
>   <release version="@version@" date="@date@">
>+    <action dev="CZ" type="add">
>+      Portal block: Add support for portal bridges and add CoWarp for authentication.
>+    </action>
>     <action dev="AN" type="add">
>       XSP block: Extend {#expr} interpolation parser to understand {}, "}", '}'
>       as not being the closing brace.
>
>
>  
>


Mime
View raw message