You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2013/06/14 19:24:15 UTC
svn commit: r1493171 - in /jena/trunk:
jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterEquality.java
jena-text/pom.xml
Author: rvesse
Date: Fri Jun 14 17:24:15 2013
New Revision: 1493171
URL: http://svn.apache.org/r1493171
Log:
Add <repository> element to jena-text POM as org.restlet.jee artifacts aren't in Maven Central and won't build in some environments (like mine) without this.
Also fix minor typos in some code comments
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterEquality.java
jena/trunk/jena-text/pom.xml
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterEquality.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterEquality.java?rev=1493171&r1=1493170&r2=1493171&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterEquality.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterEquality.java Fri Jun 14 17:24:15 2013
@@ -40,7 +40,7 @@ import com.hp.hpl.jena.sparql.expr.* ;
public class TransformFilterEquality extends TransformCopy
{
// The approach taken for { OPTIONAL{} OPTIONAL{} } is more general ... and better?
- // Still need to be careful of double-nested OPTIONALS as intermedates of a different
+ // Still need to be careful of double-nested OPTIONALS as intermediates of a different
// value can block overall results so don't mask immediately.
public TransformFilterEquality()
{ }
@@ -69,7 +69,7 @@ public class TransformFilterEquality ext
Op op = subOp ;
// Special case : deduce that the filter will always "eval unbound"
- // hence elimate all rows. Return the empty table.
+ // hence eliminate all rows. Return the empty table.
if ( testSpecialCaseUnused(subOp, equalities, remaining))
return OpTable.empty() ;
Modified: jena/trunk/jena-text/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/pom.xml?rev=1493171&r1=1493170&r2=1493171&view=diff
==============================================================================
--- jena/trunk/jena-text/pom.xml (original)
+++ jena/trunk/jena-text/pom.xml Fri Jun 14 17:24:15 2013
@@ -1,230 +1,237 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- You under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-text</artifactId>
- <packaging>jar</packaging>
- <name>Apache Jena - SPARQL and Lucene/Solr</name>
- <version>1.0.0-SNAPSHOT</version>
-
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>7-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
- </parent>
-
- <properties>
- <ver.jena>2.10.2-SNAPSHOT</ver.jena>
- <ver.lucene>4.2.1</ver.lucene>
- <ver.solr>4.2.1</ver.solr>
-
- <this.root>${project.artifactId}-${project.version}</this.root>
- <server.jar.name>${this.root}-fuseki</server.jar.name>
-
- <jdk.version>1.6</jdk.version>
- <targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
- <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
- </properties>
-
- <dependencies>
-
- <!-- All Jena libs (not Fuseki) -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>apache-jena-libs</artifactId>
- <version>${ver.jena}</version>
- <type>pom</type>
- </dependency>
-
- <!-- Testing support -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- <version>${ver.jena}</version>
- <type>jar</type>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <!-- Lucene dependencies -->
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${ver.lucene}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${ver.lucene}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- <version>${ver.lucene}</version>
- <type>jar</type>
- </dependency>
-
- <!-- Solr client -->
- <!-- Exclusion of slf4: Necessary otherwise maven complains about a "Dependency
- convergence error" of slf4j-api 1.6.1 (from zookeeper) vs 1.6.4 (Jena) possibly
- due to the use of scope-test -->
-
- <dependency>
- <artifactId>solr-solrj</artifactId>
- <groupId>org.apache.solr</groupId>
- <version>${ver.solr}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Embedded server / testing -->
- <dependency>
- <artifactId>solr-core</artifactId>
- <groupId>org.apache.solr</groupId>
- <version>${ver.solr}</version>
- <type>jar</type>
- <scope>test</scope>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Embedded Solr server -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/TS_*.java</include>
- </includes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- <!-- Only material in the main jar <execution> <id>attach-sources-test</id>
- <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <version>true</version>
- <show>public</show>
- <quiet>true</quiet>
- <encoding>UTF-8</encoding>
- <windowtitle>${project.name} ${project.version}</windowtitle>
- <doctitle>${project.name} ${project.version}</doctitle>
- <bottom>Licenced under the Apache License, Version 2.0</bottom>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <overWriteReleases>false</overWriteReleases>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <!-- By default, have separate Eclipse and maven build areas -->
- <buildOutputDirectory>${project.build.directory}/classes</buildOutputDirectory>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>false</downloadJavadocs>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-text</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Jena - SPARQL and Lucene/Solr</name>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-parent</artifactId>
+ <version>7-SNAPSHOT</version>
+ <relativePath>../jena-parent</relativePath>
+ </parent>
+
+ <properties>
+ <ver.jena>2.10.2-SNAPSHOT</ver.jena>
+ <ver.lucene>4.2.1</ver.lucene>
+ <ver.solr>4.2.1</ver.solr>
+
+ <this.root>${project.artifactId}-${project.version}</this.root>
+ <server.jar.name>${this.root}-fuseki</server.jar.name>
+
+ <jdk.version>1.6</jdk.version>
+ <targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
+ <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
+ </properties>
+
+ <dependencies>
+
+ <!-- All Jena libs (not Fuseki) -->
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>apache-jena-libs</artifactId>
+ <version>${ver.jena}</version>
+ <type>pom</type>
+ </dependency>
+
+ <!-- Testing support -->
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>${ver.jena}</version>
+ <type>jar</type>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Lucene dependencies -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${ver.lucene}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <version>${ver.lucene}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${ver.lucene}</version>
+ <type>jar</type>
+ </dependency>
+
+ <!-- Solr client -->
+ <!-- Exclusion of slf4: Necessary otherwise maven complains about a "Dependency
+ convergence error" of slf4j-api 1.6.1 (from zookeeper) vs 1.6.4 (Jena) possibly
+ due to the use of scope-test -->
+
+ <dependency>
+ <artifactId>solr-solrj</artifactId>
+ <groupId>org.apache.solr</groupId>
+ <version>${ver.solr}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Embedded server / testing -->
+ <dependency>
+ <artifactId>solr-core</artifactId>
+ <groupId>org.apache.solr</groupId>
+ <version>${ver.solr}</version>
+ <type>jar</type>
+ <scope>test</scope>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Embedded Solr server -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/TS_*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <!-- Only material in the main jar <execution> <id>attach-sources-test</id>
+ <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <version>true</version>
+ <show>public</show>
+ <quiet>true</quiet>
+ <encoding>UTF-8</encoding>
+ <windowtitle>${project.name} ${project.version}</windowtitle>
+ <doctitle>${project.name} ${project.version}</doctitle>
+ <bottom>Licenced under the Apache License, Version 2.0</bottom>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <!-- By default, have separate Eclipse and maven build areas -->
+ <buildOutputDirectory>${project.build.directory}/classes</buildOutputDirectory>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ <repositories>
+ <repository>
+ <id>maven-restlet</id>
+ <name>Public online Restlet repository</name>
+ <url>http://maven.restlet.org</url>
+ </repository>
+ </repositories>
</project>