[caboto] r554 committed - update the branch with changes that have been made to trunk

0 views
Skip to first unread message

codesite...@google.com

unread,
Jan 15, 2010, 5:07:04 AM1/15/10
to cabot...@googlegroups.com
Revision: 554
Author: mike.a.jones
Date: Fri Jan 15 02:06:22 2010
Log: update the branch with changes that have been made to trunk
http://code.google.com/p/caboto/source/detail?r=554

Deleted:
/branches/multi_valued/caboto/src/main/java/org/caboto/Scratch.java
Modified:
/branches/multi_valued/caboto/pom.xml
/branches/multi_valued/caboto/src/main/java/org/caboto/filters
/branches/multi_valued/caboto/src/test/java/org/caboto/filters

/branches/multi_valued/caboto/src/test/java/org/caboto/rest/resources/AbstractResourceTest.java

/branches/multi_valued/caboto/src/test/java/org/caboto/rest/resources/BasicAuthenticationClientFilter.java
/branches/multi_valued/caboto/src/test/resources/test-graph3.rdf
/branches/multi_valued/caboto-web/pom.xml
/branches/multi_valued/database/pom.xml

/branches/multi_valued/database/src/main/java/org/caboto/jena/db/AbstractDatabase.java
/branches/multi_valued/database/src/main/java/org/caboto/jena/db/Data.java

/branches/multi_valued/database/src/main/java/org/caboto/jena/db/DataException.java

/branches/multi_valued/database/src/main/java/org/caboto/jena/db/Database.java

/branches/multi_valued/database/src/main/java/org/caboto/jena/db/Results.java
/branches/multi_valued/database/src/main/java/org/caboto/jena/db/Utils.java

/branches/multi_valued/database/src/main/java/org/caboto/jena/db/impl/DatasourceDatabase.java

/branches/multi_valued/database/src/main/java/org/caboto/jena/db/impl/FileDatabase.java

/branches/multi_valued/database/src/main/java/org/caboto/jena/db/impl/RdfFileFilter.java

/branches/multi_valued/database/src/main/java/org/caboto/jena/db/impl/SDBAbstractDatabase.java

/branches/multi_valued/database/src/main/java/org/caboto/jena/db/impl/SDBDatabase.java

/branches/multi_valued/database/src/main/java/org/caboto/jena/db/impl/Scratch.java
/branches/multi_valued/database/src/test/java/org
/branches/multi_valued/database/src/test/java/org/caboto
/branches/multi_valued/database/src/test/java/org/caboto/jena
/branches/multi_valued/database/src/test/java/org/caboto/jena/db
/branches/multi_valued/database/src/test/java/org/caboto/jena/db/impl
/branches/multi_valued/database/src/test/resources/graphs
/branches/multi_valued/database/src/test/resources/graphs/test
/branches/multi_valued/pom.xml

