Menu
▾
▴
[trippi-codewatch] SF.net SVN: trippi:[127] tags
|
From: <pan...@us...> - 2009-12-02 01:04:38
|
Revision: 127
http://trippi.svn.sourceforge.net/trippi/?rev=127&view=rev
Author: pangloss
Date: 2009-12-02 01:04:23 +0000 (Wed, 02 Dec 2009)
Log Message:
-----------
updated for Mulgara 2.1.4 and Ben Armintor's SPARQL support updates
Added Paths:
-----------
tags/release-1.4.2/
tags/release-1.4.2/CONTRIBUTORS.txt
tags/release-1.4.2/README.txt
tags/release-1.4.2/lib/jakarta-regexp-1.5.jar
tags/release-1.4.2/lib/lib.properties
tags/release-1.4.2/lib/mulgara-core-2.1.4.jar
tags/release-1.4.2/lib/trove-2.0.4.jar
tags/release-1.4.2/src/java/org/trippi/ConnectorDescriptor.java
tags/release-1.4.2/src/java/org/trippi/ConnectorParameter.java
tags/release-1.4.2/src/java/org/trippi/RDFUtil.java
tags/release-1.4.2/src/java/org/trippi/TripleIterator.java
tags/release-1.4.2/src/java/org/trippi/TripleMaker.java
tags/release-1.4.2/src/java/org/trippi/TriplePattern.java
tags/release-1.4.2/src/java/org/trippi/TripleUpdate.java
tags/release-1.4.2/src/java/org/trippi/TriplestoreConnector.java
tags/release-1.4.2/src/java/org/trippi/Trippi.properties
tags/release-1.4.2/src/java/org/trippi/TupleIterator.java
tags/release-1.4.2/src/java/org/trippi/config/ConfigUtils.java
tags/release-1.4.2/src/java/org/trippi/config/TrippiConfig.java
tags/release-1.4.2/src/java/org/trippi/config/TrippiProfile.java
tags/release-1.4.2/src/java/org/trippi/impl/base/ConcurrentTriplestoreReader.java
tags/release-1.4.2/src/java/org/trippi/impl/base/ConcurrentTriplestoreWriter.java
tags/release-1.4.2/src/java/org/trippi/impl/base/ConfigurableSessionPool.java
tags/release-1.4.2/src/java/org/trippi/impl/base/DistinctTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/DistinctTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/LimitedTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/LimitedTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/MemUpdateBuffer.java
tags/release-1.4.2/src/java/org/trippi/impl/base/PoolAwareTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/PoolAwareTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/SynchronizedTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/SynchronizedTriplestoreReader.java
tags/release-1.4.2/src/java/org/trippi/impl/base/SynchronizedTriplestoreSession.java
tags/release-1.4.2/src/java/org/trippi/impl/base/SynchronizedTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/TupleBasedTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/mpt/MPTConnector.java
tags/release-1.4.2/src/java/org/trippi/impl/mpt/MPTSession.java
tags/release-1.4.2/src/java/org/trippi/impl/mpt/MPTTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/CollapsedAnswer.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/MulgaraConnector.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/MulgaraSession.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/MulgaraTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/MulgaraTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/RowGroup.java
tags/release-1.4.2/src/java/org/trippi/impl/multi/MultiConnector.java
tags/release-1.4.2/src/java/org/trippi/impl/oracle/OracleConnector.java
tags/release-1.4.2/src/java/org/trippi/impl/oracle/OracleSession.java
tags/release-1.4.2/src/java/org/trippi/impl/oracle/OracleTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/io/CSVTupleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/CountTripleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/CountTupleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/RIOTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/io/RIOTripleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/SimpleTupleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/SparqlTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/io/SparqlTupleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/TSVTupleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/XMLDeclarationRemover.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/NodeGraph.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/impl/ArrayUtil.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/impl/CountingResultIterator.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/impl/NodeGraphImpl.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/impl/NodeIterator.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/impl/TripleResultsImpl.java
tags/release-1.4.2/src/java/org/trippi/server/http/TrippiServlet.java
tags/release-1.4.2/src/java/org/trippi/ui/TrippiUI.java
tags/release-1.4.2/src/test/org/trippi/TriplestoreConnectorIntegrationTest.java
tags/release-1.4.2/src/test/org/trippi/impl/base/MemUpdateBufferUnitTest.java
tags/release-1.4.2/src/test/org/trippi/impl/base/UpdateBufferUnitTest.java
tags/release-1.4.2/src/test/org/trippi/impl/mulgara/MulgaraConnectorIntegrationTest.java
tags/release-1.4.2/src/test/org/trippi/impl/mulgara/MulgaraConnectorTest.java
tags/release-1.4.2/src/test/org/trippi/io/RIOTripleIteratorTest.java
Removed Paths:
-------------
tags/release-1.4.2/CONTRIBUTORS.txt
tags/release-1.4.2/README.txt
tags/release-1.4.2/lib/jakarta-regexp-1.3.jar
tags/release-1.4.2/lib/lib.properties
tags/release-1.4.2/lib/mulgara-core-2.0.6.jar
tags/release-1.4.2/lib/mulgara-core-2.0.8.jar
tags/release-1.4.2/lib/trove-1.0.2.jar
tags/release-1.4.2/src/java/org/trippi/ConnectorDescriptor.java
tags/release-1.4.2/src/java/org/trippi/ConnectorParameter.java
tags/release-1.4.2/src/java/org/trippi/RDFUtil.java
tags/release-1.4.2/src/java/org/trippi/TripleIterator.java
tags/release-1.4.2/src/java/org/trippi/TripleMaker.java
tags/release-1.4.2/src/java/org/trippi/TriplePattern.java
tags/release-1.4.2/src/java/org/trippi/TripleUpdate.java
tags/release-1.4.2/src/java/org/trippi/TriplestoreConnector.java
tags/release-1.4.2/src/java/org/trippi/Trippi.properties
tags/release-1.4.2/src/java/org/trippi/TupleIterator.java
tags/release-1.4.2/src/java/org/trippi/config/ConfigUtils.java
tags/release-1.4.2/src/java/org/trippi/config/TrippiConfig.java
tags/release-1.4.2/src/java/org/trippi/config/TrippiProfile.java
tags/release-1.4.2/src/java/org/trippi/impl/base/ConcurrentTriplestoreReader.java
tags/release-1.4.2/src/java/org/trippi/impl/base/ConcurrentTriplestoreWriter.java
tags/release-1.4.2/src/java/org/trippi/impl/base/ConfigurableSessionPool.java
tags/release-1.4.2/src/java/org/trippi/impl/base/DistinctTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/DistinctTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/LimitedTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/LimitedTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/MemUpdateBuffer.java
tags/release-1.4.2/src/java/org/trippi/impl/base/PoolAwareTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/PoolAwareTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/SynchronizedTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/SynchronizedTriplestoreReader.java
tags/release-1.4.2/src/java/org/trippi/impl/base/SynchronizedTriplestoreSession.java
tags/release-1.4.2/src/java/org/trippi/impl/base/SynchronizedTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/base/TupleBasedTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/mpt/MPTConnector.java
tags/release-1.4.2/src/java/org/trippi/impl/mpt/MPTSession.java
tags/release-1.4.2/src/java/org/trippi/impl/mpt/MPTTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/CollapsedAnswer.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/MulgaraConnector.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/MulgaraSession.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/MulgaraTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/MulgaraTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/impl/mulgara/RowGroup.java
tags/release-1.4.2/src/java/org/trippi/impl/multi/MultiConnector.java
tags/release-1.4.2/src/java/org/trippi/impl/oracle/OracleConnector.java
tags/release-1.4.2/src/java/org/trippi/impl/oracle/OracleSession.java
tags/release-1.4.2/src/java/org/trippi/impl/oracle/OracleTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/io/CSVTupleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/CountTripleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/CountTupleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/RIOTripleIterator.java
tags/release-1.4.2/src/java/org/trippi/io/RIOTripleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/SimpleTupleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/SparqlTupleIterator.java
tags/release-1.4.2/src/java/org/trippi/io/SparqlTupleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/TSVTupleWriter.java
tags/release-1.4.2/src/java/org/trippi/io/XMLDeclarationRemover.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/NodeGraph.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/impl/ArrayUtil.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/impl/CountingResultIterator.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/impl/NodeGraphImpl.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/impl/NodeIterator.java
tags/release-1.4.2/src/java/org/trippi/nodegraph/impl/TripleResultsImpl.java
tags/release-1.4.2/src/java/org/trippi/server/http/TrippiServlet.java
tags/release-1.4.2/src/java/org/trippi/ui/TrippiUI.java
tags/release-1.4.2/src/test/org/trippi/TriplestoreConnectorIntegrationTest.java
tags/release-1.4.2/src/test/org/trippi/impl/base/MemUpdateBufferUnitTest.java
tags/release-1.4.2/src/test/org/trippi/impl/base/UpdateBufferUnitTest.java
tags/release-1.4.2/src/test/org/trippi/impl/mulgara/MulgaraConnectorIntegrationTest.java
tags/release-1.4.2/src/test/org/trippi/impl/mulgara/MulgaraConnectorTest.java
tags/release-1.4.2/src/test/org/trippi/io/RIOTripleIteratorTest.java
Deleted: tags/release-1.4.2/CONTRIBUTORS.txt
===================================================================
--- trunk/CONTRIBUTORS.txt 2009-11-11 19:18:29 UTC (rev 122)
+++ tags/release-1.4.2/CONTRIBUTORS.txt 2009-12-02 01:04:23 UTC (rev 127)
@@ -1,3 +0,0 @@
-Ben O'Steen - Oxford Research Archive
- Added option to request a count via the
- web interface. Sourceforge feature #1768761
Copied: tags/release-1.4.2/CONTRIBUTORS.txt (from rev 123, trunk/CONTRIBUTORS.txt)
===================================================================
--- tags/release-1.4.2/CONTRIBUTORS.txt (rev 0)
+++ tags/release-1.4.2/CONTRIBUTORS.txt 2009-12-02 01:04:23 UTC (rev 127)
@@ -0,0 +1,7 @@
+Ben O'Steen - Oxford Research Archive
+ Added option to request a count via the
+ web interface. Sourceforge feature #1768761
+
+Benjamin Armintor - Columbia University
+ Added support for SPARQL triple queries to Mulgara connector. See
+ https://fedora-commons.org/jira/browse/FCREPO-478
\ No newline at end of file
Deleted: tags/release-1.4.2/README.txt
===================================================================
--- trunk/README.txt 2009-11-11 19:18:29 UTC (rev 122)
+++ tags/release-1.4.2/README.txt 2009-12-02 01:04:23 UTC (rev 127)
@@ -1,38 +0,0 @@
-
- Trippi Triplestore API
- Version @trippi.version@
-
- Source Distribution
-
- Copyright (c) 2005-2007, Cornell University
- Copyright (c) 2008-2009, Fedora Commons
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-LICENSE
-=======
-Trippi is distributed under the Apache License, v2.0.
-Use of this software indicates your acceptance of the terms of this license.
-The distribution includes several third-party, open-source libraries with
-thier own license terms.
-
-
-DOCUMENTATION
-=============
-Online documentation for the latest version of Trippi can be found at
-http://trippi.sourceforge.net/
-
-Offline documentation for this version of Trippi can be found in the
-dist/doc/ directory after doing a documentation build. (see below)
-
-
-BUILDING
-========
-To compile Trippi, make sure you have Ant installed, and type:
- ant dist
-
-To build the documentation, type:
- ant doc
-
-For other useful build targets, type:
- ant -p
\ No newline at end of file
Copied: tags/release-1.4.2/README.txt (from rev 123, trunk/README.txt)
===================================================================
--- tags/release-1.4.2/README.txt (rev 0)
+++ tags/release-1.4.2/README.txt 2009-12-02 01:04:23 UTC (rev 127)
@@ -0,0 +1,42 @@
+
+ Trippi Triplestore API
+ Version @trippi.version@
+
+ Source Distribution
+
+ Copyright (c) 2005-2007, Cornell University
+ Copyright (c) 2008-2009, Fedora Commons
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+LICENSE
+=======
+Trippi is distributed under the Apache License, v2.0.
+Use of this software indicates your acceptance of the terms of this license.
+The distribution includes several third-party, open-source libraries with
+thier own license terms.
+
+
+DOCUMENTATION
+=============
+Online documentation for the latest version of Trippi can be found at
+http://trippi.sourceforge.net/
+
+Offline documentation for this version of Trippi can be found in the
+dist/doc/ directory after doing a documentation build. (see below)
+
+
+BUILDING
+========
+To compile Trippi, make sure you have Ant installed, and type:
+ ant dist
+
+To build the documentation, type:
+ ant doc
+
+For other useful build targets, type:
+ ant -p
+
+Due to license restrictions on redistribution, the Oracle JDBC driver is not
+included in the source tree. See lib/lib.properties for the latest version
+that has been tested against Trippi.
\ No newline at end of file
Deleted: tags/release-1.4.2/lib/jakarta-regexp-1.3.jar
===================================================================
(Binary files differ)
Copied: tags/release-1.4.2/lib/jakarta-regexp-1.5.jar (from rev 123, trunk/lib/jakarta-regexp-1.5.jar)
===================================================================
(Binary files differ)
Deleted: tags/release-1.4.2/lib/lib.properties
===================================================================
--- trunk/lib/lib.properties 2009-11-11 19:18:29 UTC (rev 122)
+++ tags/release-1.4.2/lib/lib.properties 2009-12-02 01:04:23 UTC (rev 127)
@@ -1,270 +0,0 @@
-#
-# Library Properties
-#
-
-# title : JavaBeans Activation Framework
-# version : 1.1.1
-# license : Sun
-# organization : Sun
-# url : http://java.sun.com/products/javabeans/jaf/downloads/index.html
-#
-lib.activation = lib/activation-1.1.1.jar
-
-# title : Castor Data Binding Framework
-# version : 1.2
-# license : BSD
-# organization : ExoLab Group
-# url : http://www.castor.org/
-# depends-on : jakarta-regexp
-# depends-on : xerces
-# depends-on : xml-apis
-#
-lib.castor = lib/castor-1.2-codegen.jar
-lib.castor-xml = lib/castor-1.2-xml.jar
-lib.castor-schema = lib/castor-1.2-xml-schema.jar
-
-# title : Commons Codec
-# version : 1.3
-# license : The Apache Software License, Version 2.0
-# organization : The Apache Software Foundation
-# url : http://commons.apache.org/codec/
-#
-lib.commons-codec = lib/commons-codec-1.3.jar
-
-# title : Commons Collections
-# version : 3.2.1
-# license : The Apache Software License, Version 2.0
-# organization : The Apache Software Foundation
-# url : http://jakarta.apache.org/commons/collections/
-#
-lib.commons-collections = lib/commons-collections-3.2.1.jar
-
-# title : Commons Database Connection Pooling
-# version : 1.2.1
-# license : The Apache Software License, Version 2.0
-# organization : The Apache Software Foundation
-# url : http://jakarta.apache.org/commons/dbcp/
-# depends-on : commons-collections
-# depends-on : commons-pool
-#
-lib.commons-dbcp = lib/commons-dbcp-1.2.2.jar
-
-# title : Commons Discovery
-# version : 1.2
-# license : The Apache Software License, Version 2.0
-# organization : The Apache Software Foundation
-# url : http://commons.apache.org/discovery/
-#
-lib.commons-discovery = lib/commons-discovery-1.2.jar
-
-
-# title : Commons HttpClient
-# version : 3.1
-# license : The Apache Software License, Version 2.0
-# organization : The Apache Software Foundation
-# url : http://jakarta.apache.org/httpcomponents/httpclient-3.x/
-#
-lib.commons-httpclient = lib/commons-httpclient-3.1.jar
-
-# title : Commons Logging
-# version : 1.0.3
-# license : The Apache Software License, Version 2.0
-# organization : The Apache Software Foundation
-# url : http://commons.apache.org/logging/
-#
-lib.commons-logging = lib/commons-logging-1.0.3.jar
-
-# title : Commons Object Pooling Library
-# version : 1.4
-# license : The Apache Software License, Version 2.0
-# organization : The Apache Software Foundation
-# url : http://jakarta.apache.org/commons/pool/
-# depends-on : commons-collections
-#
-lib.commons-pool = lib/commons-pool-1.4.jar
-
-# title : J2EE Connector Architecture
-# url : http://java.sun.com/j2ee/connector/
-#
-lib.jca = lib/connector-1_5.jar
-
-lib.emory-util = lib/emory-util-2.1-remote.jar
-
-# title : Jakarta Regular Expressions Library
-# version : 1.3
-# license : The Apache Software License, Version 2.0
-# organization : The Apache Software Foundation
-# url : http://jakarta.apache.org/regexp/
-#
-lib.jakarta-regexp = lib/jakarta-regexp-1.3.jar
-
-# title : Joda Time
-# version : 1.5.2
-# license : The Apache Software License, Version 2.0
-# organization :
-# url : http://joda-time.sourceforge.net/
-#
-lib.joda-time = lib/joda-time-1.5.2.jar
-
-lib.jotm = lib/jotm-2.0.10.jar
-lib.jotm-carol = lib/carol-2.0.5.jar
-lib.jotm-howl = lib/howl-logger-0.1.11.jar
-lib.jotm-iiop = lib/jotm_jrmp_stubs-2.0.10.jar
-
-lib.jta = lib/jta-spec1_0_1.jar
-
-# title : JUnit
-# version : 4.5
-# license : Common Public License 1.0
-# organization : JUnit.org
-# url : http://junit.org/
-#
-lib.junit = lib/junit-4.5.jar
-
-# title : Mulgara
-# version : 2.0.6
-# license : Mozilla Public License 1.1
-# url : http://www.mulgara.org/
-# depends-on : log4j
-# depends-on : servlet-api
-# depends-on : activation
-# depends-on : beep
-# depends-on : castor
-# depends-on : castor-xml
-# depends-on : castor-schema
-# depends-on : commons-codec
-# depends-on : commons-discovery
-# depends-on : commons-httpclient
-# depends-on : commons-logging
-# depends-on : emory-util
-# depends-on : jca
-# depends-on : joda-time
-# depends-on : jotm
-# depends-on : jotm-carol
-# depends-on : jotm-howl
-# depends-on : jotm-iiop
-# depends-on : jta
-# depends-on : lucene
-# depends-on : mail
-# depends-on : saaj
-# depends-on : trove
-#
-lib.mulgara = lib/mulgara-core-2.0.6.jar
-
-# title : Apache Derby Database
-# version : 10.4.2.0
-# license : The Apache Software License, Version 2.0
-# organization : The Apache Software Foundation
-# url : http://db.apache.org/derby/
-#
-lib.derby = lib/derby-10.4.2.0.jar
-
-# title : Log4J
-# version : 1.2.15
-# license : The Apache Software License, Version 2.0
-# organization : The Apache Software Foundation
-# url : http://logging.apache.org/log4j/
-#
-lib.log4j = lib/log4j-1.2.15.jar
-
-# title : Lucene
-# version : 2.4.0
-# license : ?
-# organization : Apache?
-# url : http://lucene.apache.org/
-#
-lib.lucene = lib/lucene-core-2.4.0.jar
-
-# title : Java Mail
-# version : 1.3
-# license : Sun
-# organization : Sun Microsystems, Inc.
-# url : http://java.sun.com/
-#
-lib.mail = lib/mail-1.3.jar
-
-# title : MPTStore RDF Storage Engine
-# version : 0.9.1
-# license : Educational Community License 1.0
-# organization : Cornell University
-# url : http://mptstore.sourceforge.net/
-# depends-on : log4j
-#
-lib.mptstore = lib/mptstore-0.9.1.jar
-
-# title : OpenRDF Sesame
-# version : 2.2.1
-# license : ??
-# organization : Aduna
-# url : http://openrdf.org/
-# depends-on : slfj-api, slf4j-jdk14
-#
-lib.openrdf-sesame-onejar = lib/openrdf-sesame-2.2.1-onejar.jar
-
-# title : Oracle JDBC Driver
-# version : 10.2.0.2
-# license : Oracle Technology Network License
-# organization : Oracle Corporation
-# url : http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html
-# note : This driver is not included; it must be downloaded directly from Oracle.
-#
-lib.oracle-jdbc = lib/ojdbc14.jar
-
-lib.saaj = lib/saaj-1.4.jar
-
-# title : Saxon XML Parser
-# version : 8?
-# license : ?
-# organization : Michael Kay?
-# url : http://saxon.org/
-#
-lib.saxon = lib/saxon.jar
-
-# title : Java Servlet API
-# version : 2.4
-# license : Sun
-# organization : Sun Microsystems, Inc.
-# url : http://java.sun.com/
-#
-lib.servlet-api = lib/servlet-api.jar
-
-# title : Simple Logging Facade for Java (SLF4J)
-# version : 1.3.0
-# license : ??
-# organization : ??
-# url : http://www.slf4j.org/
-#
-lib.slf4j-api = lib/slf4j-api-1.5.2.jar
-
-# title : Simple Logging Facade for Java (SLF4J)
-# version : 1.3.0
-# license : ??
-# organization : ??
-# url : http://www.slf4j.org/
-#
-lib.slf4j-jdk14 = lib/slf4j-jdk14-1.5.2.jar
-
-# title : GNU Trove
-# version : 1.0.2
-# license : LGPL
-# organization : Eric D. Friedman
-# url : http://trove4j.sourceforge.net/
-#
-lib.trove = lib/trove-1.0.2.jar
-
-# title : XML Pull API
-# version : 1.1.3.4a
-# license : ?
-# organization : ?
-# url : http://xmlpull.org/
-#
-lib.xmlpull = lib/xmlpull_1_1_3_4a.jar
-
-# title : XML Pull Implementation
-# version : 1.1.4c
-# license : ?
-# organization : ?
-# url : http://xmlpull.org/
-#
-lib.xpp3 = lib/xpp3_min-1.1.4c.jar
-
Copied: tags/release-1.4.2/lib/lib.properties (from rev 123, trunk/lib/lib.properties)
===================================================================
--- tags/release-1.4.2/lib/lib.properties (rev 0)
+++ tags/release-1.4.2/lib/lib.properties 2009-12-02 01:04:23 UTC (rev 127)
@@ -0,0 +1,270 @@
+#
+# Library Properties
+#
+
+# title : JavaBeans Activation Framework
+# version : 1.1.1
+# license : Sun
+# organization : Sun
+# url : http://java.sun.com/products/javabeans/jaf/downloads/index.html
+#
+lib.activation = lib/activation-1.1.1.jar
+
+# title : Castor Data Binding Framework
+# version : 1.2
+# license : BSD
+# organization : ExoLab Group
+# url : http://www.castor.org/
+# depends-on : jakarta-regexp
+# depends-on : xerces
+# depends-on : xml-apis
+#
+lib.castor = lib/castor-1.2-codegen.jar
+lib.castor-xml = lib/castor-1.2-xml.jar
+lib.castor-schema = lib/castor-1.2-xml-schema.jar
+
+# title : Commons Codec
+# version : 1.3
+# license : The Apache Software License, Version 2.0
+# organization : The Apache Software Foundation
+# url : http://commons.apache.org/codec/
+#
+lib.commons-codec = lib/commons-codec-1.3.jar
+
+# title : Commons Collections
+# version : 3.2.1
+# license : The Apache Software License, Version 2.0
+# organization : The Apache Software Foundation
+# url : http://jakarta.apache.org/commons/collections/
+#
+lib.commons-collections = lib/commons-collections-3.2.1.jar
+
+# title : Commons Database Connection Pooling
+# version : 1.2.1
+# license : The Apache Software License, Version 2.0
+# organization : The Apache Software Foundation
+# url : http://jakarta.apache.org/commons/dbcp/
+# depends-on : commons-collections
+# depends-on : commons-pool
+#
+lib.commons-dbcp = lib/commons-dbcp-1.2.2.jar
+
+# title : Commons Discovery
+# version : 1.2
+# license : The Apache Software License, Version 2.0
+# organization : The Apache Software Foundation
+# url : http://commons.apache.org/discovery/
+#
+lib.commons-discovery = lib/commons-discovery-1.2.jar
+
+
+# title : Commons HttpClient
+# version : 3.1
+# license : The Apache Software License, Version 2.0
+# organization : The Apache Software Foundation
+# url : http://jakarta.apache.org/httpcomponents/httpclient-3.x/
+#
+lib.commons-httpclient = lib/commons-httpclient-3.1.jar
+
+# title : Commons Logging
+# version : 1.0.3
+# license : The Apache Software License, Version 2.0
+# organization : The Apache Software Foundation
+# url : http://commons.apache.org/logging/
+#
+lib.commons-logging = lib/commons-logging-1.0.3.jar
+
+# title : Commons Object Pooling Library
+# version : 1.4
+# license : The Apache Software License, Version 2.0
+# organization : The Apache Software Foundation
+# url : http://jakarta.apache.org/commons/pool/
+# depends-on : commons-collections
+#
+lib.commons-pool = lib/commons-pool-1.4.jar
+
+# title : J2EE Connector Architecture
+# url : http://java.sun.com/j2ee/connector/
+#
+lib.jca = lib/connector-1_5.jar
+
+lib.emory-util = lib/emory-util-2.1-remote.jar
+
+# title : Jakarta Regular Expressions Library
+# version : 1.5
+# license : The Apache Software License, Version 2.0
+# organization : The Apache Software Foundation
+# url : http://jakarta.apache.org/regexp/
+#
+lib.jakarta-regexp = lib/jakarta-regexp-1.5.jar
+
+# title : Joda Time
+# version : 1.5.2
+# license : The Apache Software License, Version 2.0
+# organization :
+# url : http://joda-time.sourceforge.net/
+#
+lib.joda-time = lib/joda-time-1.5.2.jar
+
+lib.jotm = lib/jotm-2.0.10.jar
+lib.jotm-carol = lib/carol-2.0.5.jar
+lib.jotm-howl = lib/howl-logger-0.1.11.jar
+lib.jotm-iiop = lib/jotm_jrmp_stubs-2.0.10.jar
+
+lib.jta = lib/jta-spec1_0_1.jar
+
+# title : JUnit
+# version : 4.5
+# license : Common Public License 1.0
+# organization : JUnit.org
+# url : http://junit.org/
+#
+lib.junit = lib/junit-4.5.jar
+
+# title : Mulgara
+# version : 2.1.4
+# license : Open Software License ("OSL") v. 3.0
+# url : http://www.mulgara.org/
+# depends-on : log4j
+# depends-on : servlet-api
+# depends-on : activation
+# depends-on : beep
+# depends-on : castor
+# depends-on : castor-xml
+# depends-on : castor-schema
+# depends-on : commons-codec
+# depends-on : commons-discovery
+# depends-on : commons-httpclient
+# depends-on : commons-logging
+# depends-on : emory-util
+# depends-on : jca
+# depends-on : joda-time
+# depends-on : jotm
+# depends-on : jotm-carol
+# depends-on : jotm-howl
+# depends-on : jotm-iiop
+# depends-on : jta
+# depends-on : lucene
+# depends-on : mail
+# depends-on : saaj
+# depends-on : trove
+#
+lib.mulgara = lib/mulgara-core-2.1.4.jar
+
+# title : Apache Derby Database
+# version : 10.4.2.0
+# license : The Apache Software License, Version 2.0
+# organization : The Apache Software Foundation
+# url : http://db.apache.org/derby/
+#
+lib.derby = lib/derby-10.4.2.0.jar
+
+# title : Log4J
+# version : 1.2.15
+# license : The Apache Software License, Version 2.0
+# organization : The Apache Software Foundation
+# url : http://logging.apache.org/log4j/
+#
+lib.log4j = lib/log4j-1.2.15.jar
+
+# title : Lucene
+# version : 2.4.0
+# license : ?
+# organization : Apache?
+# url : http://lucene.apache.org/
+#
+lib.lucene = lib/lucene-core-2.4.0.jar
+
+# title : Java Mail
+# version : 1.3
+# license : Sun
+# organization : Sun Microsystems, Inc.
+# url : http://java.sun.com/
+#
+lib.mail = lib/mail-1.3.jar
+
+# title : MPTStore RDF Storage Engine
+# version : 0.9.1
+# license : Educational Community License 1.0
+# organization : Cornell University
+# url : http://mptstore.sourceforge.net/
+# depends-on : log4j
+#
+lib.mptstore = lib/mptstore-0.9.1.jar
+
+# title : OpenRDF Sesame
+# version : 2.2.1
+# license : ??
+# organization : Aduna
+# url : http://openrdf.org/
+# depends-on : slfj-api, slf4j-jdk14
+#
+lib.openrdf-sesame-onejar = lib/openrdf-sesame-2.2.1-onejar.jar
+
+# title : Oracle JDBC Driver
+# version : 10.2.0.2
+# license : Oracle Technology Network License
+# organization : Oracle Corporation
+# url : http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html
+# note : This driver is not included; it must be downloaded directly from Oracle.
+#
+lib.oracle-jdbc = lib/ojdbc14.jar
+
+lib.saaj = lib/saaj-1.4.jar
+
+# title : Saxon XML Parser
+# version : 8?
+# license : ?
+# organization : Michael Kay?
+# url : http://saxon.org/
+#
+lib.saxon = lib/saxon.jar
+
+# title : Java Servlet API
+# version : 2.4
+# license : Sun
+# organization : Sun Microsystems, Inc.
+# url : http://java.sun.com/
+#
+lib.servlet-api = lib/servlet-api.jar
+
+# title : Simple Logging Facade for Java (SLF4J)
+# version : 1.3.0
+# license : ??
+# organization : ??
+# url : http://www.slf4j.org/
+#
+lib.slf4j-api = lib/slf4j-api-1.5.2.jar
+
+# title : Simple Logging Facade for Java (SLF4J)
+# version : 1.3.0
+# license : ??
+# organization : ??
+# url : http://www.slf4j.org/
+#
+lib.slf4j-jdk14 = lib/slf4j-jdk14-1.5.2.jar
+
+# title : GNU Trove
+# version : 2.0.4
+# license : LGPL
+# organization : Eric D. Friedman
+# url : http://trove4j.sourceforge.net/
+#
+lib.trove = lib/trove-2.0.4.jar
+
+# title : XML Pull API
+# version : 1.1.3.4a
+# license : ?
+# organization : ?
+# url : http://xmlpull.org/
+#
+lib.xmlpull = lib/xmlpull_1_1_3_4a.jar
+
+# title : XML Pull Implementation
+# version : 1.1.4c
+# license : ?
+# organization : ?
+# url : http://xmlpull.org/
+#
+lib.xpp3 = lib/xpp3_min-1.1.4c.jar
+
Deleted: tags/release-1.4.2/lib/mulgara-core-2.0.6.jar
===================================================================
(Binary files differ)
Deleted: tags/release-1.4.2/lib/mulgara-core-2.0.8.jar
===================================================================
(Binary files differ)
Copied: tags/release-1.4.2/lib/mulgara-core-2.1.4.jar (from rev 126, trunk/lib/mulgara-core-2.1.4.jar)
===================================================================
(Binary files differ)
Deleted: tags/release-1.4.2/lib/trove-1.0.2.jar
===================================================================
(Binary files differ)
Copied: tags/release-1.4.2/lib/trove-2.0.4.jar (from rev 123, trunk/lib/trove-2.0.4.jar)
===================================================================
(Binary files differ)
Deleted: tags/release-1.4.2/src/java/org/trippi/ConnectorDescriptor.java
===================================================================
--- trunk/src/java/org/trippi/ConnectorDescriptor.java 2009-11-11 19:18:29 UTC (rev 122)
+++ tags/release-1.4.2/src/java/org/trippi/ConnectorDescriptor.java 2009-12-02 01:04:23 UTC (rev 127)
@@ -1,167 +0,0 @@
-package org.trippi;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class ConnectorDescriptor {
-
- private String m_name;
- private String m_description;
- private List<ConnectorParameter> m_parameters;
-
- public static ConnectorDescriptor forName(String className)
- throws TrippiException {
- String path = className.replaceAll("\\.", "/") + "Descriptor.xml";
- InputStream xml = ClassLoader.getSystemClassLoader().
- getResourceAsStream(path);
- if (xml != null) {
- return new ConnectorDescriptor(xml);
- }
- throw new TrippiException("Not found in classpath: " + path);
- }
-
- public static Map<String, ConnectorDescriptor> find() throws TrippiException,
- IOException {
- Map<String, ConnectorDescriptor> m = new HashMap<String, ConnectorDescriptor>();
- File jarDir = new File(System.getProperty("java.endorsed.dirs"));
- String[] jarNames = jarDir.list();
- for (int i = 0; i < jarNames.length; i++) {
- if (jarNames[i].toLowerCase().endsWith(".jar")) {
- JarFile f = new JarFile(new File(jarDir, jarNames[i]));
- Enumeration<JarEntry> e = f.entries();
- while (e.hasMoreElements()) {
- JarEntry entry = (JarEntry) e.nextElement();
- if (entry.getName().endsWith("Descriptor.xml")) {
- String c = entry.getName().replaceAll("Descriptor.xml", "");
- if (f.getJarEntry(c + ".class") != null) {
- String className = c.replaceAll("/", ".");
- m.put(className, TriplestoreConnector.getDescriptor(className));
- }
- }
- }
- }
- }
- return m;
- }
-
- public ConnectorDescriptor(InputStream in) throws TrippiException {
- m_parameters = new ArrayList<ConnectorParameter>();
- try {
- Element root = DocumentBuilderFactory.newInstance().
- newDocumentBuilder().parse(in).
- getDocumentElement();
- m_name = root.getAttribute("name");
- m_description = getDescription(root);
- m_parameters = getParameters(root);
- } catch (Exception e) {
- throw new TrippiException("Unexpected error in descriptor.xml", e);
- }
- if (m_name == null || m_name.equals(""))
- throw new TrippiException("Bad descriptor.xml: name "
- + "attribute required on root element.");
- }
-
- private String getDescription(Element parent) throws Exception {
- NodeList d = parent.getChildNodes();
- for (int i = 0; i < d.getLength(); i++) {
- Node n = d.item(i);
- if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("description")) {
- String val = n.getFirstChild().getNodeValue();
- if (val != null)
- return val.trim().replaceAll("\n", " ").
- replaceAll(" +", " ");
- }
- }
- return null;
- }
-
- private List<ConnectorParameter> getParameters(Element parent) throws Exception {
- NodeList d = parent.getChildNodes();
- List<ConnectorParameter> paramList = new ArrayList<ConnectorParameter>();
- for (int i = 0; i < d.getLength(); i++) {
- Node n = d.item(i);
- if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("parameter")) {
- paramList.add(getParameter((Element) n));
- }
- }
- return paramList;
- }
-
- private ConnectorParameter getParameter(Element param) throws Exception {
- String name = param.getAttribute("name");
- String label = param.getAttribute("label");
- String optional = param.getAttribute("optional");
- boolean isOptional = true;
- if (optional == null || optional == ""
- || optional.equalsIgnoreCase("false")
- || optional.equalsIgnoreCase("no")) {
- isOptional = false;
- }
- String description = getDescription(param);
- Map<String, List<ConnectorParameter>> paramsMap = new HashMap<String, List<ConnectorParameter>>();
- List<String> options = new ArrayList<String>();
- NodeList d = param.getChildNodes();
- for (int i = 0; i < d.getLength(); i++) {
- Node n = d.item(i);
- if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("option")) {
- Element option = (Element) n;
- String optionValue = option.getAttribute("value");
- List<ConnectorParameter> optionParameters = getParameters(option);
- options.add(optionValue); // purpose: preserves order
- paramsMap.put(optionValue, optionParameters);
- }
- }
- return new ConnectorParameter(name, label, description,
- isOptional, options, paramsMap);
- }
-
- public String getName() {
- return m_name;
- }
-
- public String getDescription() {
- return m_description;
- }
-
- /**
- * Get the list of <code>ConnectorParameter</code>s that together describe
- * the configuration options for the connector.
- */
- public List<ConnectorParameter> getParameters() {
- return m_parameters;
- }
-
- public String toString() {
- StringBuffer out = new StringBuffer();
- out.append("Connector name : " + m_name + "\n");
- out.append(" Description : " + m_description + "\n");
- Iterator<ConnectorParameter> iter = m_parameters.iterator();
- while (iter.hasNext()) {
- ConnectorParameter param = iter.next();
- out.append(param.toString(0));
- }
- return out.toString();
- }
-
- public static void main(String[] args) throws Exception {
- ConnectorDescriptor d = new ConnectorDescriptor(new FileInputStream(new File(args[0])));
- System.out.println(d.toString());
- }
-
-}
\ No newline at end of file
Copied: tags/release-1.4.2/src/java/org/trippi/ConnectorDescriptor.java (from rev 124, trunk/src/java/org/trippi/ConnectorDescriptor.java)
===================================================================
--- tags/release-1.4.2/src/java/org/trippi/ConnectorDescriptor.java (rev 0)
+++ tags/release-1.4.2/src/java/org/trippi/ConnectorDescriptor.java 2009-12-02 01:04:23 UTC (rev 127)
@@ -0,0 +1,168 @@
+package org.trippi;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class ConnectorDescriptor {
+
+ private String m_name;
+ private String m_description;
+ private List<ConnectorParameter> m_parameters;
+
+ public static ConnectorDescriptor forName(String className)
+ throws TrippiException {
+ String path = className.replaceAll("\\.", "/") + "Descriptor.xml";
+ InputStream xml = ClassLoader.getSystemClassLoader().
+ getResourceAsStream(path);
+ if (xml != null) {
+ return new ConnectorDescriptor(xml);
+ }
+ throw new TrippiException("Not found in classpath: " + path);
+ }
+
+ public static Map<String, ConnectorDescriptor> find() throws TrippiException,
+ IOException {
+ Map<String, ConnectorDescriptor> m = new HashMap<String, ConnectorDescriptor>();
+ File jarDir = new File(System.getProperty("java.endorsed.dirs"));
+ String[] jarNames = jarDir.list();
+ for (int i = 0; i < jarNames.length; i++) {
+ if (jarNames[i].toLowerCase().endsWith(".jar")) {
+ JarFile f = new JarFile(new File(jarDir, jarNames[i]));
+ Enumeration<JarEntry> e = f.entries();
+ while (e.hasMoreElements()) {
+ JarEntry entry = e.nextElement();
+ if (entry.getName().endsWith("Descriptor.xml")) {
+ String c = entry.getName().replaceAll("Descriptor.xml", "");
+ if (f.getJarEntry(c + ".class") != null) {
+ String className = c.replaceAll("/", ".");
+ m.put(className, TriplestoreConnector.getDescriptor(className));
+ }
+ }
+ }
+ }
+ }
+ return m;
+ }
+
+ public ConnectorDescriptor(InputStream in) throws TrippiException {
+ m_parameters = new ArrayList<ConnectorParameter>();
+ try {
+ Element root = DocumentBuilderFactory.newInstance().
+ newDocumentBuilder().parse(in).
+ getDocumentElement();
+ m_name = root.getAttribute("name");
+ m_description = getDescription(root);
+ m_parameters = getParameters(root);
+ } catch (Exception e) {
+ throw new TrippiException("Unexpected error in descriptor.xml", e);
+ }
+ if (m_name == null || m_name.equals(""))
+ throw new TrippiException("Bad descriptor.xml: name "
+ + "attribute required on root element.");
+ }
+
+ private String getDescription(Element parent) throws Exception {
+ NodeList d = parent.getChildNodes();
+ for (int i = 0; i < d.getLength(); i++) {
+ Node n = d.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("description")) {
+ String val = n.getFirstChild().getNodeValue();
+ if (val != null)
+ return val.trim().replaceAll("\n", " ").
+ replaceAll(" +", " ");
+ }
+ }
+ return null;
+ }
+
+ private List<ConnectorParameter> getParameters(Element parent) throws Exception {
+ NodeList d = parent.getChildNodes();
+ List<ConnectorParameter> paramList = new ArrayList<ConnectorParameter>();
+ for (int i = 0; i < d.getLength(); i++) {
+ Node n = d.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("parameter")) {
+ paramList.add(getParameter((Element) n));
+ }
+ }
+ return paramList;
+ }
+
+ private ConnectorParameter getParameter(Element param) throws Exception {
+ String name = param.getAttribute("name");
+ String label = param.getAttribute("label");
+ String optional = param.getAttribute("optional");
+ boolean isOptional = true;
+ if (optional == null || optional == ""
+ || optional.equalsIgnoreCase("false")
+ || optional.equalsIgnoreCase("no")) {
+ isOptional = false;
+ }
+ String description = getDescription(param);
+ Map<String, List<ConnectorParameter>> paramsMap = new HashMap<String, List<ConnectorParameter>>();
+ List<String> options = new ArrayList<String>();
+ NodeList d = param.getChildNodes();
+ for (int i = 0; i < d.getLength(); i++) {
+ Node n = d.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("option")) {
+ Element option = (Element) n;
+ String optionValue = option.getAttribute("value");
+ List<ConnectorParameter> optionParameters = getParameters(option);
+ options.add(optionValue); // purpose: preserves order
+ paramsMap.put(optionValue, optionParameters);
+ }
+ }
+ return new ConnectorParameter(name, label, description,
+ isOptional, options, paramsMap);
+ }
+
+ public String getName() {
+ return m_name;
+ }
+
+ public String getDescription() {
+ return m_description;
+ }
+
+ /**
+ * Get the list of <code>ConnectorParameter</code>s that together describe
+ * the configuration options for the connector.
+ */
+ public List<ConnectorParameter> getParameters() {
+ return m_parameters;
+ }
+
+ @Override
+ public String toString() {
+ StringBuffer out = new StringBuffer();
+ out.append("Connector name : " + m_name + "\n");
+ out.append(" Description : " + m_description + "\n");
+ Iterator<ConnectorParameter> iter = m_parameters.iterator();
+ while (iter.hasNext()) {
+ ConnectorParameter param = iter.next();
+ out.append(param.toString(0));
+ }
+ return out.toString();
+ }
+
+ public static void main(String[] args) throws Exception {
+ ConnectorDescriptor d = new ConnectorDescriptor(new FileInputStream(new File(args[0])));
+ System.out.println(d.toString());
+ }
+
+}
\ No newline at end of file
Deleted: tags/release-1.4.2/src/java/org/trippi/ConnectorParameter.java
===================================================================
--- trunk/src/java/org/trippi/ConnectorParameter.java 2009-11-11 19:18:29 UTC (rev 122)
+++ tags/release-1.4.2/src/java/org/trippi/ConnectorParameter.java 2009-12-02 01:04:23 UTC (rev 127)
@@ -1,121 +0,0 @@
-package org.trippi;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * A parameter to a <code>TriplestoreConnector</code>.
- * <p>
- * Instances of this class document the nature of a parameter, the values
- * it may have, and the other parameters that are valid only in the context
- * of a certain value of this one.
- * </p><p>
- * For example, consider the <b>remote</b> parameter to a triplestore,
- * indicating whether it is accessed via the network or the filesystem.
- * In the case that remote is <i>true</i>, the parameters <b>hostname</b>
- * and <b>port</b> would be needed. In the case where it is <i>false</i>,
- * a <b>path</b> parameter would be needed.
- * </p>
- * @author cw...@cs...
- */
-public class ConnectorParameter {
-
- private String m_name;
- private String m_label;
- private String m_description;
- private boolean m_isOptional;
- private List<String> m_options;
- private Map<String, List<ConnectorParameter>> m_parameterMap;
-
- public ConnectorParameter(String name,
- String label,
- String description,
- boolean isOptional,
- List<String> options,
- Map<String, List<ConnectorParameter>> parameterMap) {
- m_name = name;
- m_label = label;
- m_description = description;
- m_isOptional = isOptional;
- m_options = options;
- m_parameterMap = parameterMap;
- }
-
-
-
- /** The name of the parameter. */
- public String getName() {
- return m_name;
- }
-
- /** A simple description of the parameter. */
- public String getLabel() {
- return m_label;
- }
-
- /** A longer description of the parameter. */
- public String getDescription() {
- return m_description;
- }
-
- /** Whether the parameter may be unspecified. */
- public boolean isOptional() {
- return m_isOptional;
- }
-
- /**
- * Get the value options for this parameter.
- *
- * If the array is non-empty, it can be assumed that it contains
- * all possible valid values for the parameter. Otherwise, its
- * value will be considered open-ended.
- */
- public List<String> getOptions() {
- return m_options;
- }
-
- /**
- * For a given value of this parameter, get the list of additional
- * <code>ConnectorParameter</code>s that should be considered.
- *
- * @return the List of parameters (may be empty).
- */
- public List<ConnectorParameter> getParameters(String value) {
- return m_parameterMap.get(value);
- }
-
- public String toString(int i) {
- StringBuffer out = new StringBuffer();
- out.append(indent(i) + "Parameter : " + getName() + "\n");
- out.append(indent(i) + " label : " + getLabel() + "\n");
- out.append(indent(i) + " description : " + getDescription() + "\n");
- out.append(indent(i) + " is optional : " + isOptional() + "\n");
- Iterator<String> iter = getOptions().iterator();
- while ( iter.hasNext() ) {
- String val = iter.next();
- out.append(indent(i) + " OPTION : " + val + "\n");
- List<ConnectorParameter> p = getParameters(val);
- if (p != null) {
- Iterator<ConnectorParameter> pIter = p.iterator();
- while ( pIter.hasNext() ) {
- out.append((pIter.next()).
- toString(i + 4));
- }
- }
- }
- return out.toString();
- }
-
- public String toString() {
- return toString(0);
- }
-
- private static String indent(int by) {
- StringBuffer out = new StringBuffer();
- for (int i = 0; i < by; i++) out.append(' ');
- return out.toString();
- }
-
-}
\ No newline at end of file
Copied: tags/release-1.4.2/src/java/org/trippi/ConnectorParameter.java (from rev 124, trunk/src/java/org/trippi/ConnectorParameter.java)
===================================================================
--- tags/release-1.4.2/src/java/org/trippi/ConnectorParameter.java (rev 0)
+++ tags/release-1.4.2/src/java/org/trippi/ConnectorParameter.java 2009-12-02 01:04:23 UTC (rev 127)
@@ -0,0 +1,122 @@
+package org.trippi;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * A parameter to a <code>TriplestoreConnector</code>.
+ * <p>
+ * Instances of this class document the nature of a parameter, the values
+ * it may have, and the other parameters that are valid only in the context
+ * of a certain value of this one.
+ * </p><p>
+ * For example, consider the <b>remote</b> parameter to a triplestore,
+ * indicating whether it is accessed via the network or the filesystem.
+ * In the case that remote is <i>true</i>, the parameters <b>hostname</b>
+ * and <b>port</b> would be needed. In the case where it is <i>false</i>,
+ * a <b>path</b> parameter would be needed.
+ * </p>
+ * @author cw...@cs...
+ */
+public class ConnectorParameter {
+
+ private String m_name;
+ private String m_label;
+ private String m_description;
+ private boolean m_isOptional;
+ private List<String> m_options;
+ private Map<String, List<ConnectorParameter>> m_parameterMap;
+
+ public ConnectorParameter(String name,
+ String label,
+ String description,
+ boolean isOptional,
+ List<String> options,
+ Map<String, List<ConnectorParameter>> parameterMap) {
+ m_name = name;
+ m_label = label;
+ m_description = description;
+ m_isOptional = isOptional;
+ m_options = options;
+ m_parameterMap = parameterMap;
+ }
+
+
+
+ /** The name of the parameter. */
+ public String getName() {
+ return m_name;
+ }
+
+ /** A simple description of the parameter. */
+ public String getLabel() {
+ return m_label;
+ }
+
+ /** A longer description of the parameter. */
+ public String getDescription() {
+ return m_description;
+ }
+
+ /** Whether the parameter may be unspecified. */
+ public boolean isOptional() {
+ return m_isOptional;
+ }
+
+ /**
+ * Get the value options for this parameter.
+ *
+ * If the array is non-empty, it can be assumed that it contains
+ * all possible valid values for the parameter. Otherwise, its
+ * value will be considered open-ended.
+ */
+ public List<String> getOptions() {
+ return m_options;
+ }
+
+ /**
+ * For a given value of this parameter, get the list of additional
+ * <code>ConnectorParameter</code>s that should be considered.
+ *
+ * @return the List of parameters (may be empty).
+ */
+ public List<ConnectorParameter> getParameters(String value) {
+ return m_parameterMap.get(value);
+ }
+
+ public String toString(int i) {
+ StringBuffer out = new StringBuffer();
+ out.append(indent(i) + "Parameter : " + getName() + "\n");
+ out.append(indent(i) + " label : " + getLabel() + "\n");
+ out.append(indent(i) + " description : " + getDescription() + "\n");
+ out.append(indent(i) + " is optional : " + isOptional() + "\n");
+ Iterator<String> iter = getOptions().iterator();
+ while ( iter.hasNext() ) {
+ String val = iter.next();
+ out.append(indent(i) + " OPTION : " + val + "\n");
+ List<ConnectorParameter> p = getParameters(val);
+ if (p != null) {
+ Iterator<ConnectorParameter> pIter = p.iterator();
+ while ( pIter.hasNext() ) {
+ out.append((pIter.next()).
+ toString(i + 4));
+ }
+ }
+ }
+ return out.toString();
+ }
+
+ @Override
+ public String toString() {
+ return toString(0);
+ }
+
+ private static String indent(int by) {
+ StringBuffer out = new StringBuffer();
+ for (int i = 0; i < by; i++) out.append(' ');
+ return out.toString();
+ }
+
+}
\ No newline at end of file
Deleted: tags/release-1.4.2/src/java/org/trippi/RDFUtil.java
===================================================================
--- trunk/src/java/org/trippi/RDFUtil.java 2009-11-11 19:18:29 UTC (rev 122)
+++ tags/release-1.4.2/src/java/org/trippi/RDFUtil.java 2009-12-02 01:04:23 UTC (rev 127)
@@ -1,232 +0,0 @@
-package org.trippi;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jrdf.graph.AbstractBlankNode;
-import org.jrdf.graph.AbstractLiteral;
-import org.jrdf.graph.AbstractTriple;
-import org.jrdf.graph.AbstractURIReference;
-import org.jrdf.graph.BlankNode;
-import org.jrdf.graph.GraphElementFactory;
-import org.jrdf.graph.GraphElementFactoryException;
-import org.jrdf.graph.Literal;
-import org.jrdf.graph.Node;
-import org.jrdf.graph.ObjectNode;
-import org.jrdf.graph.PredicateNode;
-import org.jrdf.graph.SubjectNode;
-import org.jrdf.graph.Triple;
-import org.jrdf.graph.URIReference;
-
-public class RDFUtil implements GraphElementFactory, java.io.Serializable {
-
- private static final long serialVersionUID = 1L;
- private Map<String, Node> m_blankMap = null;
-
- public RDFUtil() {
- }
-
- ///// printing methods /////
-
- public static String toString(Node node) {
- if (node == null) return "null";
- if (node instanceof URIReference) {
- URIReference n = (URIReference) node;
- return "<" + n.getURI().toString() + ">";
- } else if (node instanceof BlankNode) {
- return "_node" + node.hashCode();
- } else {
- Literal n = (Literal) node;
- StringBuffer out = new StringBuffer();
- out.append("\"" + escapeLiteral(n.getLexicalForm()) + "\"");
- if (n.getLanguage() != null && n.getLanguage().length() > 0) {
- out.append("@" + n.getLanguage());
- } else if (n.getDatatypeURI() != null) {
- out.append("^^" + n.getDatatypeURI().toString());
- }
- return out.toString();
- }
- }
-
- public static String toString(Triple triple) {
- return toString(triple.getSubject()) + " "
- + toString(triple.getPredicate()) + " "
- + toString(triple.getObject());
- }
-
- ////// parsing methods //////
-
- // the node should start with one following: < " ' _
- public Node parse(String n)
- throws GraphElementFactoryException,
- URISyntaxException {
- if (m_blankMap == null) m_blankMap = new HashMap<String, Node>(); // lazily
- if (n.length() > 0) {
- char c = n.charAt(0);
- if (c == '<' && n.length() > 4) { // <a:b>
- return createResource(new URI(stripFirstAndLast(n)));
- } else if ( ( c == '"' || c == '\'' ) && n.length() > 1) { // ''
- int i = n.lastIndexOf(c);
- if ( i == n.length() - 1 ) {
- return createLiteral(unescapeLiteral(stripFirstAndLast(n)));
- } else {
- String uriString = n.substring(1, i);
- String qualifier = n.substring(i + 1);
- if (qualifier.startsWith("@")) {
- return createLiteral(uriString, qualifier.substring(1));
- } else if (qualifier.startsWith("^^")) {
- return createLiteral(uriString, new URI(qualifier.substring(2)));
- } else {
- throw new GraphElementFactoryException("Malformed literal: " + n);
- }
- }
- } else if (c == '_') {
- Node blankNode = (Node) m_blankMap.get(n);
- if (blankNode == null) {
- blankNode = createResource();
- m_blankMap.put(n, blankNode);
- }
- return blankNode;
- }
- }
- throw new GraphElementFactoryException("Could not parse as Node: " + n);
- }
-
- private static String stripFirstAndLast(String s) {
- StringBuffer out = new StringBuffer();
- for (int i = 1; i < s.length() - 1; i++) {
- out.append(s.charAt(i));
- }
- return out.toString();
- }
-
- private static String escapeLiteral(String s) {
- StringBuffer out = new StringBuffer();
- for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
- if ( c == '"' ) {
- out.append("\\\"");
- } else if ( c == '\\' ) {
- out.append("\\\\");
- } else {
- out.append(c);
- }
- }
- return out.toString();
- }
-
- private static String unescapeLiteral(String s) {
- StringBuffer out = new StringBuffer();
- for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
- if (c == '\\') {
- char d = s.charAt(++i);
- out.append(d);
- } else {
- out.append(c);
- }
- }
- return out.toString();
- }
-
- /**
- * Create a BlankNode given a unique id.
- */
- public BlankNode createResource(int hashCode) {
- return new FreeBlankNode(hashCode);
- }
-
- /////// org.jrdf.graph.GraphElementFactory ///////
-
- public Literal createLiteral(String lexi...
[truncated message content] |
