You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by dm...@apache.org on 2002/06/09 03:58:42 UTC
cvs commit: jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri JXPathCompiledExpression.java
dmitri 2002/06/08 18:58:42
Modified: jxpath project.xml project.properties build-maven.xml
jxpath/src/test/org/apache/commons/jxpath
JXPathTestCase.java
jxpath/src/java/org/apache/commons/jxpath/ri
JXPathCompiledExpression.java
Log:
Updated docs
Revision Changes Path
1.4 +31 -29 jakarta-commons/jxpath/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jxpath/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 29 Apr 2002 01:00:59 -0000 1.3
+++ project.xml 9 Jun 2002 01:58:41 -0000 1.4
@@ -1,28 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <version>2</version>
+ <pomVersion>3</pomVersion>
<name>JXPath</name>
<id>jakarta-commons-jxpath</id>
<currentVersion>1.0-beta1-dev</currentVersion>
- <organization>Apache Software Foundation</organization>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://jakarta.apache.org/</url>
+ </organization>
<inceptionYear>2001</inceptionYear>
<package>org.apache.commons.jxpath</package>
-
<shortDescription>XPath for Java Objects</shortDescription>
-
- <description>a package of Java utility methods for accessing and modifying the
- elements of arbitrary graphs consisting of JavaBeans, collections, arrays,
- maps and primitive values using the XPath syntax
- </description>
-
+
+ <description>A package of Java utility methods for accessing and modifying object properties</description>
+
<url>http://jakarta.apache.org/commons/jxpath/</url>
- <cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-commons/jxpath/</cvsWebUrl>
- <issueTrackingUrl>http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&component=JXPath</issueTrackingUrl>
+ <!-- cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-commons/jxpath/</cvsWebUrl -->
+ <issueTrackingUrl>http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMEDcomponent=JXPath</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/commons/jxpath</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/jxpath</distributionDirectory>
-
+
+ <versions>
+ <version>
+ <id>b1</id>
+ <name>1.0-b1</name>
+ <tag>JXPATH_1_0_B1</tag>
+ </version>
+ </versions>
+
<mailingLists>
<mailingList>
<name>Commons Developer List</name>
@@ -31,13 +38,13 @@
<archive>http://www.mail-archive.com/commons-dev@jakarta.apache.org/</archive>
</mailingList>
</mailingLists>
-
+
<developers>
<developer>
<name>Dmitri Plotnikov</name>
<id>dmitri</id>
<email>dmitri@apache.org</email>
- <organization></organization>
+ <organization/>
</developer>
<developer>
<name>Craig McClanahan</name>
@@ -46,7 +53,6 @@
<organization>Sun Microsystems</organization>
</developer>
</developers>
-
<dependencies>
<dependency>
<name>xml-xalan2</name>
@@ -66,28 +72,24 @@
<version>3.7</version>
<jar>junit-3.7.jar</jar>
</dependency>
-
+ <dependency>
+ <name>optional</name>
+ <type>required</type>
+ <version>1.4.1</version>
+ <jar>jakarta-ant-1.4.1-optional.jar</jar>
+ </dependency>
</dependencies>
-
<build>
- <sourceDirectories>
- <sourceDirectory>src/java</sourceDirectory>
- </sourceDirectories>
-
+ <sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
<aspectSourceDirectories/>
-
<unitTestPatterns>
- <unitTestPattern>include = **/*TestCase.java</unitTestPattern>
+ <unitTestPattern>include=**/*TestCase.java</unitTestPattern>
</unitTestPatterns>
-
- <integrationUnitTestPatterns></integrationUnitTestPatterns>
-
+ <integrationUnitTestPatterns/>
<jarResources>
<!--<jarResource>include = *.properties</jarResource>-->
- </jarResources>
-
+</jarResources>
<jars/>
</build>
</project>
1.3 +7 -0 jakarta-commons/jxpath/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-commons/jxpath/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 29 Apr 2002 01:00:59 -0000 1.2
+++ project.properties 9 Jun 2002 01:58:41 -0000 1.3
@@ -9,3 +9,10 @@
checkstyle.lcurly.method=eol
checkstyle.lcurly.other=eol
checkstyle.rcurly=alone
+maven.checkstyle.excludes=org/apache/commons/jxpath/ri/parser/*
+maven.checkstyle.lcurly.type=eol
+maven.checkstyle.lcurly.method=eol
+maven.checkstyle.lcurly.other=eol
+maven.checkstyle.rcurly=alone
+maven.checkstyle.ignore.cast.whitespace=true
+maven.checkstyle.javadoc.scope=protected
\ No newline at end of file
1.2 +142 -74 jakarta-commons/jxpath/build-maven.xml
Index: build-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jxpath/build-maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-maven.xml 22 Apr 2002 15:40:25 -0000 1.1
+++ build-maven.xml 9 Jun 2002 01:58:41 -0000 1.2
@@ -1,5 +1,5 @@
-<!-- $Id: build-maven.xml,v 1.1 2002/04/22 15:40:25 dion Exp $ -->
-<project name="commons-latka" default="build-java" basedir=".">
+<!-- $Id: build-maven.xml,v 1.2 2002/06/09 01:58:41 dmitri Exp $ -->
+<project name="commons-jxpath" default="build-java" basedir=".">
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
@@ -8,79 +8,147 @@
<!-- Set default values for the build -->
<property file="project.properties" />
- <!-- maven:start -->
+<!-- maven:start -->
- <!-- ======================================================== -->
- <!-- D E L E G A T O R S -->
- <!-- ======================================================== -->
-
- <target name="maven:site">
- <ant antfile="${maven.home}/build-docs.xml" target="site"/>
- </target>
-
- <target name="maven:jar">
- <ant antfile="${maven.home}/build-maven.xml" target="jar"/>
- </target>
-
- <target name="maven:install-jar">
- <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
- </target>
-
- <target name="maven:env">
- <ant antfile="${maven.home}/build-maven.xml" target="env"/>
- </target>
-
- <target name="maven:docs">
- <ant antfile="${maven.home}/build-docs.xml" target="docs"/>
- </target>
-
- <target name="maven:test">
- <ant antfile="${maven.home}/build-test.xml" target="test"/>
- </target>
-
- <target name="maven:iutest">
- <ant antfile="${maven.home}/build-iutest.xml" target="test"/>
- </target>
-
- <target name="maven:singletest">
- <ant antfile="${maven.home}/build-test.xml" target="run-singletest"/>
- </target>
-
- <target name="maven:clean">
- <ant antfile="${maven.home}/build-maven.xml" target="clean"/>
- </target>
-
- <target name="maven:metrics">
- <ant antfile="${maven.home}/build-metrics.xml" target="metrics"/>
- </target>
-
- <target name="maven:dist">
- <ant antfile="${maven.home}/build-maven.xml" target="dist"/>
- </target>
-
- <target name="maven:deploy-site">
- <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
- </target>
-
- <target name="maven:deploy-dist">
- <ant antfile="${maven.home}/build-maven.xml" target="deploy-dist"/>
- </target>
-
- <target name="maven:gump-descriptor">
- <ant antfile="${maven.home}/build-maven.xml" target="gump-descriptor"/>
- </target>
-
- <target name="maven:javadocs">
- <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
- </target>
-
- <target name="maven:compile">
- <ant antfile="${maven.home}/build-maven.xml" target="compile"/>
- </target>
-
- <target name="maven:update-jars">
- <ant antfile="${maven.home}/build-maven.xml" target="update-jars"/>
- </target>
+<!-- ======================================================== -->
+<!-- D E L E G A T O R S -->
+<!-- ======================================================== -->
+
+<target name="maven:gump-descriptor">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="gump-descriptor"/>
+</target>
+
+<target name="maven:maven-update">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="maven-update"/>
+</target>
+
+<target name="maven:update-jars">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="update-jars"/>
+</target>
+
+<target name="maven:jar">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/>
+</target>
+
+<target name="maven:docs-quick">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs-quick"/>
+</target>
+
+<target name="maven:run-singletest">
+ <ant antfile="${maven.home}/plugins/test/build.xml" target="run-singletest"/>
+</target>
+
+<target name="maven:compile">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
+</target>
+
+<target name="maven:fo">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/>
+</target>
+
+<target name="maven:cvs-change-log">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="cvs-change-log"/>
+</target>
+
+<target name="maven:war">
+ <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/>
+</target>
+
+<target name="maven:generate-reactor">
+ <ant antfile="${maven.home}/plugins/reactor/build.xml" target="generate-reactor"/>
+</target>
+
+<target name="maven:cross-ref">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="cross-ref"/>
+</target>
+
+<target name="maven:deploy-site">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="deploy-site"/>
+</target>
+
+<target name="maven:ear">
+ <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/>
+</target>
+
+<target name="maven:install-jar">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="install-jar"/>
+</target>
+
+<target name="maven:task-list">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="task-list"/>
+</target>
+
+<target name="maven:docs">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs"/>
+</target>
+
+<target name="maven:site">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="site"/>
+</target>
+
+<target name="maven:deploy-dist">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="deploy-dist"/>
+</target>
+
+<target name="maven:javadocs">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="javadocs"/>
+</target>
+
+<target name="maven:announce">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="announce"/>
+</target>
+
+<target name="maven:check-source">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="check-source"/>
+</target>
+
+<target name="maven:dist">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="dist"/>
+</target>
+
+<target name="maven:dist-build">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="dist-build"/>
+</target>
+
+<target name="maven:metrics">
+ <ant antfile="${maven.home}/plugins/metrics/build.xml" target="metrics"/>
+</target>
+
+<target name="maven:clean">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="clean"/>
+</target>
+
+<target name="maven:env">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="env"/>
+</target>
+
+<target name="maven:test">
+ <ant antfile="${maven.home}/plugins/test/build.xml" target="test"/>
+</target>
+
+<target name="maven:pdf">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/>
+</target>
+
+<target name="maven:iutest">
+ <ant antfile="${maven.home}/plugins/iutest/build.xml" target="iutest"/>
+</target>
+
+<target name="maven:activity-log">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="activity-log"/>
+</target>
+
+<target name="maven:verify-project">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="verify-project"/>
+</target>
+
+<target name="maven:validate-pom">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="validate-pom"/>
+</target>
+
+<target name="maven:validate-war">
+ <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="validate-war"/>
+</target>
<!-- maven:end -->
</project>
1.23 +6 -4 jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/JXPathTestCase.java
Index: JXPathTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/JXPathTestCase.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JXPathTestCase.java 8 Jun 2002 22:47:24 -0000 1.22
+++ JXPathTestCase.java 9 Jun 2002 01:58:41 -0000 1.23
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/JXPathTestCase.java,v 1.22 2002/06/08 22:47:24 dmitri Exp $
- * $Revision: 1.22 $
- * $Date: 2002/06/08 22:47:24 $
+ * $Header: /home/cvs/jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/JXPathTestCase.java,v 1.23 2002/06/09 01:58:41 dmitri Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/06/09 01:58:41 $
*
* ====================================================================
* The Apache Software License, Version 1.1
@@ -95,7 +95,7 @@
* </p>
*
* @author Dmitri Plotnikov
- * @version $Revision: 1.22 $ $Date: 2002/06/08 22:47:24 $
+ * @version $Revision: 1.23 $ $Date: 2002/06/09 01:58:41 $
*/
public class JXPathTestCase extends TestCase
@@ -930,6 +930,7 @@
}
public void testParser(JXPathContext ctx, boolean ignorePath) throws Exception {
+ bean.getBeans()[1].setInt(3);
ctx.setLocale(Locale.US);
ctx.getVariables().declareVariable("a", new Double(1));
ctx.getVariables().declareVariable("b", new Double(1));
@@ -1114,6 +1115,7 @@
testEval("beans[1]/strings", list("String 1", "String 2", "String 3")),
testEval("beans/strings[2]", list("String 2", "String 2")),
test("beans/strings[2]", "String 2"),
+ test("beans[int > 2]/name", "Name 2"),
test("beans/strings[name(.)='strings'][2]", "String 2"),
test("(beans/strings[2])[1]", "String 2"),
1.3 +5 -5 jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java
Index: JXPathCompiledExpression.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JXPathCompiledExpression.java 8 May 2002 23:05:05 -0000 1.2
+++ JXPathCompiledExpression.java 9 Jun 2002 01:58:41 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java,v 1.2 2002/05/08 23:05:05 dmitri Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/08 23:05:05 $
+ * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java,v 1.3 2002/06/09 01:58:41 dmitri Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/06/09 01:58:41 $
*
* ====================================================================
* The Apache Software License, Version 1.1
@@ -70,7 +70,7 @@
*
*
* @author Dmitri Plotnikov
- * @version $Revision: 1.2 $ $Date: 2002/05/08 23:05:05 $
+ * @version $Revision: 1.3 $ $Date: 2002/06/09 01:58:41 $
*/
public class JXPathCompiledExpression implements CompiledExpression {
@@ -146,7 +146,7 @@
}
/**
- * @see CompiledExpression#remove(JXPathContext)
+ * @see CompiledExpression#removePath(JXPathContext)
*/
public void removePath(JXPathContext context){
((JXPathContextReferenceImpl)context).removePath(xpath, expression);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>