=======================================
--- /branches/multi_valued/caboto/src/main/java/org/caboto/Scratch.java Wed
Oct 1 02:45:25 2008
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * (c) Copyright 2007, 2008 Hewlett-Packard Development Company, LP
- * All rights reserved.
- * [See end of file]
- */
-package org.caboto;
-
-import com.hp.hpl.jena.sdb.Store;
-import com.hp.hpl.jena.sdb.layout2.TableDescNodes;
-import com.hp.hpl.jena.sdb.store.StoreFactory;
-import com.hp.hpl.jena.sdb.store.TableDesc;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.HashSet;
-
-public class Scratch {
-
- /**
- * @param args
- * @throws SQLException
- */
- public static void main(String[] args) throws SQLException {
- Store store = StoreFactory.create("Store/sdb-hsqldb-mem.ttl");
- System.err.println("Formatted? " + formatted(store));
- store.getTableFormatter().create();
- System.err.println("Formatted? " + formatted(store));
- }
-
- public static boolean formatted(Store store) throws SQLException {
- return checkNodes(store) && checkTuples(store);
- }
-
- private static boolean checkNodes(Store store) throws SQLException {
- Connection conn = store.getConnection().getSqlConnection();
- TableDescNodes nodeDesc = store.getNodeTableDesc();
- if (nodeDesc == null) {
- return true; // vacuous
- }
- return hasTableAndColumns(conn,
- nodeDesc.getTableName(),
- nodeDesc.getIdColName(),
- nodeDesc.getHashColName(),
- nodeDesc.getLexColName(),
- nodeDesc.getLangColName(),
- nodeDesc.getTypeColName());
- }
-
- private static boolean checkTuples(Store store) throws SQLException {
- Connection conn = store.getConnection().getSqlConnection();
- return isTupleTableFormatted(conn, store.getTripleTableDesc()) &&
- isTupleTableFormatted(conn, store.getQuadTableDesc());
- }
-
- private static boolean isTupleTableFormatted(Connection conn,
TableDesc desc) throws SQLException {
- if (desc == null) {
- return true; // vacuous
- }
- return hasTableAndColumns(conn,
- desc.getTableName(),
- desc.getColNames().toArray(new String[]{}));
- }
-
- private static boolean hasTableAndColumns(Connection conn, String
tableName, String... colNames) throws SQLException {
- Collection<String> cols = new HashSet();
- for (String c : colNames) {
- if (c != null) {
- cols.add(c.toLowerCase());
- }
- }
- return (hasColumns(conn, tableName, cols) ||
- hasColumns(conn, tableName.toLowerCase(), cols) ||
- hasColumns(conn, tableName.toUpperCase(), cols));
- }
-
- private static boolean hasColumns(Connection conn, String tableName,
Collection<String> colNames) throws SQLException {
- //System.err.println("Trying: " + tableName);
- ResultSet res = null;
- try {
- res = conn.getMetaData().getColumns(null, null, tableName,
null);
- while (res.next()) {
- String colName = res.getString("COLUMN_NAME");
- //System.err.println("Looking at :" + colName + " " +
colNames.contains(colName.toLowerCase()));
- colNames.remove(colName.toLowerCase());
- }
- //System.err.print("[");
- //for (String col: colNames) System.err.print(col + ",");
- //System.err.println("]");
- return colNames.isEmpty();
- } finally {
- if (res != null) {
- res.close();
- }
- }
- }
-}
-/*
- * (c) Copyright 2007, 2008 Hewlett-Packard Development Company, LP
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
=======================================
--- /branches/multi_valued/caboto/pom.xml Mon Mar 30 06:54:06 2009
+++ /branches/multi_valued/caboto/pom.xml Fri Jan 15 02:06:22 2010
@@ -9,7 +9,6 @@
<groupId>org.caboto</groupId>
<artifactId>caboto</artifactId>
<name>caboto</name>
- <version>0.9-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<build>
<filters>
@@ -73,11 +72,6 @@
</build>

<repositories>
- <!-- HP Labs jena repo -->
- <repository>
- <id>jena.dev</id>
- <url>http://jena.hpl.hp.com/repo</url>
- </repository>
<!-- java.net repo -->
<repository>
<id>maven2-repository.dev.java.net</id>
@@ -108,13 +102,13 @@
<dependency>
<groupId>org.caboto</groupId>
<artifactId>database</artifactId>
- <version>${project.caboto.version}</version>
+ <version>${caboto.version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${project.junit.version}</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>

@@ -132,45 +126,41 @@
</dependency>

<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.3</version>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>sdb</artifactId>
+ <version>${sdb.version}</version>
<scope>test</scope>
</dependency>


- <!-- Jena dependencies -->
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <version>${project.jena.version}</version>
- </dependency>
-
<!-- jersey dependencies -->

<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>${project.jersey.version}</version>
+ <version>${jersey.version}</version>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>${project.jersey.version}</version>
+ <version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>${project.jersey.version}</version>
+ <version>${jersey.version}</version>
<scope>test</scope>
</dependency>

+ <!-- spring dependencies -->
+
<dependency>
- <groupId>com.sun.jersey</groupId>
+ <groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
- <version>${project.jersey.version}</version>
+ <version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -191,13 +181,6 @@
</exclusions>
</dependency>

- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${project.jersey.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -205,27 +188,22 @@
<scope>provided</scope>
</dependency>

- <!-- spring dependencies -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${project.spring.version}</version>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${project.spring.version}</version>
+ <version>${spring.version}</version>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>${project.spring.version}</version>
+ <version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${project.spring.version}</version>
+ <version>${spring.version}</version>
<scope>test</scope>
</dependency>

@@ -235,18 +213,6 @@
<version>2.0.3</version>
</dependency>

- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${project.spring.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>

</project>
=======================================
---
/branches/multi_valued/caboto/src/test/java/org/caboto/rest/resources/AbstractResourceTest.java
Thu Jul 9 06:37:42 2009
+++
/branches/multi_valued/caboto/src/test/java/org/caboto/rest/resources/AbstractResourceTest.java
Fri Jan 15 02:06:22 2010
@@ -274,19 +274,6 @@

}

- // ---------- Handling credentials in the client
-
- void setCredentials(final String username, final String password) {
- Authenticator.setDefault(new Authenticator() {
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication(username,
password.toCharArray());
- }
- });
- }
-
- void clearCredentials() {
- Authenticator.setDefault(null);
- }

// ---------- Jetty server configuration

=======================================
--- /branches/multi_valued/caboto-web/pom.xml Mon Mar 30 06:54:06 2009
+++ /branches/multi_valued/caboto-web/pom.xml Fri Jan 15 02:06:22 2010
@@ -10,7 +10,6 @@
<artifactId>caboto-web</artifactId>
<packaging>war</packaging>
<name>caboto-web Maven Webapp</name>
- <version>0.9-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<build>
<plugins>
@@ -32,7 +31,7 @@
<dependency>
<groupId>org.caboto</groupId>
<artifactId>caboto</artifactId>
- <version>${project.caboto.version}</version>
+ <version>${caboto.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
=======================================
--- /branches/multi_valued/database/pom.xml Mon Mar 30 06:54:06 2009
+++ /branches/multi_valued/database/pom.xml Fri Jan 15 02:06:22 2010
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
<parent>
<artifactId>caboto-parent</artifactId>
<groupId>org.caboto</groupId>
@@ -9,43 +12,32 @@
<groupId>org.caboto</groupId>
<artifactId>database</artifactId>
<name>database</name>
- <version>0.9-SNAPSHOT</version>
<packaging>jar</packaging>
- <repositories>
- <repository>
- <id>ilrt</id>
- <url>http://maven.ilrt.bris.ac.uk</url>
- </repository>
- <repository>
- <id>jena.dev</id>
- <url>http://jena.hpl.hp.com/repo</url>
- </repository>
- </repositories>
<dependencies>
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>sdb</artifactId>
- <version>${project.sdb.version}</version>
+ <version>${sdb.version}</version>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- <version>${project.arq.version}</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq-extra</artifactId>
- <version>${project.arq.version}</version>
+ <artifactId>arq</artifactId>
+ <version>${arq.version}</version>
</dependency>
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
- <version>${project.jena.version}</version>
+ <version>${jena.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${project.junit.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
</dependency>
</dependencies>
</project>
=======================================
--- /branches/multi_valued/pom.xml Mon Mar 30 06:54:06 2009
+++ /branches/multi_valued/pom.xml Fri Jan 15 02:06:22 2010
@@ -16,13 +16,14 @@
<module>caboto-web</module>
</modules>
<properties>
- <spring.version>2.5.5</spring.version>
+ <spring.version>2.5.6</spring.version>
<junit.version>4.4</junit.version>
- <jena.version>2.5.7</jena.version>
- <sdb.version>1.3-SNAPSHOT</sdb.version>
- <arq.version>2.6.0</arq.version>
- <jersey.version>1.0</jersey.version>
+ <jena.version>2.6.2</jena.version>
+ <sdb.version>1.3.0</sdb.version>
+ <arq.version>2.7.0</arq.version>
+ <jersey.version>1.0.3</jersey.version>
<caboto.version>0.9-SNAPSHOT</caboto.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>

Reply all
Reply to author
Forward
0 new messages