Recent changes to patches

Switch to PreparedStatement use within QuadDb.java

Asheesh Laroia — Mon, 13 Sep 2010 17:51:03 -0000

As per our discussion at https://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTi%3DGUGxk-hoR%3D9Dw7S1%2B9bAny0PXPFh32MWcKwgB%40mail.gmail.com&forum_name=ng4j-namedgraphs and https://sourceforge.net/mailarchive/forum.php?thread_name=alpine.DEB.2.00.1009131317280.22409%40rose.makesad.us&forum_name=ng4j-namedgraphs , here are the patches for NG4J to use PreparedStatement.

There are three patches -- I split this out so that it would be easier to understand, I hope.

Let me know if you have questions. The way I split them out, they should never break any tests in the test suite.

Allow use of Jena 2.5.7

Tim P — Fri, 24 Jul 2009 09:52:01 -0000

Changes to pom to use jena 2.5.7 and bouncy castle jars from maven central repository.
Also antlr.

Added close method to NamedGraphDataset.

MyResultSet now returns a QuerySolution rather than an Object

fixes TrigParser

Andreas Langegger — Mon, 15 Jun 2009 14:25:27 -0000

fixes a minor bug in the TRIG parser causing a NPE when reading default graphs such as in the example 3 at http://www4.wiwiss.fu-berlin.de/bizer/TriG/#example

Regards,
AndyL

Refactor SWP code and remove deprecated TriQL

Jennifer — Fri, 09 Jan 2009 21:24:52 -0000

This patch modifies 3 files: SWPNamedGraphSetImpl, SWPWarrantImpl, and SWPSignatureUtilities.

The change to SWPSignatureUtilities was a refactoring. Changed it to reduce the amount of duplicated code. Made better use of existing helper methods and created new ones. Also a bug fix or two along the way.

Two changes to SWPWarrantImpl. One was a small refactoring change to introduce and use a helper class (NiceGraphIterator) instead of creating and using the same implementation of NiceIterator in three different methods. The other was to change TriQL queries to SPARQL queries.

The changes to SWPNamedGraphSetImpl were more extensive. In particular:

* Created two new helper methods (actOnGraphs and actOnGraphsWithSignature) which are used to do the work of all the interface methods except for verifyAllSignatures. This refactoring greatly reduced the amount of duplicate code.

* Create additional helper methods for use by verifyAllSignatures. This functionality was separated so subclasses could more easily override small portions, such as the name used for a warrant graph and the exact triples added to the verification graph.

* Changed to use SPARQL instead of TriQL for queries.

* Added functionality to the helper methods (actOnGraphs and actOnGraphsWithSignature) which could be exercised by subclasses. Namely to allow additional statements to be added to the warrant and to allow an unsigned warrant to include a graph digest.

The attached patch is of the type to be applied using the Eclipse patch wizard.

I was careful to make no changes to the way things worked previously. New functionality was added but no existing functionality was changed, to my knowledge, except for small bug fixes in SWPSignatureUtilities e.g. to use the signature method intended.

The project Junit tests all pass except for the 2 known issues in SWPSignatureUtilitiesTest.

Update to ARQ 2.4, Jena 2.5.6 and assoc libs

Jennifer — Thu, 16 Oct 2008 19:38:24 -0000

Here's an initial attempt to update all of NG4J for the latest ARQ, Jena, etc.

