Permalink
Switch branches/tags
Nothing to show
Commits on May 1, 2010
Commits on Apr 11, 2010
  1. Updated requires to expect proper $LOAD_PATH, removed __FILE__ refere…

    michaeldiamond committed Apr 11, 2010
    …nces
    
    Removed rubygems, gem_plugin dependencies
    Rename test/common.rb to test/test_helper.rb
    
    ConnectionPool now loads adapters on demand.
    
    Removed unused instance_exec
    Removed external_resource, ResourceLike
Commits on Apr 8, 2010
Commits on Feb 13, 2010
Commits on Feb 11, 2010
  1. Version bump to 1.7.0

    averell23 committed Feb 11, 2010
  2. Fixes to run Talia unit tests

    averell23 committed Feb 11, 2010
  3. Merge branch 'talia_remerge'

    averell23 committed Feb 11, 2010
  4. Merge commit '3e305ec435b8e574538d3b3961f614482d7a8a6c' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	lib/active_rdf.rb
  5. Merge commit '46a4bbbd40e79366d18463d62a0d339aab30a843' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	lib/active_rdf/federation/federation_manager.rb
    	lib/active_rdf/queryengine/query2sparql.rb
  6. Merge commit '48d51f29c52d232025216391a0a8f3e1be43fe2a' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	Rakefile
    	lib/active_rdf/objectmanager/resource.rb
  7. Merge commit '91afe26bf78623ed07980e29131e483ddbdb0fc3' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	activerdf-rdflite/lib/activerdf_rdflite/fetching.rb
    	activerdf-rdflite/lib/activerdf_rdflite/rdflite.rb
    	activerdf-redland/lib/activerdf_redland/redland.rb
    	activerdf-sesame/lib/activerdf_sesame/sesame.rb
    	activerdf-sparql/lib/activerdf_sparql/sparql.rb
    	activerdf-yars/lib/activerdf_yars/jars2.rb
    	lib/active_rdf/federation/active_rdf_adapter.rb
    	lib/active_rdf/federation/connection_pool.rb
    	lib/active_rdf/federation/federation_manager.rb
    	lib/active_rdf/objectmanager/namespace.rb
    	lib/active_rdf/objectmanager/object_manager.rb
    	lib/active_rdf/queryengine/ntriples_parser.rb
    	lib/active_rdf/queryengine/query.rb
    	lib/active_rdf/queryengine/query2jars2.rb
    	lib/active_rdf/queryengine/query2sparql.rb
  8. Merge commit 'f6215bd9105b11dbc832bc09d82db133c1d77f63' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	lib/active_rdf/objectmanager/resource.rb
  9. Merge commit '7c376ae3362751cb40c75a4b26a94ae5cd370abb' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	activerdf-rdflite/lib/activerdf_rdflite/fetching.rb
    	activerdf-rdflite/lib/activerdf_rdflite/rdflite.rb
    	activerdf-rdflite/lib/activerdf_rdflite/suggesting.rb
    	activerdf-sesame/lib/activerdf_sesame/sesame.rb
    	activerdf-sparql/lib/activerdf_sparql/sparql.rb
    	activerdf-yars/lib/activerdf_yars/jars2.rb
    	lib/active_rdf.rb
    	lib/active_rdf/federation/active_rdf_adapter.rb
    	lib/active_rdf/federation/connection_pool.rb
    	lib/active_rdf/federation/federation_manager.rb
    	lib/active_rdf/objectmanager/object_manager.rb
    	lib/active_rdf/queryengine/ntriples_parser.rb
    	lib/active_rdf/queryengine/query.rb
    	lib/active_rdf/queryengine/query2jars2.rb
    	lib/active_rdf_log.rb
  10. Merge commit '4cb0786a5eecee18b93d6557a5457247efaaa3a5' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	lib/active_rdf.rb
  11. Merge commit '061ccbb2098e6de4b743c56c9af49dee29ec72ff' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	activerdf-rdflite/lib/activerdf_rdflite/rdflite.rb
    	activerdf-redland/lib/activerdf_redland/redland.rb
    	lib/active_rdf/queryengine/query.rb
    	test/common.rb
  12. Merge commit '34cc30de05fe1b4308c8aa45127b748a22aecc93' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	lib/active_rdf/objectmanager/bnode.rb
    	lib/active_rdf/objectmanager/resource.rb
    	lib/active_rdf/queryengine/query.rb
  13. Merge commit '27050b87277efdffc487532784d68029695fe313' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	lib/active_rdf/queryengine/query.rb
    	lib/active_rdf/queryengine/query2sparql.rb
  14. Merge commit '4d35594ed65fcd20c3f66f381ad4ae1ab14edf7e' into talia_re…

    averell23 committed Feb 11, 2010
    …merge
    
    Conflicts:
    	activerdf-rdflite/lib/activerdf_rdflite/fetching.rb
    	activerdf-rdflite/lib/activerdf_rdflite/rdflite.rb
    	activerdf-sesame/lib/activerdf_sesame/sesame.rb
    	activerdf-sparql/lib/activerdf_sparql/sparql.rb
    	activerdf-yars/lib/activerdf_yars/jars2.rb
    	lib/active_rdf/federation/connection_pool.rb
    	lib/active_rdf/queryengine/query.rb
    	lib/active_rdf_helpers.rb
    	test/common.rb
    	test/objectmanager/test_namespace.rb
    	test/objectmanager/test_property.rb
