Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 45180 invoked from network); 27 Nov 2005 20:33:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Nov 2005 20:33:09 -0000 Received: (qmail 14464 invoked by uid 500); 27 Nov 2005 20:33:08 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 14354 invoked by uid 500); 27 Nov 2005 20:33:07 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 14343 invoked by uid 99); 27 Nov 2005 20:33:07 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 27 Nov 2005 12:33:05 -0800 Received: (qmail 45049 invoked by uid 65534); 27 Nov 2005 20:32:45 -0000 Message-ID: <20051127203245.45048.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r349303 - in /cocoon/trunk: cocoon.sh src/java/org/apache/cocoon/components/blocks/BlockWiring.java src/webapp/WEB-INF/block.xml src/webapp/wiring.xml Date: Sun, 27 Nov 2005 20:32:44 -0000 To: cvs@cocoon.apache.org From: danielf@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danielf Date: Sun Nov 27 12:32:39 2005 New Revision: 349303 URL: http://svn.apache.org/viewcvs?rev=349303&view=rev Log: Starting to integrate blocks in the webapp, use ./cocoon.sh blocks to try it. Doesn't work yet, context problem in source resolving. Modified: cocoon/trunk/cocoon.sh cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockWiring.java cocoon/trunk/src/webapp/WEB-INF/block.xml cocoon/trunk/src/webapp/wiring.xml Modified: cocoon/trunk/cocoon.sh URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon.sh?rev=349303&r1=349302&r2=349303&view=diff ============================================================================== --- cocoon/trunk/cocoon.sh (original) +++ cocoon/trunk/cocoon.sh Sun Nov 27 12:32:39 2005 @@ -178,6 +178,10 @@ $JAVA $JAVA_OPTIONS $JAVA_PROFILE_ARGS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN ;; + blocks) + $JAVA $JAVA_OPTIONS -Dorg.apache.cocoon.processor=org.apache.cocoon.components.blocks.BlocksManager -Dorg.apache.cocoon.configuration=/wiring.xml -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN + ;; + osgi) # -init prevents knopflerfish from using its persistent info about bundles, seems safer for now KNOP_OPTIONS="-init" Modified: cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockWiring.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockWiring.java?rev=349303&r1=349302&r2=349303&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockWiring.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockWiring.java Sun Nov 27 12:32:39 2005 @@ -112,6 +112,11 @@ try { resolver.contextualize(this.context); source = resolver.resolveURI(blockPath); + // FIXME: Have used different locations for block.xml in the OSGi and the block stuff. + if (!source.exists()) { + blockPath = this.location + "WEB-INF/block.xml"; + source = resolver.resolveURI(blockPath); + } DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder(); block = builder.build(source.getInputStream(), source.getURI()); } catch (IOException e) { Modified: cocoon/trunk/src/webapp/WEB-INF/block.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/block.xml?rev=349303&r1=349302&r2=349303&view=diff ============================================================================== --- cocoon/trunk/src/webapp/WEB-INF/block.xml (original) +++ cocoon/trunk/src/webapp/WEB-INF/block.xml Sun Nov 27 12:32:39 2005 @@ -28,7 +28,7 @@ implementation="unstable"/> Apache License 2.0 Apache Cocoon community - + Modified: cocoon/trunk/src/webapp/wiring.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/wiring.xml?rev=349303&r1=349302&r2=349303&view=diff ============================================================================== --- cocoon/trunk/src/webapp/wiring.xml (original) +++ cocoon/trunk/src/webapp/wiring.xml Sun Nov 27 12:32:39 2005 @@ -20,15 +20,7 @@ xsi:schemaLocation="http://apache.org/cocoon/blocks/wiring/1.0 wiring-schema-1.0.xsd" > - - + + - - - - - - - -