headers
danielf | 4 Jul 2005 00:16
Picon
Favicon

svn commit: r208989 - in /cocoon/trunk/src/java/org/apache/cocoon: environment/http/HttpContext.java servlet/CocoonServlet.java

Author: danielf
Date: Sun Jul  3 15:16:36 2005
New Revision: 208989

URL: http://svn.apache.org/viewcvs?rev=208989&view=rev
Log:
Using /WEB-INF/web.xml for finding out the root servlet path instead of just /WEB-INF as the bundle
protocol in OSGi has problems with accessing directories. Hopefully it doesn't affect existing code.

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/environment/http/HttpContext.java
    cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/environment/http/HttpContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/http/HttpContext.java?rev=208989&r1=208988&r2=208989&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/environment/http/HttpContext.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/environment/http/HttpContext.java Sun Jul  3
15:16:36 2005
 <at>  <at>  -76,11 +76,11  <at>  <at> 
             if (value == null) {
                 // Try to figure out the path of the root from that of WEB-INF
                 try {
-                value = this.servletContext.getResource("/WEB-INF").toString();
+                value = this.servletContext.getResource("/WEB-INF/web.xml").toString();
                 } catch (MalformedURLException mue) {
                     throw new CascadingRuntimeException("Cannot determine the base URL for " + path, mue);
                 }
-                value = value.substring(0,value.length()-"WEB-INF".length());
+                value = value.substring(0,value.length()-"WEB-INF/web.xml".length());
(Continue reading)

Permalink | Reply | 0 comments |
headers
danielf | 4 Jul 2005 00:33
Picon
Favicon

svn commit: r208999 - in /cocoon/whiteboard/osgi: ./ bundles/cocoon/ bundles/cocoon_servlet/ bundles/cocoon_servlet/resources/ bundles/cocoon_servlet/src/ bundles/cocoon_servlet/src/org/ bundles/cocoon_servlet/src/org/apache/ bundles/cocoon_servlet/src...

Author: danielf
Date: Sun Jul  3 15:33:50 2005
New Revision: 208999

URL: http://svn.apache.org/viewcvs?rev=208999&view=rev
Log:
A Cocoon servlet bundle, that try to find a sitemap bundle, create a CocoonServlet and register it in the
HTTPService. It doesn't work yet, classloading problems during initialization.

Added:
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/build.xml
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/resources/
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/src/
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/src/org/
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/src/org/apache/
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/src/org/apache/cocoon/
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/src/org/apache/cocoon/service/
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/src/org/apache/cocoon/service/servlet/
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/src/org/apache/cocoon/service/servlet/impl/
   
cocoon/whiteboard/osgi/bundles/cocoon_servlet/src/org/apache/cocoon/service/servlet/impl/Activator.java
  (with props)
    cocoon/whiteboard/osgi/jars-external/http/
    cocoon/whiteboard/osgi/jars-external/http/http_api-1.1.0.jar   (with props)
    cocoon/whiteboard/osgi/jars-external/log/
    cocoon/whiteboard/osgi/jars-external/log/log_api-1.0.0.jar   (with props)
Modified:
    cocoon/whiteboard/osgi/build.xml
    cocoon/whiteboard/osgi/bundles/cocoon/build.xml
(Continue reading)

Permalink | Reply | 0 comments |
headers
lgawron | 4 Jul 2005 12:47
Picon
Favicon

svn commit: r209055 - /cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java

Author: lgawron
Date: Mon Jul  4 03:47:55 2005
New Revision: 209055

URL: http://svn.apache.org/viewcvs?rev=209055&view=rev
Log:
rhino scope is not thread safe, same fix should be applied for cforms. 
The best would be to move JavaScriptHelper into the core and move scope helper there.

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java?rev=209055&r1=209054&r2=209055&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java Mon
Jul  4 03:47:55 2005
 <at>  <at>  -47,18 +47,22  <at>  <at> 
     /** Avoid instantiation */
     private TemplateObjectModelHelper() {}

-    public static Scriptable getRootScope() {
-        if (rootScope == null) {
+    public static Scriptable getScope() {
+        Context ctx = Context.enter();
+        try {
             // Create it if never used up to now
-            Context ctx = Context.enter();
-            try {
(Continue reading)

Permalink | Reply | 0 comments |
headers
danielf | 5 Jul 2005 20:44
Picon
Favicon

svn commit: r209303 - in /cocoon/whiteboard/osgi: README bundles/cocoon_servlet/src/org/apache/cocoon/service/servlet/impl/Activator.java cocoon.sh init.xargs props.xargs

Author: danielf
Date: Tue Jul  5 11:44:52 2005
New Revision: 209303

URL: http://svn.apache.org/viewcvs?rev=209303&view=rev
Log:
At last got the cocoon_servlet to run, see README for the various limitations.

Added:
    cocoon/whiteboard/osgi/README   (with props)
Modified:
    cocoon/whiteboard/osgi/bundles/cocoon_servlet/src/org/apache/cocoon/service/servlet/impl/Activator.java
    cocoon/whiteboard/osgi/cocoon.sh   (contents, props changed)
    cocoon/whiteboard/osgi/init.xargs
    cocoon/whiteboard/osgi/props.xargs

Added: cocoon/whiteboard/osgi/README
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/osgi/README?rev=209303&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/README (added)
+++ cocoon/whiteboard/osgi/README Tue Jul  5 11:44:52 2005
 <at>  <at>  -0,0 +1,84  <at>  <at> 
+To test the bundles here the following needs to be done:
+
+Building Cocoon trunk
+=====================
+
+The build system in whiteboard/osgi is not integrated with the build
+system in the trunk. As the OSGi bundles use results from building the
+trunk, the trunk must be build first. Furthermore the bundles
(Continue reading)

Permalink | Reply | 0 comments |
headers
cziegeler | 6 Jul 2005 10:20
Picon
Favicon

svn commit: r209432 - in /cocoon/blocks/portal/trunk: WEB-INF/xconf/cocoon-portal.xconf java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java

Author: cziegeler
Date: Wed Jul  6 01:20:25 2005
New Revision: 209432

URL: http://svn.apache.org/viewcvs?rev=209432&view=rev
Log:
Use portal logger, log execution time for a portlet and properly release component

Modified:
    cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java

Modified: cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf?rev=209432&r1=209431&r2=209432&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf (original)
+++ cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf Wed Jul  6 01:20:25 2005
 <at>  <at>  -29,19 +29,20  <at>  <at> 
   -->
   <source-factories>
     <!-- portal protocol -->
-    <component-instance class="org.apache.cocoon.portal.source.CopletSourceFactory" name="coplet"/>
+    <component-instance class="org.apache.cocoon.portal.source.CopletSourceFactory" 
+                        name="coplet" logger="portal"/>
   </source-factories>
   <input-modules>
-      <component-instance logger="core.modules.input" name="coplet" class="org.apache.cocoon.portal.components.modules.input.CopletModule"/>
-      <component-instance logger="core.modules.input" name="portal-layout" class="org.apache.cocoon.portal.components.modules.input.LayoutModule"/>
-      <component-instance logger="core.modules.input" name="portal-skin" class="org.apache.cocoon.portal.components.modules.input.SkinModule"/>
-      <component-instance logger="core.modules.input" name="portalpath" class="org.apache.cocoon.components.modules.input.ProjectPathModule">
(Continue reading)

Permalink | Reply | 0 comments |
headers
cziegeler | 6 Jul 2005 10:34
Picon
Favicon

svn commit: r209433 - /cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf

Author: cziegeler
Date: Wed Jul  6 01:34:50 2005
New Revision: 209433

URL: http://svn.apache.org/viewcvs?rev=209433&view=rev
Log:
Use portal logger, log execution time for a portlet and properly release component

Modified:
    cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf

Modified: cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf?rev=209433&r1=209432&r2=209433&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf (original)
+++ cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf Wed Jul  6 01:34:50 2005
 <at>  <at>  -42,18 +42,18  <at>  <at> 
   </input-modules>

  <!-- Event Aspect configuration -->
- <component class="org.apache.cocoon.core.container.DefaultServiceSelector"
role="org.apache.cocoon.portal.event.aspect.EventAspectSelector" logger="portal">
-    <aspect name="action-counter" class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"/>
-    <aspect name="request-parameter" class="org.apache.cocoon.portal.event.aspect.impl.RequestParameterEventAspect"/>
-    <aspect name="frame" class="org.apache.cocoon.portal.event.aspect.impl.FrameEventAspect"/>
-    <aspect name="link"  class="org.apache.cocoon.portal.event.aspect.impl.LinkEventAspect" />    
-    <aspect name="page-label" class="org.apache.cocoon.portal.event.aspect.impl.PageLabelEventAspect"/>
-    <aspect name="convertable" class="org.apache.cocoon.portal.event.aspect.impl.ConvertableEventAspect"/>
+ <component class="org.apache.cocoon.core.container.DefaultServiceSelector" role="org.apache.cocoon.portal.event.aspect.EventAspectSelector">
+    <aspect logger="portal" name="action-counter" class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"/>
(Continue reading)

Permalink | Reply | 0 comments |
headers
cziegeler | 6 Jul 2005 10:45
Picon
Favicon

svn commit: r209434 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/portal: conf/modules.xconf conf/portal.xconf conf/protocol.xconf java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java

Author: cziegeler
Date: Wed Jul  6 01:45:20 2005
New Revision: 209434

URL: http://svn.apache.org/viewcvs?rev=209434&view=rev
Log:
Use portal logger, log execution time for a portlet and properly release component

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/modules.xconf
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.xconf
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/protocol.xconf
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/modules.xconf
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/modules.xconf?rev=209434&r1=209433&r2=209434&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/modules.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/modules.xconf Wed Jul  6 01:45:20 2005
 <at>  <at>  -1,6 +1,6  <at>  <at> 
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-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.
 <at>  <at>  -14,11 +14,11  <at>  <at> 
   See the License for the specific language governing permissions and
   limitations under the License.
(Continue reading)

Permalink | Reply | 0 comments |
headers
cziegeler | 6 Jul 2005 11:23
Picon
Favicon

svn commit: r209436 - /cocoon/trunk/src/java/org/apache/cocoon/caching/impl/CacheImpl.java

Author: cziegeler
Date: Wed Jul  6 02:23:19 2005
New Revision: 209436

URL: http://svn.apache.org/viewcvs?rev=209436&view=rev
Log:
Change log level to info.

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/caching/impl/CacheImpl.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/caching/impl/CacheImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/caching/impl/CacheImpl.java?rev=209436&r1=209435&r2=209436&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/caching/impl/CacheImpl.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/caching/impl/CacheImpl.java Wed Jul  6 02:23:19 2005
 <at>  <at>  -1,5 +1,5  <at>  <at> 
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-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.
 <at>  <at>  -40,7 +40,7  <at>  <at> 
  *
  *  <at> since 2.1
  *  <at> author <a href="mailto:cziegeler <at> apache.org">Carsten Ziegeler</a>
- *  <at> version CVS $Id: CacheImpl.java,v 1.10 2004/03/05 13:02:45 bdelacretaz Exp $
+ *  <at> version CVS $Id$
  */
(Continue reading)

Permalink | Reply | 0 comments |
headers
cziegeler | 6 Jul 2005 11:31
Picon
Favicon

svn commit: r209437 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/caching/impl/CacheImpl.java

Author: cziegeler
Date: Wed Jul  6 02:31:18 2005
New Revision: 209437

URL: http://svn.apache.org/viewcvs?rev=209437&view=rev
Log:
Change log level to info.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/caching/impl/CacheImpl.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/caching/impl/CacheImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/caching/impl/CacheImpl.java?rev=209437&r1=209436&r2=209437&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/caching/impl/CacheImpl.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/caching/impl/CacheImpl.java Wed
Jul  6 02:31:18 2005
 <at>  <at>  -1,5 +1,5  <at>  <at> 
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-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.
 <at>  <at>  -40,7 +40,7  <at>  <at> 
  *
  *  <at> since 2.1
  *  <at> author <a href="mailto:cziegeler <at> apache.org">Carsten Ziegeler</a>
- *  <at> version CVS $Id: CacheImpl.java,v 1.10 2004/03/05 13:02:45 bdelacretaz Exp $
+ *  <at> version CVS $Id$
(Continue reading)

Permalink | Reply | 0 comments |
headers
danielf | 6 Jul 2005 18:40
Picon
Favicon

svn commit: r209477 - in /cocoon/whiteboard/osgi: README configuration/ configuration/config.ini legal/eclipse-licence.html org.eclipse.osgi_3.1.0.jar

Author: danielf
Date: Wed Jul  6 09:40:32 2005
New Revision: 209477

URL: http://svn.apache.org/viewcvs?rev=209477&view=rev
Log:
Trying to run the bundles under Eclipse OSGi but the cocoon_servlet bundle doesn't start and I hav not found
out how to be able to see any error messages :/, see the end of the README for details

Added:
    cocoon/whiteboard/osgi/configuration/
    cocoon/whiteboard/osgi/configuration/config.ini
    cocoon/whiteboard/osgi/legal/eclipse-licence.html   (with props)
    cocoon/whiteboard/osgi/org.eclipse.osgi_3.1.0.jar   (with props)
Modified:
    cocoon/whiteboard/osgi/README

Modified: cocoon/whiteboard/osgi/README
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/osgi/README?rev=209477&r1=209476&r2=209477&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/README (original)
+++ cocoon/whiteboard/osgi/README Wed Jul  6 09:40:32 2005
 <at>  <at>  -82,3 +82,25  <at>  <at> 
 cocoon_testcase - creates the BlocksManager testcase and register it
   in the junit service.

+Using the Eclipse OSGi framework
+================================
+
+The Eclipse OSGi is started with:
(Continue reading)

Permalink | Reply | 0 comments |

Gmane