Commits on Feb 10, 2010
  1. Merge commit 'fa4bbefff0f8b5624dba23d6d1302f9d66d9d6a3' into talia_re…

    averell23 committed Feb 10, 2010
    …merge
    
    Conflicts:
    	VERSION
    	lib/active_rdf/federation/federation_manager.rb
  2. Merge commit 'f95cc140d0c671c89711aa719c36526a60c3a9a5' into talia_re…

    averell23 committed Feb 10, 2010
    …merge
    
    Streamlined the Talia modifications and removed Resource-level modifications.
    
    Conflicts:
    	activerdf-redland/lib/activerdf_redland/redland.rb
    	lib/active_rdf.rb
    	lib/active_rdf/federation/active_rdf_adapter.rb
    	lib/active_rdf/objectmanager/namespace.rb
    	lib/active_rdf/objectmanager/object_manager.rb
    	lib/active_rdf/objectmanager/resource.rb
    	test/common.rb
    	test/federation/test_connection_pool.rb
    	test/objectmanager/test_object_manager.rb
    	test/objectmanager/test_resource_reading.rb
    	test/objectmanager/test_resource_writing.rb
    	test/small-one.nt
    	test/small-two.nt
    	test/test_adapters.rb
    	test/test_person_data.nt
  3. Merge commit 'a48361d6dc9f7c27e6f4c847c009a6ed20f970d6' into talia_re…

    averell23 committed Feb 10, 2010
    …merge
    
    Conflicts:
    	lib/active_rdf/objectmanager/resource.rb
  4. Merge commit 'b4dbc6f7f054f398bfd3ec2310d2efb21bddcb7f' into talia_re…

    averell23 committed Feb 10, 2010
    …merge
    
    Conflicts:
    	lib/active_rdf/queryengine/query.rb
    	lib/active_rdf/queryengine/query2sparql.rb
  5. Merge commit '32e62b000a7ebea0dde4f0be5f7f256f3bdd3a51' into talia_re…

    averell23 committed Feb 10, 2010
    …merge
    
    Conflicts:
    	activerdf-rdflite/lib/activerdf_rdflite/rdflite.rb
    	activerdf-redland/lib/activerdf_redland/redland.rb
    	activerdf-redland/test/test_redland_adapter.rb
    	lib/active_rdf/federation/federation_manager.rb
    	lib/active_rdf/objectmanager/resource.rb
    	lib/active_rdf/queryengine/ntriples_parser.rb
    	lib/active_rdf/queryengine/query.rb
Commits on Jan 8, 2010
  1. Fix gokdok setings

    averell23 committed Jan 7, 2010
  2. Version bump to 1.6.16

    averell23 committed Dec 11, 2009
  3. Additional sesame properties

    averell23 committed Dec 2, 2009
  4. Version bump to 1.6.15

    averell23 committed Dec 2, 2009