http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ea3f84a5/libraries/rest/src/test/java/org/apache/polygene/library/rest/admin/DomainAssembler.java ---------------------------------------------------------------------- diff --git a/libraries/rest/src/test/java/org/apache/polygene/library/rest/admin/DomainAssembler.java b/libraries/rest/src/test/java/org/apache/polygene/library/rest/admin/DomainAssembler.java index 33090b2..b385b68 100644 --- a/libraries/rest/src/test/java/org/apache/polygene/library/rest/admin/DomainAssembler.java +++ b/libraries/rest/src/test/java/org/apache/polygene/library/rest/admin/DomainAssembler.java @@ -24,7 +24,7 @@ import org.apache.polygene.bootstrap.Assembler; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.entitystore.memory.MemoryEntityStoreService; -import org.apache.polygene.index.rdf.RdfIndexingEngineService; +import org.apache.polygene.index.rdf.RdfIndexingService; import org.apache.polygene.library.rdf.repository.MemoryRepositoryService; import static org.apache.polygene.api.common.Visibility.application; @@ -41,7 +41,7 @@ public class DomainAssembler { module.services( MemoryEntityStoreService.class, - RdfIndexingEngineService.class + RdfIndexingService.class ).visibleIn( application ); module.services( MemoryRepositoryService.class ).identifiedBy( "rdf-indexing" ).visibleIn( layer );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ea3f84a5/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/jdbm/JdbmEntityStorePerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/jdbm/JdbmEntityStorePerformanceTest.java b/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/jdbm/JdbmEntityStorePerformanceTest.java index 3b4e179..fd7e6b0 100644 --- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/jdbm/JdbmEntityStorePerformanceTest.java +++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/jdbm/JdbmEntityStorePerformanceTest.java @@ -24,7 +24,7 @@ import org.apache.polygene.bootstrap.Assembler; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.cache.ehcache.EhCacheConfiguration; import org.apache.polygene.cache.ehcache.EhCachePoolService; -import org.apache.polygene.entitystore.jdbm.JdbmConfiguration; +import org.apache.polygene.entitystore.jdbm.JdbmEntityStoreConfiguration; import org.apache.polygene.entitystore.jdbm.assembly.JdbmEntityStoreAssembler; import org.apache.polygene.test.EntityTestAssembler; import org.apache.polygene.test.performance.entitystore.AbstractEntityStorePerformanceTest; @@ -46,7 +46,7 @@ public class JdbmEntityStorePerformanceTest { new JdbmEntityStoreAssembler().assemble( module ); ModuleAssembly configModule = module.layer().module( "Config" ); - configModule.entities( JdbmConfiguration.class ).visibleIn( Visibility.layer ); + configModule.entities( JdbmEntityStoreConfiguration.class ).visibleIn( Visibility.layer ); new EntityTestAssembler().assemble( configModule ); module.services( EhCachePoolService.class ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ea3f84a5/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/DerbySQLEntityStorePerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/DerbySQLEntityStorePerformanceTest.java b/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/DerbySQLEntityStorePerformanceTest.java index 09a0331..2ece1bc 100644 --- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/DerbySQLEntityStorePerformanceTest.java +++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/DerbySQLEntityStorePerformanceTest.java @@ -26,7 +26,7 @@ import org.apache.polygene.api.usecase.UsecaseBuilder; import org.apache.polygene.bootstrap.Assembler; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.entitystore.sql.SQLMapEntityStoreConfiguration; +import org.apache.polygene.entitystore.sql.SQLEntityStoreConfiguration; import org.apache.polygene.entitystore.sql.assembly.DerbySQLEntityStoreAssembler; import org.apache.polygene.library.sql.assembly.DataSourceAssembler; import org.apache.polygene.library.sql.dbcp.DBCPDataSourceServiceAssembler; @@ -93,8 +93,8 @@ public class DerbySQLEntityStorePerformanceTest ); try { - SQLMapEntityStoreConfiguration config = uow.get( SQLMapEntityStoreConfiguration.class, - DEFAULT_ENTITYSTORE_IDENTITY ); + SQLEntityStoreConfiguration config = uow.get( SQLEntityStoreConfiguration.class, + DEFAULT_ENTITYSTORE_IDENTITY ); Connection connection = serviceFinder.findService( DataSource.class ).get().getConnection(); connection.setAutoCommit( false ); try( Statement stmt = connection.createStatement() ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ea3f84a5/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java b/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java index c83356a..e1ec809 100644 --- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java +++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java @@ -44,7 +44,7 @@ import org.apache.polygene.bootstrap.LayerAssembly; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.entitystore.memory.assembly.MemoryEntityStoreAssembler; import org.apache.polygene.index.rdf.assembly.RdfNativeSesameStoreAssembler; -import org.apache.polygene.index.rdf.indexing.RdfIndexingService; +import org.apache.polygene.index.rdf.indexing.RdfIndexerService; import org.apache.polygene.index.rdf.query.SesameExpressions; import org.apache.polygene.library.rdf.repository.NativeConfiguration; import org.apache.polygene.test.EntityTestAssembler; @@ -136,7 +136,7 @@ public class QueryPerformanceTest application = polygene.newApplication( this ); module = application.findModule( LAYER_DOMAIN, MODULE_DOMAIN ); application.activate(); - indexingDataDir = module.findService( RdfIndexingService.class ).get().dataDir(); + indexingDataDir = module.findService( RdfIndexerService.class ).get().dataDir(); uowf = module.unitOfWorkFactory(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ea3f84a5/tools/envisage/src/test/java/org/apache/polygene/envisage/school/infrastructure/persistence/PersistenceAssembler.java ---------------------------------------------------------------------- diff --git a/tools/envisage/src/test/java/org/apache/polygene/envisage/school/infrastructure/persistence/PersistenceAssembler.java b/tools/envisage/src/test/java/org/apache/polygene/envisage/school/infrastructure/persistence/PersistenceAssembler.java index ffdab72..24a3094 100644 --- a/tools/envisage/src/test/java/org/apache/polygene/envisage/school/infrastructure/persistence/PersistenceAssembler.java +++ b/tools/envisage/src/test/java/org/apache/polygene/envisage/school/infrastructure/persistence/PersistenceAssembler.java @@ -24,7 +24,7 @@ import org.apache.polygene.bootstrap.Assembler; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.entitystore.memory.MemoryEntityStoreService; -import org.apache.polygene.index.rdf.RdfIndexingEngineService; +import org.apache.polygene.index.rdf.RdfIndexingService; import org.apache.polygene.index.rdf.query.RdfQueryParserFactory; import org.apache.polygene.library.rdf.entity.EntityStateSerializer; import org.apache.polygene.library.rdf.entity.EntityTypeSerializer; @@ -44,7 +44,7 @@ public class PersistenceAssembler module.services( MemoryEntityStoreService.class, // Query - RdfQueryParserFactory.class, RdfIndexingEngineService.class, + RdfQueryParserFactory.class, RdfIndexingService.class, MemoryRepositoryService.class ).visibleIn( application ).instantiateOnStartup(); }
