Permalink
Browse files

updated requires to reflect new file locations

  • Loading branch information...
1 parent 9e1004b commit 9759b1e00dcad275c5eebdc71a824a416c53bd49 @michaeldiamond michaeldiamond committed May 29, 2012
@@ -3,8 +3,8 @@
# License:: LGPL
require 'sqlite3'
-require 'active_rdf/federation/connection_pool'
-require 'active_rdf/queryengine/ntriples_parser'
+require 'active_rdf/storage/connection_pool'
+require 'active_rdf/ntriples_parser'
require 'uuidtools'
require 'open-uri'
require 'mime/types'
@@ -2,8 +2,8 @@
# Copyright:: (c) 2005-2006 Eyal Oren
# License:: LGPL
-require 'active_rdf/federation/connection_pool'
-require 'active_rdf/queryengine/query2sparql'
+require 'active_rdf/storage/connection_pool'
+require 'active_rdf/query/query2sparql'
require 'rdf/redland'
# Adapter to Redland database
@@ -5,8 +5,8 @@
require "rubygems"
require 'active_rdf'
require 'test/unit'
-require 'federation/federation_manager'
-require 'queryengine/query'
+require 'active_rdf/storage/federated_store'
+require 'active_rdf/query/query'
class TestSparqlAdapter < Test::Unit::TestCase
@@ -2,7 +2,7 @@
# Copyright:: (c) 2005-2006
# License:: LGPL
-require 'active_rdf/queryengine/query2jars2'
+require 'active_rdf/query/query2jars2'
require 'net/http'
require 'cgi'
View
@@ -6,21 +6,21 @@
# If true, disable datatype support (Default: false)
$activerdf_without_datatype = false
-require 'active_rdf/active_rdf_helpers'
-require 'active_rdf/active_rdf_log'
+require 'active_rdf/helpers'
+require 'active_rdf/logger'
# load standard classes that need to be loaded at startup
-require 'active_rdf/objectmanager/namespace'
-require 'active_rdf/objectmanager/resource'
-require 'active_rdf/objectmanager/resource_query'
-require 'active_rdf/objectmanager/property'
-require 'active_rdf/objectmanager/property_lookup'
-require 'active_rdf/objectmanager/bnode'
-require 'active_rdf/objectmanager/literal'
-require 'active_rdf/federation/connection_pool'
-require 'active_rdf/queryengine/query'
-require 'active_rdf/federation/active_rdf_adapter'
+require 'active_rdf/namespace'
+require 'active_rdf/model/resource'
+require 'active_rdf/model/resource_query'
+require 'active_rdf/model/property'
+require 'active_rdf/model/property_lookup'
+require 'active_rdf/bnode'
+require 'active_rdf/literal'
+require 'active_rdf/storage/connection_pool'
+require 'active_rdf/query/query'
+require 'active_rdf/storage/store'
ActiveRdfLogger::log_info "ActiveRDF loaded, logging level: #{ActiveRdfLogger::logger.level}"
@@ -1,4 +1,4 @@
-require 'active_rdf_helpers'
+require 'active_rdf/helpers'
# Direct access for Redland adapter
@@ -1,5 +1,5 @@
-require 'active_rdf/queryengine/query'
-require 'active_rdf/objectmanager/resource'
+require 'active_rdf/query/query'
+require 'active_rdf/model/resource'
class OrderedSet
@@ -1,6 +1,6 @@
-require 'active_rdf/objectmanager/object_manager'
-require 'active_rdf/objectmanager/namespace'
-require 'active_rdf/queryengine/query'
+require 'active_rdf/model/object_manager'
+require 'active_rdf/namespace'
+require 'active_rdf/query/query'
module RDFS
# Represents an RDF resource and manages manipulations of that resource,
@@ -1,4 +1,4 @@
-require 'active_rdf/federation/federation_manager'
+require 'active_rdf/storage/federated_store'
# Represents a query on a datasource, abstract representation of SPARQL
# features. Query is passed to federation manager or adapter for execution on
@@ -228,7 +228,7 @@ def to_s
# Returns SPARQL serialisation of query
def to_sp
- require 'active_rdf/queryengine/query2sparql' unless(defined?(Query2SPARQL))
+ require 'active_rdf/query/query2sparql' unless(defined?(Query2SPARQL))
Query2SPARQL.translate(self)
end
@@ -1,4 +1,4 @@
-require 'active_rdf/federation/connection_pool'
+require 'active_rdf/storage/connection_pool'
include ActiveRdfBenchmark
@@ -1,4 +1,4 @@
-require 'active_rdf/queryengine/query2sparql'
+require 'active_rdf/query/query2sparql'
# Generic superclass of all adapters
module ActiveRDF
@@ -1,7 +1,7 @@
$:.unshift File.join(File.dirname(__FILE__),'..', '..','lib', 'active_rdf')
require 'test/unit'
-require 'directaccess/direct_access'
+require 'active_rdf/directaccess/direct_access'
class TestDirectAccess < Test::Unit::TestCase
@@ -6,7 +6,7 @@
require 'test/unit'
require 'active_rdf'
require 'test_helper'
-require 'active_rdf/objectmanager/ordered_set'
+require 'active_rdf/model/ordered_set'
class TestOrderedSet < Test::Unit::TestCase
@@ -4,7 +4,7 @@
require 'test/unit'
require 'active_rdf'
-require 'active_rdf/queryengine/ntriples_parser'
+require 'active_rdf/ntriples_parser'
require 'test_helper'
class TestNTriplesParser < Test::Unit::TestCase
@@ -4,7 +4,7 @@
require 'test/unit'
require 'active_rdf'
-require 'active_rdf/queryengine/query2jars2'
+require 'active_rdf/query/query2jars2'
require 'test_helper'
class TestQuery2Jars2 < Test::Unit::TestCase
@@ -4,7 +4,7 @@
require 'test/unit'
require 'active_rdf'
-require 'active_rdf/queryengine/query2sparql'
+require 'active_rdf/query/query2sparql'
require 'test_helper'
require 'set'

0 comments on commit 9759b1e

Please sign in to comment.