Menu
▾
▴
trippi-codewatch — Trippi CVS Notification
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(5) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(66) |
Jun
(12) |
Jul
(14) |
Aug
(11) |
Sep
(67) |
Oct
(2) |
Nov
|
Dec
(4) |
| 2006 |
Jan
(2) |
Feb
(7) |
Mar
(5) |
Apr
(15) |
May
(1) |
Jun
|
Jul
(11) |
Aug
(19) |
Sep
(5) |
Oct
(34) |
Nov
(2) |
Dec
(16) |
| 2007 |
Jan
(6) |
Feb
(9) |
Mar
(4) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(16) |
Sep
(5) |
Oct
(7) |
Nov
(27) |
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
(16) |
Aug
|
Sep
(4) |
Oct
(7) |
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
|
From: <cw...@us...> - 2010-12-13 14:34:51
|
Revision: 143
http://trippi.svn.sourceforge.net/trippi/?rev=143&view=rev
Author: cwilper
Date: 2010-12-13 14:34:45 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
State of tags at the time of migration
Added Paths:
-----------
moved-to-github/tags/
Removed Paths:
-------------
tags/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2010-12-13 14:34:46
|
Revision: 142
http://trippi.svn.sourceforge.net/trippi/?rev=142&view=rev
Author: cwilper
Date: 2010-12-13 14:34:40 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
State of branches at the time of migration
Added Paths:
-----------
moved-to-github/branches/
Removed Paths:
-------------
branches/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2010-12-13 14:34:40
|
Revision: 141
http://trippi.svn.sourceforge.net/trippi/?rev=141&view=rev
Author: cwilper
Date: 2010-12-13 14:34:34 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
State of trunk at the time of migration
Added Paths:
-----------
moved-to-github/trunk/
Removed Paths:
-------------
trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2010-12-13 14:34:21
|
Revision: 140
http://trippi.svn.sourceforge.net/trippi/?rev=140&view=rev
Author: cwilper
Date: 2010-12-13 14:34:15 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
Latest code is at https://github.com/fcrepo/trippi
Added Paths:
-----------
moved-to-github/MOVED-README.txt
Added: moved-to-github/MOVED-README.txt
===================================================================
--- moved-to-github/MOVED-README.txt (rev 0)
+++ moved-to-github/MOVED-README.txt 2010-12-13 14:34:15 UTC (rev 140)
@@ -0,0 +1,10 @@
+ NOTICE -- THIS REPOSITORY IS OUT OF DATE!
+ -----------------------------------------
+
+This project's source code (and all commit history) has been migrated
+to github. As of December 2010, it can be found here:
+
+ https://github.com/fcrepo/trippi
+
+The state of this project's source code AT THE TIME OF MIGRATION
+is preserved here and will not change.
Property changes on: moved-to-github/MOVED-README.txt
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2010-12-13 14:33:37
|
Revision: 139
http://trippi.svn.sourceforge.net/trippi/?rev=139&view=rev
Author: cwilper
Date: 2010-12-13 14:33:31 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
moved to github
Added Paths:
-----------
moved-to-github/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2009-12-13 05:09:25
|
Revision: 130
http://trippi.svn.sourceforge.net/trippi/?rev=130&view=rev
Author: pangloss
Date: 2009-12-13 05:09:16 +0000 (Sun, 13 Dec 2009)
Log Message:
-----------
changed log level to debug
Modified Paths:
--------------
trunk/src/java/org/trippi/io/RIOTripleIterator.java
Modified: trunk/src/java/org/trippi/io/RIOTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/io/RIOTripleIterator.java 2009-12-04 19:51:42 UTC (rev 129)
+++ trunk/src/java/org/trippi/io/RIOTripleIterator.java 2009-12-13 05:09:16 UTC (rev 130)
@@ -68,7 +68,9 @@
m_parser.setStopAtFirstError(false);
try { m_util = new RDFUtil(); } catch (Exception e) { } // won't happen
Thread parserThread = new Thread(this);
- logger.info("Starting parse thread");
+ if (logger.isDebugEnabled()) {
+ logger.debug("Starting parse thread");
+ }
parserThread.start();
m_next = getNext();
}
@@ -106,14 +108,18 @@
throw new TrippiException("RDF Parse Error.", m_parseException);
}
if (m_bucket == null) {
- logger.info("Finished parsing " + m_tripleCount + " triples.");
+ if (logger.isDebugEnabled()) {
+ logger.debug("Finished parsing " + m_tripleCount + " triples.");
+ }
return null; // parser finished normally, no more triples
} else {
Triple triple = m_bucket;
m_bucket = null;
m_tripleCount++;
if (m_tripleCount % 1000 == 0) {
- logger.info("Iterated " + m_tripleCount + ", mem free = " + Runtime.getRuntime().freeMemory() );
+ if (logger.isDebugEnabled()) {
+ logger.debug("Iterated " + m_tripleCount + ", mem free = " + Runtime.getRuntime().freeMemory() );
+ }
}
notifyAll(); // notify parser that the bucket is ready for another
return triple;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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] |
|
From: <pan...@us...> - 2009-12-02 00:53:26
|
Revision: 126
http://trippi.svn.sourceforge.net/trippi/?rev=126&view=rev
Author: pangloss
Date: 2009-12-02 00:53:10 +0000 (Wed, 02 Dec 2009)
Log Message:
-----------
rebuild using java5 (instead of 6)
Modified Paths:
--------------
trunk/lib/mulgara-core-2.1.4.jar
trunk/src/java/org/trippi/impl/mulgara/CollapsedAnswer.java
Modified: trunk/lib/mulgara-core-2.1.4.jar
===================================================================
(Binary files differ)
Modified: trunk/src/java/org/trippi/impl/mulgara/CollapsedAnswer.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/CollapsedAnswer.java 2009-11-12 04:56:31 UTC (rev 125)
+++ trunk/src/java/org/trippi/impl/mulgara/CollapsedAnswer.java 2009-12-02 00:53:10 UTC (rev 126)
@@ -84,10 +84,6 @@
///////////////// from org.mulgara.query.Answer ///////////////////
///////////////////////////////////////////////////////////////////
- /**
- * {@inheritDoc}
- */
- @Override
public Object getObject(int column) throws TuplesException {
return m_values[column];
}
@@ -95,7 +91,6 @@
/**
* {@inheritDoc}
*/
- @Override
public Object getObject(String columnName) throws TuplesException {
return getObject(getColumnIndex(columnName));
}
@@ -108,7 +103,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void beforeFirst() throws TuplesException {
// don't do anything -- this is a one-use impl
}
@@ -116,7 +110,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void close() throws TuplesException {
m_wrappedAnswer.close();
}
@@ -124,7 +117,6 @@
/**
* {@inheritDoc}
*/
- @Override
public int getColumnIndex(Variable column) throws TuplesException {
return getColumnIndex(column.getName());
}
@@ -139,7 +131,6 @@
/**
* Return the number of variables (columns).
*/
- @Override
public int getNumberOfVariables() {
return m_variables.length;
}
@@ -147,7 +138,6 @@
/**
* {@inheritDoc}
*/
- @Override
public Variable[] getVariables() {
return m_variables;
}
@@ -157,7 +147,6 @@
*
* This method is unimplemented and will always throw a TuplesException.
*/
- @Override
public boolean isUnconstrained() throws TuplesException {
throw new TuplesException("isUnconstrained() not implemented.");
}
@@ -167,7 +156,6 @@
*
* This method is unimplemented and will always throw a TuplesException.
*/
- @Override
public long getRowCount() throws TuplesException {
throw new TuplesException("getRowCount() not implemented.");
}
@@ -177,8 +165,7 @@
*
* This method is unimplemented and will always throw a TuplesException.
*/
- @Override
- public long getRowExpectedCount() throws TuplesException {
+ public long getRowExpectedCount() throws TuplesException {
throw new TuplesException("getRowExpectCount() not implemented.");
}
@@ -187,7 +174,6 @@
*
* This method is unimplemented and will always throw a TuplesException.
*/
- @Override
public long getRowUpperBound() throws TuplesException {
throw new TuplesException("getRowUpperBound() not implemented.");
}
@@ -197,7 +183,6 @@
*
* This method is unimplemented and will always throw a TuplesException.
*/
- @Override
public int getRowCardinality() throws TuplesException {
throw new TuplesException("getRowCardinality() not implemented.");
}
@@ -205,7 +190,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean next() throws TuplesException {
if (m_values == null) return false;
m_values = m_currentRowGroup.nextValues();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2009-11-12 04:56:39
|
Revision: 125
http://trippi.svn.sourceforge.net/trippi/?rev=125&view=rev
Author: pangloss
Date: 2009-11-12 04:56:31 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
bumped version for upcoming 1.4.2 release
Modified Paths:
--------------
trunk/src/java/org/trippi/Trippi.properties
Modified: trunk/src/java/org/trippi/Trippi.properties
===================================================================
--- trunk/src/java/org/trippi/Trippi.properties 2009-11-12 04:50:56 UTC (rev 124)
+++ trunk/src/java/org/trippi/Trippi.properties 2009-11-12 04:56:31 UTC (rev 125)
@@ -1,2 +1,2 @@
-trippi.version=1.4.1
+trippi.version=1.4.2
buildDate=@buildDate@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2009-11-12 04:51:05
|
Revision: 124
http://trippi.svn.sourceforge.net/trippi/?rev=124&view=rev
Author: pangloss
Date: 2009-11-12 04:50:56 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
source code cleanup: types, missing @overrides, formatting, etc.
Modified Paths:
--------------
trunk/src/java/org/trippi/ConnectorDescriptor.java
trunk/src/java/org/trippi/ConnectorParameter.java
trunk/src/java/org/trippi/RDFUtil.java
trunk/src/java/org/trippi/TripleIterator.java
trunk/src/java/org/trippi/TripleMaker.java
trunk/src/java/org/trippi/TriplePattern.java
trunk/src/java/org/trippi/TripleUpdate.java
trunk/src/java/org/trippi/TriplestoreConnector.java
trunk/src/java/org/trippi/TupleIterator.java
trunk/src/java/org/trippi/config/ConfigUtils.java
trunk/src/java/org/trippi/config/TrippiConfig.java
trunk/src/java/org/trippi/config/TrippiProfile.java
trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreReader.java
trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreWriter.java
trunk/src/java/org/trippi/impl/base/ConfigurableSessionPool.java
trunk/src/java/org/trippi/impl/base/DistinctTripleIterator.java
trunk/src/java/org/trippi/impl/base/DistinctTupleIterator.java
trunk/src/java/org/trippi/impl/base/LimitedTripleIterator.java
trunk/src/java/org/trippi/impl/base/LimitedTupleIterator.java
trunk/src/java/org/trippi/impl/base/MemUpdateBuffer.java
trunk/src/java/org/trippi/impl/base/PoolAwareTripleIterator.java
trunk/src/java/org/trippi/impl/base/PoolAwareTupleIterator.java
trunk/src/java/org/trippi/impl/base/SynchronizedTripleIterator.java
trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreReader.java
trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreSession.java
trunk/src/java/org/trippi/impl/base/SynchronizedTupleIterator.java
trunk/src/java/org/trippi/impl/base/TupleBasedTripleIterator.java
trunk/src/java/org/trippi/impl/mpt/MPTConnector.java
trunk/src/java/org/trippi/impl/mpt/MPTSession.java
trunk/src/java/org/trippi/impl/mpt/MPTTripleIterator.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraConnector.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraTripleIterator.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraTupleIterator.java
trunk/src/java/org/trippi/impl/mulgara/RowGroup.java
trunk/src/java/org/trippi/impl/multi/MultiConnector.java
trunk/src/java/org/trippi/impl/oracle/OracleConnector.java
trunk/src/java/org/trippi/impl/oracle/OracleSession.java
trunk/src/java/org/trippi/impl/oracle/OracleTripleIterator.java
trunk/src/java/org/trippi/io/CSVTupleWriter.java
trunk/src/java/org/trippi/io/CountTripleWriter.java
trunk/src/java/org/trippi/io/CountTupleWriter.java
trunk/src/java/org/trippi/io/RIOTripleIterator.java
trunk/src/java/org/trippi/io/RIOTripleWriter.java
trunk/src/java/org/trippi/io/SimpleTupleWriter.java
trunk/src/java/org/trippi/io/SparqlTupleIterator.java
trunk/src/java/org/trippi/io/SparqlTupleWriter.java
trunk/src/java/org/trippi/io/TSVTupleWriter.java
trunk/src/java/org/trippi/io/XMLDeclarationRemover.java
trunk/src/java/org/trippi/nodegraph/NodeGraph.java
trunk/src/java/org/trippi/nodegraph/impl/ArrayUtil.java
trunk/src/java/org/trippi/nodegraph/impl/CountingResultIterator.java
trunk/src/java/org/trippi/nodegraph/impl/NodeGraphImpl.java
trunk/src/java/org/trippi/nodegraph/impl/NodeIterator.java
trunk/src/java/org/trippi/nodegraph/impl/TripleResultsImpl.java
trunk/src/java/org/trippi/server/http/TrippiServlet.java
trunk/src/java/org/trippi/ui/TrippiUI.java
trunk/src/test/org/trippi/TriplestoreConnectorIntegrationTest.java
trunk/src/test/org/trippi/impl/base/MemUpdateBufferUnitTest.java
trunk/src/test/org/trippi/impl/base/UpdateBufferUnitTest.java
trunk/src/test/org/trippi/impl/mulgara/MulgaraConnectorIntegrationTest.java
trunk/src/test/org/trippi/impl/mulgara/MulgaraConnectorTest.java
trunk/src/test/org/trippi/io/RIOTripleIteratorTest.java
Modified: trunk/src/java/org/trippi/ConnectorDescriptor.java
===================================================================
--- trunk/src/java/org/trippi/ConnectorDescriptor.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/ConnectorDescriptor.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -46,7 +46,7 @@
JarFile f = new JarFile(new File(jarDir, jarNames[i]));
Enumeration<JarEntry> e = f.entries();
while (e.hasMoreElements()) {
- JarEntry entry = (JarEntry) e.nextElement();
+ JarEntry entry = e.nextElement();
if (entry.getName().endsWith("Descriptor.xml")) {
String c = entry.getName().replaceAll("Descriptor.xml", "");
if (f.getJarEntry(c + ".class") != null) {
@@ -147,7 +147,8 @@
return m_parameters;
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuffer out = new StringBuffer();
out.append("Connector name : " + m_name + "\n");
out.append(" Description : " + m_description + "\n");
Modified: trunk/src/java/org/trippi/ConnectorParameter.java
===================================================================
--- trunk/src/java/org/trippi/ConnectorParameter.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/ConnectorParameter.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -108,7 +108,8 @@
return out.toString();
}
- public String toString() {
+ @Override
+ public String toString() {
return toString(0);
}
Modified: trunk/src/java/org/trippi/RDFUtil.java
===================================================================
--- trunk/src/java/org/trippi/RDFUtil.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/RDFUtil.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -83,7 +83,7 @@
}
}
} else if (c == '_') {
- Node blankNode = (Node) m_blankMap.get(n);
+ Node blankNode = m_blankMap.get(n);
if (blankNode == null) {
blankNode = createResource();
m_blankMap.put(n, blankNode);
@@ -186,7 +186,8 @@
public FreeBlankNode(Object object) {
m_hashCode = object.hashCode();
}
- public int hashCode() {
+ @Override
+ public int hashCode() {
return m_hashCode;
}
public String getID() {
Modified: trunk/src/java/org/trippi/TripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/TripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -206,7 +206,7 @@
try {
GraphElementFactory factory = graph.getElementFactory();
- TIntObjectHashMap nodePool = new TIntObjectHashMap();
+ TIntObjectHashMap<Node> nodePool = new TIntObjectHashMap<Node>();
while (hasNext()) {
@@ -236,11 +236,11 @@
private static Node localize(Node node,
GraphElementFactory factory,
- TIntObjectHashMap nodePool) throws TrippiException {
+ TIntObjectHashMap<Node> nodePool) throws TrippiException {
try {
if (nodePool.containsKey(node.hashCode())) {
- return (Node) nodePool.get(node.hashCode());
+ return nodePool.get(node.hashCode());
} else {
Node newNode;
if (node instanceof URIReference) {
Modified: trunk/src/java/org/trippi/TripleMaker.java
===================================================================
--- trunk/src/java/org/trippi/TripleMaker.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TripleMaker.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -203,7 +203,7 @@
}
}
} else if (c == '_') {
- Node blankNode = (Node) m_blankMap.get(n);
+ Node blankNode = m_blankMap.get(n);
if (blankNode == null) {
blankNode = createResource();
m_blankMap.put(n, blankNode);
@@ -285,7 +285,8 @@
public FreeBlankNode(int hashCode) {
m_hashCode = hashCode;
}
- public int hashCode() {
+ @Override
+ public int hashCode() {
return m_hashCode;
}
public String getID() {
Modified: trunk/src/java/org/trippi/TriplePattern.java
===================================================================
--- trunk/src/java/org/trippi/TriplePattern.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TriplePattern.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -63,9 +63,9 @@
int i = 0;
RDFUtil factory = new RDFUtil();
while (iter.hasNext()) {
- Object subject = parseToken((String) iter.next(), factory);
- Object predicate = parseToken((String) iter.next(), factory);
- Object object = parseToken((String) iter.next(), factory);
+ Object subject = parseToken(iter.next(), factory);
+ Object predicate = parseToken(iter.next(), factory);
+ Object object = parseToken(iter.next(), factory);
out[i++] = new TriplePattern(subject, predicate, object);
}
return out;
@@ -94,7 +94,7 @@
PredicateNode predicate;
ObjectNode object;
if (s instanceof String) {
- BlankNode b = (BlankNode) bNodes.get(s);
+ BlankNode b = bNodes.get(s);
if (b == null) {
b = factory.createResource();
bNodes.put((String)s, b);
@@ -109,7 +109,7 @@
predicate = (PredicateNode) p;
}
if (o instanceof String) {
- BlankNode b = (BlankNode) bNodes.get(o);
+ BlankNode b = bNodes.get(o);
if (b == null) {
b = factory.createResource();
bNodes.put((String)o, b);
@@ -340,7 +340,8 @@
}
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuffer out = new StringBuffer();
if (m_subject instanceof String) {
out.append(m_subject + " ");
Modified: trunk/src/java/org/trippi/TripleUpdate.java
===================================================================
--- trunk/src/java/org/trippi/TripleUpdate.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TripleUpdate.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -53,7 +53,7 @@
public static List<TripleUpdate> get(int type, List<Triple> triples) {
List<TripleUpdate> updates = new ArrayList<TripleUpdate>(triples.size());
for (int i = 0; i < triples.size(); i++) {
- Triple triple = (Triple) triples.get(i);
+ Triple triple = triples.get(i);
updates.add(new TripleUpdate(type, triple));
}
return updates;
Modified: trunk/src/java/org/trippi/TriplestoreConnector.java
===================================================================
--- trunk/src/java/org/trippi/TriplestoreConnector.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TriplestoreConnector.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -77,7 +77,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/TupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/TupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -93,7 +93,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/config/ConfigUtils.java
===================================================================
--- trunk/src/java/org/trippi/config/ConfigUtils.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/config/ConfigUtils.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -9,7 +9,7 @@
* Get a trimmed non-empty string from the map, or throw an exception.
*/
public static String getRequired(Map<String, String> map, String key) throws TrippiException {
- String value = (String) map.get(key);
+ String value = map.get(key);
if (value == null || value.length() == 0) {
throw new TrippiException("Missing required configuration value: " + key);
} else {
Modified: trunk/src/java/org/trippi/config/TrippiConfig.java
===================================================================
--- trunk/src/java/org/trippi/config/TrippiConfig.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/config/TrippiConfig.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -85,7 +85,7 @@
clearProfiles(p);
Iterator<String> ids = profiles.keySet().iterator();
while (ids.hasNext()) {
- String id = (String) ids.next();
+ String id = ids.next();
putProfile(p, profiles.get(id));
}
saveProps(p);
@@ -160,7 +160,7 @@
}
Iterator<String> iter = keysToRemove.iterator();
while (iter.hasNext()) {
- p.remove((String) iter.next());
+ p.remove(iter.next());
}
}
Modified: trunk/src/java/org/trippi/config/TrippiProfile.java
===================================================================
--- trunk/src/java/org/trippi/config/TrippiProfile.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/config/TrippiProfile.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -41,7 +41,8 @@
getConfiguration());
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuffer out = new StringBuffer();
out.append("Trippi Profile : " + getId() + "\n");
out.append(" Label : " + getLabel() + "\n");
@@ -49,7 +50,7 @@
Map<String, String> m = getConfiguration();
Iterator<String> iter = m.keySet().iterator();
while (iter.hasNext()) {
- String key = (String) iter.next();
+ String key = iter.next();
out.append(" Param : " + key + " = " + m.get(key) + "\n");
}
return out.toString();
Modified: trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreReader.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreReader.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreReader.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -215,7 +215,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreWriter.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreWriter.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreWriter.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -280,7 +280,7 @@
m_buffer.flush(m_updateSession);
}
long end = System.currentTimeMillis();
- double sec = ( (double) (end - start) ) / 1000.0;
+ double sec = ( (end - start) ) / 1000.0;
logger.info("Flushed " + size + " updates in " + sec + "seconds.");
}
@@ -330,7 +330,8 @@
* and finally, close the pool.
*
*/
- public synchronized void close() throws TrippiException {
+ @Override
+ public synchronized void close() throws TrippiException {
if (!m_needToClose) {
logger.info("Closing...");
m_needToClose = true;
Modified: trunk/src/java/org/trippi/impl/base/ConfigurableSessionPool.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/ConfigurableSessionPool.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/ConfigurableSessionPool.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -92,7 +92,7 @@
}
}
synchronized (m_freeSessions) {
- session = (TriplestoreSession) m_freeSessions.remove(0);
+ session = m_freeSessions.remove(0);
}
synchronized (m_inUseSessions) {
m_inUseSessions.add(session);
@@ -148,7 +148,8 @@
* This just ensures that pool growth occurs when necessary,
* checking every 1/4 of a second.
*/
- public void run() {
+ @Override
+ public void run() {
while ( !m_needToFinish ) {
int diff = m_spareSessions - getFreeCount();
if ( diff > 0 ) {
@@ -227,7 +228,8 @@
* Call close() at garbage collection time in case it hasn't been
* called yet.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/DistinctTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/DistinctTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/DistinctTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -39,25 +39,29 @@
return false;
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return (m_next != null);
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
if (m_next == null) return null;
Triple last = m_next;
m_next = getNext();
return last;
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
m_wrapped.close();
m_closed = true;
}
}
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/DistinctTupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/DistinctTupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/DistinctTupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -41,29 +41,34 @@
return false;
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return (m_next != null);
}
- public Map<String, Node> next() throws TrippiException {
+ @Override
+ public Map<String, Node> next() throws TrippiException {
if (m_next == null) return null;
Map<String, Node> last = m_next;
m_next = getNext();
return last;
}
- public String[] names() throws TrippiException {
+ @Override
+ public String[] names() throws TrippiException {
return m_wrapped.names();
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
m_wrapped.close();
m_closed = true;
}
}
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/LimitedTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/LimitedTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/LimitedTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -36,25 +36,29 @@
}
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return (m_next != null);
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
if (m_next == null) return null;
Triple last = m_next;
m_next = getNext();
return last;
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
m_wrapped.close();
m_closed = true;
}
}
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/LimitedTupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/LimitedTupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/LimitedTupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -38,29 +38,34 @@
}
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return (m_next != null);
}
- public Map<String, Node> next() throws TrippiException {
+ @Override
+ public Map<String, Node> next() throws TrippiException {
if (m_next == null) return null;
Map<String, Node> last = m_next;
m_next = getNext();
return last;
}
- public String[] names() throws TrippiException {
+ @Override
+ public String[] names() throws TrippiException {
return m_wrapped.names();
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
m_wrapped.close();
m_closed = true;
}
}
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/MemUpdateBuffer.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/MemUpdateBuffer.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/MemUpdateBuffer.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -85,7 +85,7 @@
private static String tripleListToString(List<Triple> triples) {
StringBuffer out = new StringBuffer();
for (int i = 0; i < triples.size(); i++) {
- out.append(RDFUtil.toString((Triple) triples.get(i)) + "\n");
+ out.append(RDFUtil.toString(triples.get(i)) + "\n");
}
return out.toString();
}
Modified: trunk/src/java/org/trippi/impl/base/PoolAwareTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/PoolAwareTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/PoolAwareTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -25,20 +25,23 @@
m_pool = pool;
}
- public boolean hasNext() throws TrippiException {
+ @Override
+ public boolean hasNext() throws TrippiException {
boolean has = m_iter.hasNext();
if (!has) close(); // proactively
return has;
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
return m_iter.next();
}
/**
* Close the wrapped iterator and release the session to the pool.
*/
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
// This ensures that even if the wrapped iter throws an exception,
// the session is released to the pool.
@@ -56,7 +59,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/PoolAwareTupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/PoolAwareTupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/PoolAwareTupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -30,7 +30,8 @@
m_pool = pool;
}
- public boolean hasNext() throws TrippiException {
+ @Override
+ public boolean hasNext() throws TrippiException {
boolean has = m_iter.hasNext();
if (!has) {
close();
@@ -38,22 +39,26 @@
return has;
}
- public Map<String, Node> next() throws TrippiException {
+ @Override
+ public Map<String, Node> next() throws TrippiException {
return m_iter.next();
}
- public List<Triple> nextTriples(TriplePattern[] patterns) throws TrippiException {
+ @Override
+ public List<Triple> nextTriples(TriplePattern[] patterns) throws TrippiException {
return m_iter.nextTriples(patterns);
}
- public String[] names() throws TrippiException {
+ @Override
+ public String[] names() throws TrippiException {
return m_iter.names();
}
/**
* Close the wrapped iterator and release the session to the pool.
*/
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
// This ensures that even if the wrapped iter throws an exception,
// the session is released to the pool.
@@ -71,7 +76,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/SynchronizedTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/SynchronizedTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/SynchronizedTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -23,20 +23,23 @@
m_session = session;
}
- public boolean hasNext() throws TrippiException {
+ @Override
+ public boolean hasNext() throws TrippiException {
boolean has = m_iter.hasNext();
if (!has) close(); // proactively
return has;
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
return m_iter.next();
}
/**
* Close the wrapped iterator and release the session to the pool.
*/
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
// This ensures that even if the wrapped iter throws an exception,
// the thread's lock on the session is released.
@@ -54,7 +57,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreReader.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreReader.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreReader.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -179,7 +179,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreSession.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreSession.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreSession.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -192,7 +192,7 @@
logger.info("Lock Status: FREE");
} else {
int waitCount = size - 1;
- Thread lockingThread = (Thread) m_lockQueue.get(0);
+ Thread lockingThread = m_lockQueue.get(0);
logger.info("Lock Status: LOCKER = '" + lockingThread.getName()
+ "', WAITING = " + waitCount);
}
Modified: trunk/src/java/org/trippi/impl/base/SynchronizedTupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/SynchronizedTupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/SynchronizedTupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -28,7 +28,8 @@
m_session = session;
}
- public boolean hasNext() throws TrippiException {
+ @Override
+ public boolean hasNext() throws TrippiException {
boolean has = m_iter.hasNext();
if (!has) {
close();
@@ -36,22 +37,26 @@
return has;
}
- public Map<String, Node> next() throws TrippiException {
+ @Override
+ public Map<String, Node> next() throws TrippiException {
return m_iter.next();
}
- public List<Triple> nextTriples(TriplePattern[] patterns) throws TrippiException {
+ @Override
+ public List<Triple> nextTriples(TriplePattern[] patterns) throws TrippiException {
return m_iter.nextTriples(patterns);
}
- public String[] names() throws TrippiException {
+ @Override
+ public String[] names() throws TrippiException {
return m_iter.names();
}
/**
* Close the wrapped iterator and release the session to the pool.
*/
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
// This ensures that even if the wrapped iter throws an exception,
// the thread's lock on the session is released.
@@ -69,7 +74,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/TupleBasedTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/TupleBasedTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/TupleBasedTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -50,14 +50,16 @@
if (!m_tuples.hasNext()) return null;
m_triplesFromTuples = m_tuples.nextTriples(m_patterns);
}
- return (Triple) m_triplesFromTuples.remove(0);
+ return m_triplesFromTuples.remove(0);
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return (m_next != null);
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
if (m_next == null) {
return null;
}
@@ -66,14 +68,16 @@
return last;
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
m_tuples.close();
m_closed = true;
}
}
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/mpt/MPTConnector.java
===================================================================
--- trunk/src/java/org/trippi/impl/mpt/MPTConnector.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mpt/MPTConnector.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -43,7 +43,8 @@
}
// Implements TriplestoreConnector.init(Map)
- public void init(Map<String, String> config) throws TrippiException {
+ @Override
+ public void init(Map<String, String> config) throws TrippiException {
// get and validate configuration values
String ddlGenerator = ConfigUtils.getRequired(config, "ddlGenerator");
@@ -134,22 +135,26 @@
}
// Implements TriplestoreConnector.getReader()
- public TriplestoreReader getReader() {
+ @Override
+ public TriplestoreReader getReader() {
return _writer;
}
// Implements TriplestoreConnector.getWriter()
- public TriplestoreWriter getWriter() {
+ @Override
+ public TriplestoreWriter getWriter() {
return _writer;
}
// Implements TriplestoreConnector.getElementFactory()
- public GraphElementFactory getElementFactory() {
+ @Override
+ public GraphElementFactory getElementFactory() {
return _elementFactory;
}
// Implements TriplestoreConnector.close()
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (_writer != null) {
_writer.close(); // flushes and closes update buffer,
// then closes session pool,
Modified: trunk/src/java/org/trippi/impl/mpt/MPTSession.java
===================================================================
--- trunk/src/java/org/trippi/impl/mpt/MPTSession.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mpt/MPTSession.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -161,7 +161,7 @@
Set<org.nsdl.mptstore.rdf.Triple> mptSet = new HashSet<org.nsdl.mptstore.rdf.Triple>(jrdfTriples.size());
Iterator<Triple> iter = jrdfTriples.iterator();
while (iter.hasNext()) {
- Triple jrdfTriple = (Triple) iter.next();
+ Triple jrdfTriple = iter.next();
org.nsdl.mptstore.rdf.SubjectNode mptSubject =
(org.nsdl.mptstore.rdf.SubjectNode)
jrdfToMPT(jrdfTriple.getSubject());
Modified: trunk/src/java/org/trippi/impl/mpt/MPTTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/mpt/MPTTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mpt/MPTTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -25,11 +25,13 @@
_util = new RDFUtil();
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return _results.hasNext();
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
try {
List<Node> result = _results.next();
Node n;
@@ -50,7 +52,8 @@
}
}
- public void close() {
+ @Override
+ public void close() {
_results.close();
}
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraConnector.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraConnector.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraConnector.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -86,7 +86,7 @@
String host = null, port = null, path = null;
if (remote) {
host = ConfigUtils.getRequired(config, "host");
- port = (String)config.get("port");
+ port = config.get("port");
} else {
path = ConfigUtils.getRequired(config, "path");
}
@@ -110,7 +110,7 @@
int poolMaxGrowth = 0, poolSpareSessions = 0;
if (poolInitialSize > 0) {
poolMaxGrowth = ConfigUtils.getRequiredInt(config, "poolMaxGrowth");
- String temp = (String)config.get("poolSpareSessions");
+ String temp = config.get("poolSpareSessions");
poolSpareSessions = (temp == null) ? 0 : Integer.parseInt(temp);
}
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -232,7 +232,7 @@
Set<Triple> plainLiteralTriples = new HashSet<Triple>();
Iterator<Triple> iter = triples.iterator();
while (iter.hasNext()) {
- Triple triple = (Triple) iter.next();
+ Triple triple = iter.next();
if (triple.getObject() instanceof Literal) {
Literal literal = (Literal) triple.getObject();
if (literal.getDatatypeURI() == null
@@ -276,7 +276,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -237,7 +237,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
}
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -82,7 +82,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraTupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraTupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraTupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -98,7 +98,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
}
Modified: trunk/src/java/org/trippi/impl/mulgara/RowGroup.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/RowGroup.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/RowGroup.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -59,7 +59,7 @@
}
m_variables = new Variable[newVars.size()];
for (int i = 0; i < newVars.size(); i++) {
- m_variables[i] = (Variable) newVars.get(i);
+ m_variables[i] = newVars.get(i);
}
m_nextValues = new Object[m_variables.length];
}
Modified: trunk/src/java/org/trippi/impl/multi/MultiConnector.java
===================================================================
--- trunk/src/java/org/trippi/impl/multi/MultiConnector.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/multi/MultiConnector.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -36,23 +36,28 @@
m_elementFactory = new RDFUtil();
}
- public void init(Map config) throws TrippiException {
+ @Override
+ public void init(Map<String,String> config) throws TrippiException {
throw new TrippiException("This connector cannot be initialized via init()");
}
- public TriplestoreReader getReader() {
+ @Override
+ public TriplestoreReader getReader() {
return m_connectors[0].getReader();
}
- public TriplestoreWriter getWriter() {
+ @Override
+ public TriplestoreWriter getWriter() {
return m_multiWriter;
}
- public GraphElementFactory getElementFactory() {
+ @Override
+ public GraphElementFactory getElementFactory() {
return m_elementFactory;
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
TrippiException m_exception = null;
for (int i = 0; i < m_connectors.length; i++) {
try {
Modified: trunk/src/java/org/trippi/impl/oracle/OracleConnector.java
===================================================================
--- trunk/src/java/org/trippi/impl/oracle/OracleConnector.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/oracle/OracleConnector.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -1,8 +1,5 @@
package org.trippi.impl.oracle;
-
-
-import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
import java.util.HashMap;
@@ -11,7 +8,6 @@
import oracle.jdbc.pool.OracleOCIConnectionPool;
-import org.apache.log4j.Logger;
import org.jrdf.graph.GraphElementFactory;
import org.trippi.TriplestoreConnector;
import org.trippi.TriplestoreReader;
@@ -23,420 +19,223 @@
import org.trippi.impl.base.SingleSessionPool;
import org.trippi.impl.base.TriplestoreSessionPool;
import org.trippi.impl.base.UpdateBuffer;
-
-
/**
-
- * A <code>TriplestoreConnector</code> for a remote or local, Oracle Spatical
-
- * triplestore.
-
- *
-
- * @author lib...@ca...
-
- * @created June 26, 2006
-
+ * A <code>TriplestoreConnector</code> for a remote or local, Oracle Spatial
+ * Triple Store.
+ *
+ * @author lib...@ca...
+ * @created June 26, 2006
*/
-
+
public class OracleConnector extends TriplestoreConnector {
-
-
- private final static Logger logger =
-
- Logger.getLogger(OracleConnector.class.getName());
-
+ //private final static Logger logger = Logger.getLogger(OracleConnector.class
+ // .getName());
-
private ConcurrentTriplestoreWriter m_writer;
-
- private GraphElementFactory m_elementFactory;
-
-
+ //private GraphElementFactory m_elementFactory;
-
/**
-
*Constructor for the OracleConnector object
-
*/
-
- public OracleConnector() { }
-
+ public OracleConnector() {
+ }
-
-
-
/**
-
- * Gets the required attribute of the OracleConnector class
-
- *
-
- * @param config Description of the Parameter
-
- * @param name Description of the Parameter
-
- * @return The required value
-
- * @exception TrippiException Description of the Exception
-
+ * Gets the required attribute of the OracleConnector class
+ *
+ * @param config
+ * Description of the Parameter
+ * @param name
+ * Description of the Parameter
+ * @return The required value
+ * @exception TrippiException
+ * Description of the Exception
*/
-
- private static String getRequired(Map config, String name) throws TrippiException {
-
- String val = (String) config.get(name);
-
+ private static String getRequired(Map<String, String> config, String name)
+ throws TrippiException {
+ String val = config.get(name);
if (val == null) {
-
throw new TrippiException("Must specify " + name);
-
}
-
return val;
-
}
-
-
-
-
/**
-
- * Gets the requiredInt attribute of the OracleConnector class
-
- *
-
- * @param config Description of the Parameter
-
- * @param name Description of the Parameter
-
- * @return The requiredInt value
-
- * @exception TrippiException Description of the Exception
-
+ * Gets the requiredInt attribute of the OracleConnector class
+ *
+ * @param config
+ * Description of the Parameter
+ * @param name
+ * Description of the Parameter
+ * @return The requiredInt value
+ * @exception TrippiException
+ * Description of the Exception
*/
-
- private static int getRequiredInt(Map config, String name) throws TrippiException {
-
+ private static int getRequiredInt(Map<String, String> config, String name)
+ throws TrippiException {
String val = getRequired(config, name);
-
try {
-
return Integer.parseInt(val);
-
} catch (Exception e) {
-
- throw new TrippiException("Expected an integer for " + name + ", got " + val);
-
+ throw new TrippiException("Expected an integer for " + name
+ + ", got " + val);
}
-
}
-
-
-
-
- // set reader, writer, and elementFactory as needed
-
+ // set reader, writer, and elementFactory as needed
/**
-
- * Description of the Method
-
- *
-
- * @param config Description of the Parameter
-
- * @exception TrippiException Description of the Exception
-
+ * Description of the Method
+ *
+ * @param config
+ * Description of the Parameter
+ * @exception TrippiException
+ * Description of the Exception
*/
-
- public void init(Map config) throws TrippiException {
-
+ @Override
+ public void init(Map<String,String> config) throws TrippiException {
+ AliasManager aliasManager = new AliasManager(new HashMap<String, String>());
-
- AliasManager aliasManager = new AliasManager(new HashMap());
-
-
-
// Get and validate configuration
-
// Required parameters
-
- File dir = null;
-
- String jdbcDriver = null;
-
String jdbcUrl = null;
-
String user = null;
-
String password = null;
-
-
-
jdbcUrl = getRequired(config, "jdbcUrl");
-
user = getRequired(config, "user");
-
password = getRequired(config, "password");
-
-
- int autoFlushDormantSeconds = getRequiredInt(config, "autoFlushDormantSeconds");
-
+ int autoFlushDormantSeconds = getRequiredInt(config,
+ "autoFlushDormantSeconds");
int autoFlushBufferSize = getRequiredInt(config, "autoFlushBufferSize");
-
int bufferSafeCapacity = getRequiredInt(config, "bufferSafeCapacity");
-
- int bufferFlushBatchSize = getRequiredInt(config, "bufferFlushBatchSize");
-
-
-
+ int bufferFlushBatchSize = getRequiredInt(config,
+ "bufferFlushBatchSize");
String RDFSchemaName = getRequired(config, "RDFSchemaName");
-
-
-
Properties poolConfig = new Properties();
-
-
-
poolConfig.put(OracleOCIConnectionPool.CONNPOOL_MIN_LIMIT,
-
- getRequired(config, "PoolConnectionMinLimit"));
-
+ getRequired(config, "PoolConnectionMinLimit"));
poolConfig.put(OracleOCIConnectionPool.CONNPOOL_MAX_LIMIT,
-
- getRequired(config, "PoolConnectionMaxLimit"));
-
+ getRequired(config, "PoolConnectionMaxLimit"));
poolConfig.put(OracleOCIConnectionPool.CONNPOOL_INCREMENT,
-
- getRequired(config, "PoolConnectionIncrement"));
-
-
-
+ getRequired(config, "PoolConnectionIncrement"));
poolConfig.put(OracleOCIConnectionPool.CONNPOOL_NOWAIT, "false");
-
- //Must wait for next conncetion to free up.
-
+
+ // Must wait for next conncetion to free up.
poolConfig.put(OracleOCIConnectionPool.CONNPOOL_TIMEOUT,
-
- getRequired(config, "PoolConnectionTimeOut"));
-
+ getRequired(config, "PoolConnectionTimeOut"));
-
if (autoFlushDormantSeconds < 0) {
-
- throw new TrippiException("autoFlushDormantSeconds cannot be negative.");
-
+ throw new TrippiException(
+ "autoFlushDormantSeconds cannot be negative.");
}
-
+
if (autoFlushBufferSize < 1) {
-
- throw new TrippiException("autoFlushBufferSize must be greater than zero.");
-
+ throw new TrippiException(
+ "autoFlushBufferSize must be greater than zero.");
}
-
+
if (bufferSafeCapacity < autoFlushBufferSize + 1) {
-
- throw new TrippiException("bufferSafeCapacity must be greater than autoFlushBufferSize.");
-
+ throw new TrippiException(
+ "bufferSafeCapacity must be greater than autoFlushBufferSize.");
}
-
+
if (bufferFlushBatchSize < 1) {
-
- throw new TrippiException("bufferFlushBatchSize must be greater than zero.");
-
+ throw new TrippiException(
+ "bufferFlushBatchSize must be greater than zero.");
}
-
+
if (bufferFlushBatchSize > autoFlushBufferSize) {
-
- throw new TrippiException("bufferFlushBatchSize must be less than or equal to autoFlushBufferSize.");
-
+ throw new TrippiException(
+ "bufferFlushBatchSize must be less than or equal to autoFlushBufferSize.");
}
-
+
// Initialize appropriate Oracle Repository
-
Connection repository;
-
+
try {
-
DriverManager.registerDriver(new oracle.jdbc.driver.OracleDriver());
-
+ repository = DriverManager.getConnection(jdbcUrl, user, password);
-
- repository = DriverManager.getConnection(
-
- jdbcUrl, user, password);
-
- //Connect ot oracle
-
+ // Connect to oracle
/*
-
- * repository = new OracleOCIConnectionPool(user, password, jdbcUrl, poolConfig);
-
+ * repository = new OracleOCIConnectionPool(user, password, jdbcUrl,
+ * poolConfig);
*/
-
+
} catch (Exception e) {
-
- throw new TrippiException("Failed to initialize Oracle repository", e);
-
+ throw new TrippiException("Failed to initialize Oracle repository",
+ e);
}
-
+
try {
-
- OracleSession session = new OracleSession(repository,
-
- aliasManager,
-
+ OracleSession session = new OracleSession(repository, aliasManager,
RDFSchemaName);
-
-
- /*
-
- * **********************************************
-
- */
-
- /*
-
- * *************** HERE *************************
-
- */
-
- /*
-
- * **********************************************
-
- */
-
- m_elementFactory = session.getElementFactory();
-
+ //m_elementFactory = session.getElementFactory();
-
- TriplestoreSessionPool sessionPool = new SingleSessionPool(
-
- session,
-
+ TriplestoreSessionPool sessionPool = new SingleSessionPool(session,
OracleSession.TUPLE_LANGUAGES,
-
OracleSession.TRIPLE_LANGUAGES);
-
+
UpdateBuffer updateBuffer = new MemUpdateBuffer(bufferSafeCapacity,
-
bufferFlushBatchSize);
-
+
m_writer = new ConcurrentTriplestoreWriter(sessionPool,
-
- aliasManager,
-
- session,
-
- updateBuffer,
-
- autoFlushBufferSize,
-
+ aliasManager, session, updateBuffer, autoFlushBufferSize,
autoFlushDormantSeconds);
-
+
m_writer.setCacheDeletes(true);
-
+
} catch (Exception e) {
-
- throw new TrippiException("Failed to initialize Trippi interface to Oracle repository", e);
-
+ throw new TrippiException(
+ "Failed to initialize Trippi interface to Oracle repository",
+ e);
}
-
}
-
-
-
-
/**
-
- * Gets the reader attribute of the OracleConnector object
-
- *
-
- * @return The reader value
-
+ * Gets the reader attribute of the OracleConnector object
+ *
+ * @return The reader value
*/
-
+ @Override
public TriplestoreReader getReader() {
-
return m_writer;
-
}
-
-
-
-
/**
-
- * Gets the writer attribute of the OracleConnector object
-
- *
-
- * @return The writer value
-
+ * Gets the writer attribute of the OracleConnector object
+ *
+ * @return The writer value
*/
-
+ @Override
public TriplestoreWriter getWriter() {
-
return m_writer;
-
}
-
-
-
-
/**
-
- * Gets the elementFactory attribute of the OracleConnector object
-
- *
-
- * @return The elementFactory value
-
+ * Gets the elementFactory attribute of the OracleConnector object
+ *
+ * @return The elementFactory value
*/
-
+ @Override
public GraphElementFactory getElementFactory() {
-
return null;
-
- //m_elementFactory;
-
+ // m_elementFactory;
}
-
-
-
-
/**
-
- * Description of the Method
-
- *
-
- * @exception TrippiException Description of the Exception
-
+ * Description of the Method
+ *
+ * @exception TrippiException
+ * Description of the Exception
*/
-
+
+ @Override
public void close() throws TrippiException {
-
m_writer.close();
-
}
-
-
-
}
-
-
-
Modified: trunk/src/java/org/trippi/impl/oracle/OracleSession.java
===================================================================
--- trunk/src/java/org/trippi/impl/oracle/OracleSession.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/oracle/OracleSession.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -25,15 +25,10 @@
import org.trippi.impl.base.TriplestoreSession;
/**
- *
* A <code>TriplestoreSession</code> that wraps a OracleRepository.
*
- *
- *
* @author lib...@ca...
- *
* @created June 26, 2006
- *
*/
public class OracleSession implements TriplestoreSession, Runnable {
@@ -43,7 +38,6 @@
* Description of the Field
*
*/
-
public final static String SPO = "spo";
/**
@@ -51,7 +45,6 @@
* tuple queries aren't supported yet
*
*/
-
public final static String[] TUPLE_LANGUAGES = new String[] { "Unsupported" };
/**
@@ -59,7 +52,6 @@
* spo
*
*/
-
public final static String[] TRIPLE_LANGUAGES = new String[] { SPO };
private final static Logger logger =
@@ -79,41 +71,26 @@
private String m_cur_query;
/**
- *
* Description of the Method
*
- *
- *
* @return Description of the Return Value
- *
*/
-
public String[] listTupleLanguages() {
-
return TUPLE_LANGUAGES;
-
}
/**
- *
* Description of the Method
*
- *
- *
* @return Description of the Return Value
- *
*/
-
public String[] listTripleLanguages() {
return TRIPLE_LANGUAGES;
}
/**
- *
* Construct an Oracle session.
*
- *
- *
* @param repository
* Description of the Parameter
*
@@ -122,30 +99,21 @@
*
* @param RDFSchemaName
* Description of the Parameter
- *
*/
-
public OracleSession(Connection repository, AliasManager aliasManager,
String RDFSchemaName) {
-
m_repository = repository;
m_aliasManager = aliasManager;
m_closed = false;
m_oracleSchema = RDFSchemaName;
logger.info("Created session.");
-
}
/**
- *
* Gets the elementFactory attribute of the OracleSession object
*
- *
- *
* @return The elementFactory value
- *
*/
-
public GraphElementFactory getElementFactory() {
// TODO
if (m_factory == null) {
@@ -163,7 +131,6 @@
* Description of the Exception
*
*/
-
public void add(Set<Triple> triples) throws TrippiException {
doTriples(triples, true);
}
@@ -175,7 +142,6 @@
* @exception TrippiException
* Description of the Exception
*/
-
public void delete(Set<Triple> triples) throws TrippiException {
doTriples(triples, false);
}
@@ -189,7 +155,6 @@
* @exception TrippiException
* Description of the Exception
*/
-
private void doTriples(Set<Triple> triples, boolean add)
throws TrippiException {
@@ -198,7 +163,7 @@
try {
if (add) {
Iterator<Triple> jrdfTriples = triples.iterator();
- boolean sendTripples = false;
+ boolean sendTriples = false;
Statement stmt = m_repository.createStatement();
m_repository.setAutoCommit(false);
startedTransaction = true;
@@ -259,20 +224,16 @@
+ ">'))";
}
- sendTripples = true;
- // //////////////////
+ sendTriples = true;
- // /////////////////////TODO REMOVE
-
stmt.addBatch(query);
// m_cur_query = query;
// this.run();
-
}
- if (sendTripples) {
+ if (sendTriples) {
stmt.executeBatch();
}
stmt.close();
@@ -282,44 +243,31 @@
+ "_rdf_data WHERE ID IN (SELECT ID FROM " +
m_oracleSchema + "_rdf_data a " +
"WHERE (";
- boolean firstTripple = true;
+ boolean firstTriple = true;
while (jrdfTriples.hasNext()) {
Triple triple = (Triple) jrdfTriples.next();
boolean first = true;
- if (firstTripple) {
- firstTripple = false;
+ if (firstTriple) {
+ firstTriple = false;
} else {
query = query + " OR ( ";
}
- if ((triple.getSubject()) != null) {
+ if ((triple.getSubject()) != null) {
+ if (!((triple.getSubject()) instanceof BlankNode)) {
+ query = query
+ + " a.triple.get_subject() = '"
+ + ((URIReference) triple.getSubject())
+ .getURI().toString().replaceAll(
+ "'", "''") + "' ";
+ first = false;
+ }
+ }
- if (!((triple.getSubject()) instanceof BlankNode)) {
-
- query = query
- + " a.triple.get_subject() = '"
- +
-
- ((URIReference) triple.getSubject())
- .getURI().toString().replaceAll(
- "'", "''") +
-
- "' ";
-
- first = false;
-
- }
-
- }
-
if ((triple.getPredicate()) != null) {
-
if (!((triple.getPredicate()) instanceof BlankNode)) {
-
if (!(first)) {
-
query = query + " AND ";
-
}
query = query
@@ -331,21 +279,14 @@
"'", "''") +
"' ";
-
first = false;
-
}
-
}
if ((triple.getObject()) != null) {
-
if (!((triple.getObject() instanceof BlankNode))) {
-
if (!(first)) {
-
query = query + " AND ";
-
}
if (triple.getObject() instanceof Literal) {
@@ -402,13 +343,13 @@
}
- if (firstTripple == false) {
+ if (firstTriple == false) {
query = query + " )";
}
- if (firstTripple == false) {
+ if (firstTriple == false) {
Statement stmt = m_repository.createStatement();
@@ -501,11 +442,11 @@
private String doAliasReplacements(String q, boolean noBrackets) {
String out = q;
- Map m = m_aliasManager.getAliasMap();
- Iterator iter = m.keySet().iterator();
+ Map...
[truncated message content] |
|
From: <pan...@us...> - 2009-11-12 03:51:41
|
Revision: 123
http://trippi.svn.sourceforge.net/trippi/?rev=123&view=rev
Author: pangloss
Date: 2009-11-12 03:51:34 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
Updated for Mulgara 2.1.4 (issue FCREPO-580). Added Ben to the contributor's list and noted the issue of Oracle JDBC driver in README.txt.
Also cleaned up CollapsedAnswer's javadocs.
Modified Paths:
--------------
trunk/CONTRIBUTORS.txt
trunk/README.txt
trunk/lib/lib.properties
trunk/src/java/org/trippi/impl/mulgara/CollapsedAnswer.java
Added Paths:
-----------
trunk/lib/jakarta-regexp-1.5.jar
trunk/lib/mulgara-core-2.1.4.jar
trunk/lib/trove-2.0.4.jar
Removed Paths:
-------------
trunk/lib/jakarta-regexp-1.3.jar
trunk/lib/mulgara-core-2.0.6.jar
trunk/lib/mulgara-core-2.0.8.jar
trunk/lib/trove-1.0.2.jar
Modified: trunk/CONTRIBUTORS.txt
===================================================================
--- trunk/CONTRIBUTORS.txt 2009-11-11 19:18:29 UTC (rev 122)
+++ trunk/CONTRIBUTORS.txt 2009-11-12 03:51:34 UTC (rev 123)
@@ -1,3 +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
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt 2009-11-11 19:18:29 UTC (rev 122)
+++ trunk/README.txt 2009-11-12 03:51:34 UTC (rev 123)
@@ -35,4 +35,8 @@
ant doc
For other useful build targets, type:
- ant -p
\ No newline at end of file
+ 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: trunk/lib/jakarta-regexp-1.3.jar
===================================================================
(Binary files differ)
Added: trunk/lib/jakarta-regexp-1.5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jakarta-regexp-1.5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/lib/lib.properties
===================================================================
--- trunk/lib/lib.properties 2009-11-11 19:18:29 UTC (rev 122)
+++ trunk/lib/lib.properties 2009-11-12 03:51:34 UTC (rev 123)
@@ -91,12 +91,12 @@
lib.emory-util = lib/emory-util-2.1-remote.jar
# title : Jakarta Regular Expressions Library
-# version : 1.3
+# 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.3.jar
+lib.jakarta-regexp = lib/jakarta-regexp-1.5.jar
# title : Joda Time
# version : 1.5.2
@@ -122,8 +122,8 @@
lib.junit = lib/junit-4.5.jar
# title : Mulgara
-# version : 2.0.6
-# license : Mozilla Public License 1.1
+# version : 2.1.4
+# license : Open Software License ("OSL") v. 3.0
# url : http://www.mulgara.org/
# depends-on : log4j
# depends-on : servlet-api
@@ -149,7 +149,7 @@
# depends-on : saaj
# depends-on : trove
#
-lib.mulgara = lib/mulgara-core-2.0.6.jar
+lib.mulgara = lib/mulgara-core-2.1.4.jar
# title : Apache Derby Database
# version : 10.4.2.0
@@ -245,12 +245,12 @@
lib.slf4j-jdk14 = lib/slf4j-jdk14-1.5.2.jar
# title : GNU Trove
-# version : 1.0.2
+# version : 2.0.4
# license : LGPL
# organization : Eric D. Friedman
# url : http://trove4j.sourceforge.net/
#
-lib.trove = lib/trove-1.0.2.jar
+lib.trove = lib/trove-2.0.4.jar
# title : XML Pull API
# version : 1.1.3.4a
Deleted: trunk/lib/mulgara-core-2.0.6.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/mulgara-core-2.0.8.jar
===================================================================
(Binary files differ)
Added: trunk/lib/mulgara-core-2.1.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/mulgara-core-2.1.4.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/trove-1.0.2.jar
===================================================================
(Binary files differ)
Added: trunk/lib/trove-2.0.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/trove-2.0.4.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/java/org/trippi/impl/mulgara/CollapsedAnswer.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/CollapsedAnswer.java 2009-11-11 19:18:29 UTC (rev 122)
+++ trunk/src/java/org/trippi/impl/mulgara/CollapsedAnswer.java 2009-11-12 03:51:34 UTC (rev 123)
@@ -83,39 +83,48 @@
///////////////////////////////////////////////////////////////////
///////////////// from org.mulgara.query.Answer ///////////////////
///////////////////////////////////////////////////////////////////
-
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public Object getObject(int column) throws TuplesException {
return m_values[column];
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public Object getObject(String columnName) throws TuplesException {
return getObject(getColumnIndex(columnName));
}
///////////////////////////////////////////////////////////////////
- ///////////////// from org.kowari.query.Cursor ////////////////////
+ ///////////////// from org.mulgara.query.Cursor ////////////////////
///////////////////////////////////////////////////////////////////
/**
- * Reset to iterate through every single element.
+ * {@inheritDoc}
*/
+ @Override
public void beforeFirst() throws TuplesException {
// don't do anything -- this is a one-use impl
}
/**
- * Free resources associated with this instance.
+ * {@inheritDoc}
*/
+ @Override
public void close() throws TuplesException {
m_wrappedAnswer.close();
}
/**
- * Find the index of a variable.
- *
- * @return the ColumnIndex value
+ * {@inheritDoc}
*/
+ @Override
public int getColumnIndex(Variable column) throws TuplesException {
return getColumnIndex(column.getName());
}
@@ -130,71 +139,73 @@
/**
* Return the number of variables (columns).
*/
+ @Override
public int getNumberOfVariables() {
return m_variables.length;
}
/**
- * Get the variables bound and their default collation order.
- *
- * The array returned by this method should be treated as if its contents
- * were immutable, even though Java won't enforce this. If the elements of
- * the array are modified, there may be side effects on the past and
- * future clones of the tuples it was obtained from.
- *
- * @return the Variables bound within this answer
+ * {@inheritDoc}
*/
+ @Override
public Variable[] getVariables() {
return m_variables;
}
/**
- * Test whether this is a unit-valued answer.
- *
- * A unit answer appended to something yields the unit answer. A unit
- * answer joined to something yields the same something. Notionally, the
- * unit answer has zero columns and one row.
- *
- * @return true if the answer is unconstrained
+ * {@inheritDoc}
+ *
+ * This method is unimplemented and will always throw a TuplesException.
*/
+ @Override
public boolean isUnconstrained() throws TuplesException {
throw new TuplesException("isUnconstrained() not implemented.");
}
/**
- * Return the exact number of rows this instance contains.
+ * {@inheritDoc}
+ *
+ * This method is unimplemented and will always throw a TuplesException.
*/
+ @Override
public long getRowCount() throws TuplesException {
throw new TuplesException("getRowCount() not implemented.");
}
+ /**
+ * {@inheritDoc}
+ *
+ * This method is unimplemented and will always throw a TuplesException.
+ */
+ @Override
+ public long getRowExpectedCount() throws TuplesException {
+ throw new TuplesException("getRowExpectCount() not implemented.");
+ }
/**
- * Return an upper bound on the number of rows this instance contains.
+ * {@inheritDoc}
+ *
+ * This method is unimplemented and will always throw a TuplesException.
*/
+ @Override
public long getRowUpperBound() throws TuplesException {
throw new TuplesException("getRowUpperBound() not implemented.");
}
/**
- * Return cardinality of the number of rows which this instance contains.
- *
- * @return the cardinality of this tuples. {0,1,N} rows.
+ * {@inheritDoc}
+ *
+ * This method is unimplemented and will always throw a TuplesException.
*/
+ @Override
public int getRowCardinality() throws TuplesException {
throw new TuplesException("getRowCardinality() not implemented.");
}
/**
- * Move to the next row.
- *
- * If no such row exists, return false and the current row becomes
- * unspecified. The current row is unspecified when an instance is
- * created. To specify the current row, the beforeFirst() method must
- * be invoked.
- *
- * @return whether a subsequent row exists.
+ * {@inheritDoc}
*/
+ @Override
public boolean next() throws TuplesException {
if (m_values == null) return false;
m_values = m_currentRowGroup.nextValues();
@@ -216,7 +227,8 @@
/////////////////// from java.lang.Cloneable //////////////////////
///////////////////////////////////////////////////////////////////
- public Object clone() {
+ @Override
+ public Object clone() {
throw new RuntimeException("CollapsedAnswer.clone() not implemented.");
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2009-02-03 16:40:56
|
Revision: 113
http://trippi.svn.sourceforge.net/trippi/?rev=113&view=rev
Author: pangloss
Date: 2009-02-03 16:40:48 +0000 (Tue, 03 Feb 2009)
Log Message:
-----------
library updates for Mulgara 2.0.8
* note, this build of mulgara-core-2.0.8.jar is modified from the official 2.0.8 release to include several mulgara packages that were omitted from the release build. These modifications should be reflected in a future Mulgara release
Modified Paths:
--------------
trunk/README.txt
trunk/lib/lib.properties
Added Paths:
-----------
trunk/lib/mulgara-core-2.0.8.jar
trunk/lib/openrdf-sesame-2.2.1-onejar.jar
Removed Paths:
-------------
trunk/lib/openrdf-sesame-2.1.3-onejar.jar
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt 2008-10-31 03:32:48 UTC (rev 112)
+++ trunk/README.txt 2009-02-03 16:40:48 UTC (rev 113)
@@ -5,12 +5,13 @@
Source Distribution
Copyright (c) 2005-2007, Cornell University
+ Copyright (c) 2008-2009, Fedora Commons
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
LICENSE
=======
-Trippi is distributed under the Educational Community License (ECL), v1.0.
+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.
Modified: trunk/lib/lib.properties
===================================================================
--- trunk/lib/lib.properties 2008-10-31 03:32:48 UTC (rev 112)
+++ trunk/lib/lib.properties 2009-02-03 16:40:48 UTC (rev 113)
@@ -193,13 +193,13 @@
lib.mptstore = lib/mptstore-0.9.1.jar
# title : OpenRDF Sesame
-# version : 2.0.1
+# 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.1.3-onejar.jar
+lib.openrdf-sesame-onejar = lib/openrdf-sesame-2.2.1-onejar.jar
# title : Oracle JDBC Driver
# version : 10.2.0.2
Added: trunk/lib/mulgara-core-2.0.8.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/mulgara-core-2.0.8.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/openrdf-sesame-2.1.3-onejar.jar
===================================================================
(Binary files differ)
Added: trunk/lib/openrdf-sesame-2.2.1-onejar.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/openrdf-sesame-2.2.1-onejar.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-10-31 03:32:58
|
Revision: 112
http://trippi.svn.sourceforge.net/trippi/?rev=112&view=rev
Author: pangloss
Date: 2008-10-31 03:32:48 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
updated mulgara-core to include missing org.mulgara.client.jrdf package
Modified Paths:
--------------
trunk/lib/mulgara-core-2.0.6.jar
Modified: trunk/lib/mulgara-core-2.0.6.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-10-31 03:26:40
|
Revision: 111
http://trippi.svn.sourceforge.net/trippi/?rev=111&view=rev
Author: pangloss
Date: 2008-10-31 03:26:30 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
removed obsolete dependency
Modified Paths:
--------------
trunk/src/build/dependencies.xml
Modified: trunk/src/build/dependencies.xml
===================================================================
--- trunk/src/build/dependencies.xml 2008-10-31 03:25:43 UTC (rev 110)
+++ trunk/src/build/dependencies.xml 2008-10-31 03:26:30 UTC (rev 111)
@@ -75,7 +75,6 @@
<path id="mulgara.runtime.classpath">
<path refid="mulgara.common.classpath"/>
<pathelement path="${lib.activation}"/>
- <pathelement path="${lib.beep}"/>
<pathelement path="${lib.castor}"/>
<pathelement path="${lib.castor-xml}"/>
<pathelement path="${lib.castor-schema}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-10-31 03:25:48
|
Revision: 110
http://trippi.svn.sourceforge.net/trippi/?rev=110&view=rev
Author: pangloss
Date: 2008-10-31 03:25:43 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
updated for compatibility w/ junit4
Modified Paths:
--------------
trunk/src/test/org/trippi/TrippiIntegrationTestSuite.java
trunk/src/test/org/trippi/TrippiUnitTestSuite.java
trunk/src/test/org/trippi/impl/ImplIntegrationTestSuite.java
trunk/src/test/org/trippi/impl/ImplUnitTestSuite.java
trunk/src/test/org/trippi/impl/base/BaseUnitTestSuite.java
trunk/src/test/org/trippi/impl/mpt/MPTIntegrationTestSuite.java
Modified: trunk/src/test/org/trippi/TrippiIntegrationTestSuite.java
===================================================================
--- trunk/src/test/org/trippi/TrippiIntegrationTestSuite.java 2008-10-31 03:22:30 UTC (rev 109)
+++ trunk/src/test/org/trippi/TrippiIntegrationTestSuite.java 2008-10-31 03:25:43 UTC (rev 110)
@@ -1,12 +1,11 @@
package org.trippi;
+import org.trippi.impl.ImplIntegrationTestSuite;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.swingui.TestRunner;
-import org.trippi.impl.ImplIntegrationTestSuite;
-
public class TrippiIntegrationTestSuite extends TestCase {
public static Test suite() throws Exception {
@@ -22,14 +21,4 @@
return suite;
}
-
-
-
- public static void main(String[] args) throws Exception {
- if (System.getProperty("text") != null && System.getProperty("text").equals("true")) {
- junit.textui.TestRunner.run(TrippiIntegrationTestSuite.suite());
- } else {
- TestRunner.run(TrippiIntegrationTestSuite.class);
- }
- }
}
Modified: trunk/src/test/org/trippi/TrippiUnitTestSuite.java
===================================================================
--- trunk/src/test/org/trippi/TrippiUnitTestSuite.java 2008-10-31 03:22:30 UTC (rev 109)
+++ trunk/src/test/org/trippi/TrippiUnitTestSuite.java 2008-10-31 03:25:43 UTC (rev 110)
@@ -1,12 +1,11 @@
package org.trippi;
+import org.trippi.impl.ImplUnitTestSuite;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.swingui.TestRunner;
-import org.trippi.impl.ImplUnitTestSuite;
-
public class TrippiUnitTestSuite extends TestCase {
public static Test suite() throws Exception {
@@ -22,12 +21,4 @@
return suite;
}
-
- public static void main(String[] args) throws Exception {
- if (System.getProperty("text") != null && System.getProperty("text").equals("true")) {
- junit.textui.TestRunner.run(TrippiUnitTestSuite.suite());
- } else {
- TestRunner.run(TrippiUnitTestSuite.class);
- }
- }
}
Modified: trunk/src/test/org/trippi/impl/ImplIntegrationTestSuite.java
===================================================================
--- trunk/src/test/org/trippi/impl/ImplIntegrationTestSuite.java 2008-10-31 03:22:30 UTC (rev 109)
+++ trunk/src/test/org/trippi/impl/ImplIntegrationTestSuite.java 2008-10-31 03:25:43 UTC (rev 110)
@@ -1,15 +1,14 @@
package org.trippi.impl;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.swingui.TestRunner;
-
import org.trippi.TestConfig;
import org.trippi.config.TrippiProfile;
import org.trippi.impl.mpt.MPTIntegrationTestSuite;
import org.trippi.impl.mulgara.MulgaraIntegrationTestSuite;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
public class ImplIntegrationTestSuite extends TestCase {
public static Test suite() throws Exception {
@@ -36,14 +35,4 @@
return suite;
}
-
-
-
- public static void main(String[] args) throws Exception {
- if (System.getProperty("text") != null && System.getProperty("text").equals("true")) {
- junit.textui.TestRunner.run(ImplIntegrationTestSuite.suite());
- } else {
- TestRunner.run(ImplIntegrationTestSuite.class);
- }
- }
}
Modified: trunk/src/test/org/trippi/impl/ImplUnitTestSuite.java
===================================================================
--- trunk/src/test/org/trippi/impl/ImplUnitTestSuite.java 2008-10-31 03:22:30 UTC (rev 109)
+++ trunk/src/test/org/trippi/impl/ImplUnitTestSuite.java 2008-10-31 03:25:43 UTC (rev 110)
@@ -1,12 +1,11 @@
package org.trippi.impl;
+import org.trippi.impl.base.BaseUnitTestSuite;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.swingui.TestRunner;
-import org.trippi.impl.base.BaseUnitTestSuite;
-
public class ImplUnitTestSuite extends TestCase {
public static Test suite() throws Exception {
@@ -22,12 +21,4 @@
return suite;
}
-
- public static void main(String[] args) throws Exception {
- if (System.getProperty("text") != null && System.getProperty("text").equals("true")) {
- junit.textui.TestRunner.run(ImplUnitTestSuite.suite());
- } else {
- TestRunner.run(ImplUnitTestSuite.class);
- }
- }
}
Modified: trunk/src/test/org/trippi/impl/base/BaseUnitTestSuite.java
===================================================================
--- trunk/src/test/org/trippi/impl/base/BaseUnitTestSuite.java 2008-10-31 03:22:30 UTC (rev 109)
+++ trunk/src/test/org/trippi/impl/base/BaseUnitTestSuite.java 2008-10-31 03:25:43 UTC (rev 110)
@@ -3,7 +3,6 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.swingui.TestRunner;
public class BaseUnitTestSuite extends TestCase {
@@ -17,12 +16,4 @@
return suite;
}
-
- public static void main(String[] args) throws Exception {
- if (System.getProperty("text") != null && System.getProperty("text").equals("true")) {
- junit.textui.TestRunner.run(BaseUnitTestSuite.suite());
- } else {
- TestRunner.run(BaseUnitTestSuite.class);
- }
- }
}
Modified: trunk/src/test/org/trippi/impl/mpt/MPTIntegrationTestSuite.java
===================================================================
--- trunk/src/test/org/trippi/impl/mpt/MPTIntegrationTestSuite.java 2008-10-31 03:22:30 UTC (rev 109)
+++ trunk/src/test/org/trippi/impl/mpt/MPTIntegrationTestSuite.java 2008-10-31 03:25:43 UTC (rev 110)
@@ -3,7 +3,6 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.swingui.TestRunner;
public class MPTIntegrationTestSuite extends TestCase {
@@ -20,12 +19,4 @@
return suite;
}
-
- public static void main(String[] args) throws Exception {
- if (System.getProperty("text") != null && System.getProperty("text").equals("true")) {
- junit.textui.TestRunner.run(MPTIntegrationTestSuite.suite());
- } else {
- TestRunner.run(MPTIntegrationTestSuite.class);
- }
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-10-31 03:22:40
|
Revision: 109
http://trippi.svn.sourceforge.net/trippi/?rev=109&view=rev
Author: pangloss
Date: 2008-10-31 03:22:30 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
updated libraries
Modified Paths:
--------------
trunk/lib/lib.properties
Added Paths:
-----------
trunk/lib/commons-collections-3.2.1.jar
trunk/lib/commons-dbcp-1.2.2.jar
trunk/lib/commons-pool-1.4.jar
trunk/lib/derby-10.4.2.0.jar
trunk/lib/junit-4.5.jar
trunk/lib/xpp3_min-1.1.4c.jar
Removed Paths:
-------------
trunk/lib/commons-collections-3.1.jar
trunk/lib/commons-dbcp-1.2.1.jar
trunk/lib/commons-pool-1.2.jar
trunk/lib/derby.jar
trunk/lib/junit.jar
trunk/lib/xpp3_min-1.1.3.4.K.jar
Deleted: trunk/lib/commons-collections-3.1.jar
===================================================================
(Binary files differ)
Added: trunk/lib/commons-collections-3.2.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/commons-collections-3.2.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/commons-dbcp-1.2.1.jar
===================================================================
(Binary files differ)
Added: trunk/lib/commons-dbcp-1.2.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/commons-dbcp-1.2.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/commons-pool-1.2.jar
===================================================================
(Binary files differ)
Added: trunk/lib/commons-pool-1.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/commons-pool-1.4.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/derby-10.4.2.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/derby-10.4.2.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/derby.jar
===================================================================
(Binary files differ)
Added: trunk/lib/junit-4.5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/junit-4.5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/junit.jar
===================================================================
(Binary files differ)
Modified: trunk/lib/lib.properties
===================================================================
--- trunk/lib/lib.properties 2008-10-17 11:49:30 UTC (rev 108)
+++ trunk/lib/lib.properties 2008-10-31 03:22:30 UTC (rev 109)
@@ -32,12 +32,12 @@
lib.commons-codec = lib/commons-codec-1.3.jar
# title : Commons Collections
-# version : 3.1
+# 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.1.jar
+lib.commons-collections = lib/commons-collections-3.2.1.jar
# title : Commons Database Connection Pooling
# version : 1.2.1
@@ -47,7 +47,7 @@
# depends-on : commons-collections
# depends-on : commons-pool
#
-lib.commons-dbcp = lib/commons-dbcp-1.2.1.jar
+lib.commons-dbcp = lib/commons-dbcp-1.2.2.jar
# title : Commons Discovery
# version : 1.2
@@ -75,13 +75,13 @@
lib.commons-logging = lib/commons-logging-1.0.3.jar
# title : Commons Object Pooling Library
-# version : 1.2
+# 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.2.jar
+lib.commons-pool = lib/commons-pool-1.4.jar
# title : J2EE Connector Architecture
# url : http://java.sun.com/j2ee/connector/
@@ -114,12 +114,12 @@
lib.jta = lib/jta-spec1_0_1.jar
# title : JUnit
-# version : 3.8.1
+# version : 4.5
# license : Common Public License 1.0
# organization : JUnit.org
# url : http://junit.org/
#
-lib.junit = lib/junit.jar
+lib.junit = lib/junit-4.5.jar
# title : Mulgara
# version : 2.0.6
@@ -152,12 +152,12 @@
lib.mulgara = lib/mulgara-core-2.0.6.jar
# title : Apache Derby Database
-# version : 10.1.3.1
+# 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.jar
+lib.derby = lib/derby-10.4.2.0.jar
# title : Log4J
# version : 1.2.15
@@ -261,10 +261,10 @@
lib.xmlpull = lib/xmlpull_1_1_3_4a.jar
# title : XML Pull Implementation
-# version : 1.1.3.4.K
+# version : 1.1.4c
# license : ?
# organization : ?
# url : http://xmlpull.org/
#
-lib.xpp3 = lib/xpp3_min-1.1.3.4.K.jar
+lib.xpp3 = lib/xpp3_min-1.1.4c.jar
Deleted: trunk/lib/xpp3_min-1.1.3.4.K.jar
===================================================================
(Binary files differ)
Added: trunk/lib/xpp3_min-1.1.4c.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/xpp3_min-1.1.4c.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-10-17 11:49:33
|
Revision: 108
http://trippi.svn.sourceforge.net/trippi/?rev=108&view=rev
Author: pangloss
Date: 2008-10-17 11:49:30 +0000 (Fri, 17 Oct 2008)
Log Message:
-----------
release 1.4.1
Added Paths:
-----------
tags/release-1.4.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-10-17 11:36:55
|
Revision: 107
http://trippi.svn.sourceforge.net/trippi/?rev=107&view=rev
Author: pangloss
Date: 2008-10-17 11:36:45 +0000 (Fri, 17 Oct 2008)
Log Message:
-----------
updated for mulgara 2.0.6
Added Paths:
-----------
trunk/lib/mulgara-core-2.0.6.jar
Removed Paths:
-------------
trunk/lib/mulgara-core-2.0.5.jar
Deleted: trunk/lib/mulgara-core-2.0.5.jar
===================================================================
(Binary files differ)
Added: trunk/lib/mulgara-core-2.0.6.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/mulgara-core-2.0.6.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-10-17 11:25:12
|
Revision: 106
http://trippi.svn.sourceforge.net/trippi/?rev=106&view=rev
Author: pangloss
Date: 2008-10-17 11:25:05 +0000 (Fri, 17 Oct 2008)
Log Message:
-----------
updated for mulgara 2.0.6
Modified Paths:
--------------
trunk/lib/lib.properties
trunk/src/java/org/trippi/Trippi.properties
Added Paths:
-----------
trunk/lib/lucene-core-2.4.0.jar
Removed Paths:
-------------
trunk/lib/lucene-2.0.0.jar
Modified: trunk/lib/lib.properties
===================================================================
--- trunk/lib/lib.properties 2008-09-18 03:47:21 UTC (rev 105)
+++ trunk/lib/lib.properties 2008-10-17 11:25:05 UTC (rev 106)
@@ -122,7 +122,7 @@
lib.junit = lib/junit.jar
# title : Mulgara
-# version : 2.0
+# version : 2.0.6
# license : Mozilla Public License 1.1
# url : http://www.mulgara.org/
# depends-on : log4j
@@ -149,7 +149,7 @@
# depends-on : saaj
# depends-on : trove
#
-lib.mulgara = lib/mulgara-core-2.0.5.jar
+lib.mulgara = lib/mulgara-core-2.0.6.jar
# title : Apache Derby Database
# version : 10.1.3.1
@@ -168,12 +168,12 @@
lib.log4j = lib/log4j-1.2.15.jar
# title : Lucene
-# version : 2.0.0
+# version : 2.4.0
# license : ?
# organization : Apache?
# url : http://lucene.apache.org/
#
-lib.lucene = lib/lucene-2.0.0.jar
+lib.lucene = lib/lucene-core-2.4.0.jar
# title : Java Mail
# version : 1.3
Deleted: trunk/lib/lucene-2.0.0.jar
===================================================================
(Binary files differ)
Added: trunk/lib/lucene-core-2.4.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/lucene-core-2.4.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/java/org/trippi/Trippi.properties
===================================================================
--- trunk/src/java/org/trippi/Trippi.properties 2008-09-18 03:47:21 UTC (rev 105)
+++ trunk/src/java/org/trippi/Trippi.properties 2008-10-17 11:25:05 UTC (rev 106)
@@ -1,2 +1,2 @@
-trippi.version=1.4
+trippi.version=1.4.1
buildDate=@buildDate@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-09-18 03:47:10
|
Revision: 105
http://trippi.svn.sourceforge.net/trippi/?rev=105&view=rev
Author: pangloss
Date: 2008-09-18 03:47:21 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
release 1.4 (Mulgara 2.0.5)
Added Paths:
-----------
tags/release-1.4/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-09-18 03:43:17
|
Revision: 104
http://trippi.svn.sourceforge.net/trippi/?rev=104&view=rev
Author: pangloss
Date: 2008-09-18 03:43:27 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
included a patch submitted by Morten Grouleff to address "TransactionalAnswer not closed" warnings (see: http://sourceforge.net/mailarchive/message.php?msg_name=48C983B2.2090000%40trifork.com)
Modified Paths:
--------------
trunk/src/java/org/trippi/impl/mulgara/RowGroup.java
Modified: trunk/src/java/org/trippi/impl/mulgara/RowGroup.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/RowGroup.java 2008-09-10 04:15:34 UTC (rev 103)
+++ trunk/src/java/org/trippi/impl/mulgara/RowGroup.java 2008-09-18 03:43:27 UTC (rev 104)
@@ -109,6 +109,14 @@
if (m_rowCount > 0) {
m_nextValues = null;
}
+
+ for (int i = 0; i < m_valueList.size(); i++) {
+ Object val = m_valueList.get(i);
+ if (val instanceof Answer) {
+ Answer innerAnswer = (Answer) val;
+ innerAnswer.close();
+ }
+ }
}
} else {
m_nextValues = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-09-10 04:15:24
|
Revision: 103
http://trippi.svn.sourceforge.net/trippi/?rev=103&view=rev
Author: pangloss
Date: 2008-09-10 04:15:34 +0000 (Wed, 10 Sep 2008)
Log Message:
-----------
sparql support
Modified Paths:
--------------
trunk/src/java/org/trippi/Trippi.properties
trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java
trunk/src/test/org/trippi/impl/mulgara/MulgaraConnectorIntegrationTest.java
Modified: trunk/src/java/org/trippi/Trippi.properties
===================================================================
--- trunk/src/java/org/trippi/Trippi.properties 2008-09-09 09:20:23 UTC (rev 102)
+++ trunk/src/java/org/trippi/Trippi.properties 2008-09-10 04:15:34 UTC (rev 103)
@@ -1,2 +1,2 @@
-trippi.version=1.3.2
+trippi.version=1.4
buildDate=@buildDate@
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java 2008-09-09 09:20:23 UTC (rev 102)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java 2008-09-10 04:15:34 UTC (rev 103)
@@ -30,6 +30,7 @@
import org.mulgara.resolver.LocalJRDFDatabaseSession;
import org.mulgara.server.JRDFSession;
import org.mulgara.server.driver.JRDFGraphFactory;
+import org.mulgara.sparql.SparqlInterpreter;
import org.trippi.TripleIterator;
import org.trippi.TrippiException;
@@ -136,6 +137,27 @@
throw new TrippiException(e.getMessage(), e);
}
return new MulgaraTupleIterator(ans);
+ } else if (language.equalsIgnoreCase("sparql")) {
+ queryText = doAliasReplacements(queryText);
+ Answer ans = null;
+
+ // expand shortcut "from <#" to "from <" + m_serverURI
+ queryText = queryText.replaceAll("\\s+from\\s+<#", " from <" + m_serverURI);
+ // expand shortcut "in <#" to "in <" + m_serverURI
+ queryText = queryText.replaceAll("\\s+in\\s+<#", " in <" + m_serverURI);
+ SparqlInterpreter interpreter = new SparqlInterpreter();
+ try {
+ ans = m_session.query(interpreter.parseQuery(queryText));
+ } catch (QueryException e) {
+ throw new TrippiException(e.getMessage(), e);
+ } catch (IOException e) {
+ throw new TrippiException(e.getMessage(), e);
+ } catch (MulgaraLexerException e) {
+ throw new TrippiException(e.getMessage(), e);
+ } catch (MulgaraParserException e) {
+ throw new TrippiException(e.getMessage(), e);
+ }
+ return new MulgaraTupleIterator(ans);
} else {
throw new TrippiException("Unrecognized query language: "
+ language);
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java 2008-09-09 09:20:23 UTC (rev 102)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java 2008-09-10 04:15:34 UTC (rev 103)
@@ -25,7 +25,7 @@
.getLogger(MulgaraSessionFactory.class.getName());
/** iTQL */
- public static final String[] TUPLE_LANGUAGES = new String[] { "itql" };
+ public static final String[] TUPLE_LANGUAGES = new String[] { "itql", "sparql" };
/** SPO */
public static final String[] TRIPLE_LANGUAGES = new String[] { "spo" };
Modified: trunk/src/test/org/trippi/impl/mulgara/MulgaraConnectorIntegrationTest.java
===================================================================
--- trunk/src/test/org/trippi/impl/mulgara/MulgaraConnectorIntegrationTest.java 2008-09-09 09:20:23 UTC (rev 102)
+++ trunk/src/test/org/trippi/impl/mulgara/MulgaraConnectorIntegrationTest.java 2008-09-10 04:15:34 UTC (rev 103)
@@ -57,6 +57,74 @@
}
}
+ public void testTql() throws Exception {
+ if (!(_connector instanceof MulgaraConnector)) {
+ fail("expected MulgaraConnector");
+ }
+
+ TriplestoreReader reader = _connector.getReader();
+ TriplestoreWriter writer = _connector.getWriter();
+ MulgaraConnector conn = (MulgaraConnector) _connector;
+ MulgaraSessionFactory factory = (MulgaraSessionFactory) conn
+ .getSessionFactory();
+ URI modelURI = factory.getModelURI();
+
+ SubjectNode s = _geFactory.createResource(new URI("urn:test:subject"));
+ PredicateNode p = _geFactory.createResource(new URI("urn:test:predicate"));
+ ObjectNode o = _geFactory.createResource(new URI("urn:test:object"));
+ Triple triple = _geFactory.createTriple(s, p, o);
+ writer.add(triple, true);
+
+ String query = "select $s $o from <" + modelURI + "> "
+ + "where $s <" + p + "> $o;";
+
+ System.out.println("query: " + query);
+
+ TupleIterator tuples = reader.findTuples("itql", query, 0, false);
+
+ assertTrue(tuples.hasNext());
+ Map<String, Node> map = tuples.next();
+ assertFalse(tuples.hasNext());
+ ObjectNode obj = (ObjectNode)map.get("o");
+ assertEquals(o.toString(), obj.toString());
+ }
+
+ /**
+ * This is just a sanity check for SPARQL support.
+ *
+ * @throws Exception
+ */
+ public void testSparql() throws Exception {
+ if (!(_connector instanceof MulgaraConnector)) {
+ fail("expected MulgaraConnector");
+ }
+
+ TriplestoreReader reader = _connector.getReader();
+ TriplestoreWriter writer = _connector.getWriter();
+ MulgaraConnector conn = (MulgaraConnector) _connector;
+ MulgaraSessionFactory factory = (MulgaraSessionFactory) conn
+ .getSessionFactory();
+ URI modelURI = factory.getModelURI();
+
+ SubjectNode s = _geFactory.createResource(new URI("urn:test:subject"));
+ PredicateNode p = _geFactory.createResource(new URI("urn:test:predicate"));
+ ObjectNode o = _geFactory.createResource(new URI("urn:test:object"));
+ Triple triple = _geFactory.createTriple(s, p, o);
+ writer.add(triple, true);
+
+ String query = "SELECT * FROM <" + modelURI + "> WHERE { ?s <" + p + "> ?o }";
+
+ System.out.println("query: " + query);
+
+ TupleIterator tuples = reader.findTuples("sparql", query, 0, false);
+
+ assertTrue(tuples.hasNext());
+ Map<String, Node> map = tuples.next();
+ assertFalse(tuples.hasNext());
+ ObjectNode obj = (ObjectNode)map.get("o");
+ assertEquals(o.toString(), obj.toString());
+ }
+
public void xtestLuceneModel() throws Exception {
if (!(_connector instanceof MulgaraConnector)) {
fail("expected MulgaraConnector");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-09-09 09:20:14
|
Revision: 102
http://trippi.svn.sourceforge.net/trippi/?rev=102&view=rev
Author: pangloss
Date: 2008-09-09 09:20:23 +0000 (Tue, 09 Sep 2008)
Log Message:
-----------
updating Mulgara from version 2.0.0 to 2.0.5.
Notably, JRDF is now included in mulgara-core-NNN.jar. This means mulgara-core-NNN.jar is a dependency for all Trippi distributions, even ones that don't intend to deploy with Mulgara (e.g. MPTStore).
Also removed and/or updated libs that were removed/updated in Mulgara.
Modified Paths:
--------------
trunk/lib/lib.properties
trunk/src/build/dependencies.xml
Added Paths:
-----------
trunk/lib/activation-1.1.1.jar
trunk/lib/commons-httpclient-3.1.jar
trunk/lib/mulgara-core-2.0.5.jar
Removed Paths:
-------------
trunk/lib/activation-1.0.2.jar
trunk/lib/beepcore-0.9.08.jar
trunk/lib/commons-httpclient-3.0.1.jar
trunk/lib/jrdf-0.3.4.3.jar
trunk/lib/mulgara-core-2.0.0.jar
Property changes on: trunk/lib/activation-1.1.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/lib/commons-httpclient-3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/lib/lib.properties
===================================================================
--- trunk/lib/lib.properties 2008-07-24 03:50:15 UTC (rev 101)
+++ trunk/lib/lib.properties 2008-09-09 09:20:23 UTC (rev 102)
@@ -3,19 +3,13 @@
#
# title : JavaBeans Activation Framework
-# version : 1.0.2
+# version : 1.1.1
# license : Sun
# organization : Sun
# url : http://java.sun.com/products/javabeans/jaf/downloads/index.html
#
-lib.activation = lib/activation-1.0.2.jar
+lib.activation = lib/activation-1.1.1.jar
-# title :
-# version :
-# license :
-#
-lib.beep = lib/beepcore-0.9.08.jar
-
# title : Castor Data Binding Framework
# version : 1.2
# license : BSD
@@ -65,12 +59,12 @@
# title : Commons HttpClient
-# version : 3.0.1
+# 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.0.1.jar
+lib.commons-httpclient = lib/commons-httpclient-3.1.jar
# title : Commons Logging
# version : 1.0.3
@@ -116,14 +110,6 @@
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
-
-# title : JRDF
-# version : 0.3.4.3
-# license : Mozilla Public License
-# organization : Andrew Newman
-# url : http://jrdf.sourceforge.net/
-#
-lib.jrdf = lib/jrdf-0.3.4.3.jar
lib.jta = lib/jta-spec1_0_1.jar
@@ -139,7 +125,6 @@
# version : 2.0
# license : Mozilla Public License 1.1
# url : http://www.mulgara.org/
-# depends-on : jrdf
# depends-on : log4j
# depends-on : servlet-api
# depends-on : activation
@@ -164,7 +149,7 @@
# depends-on : saaj
# depends-on : trove
#
-lib.mulgara = lib/mulgara-core-2.0.0.jar
+lib.mulgara = lib/mulgara-core-2.0.5.jar
# title : Apache Derby Database
# version : 10.1.3.1
Property changes on: trunk/lib/mulgara-core-2.0.5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/build/dependencies.xml
===================================================================
--- trunk/src/build/dependencies.xml 2008-07-24 03:50:15 UTC (rev 101)
+++ trunk/src/build/dependencies.xml 2008-09-09 09:20:23 UTC (rev 102)
@@ -7,6 +7,7 @@
<pathelement path="${lib.jrdf}"/>
<pathelement path="${lib.log4j}"/>
<pathelement path="${lib.openrdf-sesame-onejar}"/>
+ <pathelement path="${lib.mulgara}"/>
</path>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-07-24 03:50:06
|
Revision: 101
http://trippi.svn.sourceforge.net/trippi/?rev=101&view=rev
Author: pangloss
Date: 2008-07-24 03:50:15 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
2.0.0-final2 ;)
fixes a last-minute transaction issue
Modified Paths:
--------------
trunk/lib/mulgara-core-2.0.0.jar
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pan...@us...> - 2008-07-23 19:33:45
|
Revision: 100
http://trippi.svn.sourceforge.net/trippi/?rev=100&view=rev
Author: pangloss
Date: 2008-07-23 19:33:55 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
removing openrdf-util and changing default test profile back to local instance of Mulgara
Modified Paths:
--------------
trunk/src/build/dependencies.xml
trunk/src/test/test.properties
Removed Paths:
-------------
trunk/lib/openrdf-util.jar
Modified: trunk/src/build/dependencies.xml
===================================================================
--- trunk/src/build/dependencies.xml 2008-07-23 19:00:05 UTC (rev 99)
+++ trunk/src/build/dependencies.xml 2008-07-23 19:33:55 UTC (rev 100)
@@ -27,7 +27,6 @@
<path id="core.runtime.classpath">
<path refid="core.common.classpath"/>
- <pathelement path="${lib.openrdf-util}"/>
</path>
<pathconvert property="core.runtime.libs"
Modified: trunk/src/test/test.properties
===================================================================
--- trunk/src/test/test.properties 2008-07-23 19:00:05 UTC (rev 99)
+++ trunk/src/test/test.properties 2008-07-23 19:33:55 UTC (rev 100)
@@ -1,7 +1,7 @@
#
# Test Properties
#
-test.profile = mulgara-remote
+test.profile = mulgara
profile.mpt-derby.label = mpt-derby
profile.mpt-derby.connectorClassName = org.trippi.impl.mpt.MPTConnector
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
21 messages has been excluded from this view by a project administrator.
