cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r371669 - in /cocoon/trunk/cocoon-blocks-fw: cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/ cocoon-blocks-fw-impl/src/main/resources/org/apache/cocoon/blocks/ cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/bl...
Date Mon, 23 Jan 2006 21:14:42 GMT
Author: danielf
Date: Mon Jan 23 13:14:19 2006
New Revision: 371669

URL: http://svn.apache.org/viewcvs?rev=371669&view=rev
Log:
Used mistakingly String instead of File for some Context attributes.
Changed the block fw sample to use the full core configuration files instead of just a minimal
for illustrating how to add the core components as a "fake" block.
Moved the core-components.xconf from main to test as it only is used for the test cases.

Added:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/core-components.xconf
      - copied unchanged from r371401, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/resources/org/apache/cocoon/blocks/core-components.xconf
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core-sitemap.xconf
      - copied unchanged from r371340, cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/xconf/cocoon-core-sitemap.xconf
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core.xconf
      - copied, changed from r371340, cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/xconf/cocoon-core.xconf
Removed:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/resources/org/apache/cocoon/blocks/core-components.xconf
Modified:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/CoreUtil.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/block.xml
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/block.xml

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/CoreUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/CoreUtil.java?rev=371669&r1=371668&r2=371669&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/CoreUtil.java
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/CoreUtil.java
Mon Jan 23 13:14:19 2006
@@ -312,11 +312,11 @@
     }
 
     private static void addSettingsContext(DefaultContext appContext, Settings settings)
{
-        appContext.put(Constants.CONTEXT_WORK_DIR, settings.getWorkDirectory());
+        appContext.put(Constants.CONTEXT_WORK_DIR, new File(settings.getWorkDirectory()));
 
-        appContext.put(Constants.CONTEXT_UPLOAD_DIR, settings.getUploadDirectory());
+        appContext.put(Constants.CONTEXT_UPLOAD_DIR, new File(settings.getUploadDirectory()));
 
-        appContext.put(Constants.CONTEXT_CACHE_DIR, settings.getCacheDirectory());
+        appContext.put(Constants.CONTEXT_CACHE_DIR, new File(settings.getCacheDirectory()));
 
         //appContext.put(Constants.CONTEXT_CONFIG_URL, settings.getConfiguration());
 

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/block.xml?rev=371669&r1=371668&r2=371669&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/block.xml
Mon Jan 23 13:14:19 2006
@@ -29,6 +29,6 @@
   <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
   <author href="http://cocoon.apache.org">Apache Cocoon community</author>
   <components>
-    <include src="resource://org/apache/cocoon/blocks/core-components.xconf"/>
+    <include src="META-INF/core-components.xconf"/>
   </components>
 </block>

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/block.xml?rev=371669&r1=371668&r2=371669&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/block.xml
Mon Jan 23 13:14:19 2006
@@ -17,18 +17,19 @@
 <block xmlns="http://apache.org/cocoon/blocks/cob/1.0"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
        xsi:schemaLocation="http://apache.org/cocoon/blocks/cob/1.0 cob-schema-1.0.xsd"
-       id="http://cocoon.apache.org/blocks/core/1.0">
+       id="http://cocoon.apache.org/blocks/core/2.2">
   <name>core</name>
-  <description href="http://cocoon.apache.org/blocks/core/1.0">
-    Cocoon core functionality
+  <description href="http://cocoon.apache.org/blocks/core/2.2">
+    Cocoon core components
   </description>
-  <state href="http://cocoon.apache.org/blocks/anyblock/1.0/state.html" 
+  <state href="http://cocoon.apache.org/blocks/core/2.2/state.html" 
          community="committed" 
-         interfaces="unstable" 
+         interfaces="stable" 
          implementation="stable"/>
   <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
   <author href="http://cocoon.apache.org">Apache Cocoon community</author>
   <components>
-    <include src="resource://org/apache/cocoon/blocks/core-components.xconf"/>
+    <include src="META-INF/cocoon-core.xconf"/>
+    <include src="META-INF/cocoon-core-sitemap.xconf"/>
   </components>
 </block>

Copied: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core.xconf
(from r371340, cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/xconf/cocoon-core.xconf)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core.xconf?p2=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core.xconf&p1=cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/xconf/cocoon-core.xconf&r1=371340&r2=371669&rev=371669&view=diff
==============================================================================
--- cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/xconf/cocoon-core.xconf (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core.xconf
Mon Jan 23 13:14:19 2006
@@ -44,7 +44,9 @@
       | For development environment, set the check-reload to yes.
       | For production environment, it is advisable to set check-reload to no.
       +-->
+  <!-- Setup in block.xml instead
   <sitemap file="context://sitemap.xmap" logger="sitemap"/>
+  -->
 
 <!-- ========================= Sitemap Flowscript ========================== -->
 
@@ -493,7 +495,7 @@
         | How often shall the cleanup thread check memory?
         | If not specified, defaults to 10 seconds.
         +-->
-    <parameter name="cleanupthreadinterval" value="10"/>
+    <parameter name="cleanupthreadinterval" value="100"/>
     <!--+
         | Experimental adaptive algorithm for cleanup interval
     <parameter name="adaptivethreadinterval" value="true"/>



Mime
View raw message