http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrEntityFinderTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrEntityFinderTest.java b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrEntityFinderTest.java index b0fd2ff..277497f 100644 --- a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrEntityFinderTest.java +++ b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrEntityFinderTest.java @@ -41,8 +41,8 @@ public class SolrEntityFinderTest throws AssemblyException { super.assemble( module ); - FileConfigurationOverride override = new FileConfigurationOverride().withData( new File( DATA_DIR, "qi4j-data" ) ). - withLog( new File( DATA_DIR, "qi4j-logs" ) ).withTemporary( new File( DATA_DIR, "qi4j-temp" ) ); + FileConfigurationOverride override = new FileConfigurationOverride().withData( new File( DATA_DIR, "zest-data" ) ). + withLog( new File( DATA_DIR, "zest-logs" ) ).withTemporary( new File( DATA_DIR, "zest-temp" ) ); module.services( FileConfigurationService.class ). setMetaInfo( override ); new SolrAssembler().assemble( module );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrNamedQueryTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrNamedQueryTest.java b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrNamedQueryTest.java index 9d0773f..87fecb2 100644 --- a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrNamedQueryTest.java +++ b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrNamedQueryTest.java @@ -43,8 +43,8 @@ public class SolrNamedQueryTest throws AssemblyException { super.assemble( module ); - FileConfigurationOverride override = new FileConfigurationOverride().withData( new File( DATA_DIR, "qi4j-data" ) ). - withLog( new File( DATA_DIR, "qi4j-logs" ) ).withTemporary( new File( DATA_DIR, "qi4j-temp" ) ); + FileConfigurationOverride override = new FileConfigurationOverride().withData( new File( DATA_DIR, "zest-data" ) ). + withLog( new File( DATA_DIR, "zest-logs" ) ).withTemporary( new File( DATA_DIR, "zest-temp" ) ); module.services( FileConfigurationService.class ). setMetaInfo( override ); new SolrAssembler().assemble( module ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java index 86ce975..29509ea 100644 --- a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java +++ b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java @@ -30,7 +30,7 @@ import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.library.fileconfig.FileConfigurationService; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import java.util.ArrayList; @@ -42,7 +42,7 @@ import org.apache.zest.test.util.DelTreeAfter; import static org.hamcrest.CoreMatchers.equalTo; public class SolrQueryServiceTest - extends AbstractQi4jTest + extends AbstractZestTest { private static final File DATA_DIR = new File( "build/tmp/solr-query-service-test" ); @@ -55,8 +55,8 @@ public class SolrQueryServiceTest { module.layer().application().setMode( Application.Mode.test ); - FileConfigurationOverride override = new FileConfigurationOverride().withData( new File( DATA_DIR, "qi4j-data" ) ). - withLog( new File( DATA_DIR, "qi4j-logs" ) ).withTemporary( new File( DATA_DIR, "qi4j-temp" ) ); + FileConfigurationOverride override = new FileConfigurationOverride().withData( new File( DATA_DIR, "zest-data" ) ). + withLog( new File( DATA_DIR, "zest-logs" ) ).withTemporary( new File( DATA_DIR, "zest-temp" ) ); module.services( FileConfigurationService.class ). setMetaInfo( override ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryTest.java b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryTest.java index 5e7b5d2..1389cbd 100644 --- a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryTest.java +++ b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryTest.java @@ -41,8 +41,8 @@ public class SolrQueryTest throws AssemblyException { super.assemble( module ); - FileConfigurationOverride override = new FileConfigurationOverride().withData( new File( DATA_DIR, "qi4j-data" ) ). - withLog( new File( DATA_DIR, "qi4j-logs" ) ).withTemporary( new File( DATA_DIR, "qi4j-temp" ) ); + FileConfigurationOverride override = new FileConfigurationOverride().withData( new File( DATA_DIR, "zest-data" ) ). + withLog( new File( DATA_DIR, "zest-logs" ) ).withTemporary( new File( DATA_DIR, "zest-temp" ) ); module.services( FileConfigurationService.class ). setMetaInfo( override ); new SolrAssembler().assemble( module ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-sql/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/build.gradle b/extensions/indexing-sql/build.gradle index 9330210..f4ef763 100644 --- a/extensions/indexing-sql/build.gradle +++ b/extensions/indexing-sql/build.gradle @@ -23,18 +23,18 @@ jar {manifest {name = "Apache Zest⢠Extension - Indexing - SQL"}} dependencies { - compile project(":org.qi4j.core:org.qi4j.core.bootstrap") - compile project(":org.qi4j.libraries:org.qi4j.library.sql") - compile project(':org.qi4j.extensions:org.qi4j.extension.reindexer') + compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") + compile project(":org.apache.zest.libraries:org.apache.zest.library.sql") + compile project(':org.apache.zest.extensions:org.apache.zest.extension.reindexer') compile libraries.javaSqlGenerator compile( libraries.javaSqlGeneratorImpl ) { exclude group: 'junit' } - testCompile project(":org.qi4j.core:org.qi4j.core.testsupport") - testCompile project(":org.qi4j.libraries:org.qi4j.library.sql-dbcp") + testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") + testCompile project(":org.apache.zest.libraries:org.apache.zest.library.sql-dbcp") - testRuntime project(":org.qi4j.core:org.qi4j.core.runtime") + testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") testRuntime libraries.logback testRuntime libraries.derby testRuntime libraries.h2 http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-sql/dev-status.xml ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/dev-status.xml b/extensions/indexing-sql/dev-status.xml index ac63cda..22993de 100644 --- a/extensions/indexing-sql/dev-status.xml +++ b/extensions/indexing-sql/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>stable</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-sql/instructions.txt ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/instructions.txt b/extensions/indexing-sql/instructions.txt index 3b38bca..fd976a6 100644 --- a/extensions/indexing-sql/instructions.txt +++ b/extensions/indexing-sql/instructions.txt @@ -29,6 +29,6 @@ These instructions are for preparing your out-of-box PostgreSQL installation so 2.3. This will open new window, erase any text which pgAdmin generates there for you. 2.4. Then navigate to your PostgreSQL installation directory, then into 'share', and then into 'contrib'. Open file 'ltree.sql' in your favorite text editor. 2.5. Select all text, copy it, and paste to SQL query window which you opened in stage 2.2. -2.6. If you know what you are doing, you may change the line 'SET search_path = public;' to make search_path be 'pg_catalog', or name of schema that Zest⢠application will use ('qi4j' by default). It's ok to leave it to 'public' though. +2.6. If you know what you are doing, you may change the line 'SET search_path = public;' to make search_path be 'pg_catalog', or name of schema that Zest⢠application will use ('zest' by default). It's ok to leave it to 'public' though. 2.7. Hit F5 or go Query -> Execute Query to execute the SQL. It should print some notices into output window but no errors nor warnings should be present. 2.8. Ltree type should be now installed to your PostgreSQL installation. http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-sql/src/docs/index-sql.txt ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/src/docs/index-sql.txt b/extensions/indexing-sql/src/docs/index-sql.txt index 81980c1..a46c9de 100644 --- a/extensions/indexing-sql/src/docs/index-sql.txt +++ b/extensions/indexing-sql/src/docs/index-sql.txt @@ -43,7 +43,7 @@ include::../../build/docs/buildinfo/artifact.txt[] == Configuration == SQL Index/Query Configuration is optional and provides only one configuration property: `schemaName` defaulted to -'qi4j_es'. On SQL databases that don't support schemas this configuration property is simply ignored. +'zest_es'. On SQL databases that don't support schemas this configuration property is simply ignored. The assembly snippets below show the DataSource assembly alongside the SQL Index/Query assembly. Remember to configure the DataSource properly, see <<library-sql>> and <<howto-configure-service>>. http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLIndexing.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLIndexing.java b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLIndexing.java index ec395a4..df4835f 100644 --- a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLIndexing.java +++ b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLIndexing.java @@ -32,7 +32,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import javax.sql.DataSource; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.association.AssociationDescriptor; import org.apache.zest.api.common.QualifiedName; import org.apache.zest.api.entity.EntityReference; @@ -57,7 +57,7 @@ import org.apache.zest.index.sql.support.postgresql.PostgreSQLTypeHelper; import org.apache.zest.index.sql.support.skeletons.SQLSkeletonUtil.Lazy; import org.apache.zest.index.sql.support.skeletons.SQLSkeletonUtil.LazyInit; import org.apache.zest.library.sql.common.SQLUtil; -import org.apache.zest.spi.Qi4jSPI; +import org.apache.zest.spi.ZestSPI; import org.apache.zest.spi.entity.EntityState; import org.apache.zest.spi.entity.EntityStatus; import org.sql.generation.api.grammar.builders.modification.ColumnSourceByValuesBuilder; @@ -100,7 +100,7 @@ public abstract class AbstractSQLIndexing private Application _app; @Structure - private Qi4jSPI _qi4SPI; + private ZestSPI _qi4SPI; @This private SQLDBState _state; @@ -927,7 +927,7 @@ public abstract class AbstractSQLIndexing throws SQLException { ValueDescriptor vDesc = this._qi4SPI.valueDescriptorFor( (ValueComposite) property ); - StateHolder state = Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF.map( (ValueComposite) property ).state(); + StateHolder state = ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF.map( (ValueComposite) property ).state(); Integer originalPropertyPK = propertyPK; ++propertyPK; for( PropertyDescriptor pDesc : vDesc.state().properties() ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLQuerying.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLQuerying.java b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLQuerying.java index a1749b4..e1cf34e 100644 --- a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLQuerying.java +++ b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLQuerying.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.Stack; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.common.QualifiedName; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.entity.EntityComposite; @@ -70,7 +70,7 @@ import org.apache.zest.index.sql.support.api.SQLQuerying; import org.apache.zest.index.sql.support.common.DBNames; import org.apache.zest.index.sql.support.common.QNameInfo; import org.apache.zest.index.sql.support.postgresql.PostgreSQLTypeHelper; -import org.apache.zest.spi.Qi4jSPI; +import org.apache.zest.spi.ZestSPI; import org.apache.zest.spi.query.EntityFinderException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -112,7 +112,7 @@ public abstract class AbstractSQLQuerying private Module module; @Structure - private Qi4jSPI spi; + private ZestSPI spi; private static class TraversedAssoOrManyAssoRef { @@ -1747,7 +1747,7 @@ public abstract class AbstractSQLQuerying // Visit all properties with recursion and make joins as necessary // @formatter:off for( Property<?> property - : Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF.map( (ValueComposite) value ).state().properties() ) + : ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF.map( (ValueComposite) value ).state().properties() ) { Boolean qNameJoinDone = false; Integer sourceIndex = maxTableIndex.getInt(); http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java index 46cdaad..e7f98c1 100644 --- a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java +++ b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java @@ -131,7 +131,7 @@ public abstract class AbstractSQLStartup SQLDataType customizeType( Type propertyType, SQLTypeInfo sqlTypeInfo ); } - public static final String DEFAULT_SCHEMA_NAME = "qi4j"; + public static final String DEFAULT_SCHEMA_NAME = "zest"; private static final Class<?> ENTITY_PK_TYPE = Long.class; private static final Class<?> ENTITY_TYPE_PK_TYPE = Integer.class; http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLDBIntegrityTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLDBIntegrityTest.java b/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLDBIntegrityTest.java index 4840868..d6b2bcb 100644 --- a/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLDBIntegrityTest.java +++ b/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLDBIntegrityTest.java @@ -32,14 +32,14 @@ import org.apache.zest.index.sql.support.common.GenericDatabaseExplorer.Database import org.apache.zest.index.sql.support.postgresql.PostgreSQLAppStartup; import org.apache.zest.library.sql.common.SQLConfiguration; import org.apache.zest.library.sql.common.SQLUtil; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.sql.generation.api.vendor.PostgreSQLVendor; import org.sql.generation.api.vendor.SQLVendorProvider; import static org.apache.zest.test.util.Assume.assumeConnectivity; public class PostgreSQLDBIntegrityTest - extends AbstractQi4jTest + extends AbstractZestTest { @BeforeClass public static void beforePostgreSQLQueryTests() http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLQueryTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLQueryTest.java b/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLQueryTest.java index ad2019a..a0945e9 100644 --- a/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLQueryTest.java +++ b/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLQueryTest.java @@ -28,7 +28,7 @@ import static org.apache.zest.test.util.Assume.assumeConnectivity; * PostgreSQL Query Tests. * <p>Many features are not supported.</p> */ -// See org.qi4j.index.sql.support.skeletons.SQLCompatEntityStateWrapper that filter out unsupported properties. +// See org.apache.zest.index.sql.support.skeletons.SQLCompatEntityStateWrapper that filter out unsupported properties. public class PostgreSQLQueryTest extends AbstractQueryTest { http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/metrics-yammer/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/metrics-yammer/build.gradle b/extensions/metrics-yammer/build.gradle index c89eba1..5fb0c88 100644 --- a/extensions/metrics-yammer/build.gradle +++ b/extensions/metrics-yammer/build.gradle @@ -20,12 +20,12 @@ jar { manifest { name = "Apache Zest⢠Extension - Metrics" }} dependencies { - compile project(":org.qi4j.core:org.qi4j.core.bootstrap") + compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") compile libraries.yammer_metrics - testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" ) + testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testRuntime project( ":org.qi4j.core:org.qi4j.core.runtime" ) + testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/metrics-yammer/dev-status.xml ---------------------------------------------------------------------- diff --git a/extensions/metrics-yammer/dev-status.xml b/extensions/metrics-yammer/dev-status.xml index 9c6bbae..10cc363 100644 --- a/extensions/metrics-yammer/dev-status.xml +++ b/extensions/metrics-yammer/dev-status.xml @@ -15,10 +15,10 @@ ~ limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>stable</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/metrics-yammer/src/test/java/org/apache/zest/metrics/yammer/NoMetricsInstalledTest.java ---------------------------------------------------------------------- diff --git a/extensions/metrics-yammer/src/test/java/org/apache/zest/metrics/yammer/NoMetricsInstalledTest.java b/extensions/metrics-yammer/src/test/java/org/apache/zest/metrics/yammer/NoMetricsInstalledTest.java index c6efa83..8fc6cdc 100644 --- a/extensions/metrics-yammer/src/test/java/org/apache/zest/metrics/yammer/NoMetricsInstalledTest.java +++ b/extensions/metrics-yammer/src/test/java/org/apache/zest/metrics/yammer/NoMetricsInstalledTest.java @@ -28,10 +28,10 @@ import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; -public class NoMetricsInstalledTest extends AbstractQi4jTest +public class NoMetricsInstalledTest extends AbstractZestTest { @Override public void assemble( ModuleAssembly module ) @@ -42,7 +42,7 @@ public class NoMetricsInstalledTest extends AbstractQi4jTest } @Test - public void givenMetricsEnabledQi4jWhenManyEntityChangesExpectCounterToBeOneOrZeroAndChangeRateHigh() + public void givenMetricsEnabledZestWhenManyEntityChangesExpectCounterToBeOneOrZeroAndChangeRateHigh() throws UnitOfWorkCompletionException { ConsoleReporter reporter = new ConsoleReporter( Metrics.defaultRegistry(), System.out, MetricPredicate.ALL ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/metrics-yammer/src/test/java/org/apache/zest/metrics/yammer/YammerTest.java ---------------------------------------------------------------------- diff --git a/extensions/metrics-yammer/src/test/java/org/apache/zest/metrics/yammer/YammerTest.java b/extensions/metrics-yammer/src/test/java/org/apache/zest/metrics/yammer/YammerTest.java index c9c88f4..3f13774 100644 --- a/extensions/metrics-yammer/src/test/java/org/apache/zest/metrics/yammer/YammerTest.java +++ b/extensions/metrics-yammer/src/test/java/org/apache/zest/metrics/yammer/YammerTest.java @@ -28,10 +28,10 @@ import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; -public class YammerTest extends AbstractQi4jTest +public class YammerTest extends AbstractZestTest { @Override public void assemble( ModuleAssembly module ) @@ -43,7 +43,7 @@ public class YammerTest extends AbstractQi4jTest } @Test - public void givenMetricsEnabledQi4jWhenManyEntityChangesExpectCounterToBeOneOrZeroAndChangeRateHigh() + public void givenMetricsEnabledZestWhenManyEntityChangesExpectCounterToBeOneOrZeroAndChangeRateHigh() throws UnitOfWorkCompletionException { ConsoleReporter reporter = new ConsoleReporter( Metrics.defaultRegistry(), System.out, MetricPredicate.ALL ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/migration/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/migration/build.gradle b/extensions/migration/build.gradle index fa3072a..86e8a88 100644 --- a/extensions/migration/build.gradle +++ b/extensions/migration/build.gradle @@ -22,11 +22,11 @@ description = "Apache Zest⢠Migration Extension" jar { manifest { name = "Apache Zest⢠Extension - Migration" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.spi")) + compile(project(":org.apache.zest.core:org.apache.zest.core.spi")) compile libraries.slf4j_api - testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) + testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime")) + testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) testRuntime(libraries.logback) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/migration/dev-status.xml ---------------------------------------------------------------------- diff --git a/extensions/migration/dev-status.xml b/extensions/migration/dev-status.xml index f6b60e4..a5503b5 100644 --- a/extensions/migration/dev-status.xml +++ b/extensions/migration/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>stable</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/migration/src/test/java/org/apache/zest/migration/MigrationTest.java ---------------------------------------------------------------------- diff --git a/extensions/migration/src/test/java/org/apache/zest/migration/MigrationTest.java b/extensions/migration/src/test/java/org/apache/zest/migration/MigrationTest.java index 333f1a9..1e1f091 100644 --- a/extensions/migration/src/test/java/org/apache/zest/migration/MigrationTest.java +++ b/extensions/migration/src/test/java/org/apache/zest/migration/MigrationTest.java @@ -37,7 +37,7 @@ import org.apache.zest.migration.assembly.MigrationOperation; import org.apache.zest.spi.entitystore.BackupRestore; import org.apache.zest.spi.entitystore.helpers.JSONKeys; import org.apache.zest.spi.entitystore.helpers.StateStore; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.junit.Assert.assertThat; @@ -46,7 +46,7 @@ import static org.junit.Assert.assertThat; * JAVADOC */ public class MigrationTest - extends AbstractQi4jTest + extends AbstractZestTest { @Override public void assemble( ModuleAssembly module ) @@ -82,7 +82,7 @@ public class MigrationTest custom( new CustomBarOperation() ). end(). toVersion( "3.0" ). - renamePackage( "org.qi4j.migration", "org.qi4j.migration.moved" ). + renamePackage( "org.apache.zest.migration", "org.apache.zest.migration.moved" ). withEntities( "TestEntity2_0" ). end(); http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/reindexer/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/reindexer/build.gradle b/extensions/reindexer/build.gradle index 018ace0..8eae765 100644 --- a/extensions/reindexer/build.gradle +++ b/extensions/reindexer/build.gradle @@ -20,13 +20,13 @@ jar { manifest { description = "Apache Zest⢠Reindexer Extension" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.spi")) + compile(project(":org.apache.zest.core:org.apache.zest.core.spi")) compile(libraries.slf4j_api) - testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) - testCompile(project(':org.qi4j.extensions:org.qi4j.extension.entitystore-jdbm')) - testCompile(project(':org.qi4j.extensions:org.qi4j.extension.indexing-rdf')) + testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + testCompile(project(':org.apache.zest.extensions:org.apache.zest.extension.entitystore-jdbm')) + testCompile(project(':org.apache.zest.extensions:org.apache.zest.extension.indexing-rdf')) - testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime")) + testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) testRuntime(libraries.logback) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/reindexer/dev-status.xml ---------------------------------------------------------------------- diff --git a/extensions/reindexer/dev-status.xml b/extensions/reindexer/dev-status.xml index f6b60e4..a5503b5 100644 --- a/extensions/reindexer/dev-status.xml +++ b/extensions/reindexer/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>stable</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/reindexer/src/test/java/org/apache/zest/index/reindexer/ReindexerTest.java ---------------------------------------------------------------------- diff --git a/extensions/reindexer/src/test/java/org/apache/zest/index/reindexer/ReindexerTest.java b/extensions/reindexer/src/test/java/org/apache/zest/index/reindexer/ReindexerTest.java index ed2cb46..8fd67cf 100644 --- a/extensions/reindexer/src/test/java/org/apache/zest/index/reindexer/ReindexerTest.java +++ b/extensions/reindexer/src/test/java/org/apache/zest/index/reindexer/ReindexerTest.java @@ -36,7 +36,7 @@ import org.apache.zest.entitystore.jdbm.JdbmConfiguration; import org.apache.zest.entitystore.jdbm.assembly.JdbmEntityStoreAssembler; import org.apache.zest.index.rdf.assembly.RdfNativeSesameStoreAssembler; import org.apache.zest.library.rdf.repository.NativeConfiguration; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.hamcrest.CoreMatchers.is; @@ -47,7 +47,7 @@ import static org.apache.zest.api.query.QueryExpressions.templateFor; @SuppressWarnings( "PublicInnerClass" ) public class ReindexerTest - extends AbstractQi4jTest + extends AbstractZestTest { @SuppressWarnings( "unchecked" ) @@ -87,7 +87,7 @@ public class ReindexerTest public void createDataWipeIndexReindexAndAssertData() throws UnitOfWorkCompletionException { - File rdfDir = new File( System.getProperty( "user.dir" ), "build/testdata/qi4j-index" ).getAbsoluteFile(); + File rdfDir = new File( System.getProperty( "user.dir" ), "build/testdata/zest-index" ).getAbsoluteFile(); rdfDir.mkdirs(); assertThat( rdfDir.exists(), is(true) ); @@ -139,7 +139,7 @@ public class ReindexerTest private static boolean deleteEntitiesData() { boolean success = true; - File esDir = new File( System.getProperty( "user.dir" ), "build/testdata/qi4j-entities" ).getAbsoluteFile(); + File esDir = new File( System.getProperty( "user.dir" ), "build/testdata/zest-entities" ).getAbsoluteFile(); if ( esDir.exists() ) { success = FileUtil.deltree( esDir ); } @@ -149,7 +149,7 @@ public class ReindexerTest private static boolean deleteIndexData() { boolean success = true; - File rdfDir = new File( System.getProperty( "user.dir" ), "build/testdata/qi4j-index" ).getAbsoluteFile(); + File rdfDir = new File( System.getProperty( "user.dir" ), "build/testdata/zest-index" ).getAbsoluteFile(); if ( rdfDir.exists() ) { FileUtils.delete( rdfDir ); success = FileUtil.deltree( rdfDir ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/reindexer/src/test/resources/org/apache/zest/entitystore/jdbm/JdbmEntityStoreService.properties ---------------------------------------------------------------------- diff --git a/extensions/reindexer/src/test/resources/org/apache/zest/entitystore/jdbm/JdbmEntityStoreService.properties b/extensions/reindexer/src/test/resources/org/apache/zest/entitystore/jdbm/JdbmEntityStoreService.properties index 514c133..0b22c57 100644 --- a/extensions/reindexer/src/test/resources/org/apache/zest/entitystore/jdbm/JdbmEntityStoreService.properties +++ b/extensions/reindexer/src/test/resources/org/apache/zest/entitystore/jdbm/JdbmEntityStoreService.properties @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -file=build/testdata/qi4j-entities/qi4j-entities \ No newline at end of file +file=build/testdata/zest-entities/zest-entities \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/reindexer/src/test/resources/org/apache/zest/library/rdf/repository/rdf-indexing.properties ---------------------------------------------------------------------- diff --git a/extensions/reindexer/src/test/resources/org/apache/zest/library/rdf/repository/rdf-indexing.properties b/extensions/reindexer/src/test/resources/org/apache/zest/library/rdf/repository/rdf-indexing.properties index ddd352d..c48a19a 100644 --- a/extensions/reindexer/src/test/resources/org/apache/zest/library/rdf/repository/rdf-indexing.properties +++ b/extensions/reindexer/src/test/resources/org/apache/zest/library/rdf/repository/rdf-indexing.properties @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -dataDirectory=build/testdata/qi4j-index \ No newline at end of file +dataDirectory=build/testdata/zest-index \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/valueserialization-jackson/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-jackson/build.gradle b/extensions/valueserialization-jackson/build.gradle index 616e01b..931db0c 100644 --- a/extensions/valueserialization-jackson/build.gradle +++ b/extensions/valueserialization-jackson/build.gradle @@ -23,12 +23,12 @@ jar { manifest { name = "Apache Zest⢠Extension - ValueSerialization - Jackson dependencies { - compile project(":org.qi4j.core:org.qi4j.core.bootstrap") + compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") compile libraries.jackson_mapper - testCompile project(":org.qi4j.core:org.qi4j.core.testsupport") + testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") - testRuntime project(":org.qi4j.core:org.qi4j.core.runtime") + testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") testRuntime libraries.slf4j_simple } http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/valueserialization-jackson/dev-status.xml ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-jackson/dev-status.xml b/extensions/valueserialization-jackson/dev-status.xml index cbf512f..447d5cd 100644 --- a/extensions/valueserialization-jackson/dev-status.xml +++ b/extensions/valueserialization-jackson/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <codebase>beta</codebase> <!--none,early,beta,stable,mature--> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/valueserialization-orgjson/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-orgjson/build.gradle b/extensions/valueserialization-orgjson/build.gradle index a919f4e..737ca6c 100644 --- a/extensions/valueserialization-orgjson/build.gradle +++ b/extensions/valueserialization-orgjson/build.gradle @@ -23,11 +23,11 @@ jar { manifest { name = "Apache Zest⢠Extension - ValueSerialization - org.jso dependencies { - compile project(":org.qi4j.core:org.qi4j.core.bootstrap") + compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") - testCompile project(":org.qi4j.core:org.qi4j.core.testsupport") + testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") - testRuntime project(":org.qi4j.core:org.qi4j.core.runtime") + testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") testRuntime libraries.slf4j_simple } http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/valueserialization-orgjson/dev-status.xml ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-orgjson/dev-status.xml b/extensions/valueserialization-orgjson/dev-status.xml index b41b4f7..8e7f561 100644 --- a/extensions/valueserialization-orgjson/dev-status.xml +++ b/extensions/valueserialization-orgjson/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <codebase>stable</codebase> <!--none,early,beta,stable,mature--> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/valueserialization-stax/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-stax/build.gradle b/extensions/valueserialization-stax/build.gradle index ea05136..540cbd0 100644 --- a/extensions/valueserialization-stax/build.gradle +++ b/extensions/valueserialization-stax/build.gradle @@ -23,12 +23,12 @@ jar { manifest { name = "Apache Zest⢠Extension - ValueSerialization - StaX" } dependencies { - compile project(":org.qi4j.core:org.qi4j.core.bootstrap") + compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") compile libraries.commons_lang - testCompile project(":org.qi4j.core:org.qi4j.core.testsupport") + testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") - testRuntime project(":org.qi4j.core:org.qi4j.core.runtime") + testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") testRuntime libraries.slf4j_simple } http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/extensions/valueserialization-stax/dev-status.xml ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-stax/dev-status.xml b/extensions/valueserialization-stax/dev-status.xml index cbf512f..447d5cd 100644 --- a/extensions/valueserialization-stax/dev-status.xml +++ b/extensions/valueserialization-stax/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <codebase>beta</codebase> <!--none,early,beta,stable,mature--> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/alarm/build.gradle b/libraries/alarm/build.gradle index 72f0fb1..c2256f1 100644 --- a/libraries/alarm/build.gradle +++ b/libraries/alarm/build.gradle @@ -22,10 +22,10 @@ description = "Apache Zest⢠Alarm Library provides industrial automation style jar { manifest { name = "Apache Zest⢠Library - Alarm - APi" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.bootstrap")) + compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) + testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime")) + testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) testRuntime(libraries.logback) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/alarm/dev-status.xml b/libraries/alarm/dev-status.xml index f754146..c58d64b 100644 --- a/libraries/alarm/dev-status.xml +++ b/libraries/alarm/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>stable</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/AlarmModel.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/main/java/org/apache/zest/library/alarm/AlarmModel.java b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/AlarmModel.java index 4d7cd7f..38250e5 100644 --- a/libraries/alarm/src/main/java/org/apache/zest/library/alarm/AlarmModel.java +++ b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/AlarmModel.java @@ -40,7 +40,7 @@ import org.apache.zest.api.common.Optional; */ public interface AlarmModel { - String MODEL_BUNDLE_NAME = "org.qi4j.library.alarm.AlarmResources"; + String MODEL_BUNDLE_NAME = "org.apache.zest.library.alarm.AlarmResources"; /** * Execute the required changes upon an AlarmTrigger. http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/AlarmPoint.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/main/java/org/apache/zest/library/alarm/AlarmPoint.java b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/AlarmPoint.java index 020e8b7..b4b6825 100644 --- a/libraries/alarm/src/main/java/org/apache/zest/library/alarm/AlarmPoint.java +++ b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/AlarmPoint.java @@ -456,7 +456,7 @@ public interface AlarmPoint { locale = Locale.getDefault(); } - ResourceBundle rb = ResourceBundle.getBundle( "org.qi4j.library.alarm.user.AlarmDescriptions", locale ); + ResourceBundle rb = ResourceBundle.getBundle( "org.apache.zest.library.alarm.user.AlarmDescriptions", locale ); return rb.getString( name() ); } http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/ExtendedAlarmModelService.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/main/java/org/apache/zest/library/alarm/ExtendedAlarmModelService.java b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/ExtendedAlarmModelService.java index 8801912..0d38206 100644 --- a/libraries/alarm/src/main/java/org/apache/zest/library/alarm/ExtendedAlarmModelService.java +++ b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/ExtendedAlarmModelService.java @@ -136,7 +136,7 @@ public interface ExtendedAlarmModelService @Override public String modelName() { - return "org.qi4j.library.alarm.model.extended"; + return "org.apache.zest.library.alarm.model.extended"; } /** http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/SimpleAlarmModelService.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/main/java/org/apache/zest/library/alarm/SimpleAlarmModelService.java b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/SimpleAlarmModelService.java index 6e85a55..f53a7a2 100644 --- a/libraries/alarm/src/main/java/org/apache/zest/library/alarm/SimpleAlarmModelService.java +++ b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/SimpleAlarmModelService.java @@ -89,7 +89,7 @@ public interface SimpleAlarmModelService extends AlarmModel, ServiceComposite @Override public String modelName() { - return "org.qi4j.library.alarm.model.simple"; + return "org.apache.zest.library.alarm.model.simple"; } /** http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/StandardAlarmModelService.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/main/java/org/apache/zest/library/alarm/StandardAlarmModelService.java b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/StandardAlarmModelService.java index 46e2abe..92d35ae 100644 --- a/libraries/alarm/src/main/java/org/apache/zest/library/alarm/StandardAlarmModelService.java +++ b/libraries/alarm/src/main/java/org/apache/zest/library/alarm/StandardAlarmModelService.java @@ -101,7 +101,7 @@ public interface StandardAlarmModelService extends AlarmModel, ServiceComposite @Override public String modelName() { - return "org.qi4j.library.alarm.model.standard"; + return "org.apache.zest.library.alarm.model.standard"; } /** http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmHistoryImplTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmHistoryImplTest.java b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmHistoryImplTest.java index 7dfccbe..2b27fc3 100644 --- a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmHistoryImplTest.java +++ b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmHistoryImplTest.java @@ -26,7 +26,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import java.util.Map; import org.apache.zest.test.EntityTestAssembler; @@ -34,7 +34,7 @@ import org.apache.zest.test.EntityTestAssembler; import static org.junit.Assert.*; public class AlarmHistoryImplTest - extends AbstractQi4jTest + extends AbstractZestTest implements AlarmListener { private int eventCounter = 0; http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmPointImplTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmPointImplTest.java b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmPointImplTest.java index 9580cc5..1e0b3ca 100644 --- a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmPointImplTest.java +++ b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmPointImplTest.java @@ -28,14 +28,14 @@ import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -public class AlarmPointImplTest extends AbstractQi4jTest +public class AlarmPointImplTest extends AbstractZestTest implements AlarmListener { private int fired; http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmProxyTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmProxyTest.java b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmProxyTest.java index 9f9970e..718a822 100644 --- a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmProxyTest.java +++ b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmProxyTest.java @@ -21,14 +21,14 @@ import org.apache.zest.api.injection.scope.Service; import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; -public class AlarmProxyTest extends AbstractQi4jTest +public class AlarmProxyTest extends AbstractZestTest { // START SNIPPET: documentation @Service http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmServiceTest.java b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmServiceTest.java index cd56f42..b08e189 100644 --- a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmServiceTest.java +++ b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmServiceTest.java @@ -25,7 +25,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import java.util.List; import org.apache.zest.test.EntityTestAssembler; @@ -33,7 +33,7 @@ import org.apache.zest.test.EntityTestAssembler; import static org.junit.Assert.*; public class AlarmServiceTest - extends AbstractQi4jTest + extends AbstractZestTest { @Override http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/ExtendedAlarmModelTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/ExtendedAlarmModelTest.java b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/ExtendedAlarmModelTest.java index e284776..98079ac 100644 --- a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/ExtendedAlarmModelTest.java +++ b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/ExtendedAlarmModelTest.java @@ -28,7 +28,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.junit.Assert.assertEquals; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public class ExtendedAlarmModelTest - extends AbstractQi4jTest + extends AbstractZestTest { @SuppressWarnings( { "unchecked" } ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/SimpleAlarmModelTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/SimpleAlarmModelTest.java b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/SimpleAlarmModelTest.java index 4c738d8..a7dd590 100644 --- a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/SimpleAlarmModelTest.java +++ b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/SimpleAlarmModelTest.java @@ -28,7 +28,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.junit.Assert.assertEquals; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public class SimpleAlarmModelTest - extends AbstractQi4jTest + extends AbstractZestTest { @SuppressWarnings( { "unchecked" } ) @@ -87,7 +87,7 @@ public class SimpleAlarmModelTest throws Exception { SimpleAlarmModelService.SimpleAlarmModelMixin spi = new SimpleAlarmModelService.SimpleAlarmModelMixin(); - assertEquals( "org.qi4j.library.alarm.model.simple", spi.modelName() ); + assertEquals( "org.apache.zest.library.alarm.model.simple", spi.modelName() ); } @Test http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/StandardAlarmModelTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/StandardAlarmModelTest.java b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/StandardAlarmModelTest.java index e9959b9..69dab9b 100644 --- a/libraries/alarm/src/test/java/org/apache/zest/library/alarm/StandardAlarmModelTest.java +++ b/libraries/alarm/src/test/java/org/apache/zest/library/alarm/StandardAlarmModelTest.java @@ -29,7 +29,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.junit.Assert.assertEquals; @@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public class StandardAlarmModelTest - extends AbstractQi4jTest + extends AbstractZestTest { @SuppressWarnings( { "unchecked" } ) @@ -88,7 +88,7 @@ public class StandardAlarmModelTest throws Exception { StandardAlarmModelService.StandardAlarmModelMixin spi = new StandardAlarmModelService.StandardAlarmModelMixin(); - assertEquals( "org.qi4j.library.alarm.model.standard", spi.modelName() ); + assertEquals( "org.apache.zest.library.alarm.model.standard", spi.modelName() ); } @Test http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/appbrowser/src/test/java/org/apache/zest/library/appbrowser/AppBrowserTest.java ---------------------------------------------------------------------- diff --git a/libraries/appbrowser/src/test/java/org/apache/zest/library/appbrowser/AppBrowserTest.java b/libraries/appbrowser/src/test/java/org/apache/zest/library/appbrowser/AppBrowserTest.java index 9d8d82e..0cbb157 100644 --- a/libraries/appbrowser/src/test/java/org/apache/zest/library/appbrowser/AppBrowserTest.java +++ b/libraries/appbrowser/src/test/java/org/apache/zest/library/appbrowser/AppBrowserTest.java @@ -37,9 +37,9 @@ import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.entitystore.memory.MemoryEntityStoreService; import org.apache.zest.library.appbrowser.json.JsonFormatterFactory; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; -public class AppBrowserTest extends AbstractQi4jTest +public class AppBrowserTest extends AbstractZestTest { @Override public void assemble( ModuleAssembly module ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/circuitbreaker/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/circuitbreaker/build.gradle b/libraries/circuitbreaker/build.gradle index d91bfa8..5c5e7a4 100644 --- a/libraries/circuitbreaker/build.gradle +++ b/libraries/circuitbreaker/build.gradle @@ -22,18 +22,18 @@ description = "Apache Zest⢠Circuit Breaker Library provides a framework for c jar { manifest {name = "Apache Zest⢠Library - Circuit Breaker"}} dependencies { - compile project( ':org.qi4j.core:org.qi4j.core.api' ) - compile project( ':org.qi4j.libraries:org.qi4j.library.jmx' ) + compile project( ':org.apache.zest.core:org.apache.zest.core.api' ) + compile project( ':org.apache.zest.libraries:org.apache.zest.library.jmx' ) compile libraries.slf4j_api - testCompile project( ':org.qi4j.core:org.qi4j.core.testsupport' ) + testCompile project( ':org.apache.zest.core:org.apache.zest.core.testsupport' ) testCompile libraries.awaitility - testRuntime project( ':org.qi4j.core:org.qi4j.core.runtime' ) + testRuntime project( ':org.apache.zest.core:org.apache.zest.core.runtime' ) testRuntime libraries.logback } task( runSample, dependsOn: 'testClasses', type: JavaExec ) { - main = 'org.qi4j.library.circuitbreaker.jmx.CircuitBreakerManagementTest' + main = 'org.apache.zest.library.circuitbreaker.jmx.CircuitBreakerManagementTest' classpath = sourceSets.test.runtimeClasspath } http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/circuitbreaker/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/circuitbreaker/dev-status.xml b/libraries/circuitbreaker/dev-status.xml index 7cd8719..3acc42a 100644 --- a/libraries/circuitbreaker/dev-status.xml +++ b/libraries/circuitbreaker/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>stable</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/circuitbreaker/src/main/java/org/apache/zest/library/circuitbreaker/jmx/CircuitBreakerManagement.java ---------------------------------------------------------------------- diff --git a/libraries/circuitbreaker/src/main/java/org/apache/zest/library/circuitbreaker/jmx/CircuitBreakerManagement.java b/libraries/circuitbreaker/src/main/java/org/apache/zest/library/circuitbreaker/jmx/CircuitBreakerManagement.java index 18d73dc..efc3344 100644 --- a/libraries/circuitbreaker/src/main/java/org/apache/zest/library/circuitbreaker/jmx/CircuitBreakerManagement.java +++ b/libraries/circuitbreaker/src/main/java/org/apache/zest/library/circuitbreaker/jmx/CircuitBreakerManagement.java @@ -34,7 +34,7 @@ import org.apache.zest.api.service.ServiceReference; import org.apache.zest.api.structure.Application; import org.apache.zest.library.circuitbreaker.CircuitBreaker; import org.apache.zest.library.circuitbreaker.service.ServiceCircuitBreaker; -import org.apache.zest.library.jmx.Qi4jMBeans; +import org.apache.zest.library.jmx.ZestMBeans; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -123,7 +123,7 @@ public interface CircuitBreakerManagement { ObjectName mbeanObjectName = null; - ObjectName serviceName = Qi4jMBeans.findServiceName( server, application.name(), name ); + ObjectName serviceName = ZestMBeans.findServiceName( server, application.name(), name ); if ( serviceName != null ) { mbeanObjectName = new ObjectName( serviceName.toString() + ",name=Circuit breaker" ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/BreaksCircuitOnThrowableTest.java ---------------------------------------------------------------------- diff --git a/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/BreaksCircuitOnThrowableTest.java b/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/BreaksCircuitOnThrowableTest.java index 83c02c5..e08678c 100644 --- a/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/BreaksCircuitOnThrowableTest.java +++ b/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/BreaksCircuitOnThrowableTest.java @@ -25,13 +25,13 @@ import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.library.circuitbreaker.service.AbstractBreakOnThrowable; import org.apache.zest.library.circuitbreaker.service.BreaksCircuitOnThrowable; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; /** * Test @BreaksCircuitOnThrowable annotation */ public class BreaksCircuitOnThrowableTest - extends AbstractQi4jTest + extends AbstractZestTest { // START SNIPPET: service http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/constraints/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/constraints/build.gradle b/libraries/constraints/build.gradle index 826b73d..f9b7c5a 100644 --- a/libraries/constraints/build.gradle +++ b/libraries/constraints/build.gradle @@ -22,10 +22,10 @@ description = "Apache Zest⢠Constraint Library provides common set of constrai jar { manifest { name = "Apache Zest⢠Library - Constraints"}} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.bootstrap")) + compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) + testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime")) + testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) testRuntime(libraries.logback) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/constraints/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/constraints/dev-status.xml b/libraries/constraints/dev-status.xml index bdf00e7..b316462 100644 --- a/libraries/constraints/dev-status.xml +++ b/libraries/constraints/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>stable</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/constraints/src/test/java/org/apache/zest/library/constraints/ConstraintTest.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/test/java/org/apache/zest/library/constraints/ConstraintTest.java b/libraries/constraints/src/test/java/org/apache/zest/library/constraints/ConstraintTest.java index 2fa7757..2072b06 100644 --- a/libraries/constraints/src/test/java/org/apache/zest/library/constraints/ConstraintTest.java +++ b/libraries/constraints/src/test/java/org/apache/zest/library/constraints/ConstraintTest.java @@ -20,12 +20,12 @@ import org.apache.zest.api.composite.TransientBuilder; import org.apache.zest.api.constraint.ConstraintViolationException; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import static org.junit.Assert.fail; public class ConstraintTest - extends AbstractQi4jTest + extends AbstractZestTest { @Override @@ -79,7 +79,7 @@ public class ConstraintTest public void testURLOk() { TransientBuilder<TestCaseComposite> cb = module.newTransientBuilder( TestCaseComposite.class ); - cb.prototype().url().set( "http://qi4j.org/path?query=string#fragment"; ); + cb.prototype().url().set( "http://zest.apache.org/path?query=string#fragment"; ); } @Test( expected = ConstraintViolationException.class ) @@ -93,7 +93,7 @@ public class ConstraintTest public void testURIOk() { TransientBuilder<TestCaseComposite> cb = module.newTransientBuilder( TestCaseComposite.class ); - cb.prototype().uri().set( "http://qi4j.org/path?query=string#fragment"; ); + cb.prototype().uri().set( "http://zest.apache.org/path?query=string#fragment"; ); } @Test( expected = ConstraintViolationException.class ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/constraints/src/test/java/org/apache/zest/library/constraints/qi70/IssueTest.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/test/java/org/apache/zest/library/constraints/qi70/IssueTest.java b/libraries/constraints/src/test/java/org/apache/zest/library/constraints/qi70/IssueTest.java index 2e2488b..4f98467 100644 --- a/libraries/constraints/src/test/java/org/apache/zest/library/constraints/qi70/IssueTest.java +++ b/libraries/constraints/src/test/java/org/apache/zest/library/constraints/qi70/IssueTest.java @@ -23,10 +23,10 @@ import org.apache.zest.api.composite.TransientBuilder; import org.apache.zest.api.constraint.ConstraintViolationException; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; public class IssueTest - extends AbstractQi4jTest + extends AbstractZestTest { public void assemble( ModuleAssembly module ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/conversion/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/conversion/build.gradle b/libraries/conversion/build.gradle index 83a7ad7..cb146c1 100644 --- a/libraries/conversion/build.gradle +++ b/libraries/conversion/build.gradle @@ -22,10 +22,10 @@ description = "Apache Zest⢠Conversion Library has various generic services to jar { manifest { name = "Apache Zest⢠Library - Conversion" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.bootstrap")) + compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) + testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime")) + testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) testRuntime(libraries.logback) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/conversion/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/conversion/dev-status.xml b/libraries/conversion/dev-status.xml index 515291a..af6cfa7 100644 --- a/libraries/conversion/dev-status.xml +++ b/libraries/conversion/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>stable</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/conversion/src/main/java/org/apache/zest/library/conversion/values/EntityToValue.java ---------------------------------------------------------------------- diff --git a/libraries/conversion/src/main/java/org/apache/zest/library/conversion/values/EntityToValue.java b/libraries/conversion/src/main/java/org/apache/zest/library/conversion/values/EntityToValue.java index 49308f7..db28b20 100644 --- a/libraries/conversion/src/main/java/org/apache/zest/library/conversion/values/EntityToValue.java +++ b/libraries/conversion/src/main/java/org/apache/zest/library/conversion/values/EntityToValue.java @@ -44,7 +44,7 @@ import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.api.value.ValueDescriptor; import org.apache.zest.functional.Function; import org.apache.zest.functional.Iterables; -import org.apache.zest.spi.Qi4jSPI; +import org.apache.zest.spi.ZestSPI; import static org.apache.zest.library.conversion.values.Shared.STRING_COLLECTION_TYPE_SPEC; import static org.apache.zest.library.conversion.values.Shared.STRING_MAP_TYPE_SPEC; @@ -103,7 +103,7 @@ public interface EntityToValue { @Structure - private Qi4jSPI spi; + private ZestSPI spi; @Structure private Module module; http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/conversion/src/main/java/org/apache/zest/library/conversion/values/ValueToEntityMixin.java ---------------------------------------------------------------------- diff --git a/libraries/conversion/src/main/java/org/apache/zest/library/conversion/values/ValueToEntityMixin.java b/libraries/conversion/src/main/java/org/apache/zest/library/conversion/values/ValueToEntityMixin.java index 2180915..b5dcdcb 100644 --- a/libraries/conversion/src/main/java/org/apache/zest/library/conversion/values/ValueToEntityMixin.java +++ b/libraries/conversion/src/main/java/org/apache/zest/library/conversion/values/ValueToEntityMixin.java @@ -41,7 +41,7 @@ import org.apache.zest.api.value.ValueComposite; import org.apache.zest.api.value.ValueDescriptor; import org.apache.zest.functional.Function; import org.apache.zest.functional.Iterables; -import org.apache.zest.spi.Qi4jSPI; +import org.apache.zest.spi.ZestSPI; import org.apache.zest.spi.module.ModelModule; import org.apache.zest.spi.module.ModuleSpi; @@ -145,7 +145,7 @@ public class ValueToEntityMixin } @Structure - private Qi4jSPI spi; + private ZestSPI spi; @Structure private ModuleSpi module; http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/EntityToValueTest.java ---------------------------------------------------------------------- diff --git a/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/EntityToValueTest.java b/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/EntityToValueTest.java index d39f709..59caf83 100644 --- a/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/EntityToValueTest.java +++ b/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/EntityToValueTest.java @@ -33,7 +33,7 @@ import org.apache.zest.library.conversion.values.TestModel.PersonValue; import org.apache.zest.library.conversion.values.TestModel.PersonValue2; import org.apache.zest.library.conversion.values.TestModel.PersonValue3; import org.apache.zest.library.conversion.values.TestModel.PersonValue4; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.junit.Assert.assertEquals; @@ -41,7 +41,7 @@ import static org.apache.zest.library.conversion.values.TestModel.createBirthDat import static org.apache.zest.library.conversion.values.TestModel.createPerson; public class EntityToValueTest - extends AbstractQi4jTest + extends AbstractZestTest { @Override public void assemble( ModuleAssembly module ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/NestedValuesConversionTest.java ---------------------------------------------------------------------- diff --git a/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/NestedValuesConversionTest.java b/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/NestedValuesConversionTest.java index 4078cc3..4644d4d 100644 --- a/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/NestedValuesConversionTest.java +++ b/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/NestedValuesConversionTest.java @@ -27,14 +27,14 @@ import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.api.value.ValueComposite; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertThat; public class NestedValuesConversionTest - extends AbstractQi4jTest + extends AbstractZestTest { @Override http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/ValueToEntityTest.java ---------------------------------------------------------------------- diff --git a/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/ValueToEntityTest.java b/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/ValueToEntityTest.java index 52757a2..938ae74 100644 --- a/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/ValueToEntityTest.java +++ b/libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/ValueToEntityTest.java @@ -32,7 +32,7 @@ import org.apache.zest.library.conversion.values.TestModel.PersonValue; import org.apache.zest.library.conversion.values.TestModel.PersonValue2; import org.apache.zest.library.conversion.values.TestModel.PersonValue3; import org.apache.zest.library.conversion.values.TestModel.PersonValue4; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.hamcrest.CoreMatchers.is; @@ -48,7 +48,7 @@ import static org.apache.zest.library.conversion.values.TestModel.createPerson; * ValueToEntity Service Test. */ public class ValueToEntityTest - extends AbstractQi4jTest + extends AbstractZestTest { @Override public void assemble( ModuleAssembly module ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/eventsourcing-jdbm/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing-jdbm/build.gradle b/libraries/eventsourcing-jdbm/build.gradle index f5d0f25..efc4d8a 100644 --- a/libraries/eventsourcing-jdbm/build.gradle +++ b/libraries/eventsourcing-jdbm/build.gradle @@ -22,14 +22,14 @@ description = "Extension to the Apache Zest⢠Event Sourcing Library for provid jar { manifest { name = "Apache Zest⢠Library - Event Sourcing - JDBM" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.bootstrap")) - compile(project(":org.qi4j.libraries:org.qi4j.library.eventsourcing")) - compile(project(":org.qi4j.libraries:org.qi4j.library.fileconfig")) + compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + compile(project(":org.apache.zest.libraries:org.apache.zest.library.eventsourcing")) + compile(project(":org.apache.zest.libraries:org.apache.zest.library.fileconfig")) compile(libraries.jdbm) - testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) - testCompile project( ':org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson' ) + testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' ) - testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime")) + testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) testRuntime(libraries.logback) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/eventsourcing-jdbm/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing-jdbm/dev-status.xml b/libraries/eventsourcing-jdbm/dev-status.xml index 5adebd7..8403084 100644 --- a/libraries/eventsourcing-jdbm/dev-status.xml +++ b/libraries/eventsourcing-jdbm/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>beta</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/eventsourcing-jdbm/src/test/java/org/apache/zest/library/eventsourcing/domain/source/jdbm/JdbmEventStoreServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing-jdbm/src/test/java/org/apache/zest/library/eventsourcing/domain/source/jdbm/JdbmEventStoreServiceTest.java b/libraries/eventsourcing-jdbm/src/test/java/org/apache/zest/library/eventsourcing/domain/source/jdbm/JdbmEventStoreServiceTest.java index a8163a5..d8d4271 100644 --- a/libraries/eventsourcing-jdbm/src/test/java/org/apache/zest/library/eventsourcing/domain/source/jdbm/JdbmEventStoreServiceTest.java +++ b/libraries/eventsourcing-jdbm/src/test/java/org/apache/zest/library/eventsourcing/domain/source/jdbm/JdbmEventStoreServiceTest.java @@ -38,12 +38,12 @@ import org.apache.zest.library.eventsourcing.domain.factory.DomainEventCreationC import org.apache.zest.library.eventsourcing.domain.factory.DomainEventFactoryService; import org.apache.zest.library.eventsourcing.domain.source.EventSource; import org.apache.zest.library.fileconfig.FileConfigurationService; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler; public class JdbmEventStoreServiceTest - extends AbstractQi4jTest + extends AbstractZestTest { @Override public void assemble( ModuleAssembly module ) throws AssemblyException http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/eventsourcing-rest/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing-rest/build.gradle b/libraries/eventsourcing-rest/build.gradle index ea1286a..3bc8373 100644 --- a/libraries/eventsourcing-rest/build.gradle +++ b/libraries/eventsourcing-rest/build.gradle @@ -22,12 +22,12 @@ description = "Apache Zest⢠Event Sourcing Library for Restful applications." jar { manifest { name = "Apache Zest⢠Library - Event Sourcing - Rest" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.bootstrap")) - compile(project(":org.qi4j.libraries:org.qi4j.library.eventsourcing")) + compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + compile(project(":org.apache.zest.libraries:org.apache.zest.library.eventsourcing")) compile(libraries.restlet) - testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) + testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime")) + testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) testRuntime(libraries.logback) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/eventsourcing-rest/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing-rest/dev-status.xml b/libraries/eventsourcing-rest/dev-status.xml index 5adebd7..8403084 100644 --- a/libraries/eventsourcing-rest/dev-status.xml +++ b/libraries/eventsourcing-rest/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>beta</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/eventsourcing/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/build.gradle b/libraries/eventsourcing/build.gradle index 05ed544..0fc5a4e 100644 --- a/libraries/eventsourcing/build.gradle +++ b/libraries/eventsourcing/build.gradle @@ -22,11 +22,11 @@ description = "Apache Zest⢠Event Sourcing Library." jar { manifest { name = "Apache Zest⢠Library - Event Sourcing" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.bootstrap")) + compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) compile libraries.slf4j_api - testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) + testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime")) + testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) testRuntime(libraries.logback) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/libraries/eventsourcing/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/dev-status.xml b/libraries/eventsourcing/dev-status.xml index 5adebd7..8403084 100644 --- a/libraries/eventsourcing/dev-status.xml +++ b/libraries/eventsourcing/dev-status.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"; +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1 - http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> <status> <!--none,early,beta,stable,mature--> <codebase>beta</codebase>
