You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2006/03/16 19:46:20 UTC
svn commit: r386413 - in /incubator/jackrabbit/branches/1.0/jackrabbit:
README.txt maven.xml src/main/javacc/xpath/ src/main/javacc/xpath/XPath.jjt
src/site/xdoc/doc/building.xml
Author: jukka
Date: Thu Mar 16 10:46:02 2006
New Revision: 386413
URL: http://svn.apache.org/viewcvs?rev=386413&view=rev
Log:
1.0: Merged revision 386412: JCR-354 Use a pre-generated version of XPath.jjt
Added:
incubator/jackrabbit/branches/1.0/jackrabbit/src/main/javacc/xpath/XPath.jjt
- copied unchanged from r386412, incubator/jackrabbit/trunk/jackrabbit/src/main/javacc/xpath/XPath.jjt
Modified:
incubator/jackrabbit/branches/1.0/jackrabbit/README.txt
incubator/jackrabbit/branches/1.0/jackrabbit/maven.xml
incubator/jackrabbit/branches/1.0/jackrabbit/src/main/javacc/xpath/ (props changed)
incubator/jackrabbit/branches/1.0/jackrabbit/src/site/xdoc/doc/building.xml
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/README.txt
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/README.txt?rev=386413&r1=386412&r2=386413&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/README.txt (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/README.txt Thu Mar 16 10:46:02 2006
@@ -89,15 +89,6 @@
http://incubator.apache.org/jackrabbit/doc/building.html
-NOTE: Java 5 users need to download the xalan.jar and serializer.jar
-libraries from the Xalan-Java binary distribution at
-http://xml.apache.org/xalan-j/downloads.html and place them in
-$MAVEN_HOME/lib/endorsed (or $JAVA_HOME/jre/lib/endorsed if using Maven 1.1)
-to build the Jackrabbit sources. The reason for this workaround is
-explained in
-
- http://issues.apache.org/jira/browse/JCR-46
-
Credits
=======
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/maven.xml?rev=386413&r1=386412&r2=386413&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/maven.xml (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/maven.xml Thu Mar 16 10:46:02 2006
@@ -115,11 +115,7 @@
<ant:not>
<ant:uptodate targetfile="${maven.gen.src}/java/org/apache/jackrabbit/core/query/xpath/XPath.java">
<ant:srcfiles dir="${maven.src.dir}/main/javacc/xpath">
- <ant:include name="javacc.xsl"/>
- <ant:include name="jjtree.xsl"/>
- <ant:include name="jjtree-jackrabbit.xsl"/>
- <ant:include name="strip.xsl"/>
- <ant:include name="xpath-grammar.xml"/>
+ <ant:include name="XPath.jjt"/>
</ant:srcfiles>
</ant:uptodate>
</ant:not>
@@ -167,27 +163,13 @@
<!-- Generates the XPath Parser -->
<goal name="jackrabbit:generate-xpath-parser">
- <!-- Generate the JavaCC grammar file using XSLT -->
- <ant:mkdir dir="${maven.gen.src}/javacc"/>
- <!-- The following is a hack to get xslt work with maven (See: http://maven.apache.org/faq.html#BadXSLT ) -->
- ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
- <ant:xslt style="${maven.src.dir}/main/javacc/xpath/strip.xsl"
- in="${maven.src.dir}/main/javacc/xpath/xpath-grammar.xml"
- out="${maven.gen.src}/javacc/stripped-xpath-grammar.xml"
- force="yes">
- </ant:xslt>
- <ant:xslt style="${maven.src.dir}/main/javacc/xpath/jjtree-jackrabbit.xsl"
- in="${maven.gen.src}/javacc/stripped-xpath-grammar.xml"
- out="${maven.gen.src}/javacc/XPath.jjt"
- force="yes">
- </ant:xslt>
<!-- Generate the XPath parser using JavaCC -->
<j:set var="maven.javacc.jjtree.package"
value="org.apache.jackrabbit.core.query.xpath"/>
<j:set var="maven.javacc.javacc.package"
value="${maven.javacc.jjtree.package}"/>
<j:set var="maven.javacc.jjtree.grammar"
- value="${maven.gen.src}/javacc/XPath.jjt"/>
+ value="${maven.src.dir}/main/javacc/xpath/XPath.jjt"/>
<attainGoal name="javacc"/>
<!-- Remove files that have been customized in Jackrabbit. -->
<ant:delete>
@@ -195,6 +177,28 @@
<ant:include name="SimpleNode.java"/>
</ant:fileset>
</ant:delete>
+ </goal>
+
+ <!--
+ Generates the XPath parser JJT file. This goal needs to be manually
+ invoked to regenerate the XPath.jjt file whenever the XML and XSL
+ source files are updated. The resulting file is stored as a normal
+ source file instead of automatically generating it to avoid the XSLT
+ problems described in JCR-46.
+ -->
+ <goal name="jackrabbit:generate-xpath-parser-jjt">
+ <!-- Generate the JavaCC grammar file using XSLT -->
+ <ant:mkdir dir="${maven.gen.src}/javacc"/>
+ <!-- The following is a hack to get xslt work with maven (See: http://maven.apache.org/faq.html#BadXSLT ) -->
+ ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
+ <ant:xslt style="${maven.src.dir}/main/javacc/xpath/strip.xsl"
+ in="${maven.src.dir}/main/javacc/xpath/xpath-grammar.xml"
+ out="${maven.gen.src}/javacc/stripped-xpath-grammar.xml"
+ force="yes"/>
+ <ant:xslt style="${maven.src.dir}/main/javacc/xpath/jjtree-jackrabbit.xsl"
+ in="${maven.gen.src}/javacc/stripped-xpath-grammar.xml"
+ out="${maven.gen.src}/javacc/XPath.jjt"
+ force="yes"/>
</goal>
<!-- Generates the fulltext query Parser -->
Propchange: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/javacc/xpath/
('svn:ignore' removed)
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/site/xdoc/doc/building.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/site/xdoc/doc/building.xml?rev=386413&r1=386412&r2=386413&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/site/xdoc/doc/building.xml (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/site/xdoc/doc/building.xml Thu Mar 16 10:46:02 2006
@@ -84,17 +84,6 @@
with Maven 1.1 and Java 5.
</p>
<p>
- <strong>Note for Java 5 users:</strong>
- As discussed in
- <a href="http://issues.apache.org/jira/browse/JCR-46">JCR-46</a>, you
- need to <a href="http://xml.apache.org/xalan-j/downloads.html">download</a>
- the <a href="http://xml.apache.org/xalan-j/">Xalan-Java</a> files
- <code>xalan.jar</code> and <code>serializer.jar</code> and place them
- in <code>$MAVEN_HOME/lib/endorsed</code> (or <code>$JAVA_HOME/jre/lib/endorsed</code>
- if you use Maven 1.1) to avoid problems in generating the JavaCC
- grammar files used by Jackrabbit.
- </p>
- <p>
See the Maven 1.x
<a href="http://maven.apache.org/maven-1.x/start/install.html">installation</a>
and <a href="http://maven.apache.org/maven-1.x/start/quick-start.html">quick-start</a>