Get ARQ-2.4.zip from the download section of the Jena site on SourceForge (http://sourceforge.net/projects/jena/).

Need to *add* jenatest.jar.

Need to *replace*
* arq.jar
* commons-logging.jar with commons-logging-1.1.1.jar
* jena.jar

I'm attaching separate patch files for /src and /tests. These are created using the Eclipse "Unified" format. Let me know if you'd like a different format.

No new failures or errors when running tests. The only 2 problems are those known due to the expected results in SWP tests due to the new vs. old key (crypto) values.

However, many classes in de.fuberlin.wiwiss.ng4j.triql.parser are auto-generated and not supposed to be modified. But I don't know how the autogeneration is done so I modified them manually.

Also, many of those same autogenerated classes now need to implement inherited method com.hp.hpl.jena.sparql.lang.rdql.PrintableRDQL#format, but I only included a stub method that does nothing. Each such location in the code is labeled with an Eclipse task that begins with
FIXME (Update to Jena 2.5.6)
so they should be easy to find.

Additionally, in class de.fuberlin.wiwiss.ng4j.triql.legacy.QueryPrintUtils, I commented out part of the "print" method to get the code to compile. This too is labeled with the same type of FIXME task.

For the most part I found the new locations of required classes. A few (jena/arq) classes I could not find and added them as new classes in NG4J, noting the prior package.

The worst of the port should be over. If we could just have someone who knows something about these auto-generated classes take a look and advise us, then I think we'd be in good shape to finish up and finally upgrade to the latest Jena/ARQ.

Update Bouncy Castle Libs to version 1.41

Jennifer — Thu, 16 Oct 2008 15:51:50 -0000

SWPSignatureUtilities and CreateTestKeystore create Signature objects directly instead of using the factory method.

The attached patches contain modified version of both files. These use the factory methods instead of the previous non-standard method. This works with both the current version of bouncycastle (1.38) and newer versions (including 1.41).

I ran the full ng4j test suite and the test results are the same before and after this patch is applied. I did not try running CreateTestKeystore to create a new keystore.

My colleague Rob fixed SWPSignatureUtilities and said it could be shared with the NG4J community. In addition to changing the class to use the factory methods, he fixed the algorithm type in various places where SHA1 was used instead of the type matching the if statement. In one place he also added a missing line to create the signature.

These patches use the Eclipse "Unified" method. If you prefer a different method such as Standard, please let me know.

Download the latest libraries from http://www.bouncycastle.org/.

Code to create a new test keystore

Jennifer — Wed, 03 Sep 2008 19:29:06 -0000

The main() method of new file CreateTestKeystore creates a new keystore - ng4jtest.p12 - with two certificates, one for the client and one for a certificate authority.

Unfortunately there are still 2 failures in the SWP tests. I haven't yet figured out what signature value needs to be used so that the tests run correctly. When we figure that out we can have CreateTestKeystore print that value at the end (instead of what it prints now).

Because not everything is running smoothly yet, rather than replacing the existing test.p12, I had it make a new keystore and modified the code to use the new keystore. I suggest we leave the old test.p12 as part of the release so that it can still be easily referred to, hopefully leading to a final fix.

Fix some errors in SWPNamedGraphSetImpl

Jennifer — Fri, 29 Aug 2008 03:49:03 -0000

The following methods had problems which have been fixed in the attached patch:
* getAllWarrants
* getAllAssertedGraphs
* getAllQuotedGraphs

The latter 2 still have a (pre-existing) logic issue - this has been noted as a FIXME task in the code. Rather than getting all asserted or quoted graphs for a particular authority, they get all the graphs asserted or quoted by a single warrant which has that authority. This needs to be fixed too, but I don't have time tonight.

This patch fixes all the errors from test runs except those pertaining to the expired certificate (so 3 errors remain due to that, 7 have been fixed).

Fix some Java warnings

Jennifer — Thu, 21 Aug 2008 13:54:44 -0000

This morning I updated to HEAD and then fixed some of the Java warnings in /tests and /src (but not auto-generated source).

Attaching separate patches for files in /src and /tests.

It would be nice to include some code cleanup like this in the upcoming 0.7 release.

Update Bouncy Castle Libs to version 138

Jennifer — Tue, 19 Aug 2008 20:49:03 -0000

This patch is to update the Bouncy Castle libraries included with NG4J from verison 127 to version 138.

The patch for the classpath is attached.

I plan to attach the actual replacement libraries shortly.
* bcpg-jdk15-138.jar replaces bcpg-jdk14-127.jar
* bcprov-jdk15-138.jar replaces bcprov-jdk14-127.jar

Note that these libraries are for JDK version 1.5 instead of 1.4.

I have been using these for a few months with NG4J with no problems. Note however that I have only been using PKCS12, not OpenPGP, and the tests may not test PGP either.

The results of running the tests appear the same before and after the patch is applied. However, since there are currently errors when the tests are run, I think we should get the tests working, and then try the tests with this patch and make sure everything is ok.