You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2005/04/23 10:10:19 UTC
svn commit: r164369 - in /cocoon/branches/BRANCH_2_1_X: blocks.properties
gump.xml lib/jars.xml lib/optional/jackrabbit-20050422T153417.jar
lib/optional/jcr-0.16.4.jar src/blocks/
src/java/org/apache/cocoon/cocoon.roles status.xml
Author: sylvain
Date: Sat Apr 23 01:10:19 2005
New Revision: 164369
URL: http://svn.apache.org/viewcvs?rev=164369&view=rev
Log:
New JCR block
Added:
cocoon/branches/BRANCH_2_1_X/lib/optional/jackrabbit-20050422T153417.jar (with props)
cocoon/branches/BRANCH_2_1_X/lib/optional/jcr-0.16.4.jar (with props)
Modified:
cocoon/branches/BRANCH_2_1_X/blocks.properties
cocoon/branches/BRANCH_2_1_X/gump.xml
cocoon/branches/BRANCH_2_1_X/lib/jars.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/ (props changed)
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/cocoon.roles
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/blocks.properties?rev=164369&r1=164368&r2=164369&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/blocks.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/blocks.properties Sat Apr 23 01:10:19 2005
@@ -141,6 +141,7 @@
#include.block.forms=false
#-----[dependency]: "javaflow" depends on "forms", "ojb".
#include.block.javaflow=false
+#include.block.jcr=false
#-----[dependency]: "jms" depends on "databases" (for samples), "hsqldb".
#-----[dependency]: "jms" is needed by "eventcache", "slide".
#include.block.jms=false
Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/gump.xml?rev=164369&r1=164368&r2=164369&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml Sat Apr 23 01:10:19 2005
@@ -1523,6 +1523,29 @@
<nag from="Gump <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
</project>
+ <project name="cocoon-block-jcr" status="unstable" dir="src/blocks/jcr">
+ <package>org.apache.cocoon</package>
+
+ <description>A "jcr:" protocol for Cocoon</description>
+
+ <ant target="jcr-block">
+ <property name="block-name" value="jcr"/>
+ <property name="version" value="@@DATE@@"/>
+ </ant>
+
+ <depend project="cocoon" inherit="all"/>
+
+ <library name="jcr"/>
+ <library name="jackrabbit"/>
+
+ <work nested="tools/anttasks"/>
+ <home nested="build/cocoon-@@DATE@@"/>
+
+ <jar name="blocks/jcr-block.jar"/>
+
+ <nag from="Gump <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
+ </project>
+
<!--
********************************************
******** COCOON SUPPLIED PROJECTS ********
@@ -1667,5 +1690,16 @@
<package>org.outerj.daisy.xmlutil</package>
<jar name="lib/optional/daisy-util-1.1.jar"/>
</project>
+
+ <project name="jcr">
+ <package>javax.jcr</package>
+ <jar name="lib/optional/jcr-0.16.4.jar"/>
+ </project>
+
+ <project name="jackrabbit">
+ <url href="http://incubator.apache.org/jackrabbit"/>
+ <package>org.apache.jackrabbit</package>
+ <jar name="lib/optional/jackrabbit-20050422T153417.jar"/>
+ </project>
</module>
Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?rev=164369&r1=164368&r2=164369&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Sat Apr 23 01:10:19 2005
@@ -1167,4 +1167,24 @@
<homepage>http://jakarta.apache.org/tomcat/</homepage>
</file>
+ <file>
+ <title>JCR API</title>
+ <description>
+ JCR (aka JSR-170 API)
+ </description>
+ <used-by>JCR block</used-by>
+ <lib>optional/jcr-0.16.4.jar</lib>
+ <homepage> </homepage>
+ </file>
+
+ <file>
+ <title>Jackrabbit</title>
+ <description>
+ Jackrabbit JCR implementation
+ </description>
+ <used-by>JCR block</used-by>
+ <lib>optional/jackrabbit-20050422T153417.jar</lib>
+ <homepage>http://incubator.apache.org/jackrabbit/</homepage>
+ </file>
+
</jars>
Added: cocoon/branches/BRANCH_2_1_X/lib/optional/jackrabbit-20050422T153417.jar
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/jackrabbit-20050422T153417.jar?rev=164369&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/jackrabbit-20050422T153417.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/branches/BRANCH_2_1_X/lib/optional/jcr-0.16.4.jar
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/jcr-0.16.4.jar?rev=164369&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/jcr-0.16.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Sat Apr 23 01:10:19 2005
@@ -0,0 +1 @@
+jcr https://svn.apache.org/repos/asf/cocoon/blocks/jcr/trunk
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/cocoon.roles
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/cocoon.roles?rev=164369&r1=164368&r2=164369&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/cocoon.roles (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/cocoon.roles Sat Apr 23 01:10:19 2005
@@ -16,6 +16,7 @@
-->
<!DOCTYPE role-list [
<!ELEMENT role-list (role+)>
+<!ATTLIST role-list cocoon-version CDATA #REQUIRED>
<!ELEMENT role (hint*)>
<!ELEMENT hint EMPTY>
<!ATTLIST role name CDATA #REQUIRED
@@ -27,7 +28,9 @@
>
]>
-<role-list>
+<!-- Defininition of component roles. The "cocoon-version" attribute is used by some xroles patch
+ files that depend on the actual Cocoon version -->
+<role-list cocoon-version="2.1">
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=164369&r1=164368&r2=164369&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Sat Apr 23 01:10:19 2005
@@ -196,6 +196,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="SW" type="add">
+ New JCR block that adds a "jcr:" protocol to access and modify repository contents.
+ </action>
<action dev="BD" type="add">
New HTMLTransformer sample in html block
</action>