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/05/30 23:36:34 UTC
svn commit: r179151 - in /cocoon: blocks/axis/trunk/build-special.xml
blocks/ojb/trunk/build-special.xml trunk/gump.xml trunk/lib/jars.xml
trunk/lib/optional/jackrabbit-20050422T153417.jar
trunk/lib/optional/jcr-0.16.4.jar trunk/tools/targets/ide-build.xml
Author: sylvain
Date: Mon May 30 14:36:32 2005
New Revision: 179151
URL: http://svn.apache.org/viewcvs?rev=179151&view=rev
Log:
Fixing the build
Added:
cocoon/trunk/lib/optional/jackrabbit-20050422T153417.jar (with props)
cocoon/trunk/lib/optional/jcr-0.16.4.jar (with props)
Modified:
cocoon/blocks/axis/trunk/build-special.xml
cocoon/blocks/ojb/trunk/build-special.xml
cocoon/trunk/gump.xml
cocoon/trunk/lib/jars.xml
cocoon/trunk/tools/targets/ide-build.xml
Modified: cocoon/blocks/axis/trunk/build-special.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/axis/trunk/build-special.xml?rev=179151&r1=179150&r2=179151&view=diff
==============================================================================
--- cocoon/blocks/axis/trunk/build-special.xml (original)
+++ cocoon/blocks/axis/trunk/build-special.xml Mon May 30 14:36:32 2005
@@ -18,7 +18,7 @@
<target name="main">
<copy filtering="off" todir="${build.blocks}/axis/dest">
- <fileset dir="${blocks}/axis/java">
+ <fileset dir="${block.dir}/java">
<include name="**/*.wsdd" />
</fileset>
</copy>
Modified: cocoon/blocks/ojb/trunk/build-special.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/ojb/trunk/build-special.xml?rev=179151&r1=179150&r2=179151&view=diff
==============================================================================
--- cocoon/blocks/ojb/trunk/build-special.xml (original)
+++ cocoon/blocks/ojb/trunk/build-special.xml Mon May 30 14:36:32 2005
@@ -57,7 +57,7 @@
target="${target.vm}" deprecation="${compiler.deprecation}"
optimize="${compiler.optimize}" debug="${compiler.debug}"
destdir="${build.blocks.ojb.samples}">
- <src path="${blocks}/ojb/java"/>
+ <src path="${block.dir}/java"/>
<classpath refid="ojb.classpath"/>
<include name="**/samples/bean/*.java"/>
</javac>
@@ -72,4 +72,4 @@
<arg line="-f -d ${build.blocks.ojb.samples} ${build.blocks.ojb.samples}/package.jdo ${build.blocks.ojb.samples.package}/Employee.class ${build.blocks.ojb.samples.package}/Department.class"/>
</java>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: cocoon/trunk/gump.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?rev=179151&r1=179150&r2=179151&view=diff
==============================================================================
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Mon May 30 14:36:32 2005
@@ -619,7 +619,7 @@
<nag from="Gump <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
</project>
- <project name="cocoon-block-proxy" status="unstable" dir="src/blocks/proxy">
+ <project name="cocoon-block-proxy" status="unstable" dir="src/blocks/proxy/trunk">
<package>org.apache.cocoon</package>
<ant target="gump-block">
@@ -1320,6 +1320,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/trunk">
+ <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 ********
@@ -1432,5 +1455,16 @@
<home nested="lib/core"/>
<jar name="commons-jci-r159148.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/trunk/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/jars.xml?rev=179151&r1=179150&r2=179151&view=diff
==============================================================================
--- cocoon/trunk/lib/jars.xml (original)
+++ cocoon/trunk/lib/jars.xml Mon May 30 14:36:32 2005
@@ -1113,4 +1113,25 @@
<homepage>http://jakarta.apache.org/commons/io/</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/trunk/lib/optional/jackrabbit-20050422T153417.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/jackrabbit-20050422T153417.jar?rev=179151&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/optional/jackrabbit-20050422T153417.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/lib/optional/jcr-0.16.4.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/jcr-0.16.4.jar?rev=179151&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/optional/jcr-0.16.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: cocoon/trunk/tools/targets/ide-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/ide-build.xml?rev=179151&r1=179150&r2=179151&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/ide-build.xml (original)
+++ cocoon/trunk/tools/targets/ide-build.xml Mon May 30 14:36:32 2005
@@ -81,6 +81,8 @@
<dirset dir="${src}">
<include name="mocks"/>
<include name="blocks/*/trunk/mocks"/>
+ <!-- exclude xsp mocks that redefine classes in session-fw -->
+ <exclude name="blocks/xsp/trunk/mocks"/>
</dirset>
</path>