define DATA_DIR as a configurable property and use for typing.ttl too
change the name of property to configure dir to 'empire.test.data'
Merge pull request #74 from evren/master

tweaks to test
Avoid NPE with short-named methods in non-strict mode
Merge pull request #75 from sotty/master

Avoid NPE with short-named methods in non-strict mode
updating acknowledgements
upgraded to latest sesame, cp utils, cp openrdf utils.  updating build file to exlude old slf4j jars from other libs, attempting to update pom files.  modifying to run w/ latest openrdf utils lib.
* removing an inadvertent stack track print
* better handling of proxy objects in lazily fetched collections so that they are not mangled over repeated merges of an object. fixes #81
* adding a test case adapted from the code provided on the mailing list, linking it to main test suite
updating to Jena 2.7.4, SDB 1.3.5 & TDB 0.9.4, fixes #82
deprecating specific 4store support.  im not maintaining that lib anymore, so its just a burden.  you should be able to get the same rough support with the Sesame SPARQLRepository class, fixes #84
updating logging to slf4j and wrapping log calls in all core parts w/ conditional checks to avoid unnecessary logging, fixes #83
* updating changes file, build rev, acks
Fix for a problem with excessive triple removal on EntityManager.merge() when there are multiple bean instances (different Java classes/Empire annotations) for the same RDF individual, and one of those beans does not have mInstanceTriples field initialized (or is empty). Previously, merge() would try to estimate mInstanceTriples by performing a describe operation on the RDF individual (as an attempt to fix a problem with duplicated triples on merge), but this estimate was effectively computing what mAllTriples would typically contain. The current approach on estimation creates a copy of the bean being merged (using the same Java class as the bean being merged) and populates it for that RDF individual, and then uses the copy's mInstanceTriples, which is more accurate since it takes into account annotations on the specific Java class.
* first pass at cleaning up the SPI/DI layer
* PlanGenerator does not need to be created by Guice, it only does so because we're overloading a DI framework to do SPI for us.  So we're just going to use the JDK service loader (faster, simplified, guice friendly version of it anyway) to find the Function & PropertyFunction implementations we need.
* ValueProviderFactory, FunctionRegistry, & PropertyFunctions no longer need guice, the just get stuff from the SPI layer now.  Thus, you dont need guice to create PlanGenerator.  Next is the executable plan factory
Added support for mapping multiple values to a simple object field in non strict mode (EmpireOptions.STRICT_MODE set to false): the first entry of the value collection is used.
Merge pull request #85 from lbihanic/master

[Enhancement] Support mapping multiple triples to a simple value in non strict mode
* couple small test code tweaks
* small build file update
Merge branch 'master' of github.com:mhgrove/Empire
updating cp openrdf & utils to 1.0 & 2.4.1 respectively, deleting the unused 4store libs
additional updates for the sesame 2.7 transition