http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/application/replay/ApplicationEventPlayerService.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/application/replay/ApplicationEventPlayerService.java b/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/application/replay/ApplicationEventPlayerService.java index 1945479..0c1f19d 100644 --- a/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/application/replay/ApplicationEventPlayerService.java +++ b/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/application/replay/ApplicationEventPlayerService.java @@ -22,7 +22,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.json.JSONObject; import org.json.JSONTokener; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.injection.scope.Structure; import org.apache.zest.api.mixin.Mixins; import org.apache.zest.api.service.ServiceComposite; @@ -52,7 +52,7 @@ public interface ApplicationEventPlayerService Module module; @Structure - Qi4j api; + ZestAPI api; SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE MMM dd HH:mm:ss zzz yyyy" );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/factory/DomainEventFactoryService.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/factory/DomainEventFactoryService.java b/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/factory/DomainEventFactoryService.java index ebaf3a3..338ae29 100644 --- a/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/factory/DomainEventFactoryService.java +++ b/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/factory/DomainEventFactoryService.java @@ -21,7 +21,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONStringer; import org.json.JSONWriter; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.concern.Concerns; import org.apache.zest.api.entity.EntityComposite; import org.apache.zest.api.injection.scope.Structure; @@ -54,7 +54,7 @@ public interface DomainEventFactoryService DomainEventValue prototype = builder.prototype(); prototype.name().set( name ); - prototype.entityType().set( first( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( entity ).types()).getName() ); + prototype.entityType().set( first( ZestAPI.FUNCTION_DESCRIPTOR_FOR.map( entity ).types()).getName() ); prototype.entityId().set( entity.identity().get() ); // JSON-ify parameters http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/factory/UnitOfWorkNotificationConcern.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/factory/UnitOfWorkNotificationConcern.java b/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/factory/UnitOfWorkNotificationConcern.java index e6b2fbe..4e7eb87 100644 --- a/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/factory/UnitOfWorkNotificationConcern.java +++ b/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/factory/UnitOfWorkNotificationConcern.java @@ -18,7 +18,7 @@ package org.apache.zest.library.eventsourcing.domain.factory; import java.io.IOException; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.concern.ConcernOf; import org.apache.zest.api.entity.EntityComposite; import org.apache.zest.api.injection.scope.Service; @@ -64,7 +64,7 @@ public class UnitOfWorkNotificationConcern UnitOfWorkFactory uowf; @Structure - Qi4j api; + ZestAPI api; String version; http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/replay/DomainEventPlayerService.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/replay/DomainEventPlayerService.java b/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/replay/DomainEventPlayerService.java index 0764581..8f63723 100644 --- a/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/replay/DomainEventPlayerService.java +++ b/libraries/eventsourcing/src/main/java/org/apache/zest/library/eventsourcing/domain/replay/DomainEventPlayerService.java @@ -35,7 +35,7 @@ import org.apache.zest.api.usecase.UsecaseBuilder; import org.apache.zest.api.value.ValueComposite; import org.apache.zest.library.eventsourcing.domain.api.DomainEventValue; import org.apache.zest.library.eventsourcing.domain.api.UnitOfWorkDomainEventsValue; -import org.apache.zest.spi.Qi4jSPI; +import org.apache.zest.spi.ZestSPI; import org.apache.zest.spi.entity.EntityState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +59,7 @@ public interface DomainEventPlayerService Module module; @Structure - Qi4jSPI spi; + ZestSPI spi; SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE MMM dd HH:mm:ss zzz yyyy" ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/application/ApplicationEventTest.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/application/ApplicationEventTest.java b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/application/ApplicationEventTest.java index 9234286..9f38d7f 100644 --- a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/application/ApplicationEventTest.java +++ b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/application/ApplicationEventTest.java @@ -43,7 +43,7 @@ import org.apache.zest.library.eventsourcing.application.source.ApplicationEvent import org.apache.zest.library.eventsourcing.application.source.helper.ApplicationEventParameters; import org.apache.zest.library.eventsourcing.application.source.memory.MemoryApplicationEventStoreService; import org.apache.zest.library.eventsourcing.bootstrap.EventsourcingAssembler; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import java.security.Principal; @@ -59,7 +59,7 @@ import static org.junit.Assert.assertEquals; * Subscription is not stored in domain model but is available via application events feed. */ public class ApplicationEventTest - extends AbstractQi4jTest + extends AbstractZestTest { @Service ApplicationEventSource eventSource; http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/DomainEventTest.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/DomainEventTest.java b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/DomainEventTest.java index e84b16c..ffa4a5c 100644 --- a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/DomainEventTest.java +++ b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/DomainEventTest.java @@ -33,7 +33,7 @@ import org.apache.zest.library.eventsourcing.domain.api.UnitOfWorkDomainEventsVa import org.apache.zest.library.eventsourcing.domain.factory.DomainEventCreationConcern; import org.apache.zest.library.eventsourcing.domain.source.EventSource; import org.apache.zest.library.eventsourcing.domain.source.memory.MemoryEventStoreService; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import java.io.IOException; @@ -43,7 +43,7 @@ import java.security.Principal; * JAVADOC */ public class DomainEventTest - extends AbstractQi4jTest + extends AbstractZestTest { public void assemble( ModuleAssembly module ) throws AssemblyException { http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/DomainEventTrackerTest.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/DomainEventTrackerTest.java b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/DomainEventTrackerTest.java index 09b4f06..3a036a1 100644 --- a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/DomainEventTrackerTest.java +++ b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/DomainEventTrackerTest.java @@ -47,11 +47,11 @@ import org.apache.zest.library.eventsourcing.domain.factory.DomainEventFactorySe import org.apache.zest.library.eventsourcing.domain.source.EventSource; import org.apache.zest.library.eventsourcing.domain.source.EventStream; import org.apache.zest.library.eventsourcing.domain.source.memory.MemoryEventStoreService; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; public class DomainEventTrackerTest - extends AbstractQi4jTest + extends AbstractZestTest { public void assemble( ModuleAssembly module ) throws AssemblyException { http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/fileconfig/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/fileconfig/build.gradle b/libraries/fileconfig/build.gradle index 830117a..f331c0a 100644 --- a/libraries/fileconfig/build.gradle +++ b/libraries/fileconfig/build.gradle @@ -22,11 +22,11 @@ description = "Apache Zest⢠File Configuration Library provides platform speci jar { manifest { name = "Apache Zest⢠Library - FileConfig" }} 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/95d31c05/libraries/fileconfig/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/fileconfig/dev-status.xml b/libraries/fileconfig/dev-status.xml index bdf00e7..b316462 100644 --- a/libraries/fileconfig/dev-status.xml +++ b/libraries/fileconfig/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/95d31c05/libraries/fileconfig/src/main/java/org/apache/zest/library/fileconfig/FileConfiguration.java ---------------------------------------------------------------------- diff --git a/libraries/fileconfig/src/main/java/org/apache/zest/library/fileconfig/FileConfiguration.java b/libraries/fileconfig/src/main/java/org/apache/zest/library/fileconfig/FileConfiguration.java index 901677b..242641e 100644 --- a/libraries/fileconfig/src/main/java/org/apache/zest/library/fileconfig/FileConfiguration.java +++ b/libraries/fileconfig/src/main/java/org/apache/zest/library/fileconfig/FileConfiguration.java @@ -26,7 +26,7 @@ import java.io.File; * These will default to the platform settings, but can be overridden manually, either one-by-one or as a whole. * </p> * <p> - * You can override defaults by adding org.qi4j.library.fileconfig.FileConfiguration_OS.properties files to your + * You can override defaults by adding org.apache.zest.library.fileconfig.FileConfiguration_OS.properties files to your * classpath where OS is one of win, mac or unix. * </p> * <p> http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/http/build.gradle b/libraries/http/build.gradle index bf7489b..0f82572 100644 --- a/libraries/http/build.gradle +++ b/libraries/http/build.gradle @@ -28,18 +28,18 @@ test { dependencies { - compile( project( ":org.qi4j.core:org.qi4j.core.api" ) ) - compile( project( ":org.qi4j.libraries:org.qi4j.library.constraints" ) ) - 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.constraints" ) ) + compile( project( ":org.apache.zest.libraries:org.apache.zest.library.jmx" ) ) compile( libraries.bouncy_castle ) compile( libraries.jetty_webapp ) compile( libraries.jetty_jmx ) - testCompile( project( ":org.qi4j.core:org.qi4j.core.testsupport" ) ) + testCompile( project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) ) testCompile( libraries.http_client ) testCompile( libraries.dnsjava ) - 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/95d31c05/libraries/http/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/http/dev-status.xml b/libraries/http/dev-status.xml index bdf00e7..b316462 100644 --- a/libraries/http/dev-status.xml +++ b/libraries/http/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/95d31c05/libraries/http/src/test/java/org/apache/zest/library/http/AbstractJettyTest.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/AbstractJettyTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/AbstractJettyTest.java index d5ceff9..fbd113e 100644 --- a/libraries/http/src/test/java/org/apache/zest/library/http/AbstractJettyTest.java +++ b/libraries/http/src/test/java/org/apache/zest/library/http/AbstractJettyTest.java @@ -27,10 +27,10 @@ import org.apache.http.util.EntityUtils; import org.junit.Before; import org.junit.BeforeClass; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; public abstract class AbstractJettyTest - extends AbstractQi4jTest + extends AbstractZestTest { protected static final int HTTP_PORT = 8041; http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/src/test/java/org/apache/zest/library/http/AbstractSecureJettyTest.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/AbstractSecureJettyTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/AbstractSecureJettyTest.java index 65553b9..923956e 100644 --- a/libraries/http/src/test/java/org/apache/zest/library/http/AbstractSecureJettyTest.java +++ b/libraries/http/src/test/java/org/apache/zest/library/http/AbstractSecureJettyTest.java @@ -45,11 +45,11 @@ public abstract class AbstractSecureJettyTest private static final String HTTPS = "https"; protected static final int HTTPS_PORT = 8441; protected static final String KS_PASSWORD = "changeit"; - protected static final String CLIENT_KEYSTORE_PATH = "src/test/resources/org/qi4j/library/http/qi4j-lib-http-unittests-client-cert.jceks"; + protected static final String CLIENT_KEYSTORE_PATH = "src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-client-cert.jceks"; protected static final File CLIENT_KEYSTORE_FILE = new File( CLIENT_KEYSTORE_PATH ); - protected static final String SERVER_KEYSTORE_PATH = "src/test/resources/org/qi4j/library/http/qi4j-lib-http-unittests-server-cert.jceks"; + protected static final String SERVER_KEYSTORE_PATH = "src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-server-cert.jceks"; protected static final File SERVER_KEYSTORE_FILE = new File( SERVER_KEYSTORE_PATH ); - protected static final String TRUSTSTORE_PATH = "src/test/resources/org/qi4j/library/http/qi4j-lib-http-unittests-ca.jceks"; + protected static final String TRUSTSTORE_PATH = "src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-ca.jceks"; protected static final File TRUSTSTORE_FILE = new File( TRUSTSTORE_PATH ); // These two clients use a HostnameVerifier that don't do any check, don't do this in production code protected HttpClient trustHttpClient; http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java index a0f95aa..136afa8 100644 --- a/libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java +++ b/libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java @@ -18,14 +18,14 @@ import org.apache.zest.api.common.Visibility; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.library.jmx.JMXAssembler; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; import static org.apache.zest.library.http.Servlets.addServlets; import static org.apache.zest.library.http.Servlets.serve; public class JettyJMXStatisticsTest - extends AbstractQi4jTest + extends AbstractZestTest { @Override public void assemble( ModuleAssembly module ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/src/test/java/org/apache/zest/library/http/VirtualHostJettyServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/VirtualHostJettyServiceTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/VirtualHostJettyServiceTest.java index 7dabab5..9f018bd 100644 --- a/libraries/http/src/test/java/org/apache/zest/library/http/VirtualHostJettyServiceTest.java +++ b/libraries/http/src/test/java/org/apache/zest/library/http/VirtualHostJettyServiceTest.java @@ -32,8 +32,8 @@ import static org.apache.zest.test.util.Assume.assumeNoIbmJdk; public class VirtualHostJettyServiceTest extends AbstractJettyTest { - private static final String HOST1 = "host1.http.library.qi4j"; - private static final String HOST2 = "host2.http.library.qi4j"; + private static final String HOST1 = "host1.http.library.zest"; + private static final String HOST2 = "host2.http.library.zest"; @Override public void assemble( ModuleAssembly module ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/resources/logback.xml b/libraries/http/src/test/resources/logback.xml index 87fa8d2..3fcf2fd 100644 --- a/libraries/http/src/test/resources/logback.xml +++ b/libraries/http/src/test/resources/logback.xml @@ -19,7 +19,7 @@ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender"> <encoder> - <pattern>[QI4J] @%-20thread %-5level %logger{36} - %msg%n</pattern> + <pattern>[ZEST] @%-20thread %-5level %logger{36} - %msg%n</pattern> </encoder> </appender> http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-ca.jceks ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-ca.jceks b/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-ca.jceks deleted file mode 100644 index e288b8c..0000000 Binary files a/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-ca.jceks and /dev/null differ http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-client-cert.jceks ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-client-cert.jceks b/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-client-cert.jceks deleted file mode 100644 index aae1ee1..0000000 Binary files a/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-client-cert.jceks and /dev/null differ http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-server-cert.jceks ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-server-cert.jceks b/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-server-cert.jceks deleted file mode 100644 index 5311cd7..0000000 Binary files a/libraries/http/src/test/resources/org/apache/zest/library/http/qi4j-lib-http-unittests-server-cert.jceks and /dev/null differ http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-ca.jceks ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-ca.jceks b/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-ca.jceks new file mode 100644 index 0000000..e288b8c Binary files /dev/null and b/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-ca.jceks differ http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-client-cert.jceks ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-client-cert.jceks b/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-client-cert.jceks new file mode 100644 index 0000000..aae1ee1 Binary files /dev/null and b/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-client-cert.jceks differ http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-server-cert.jceks ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-server-cert.jceks b/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-server-cert.jceks new file mode 100644 index 0000000..5311cd7 Binary files /dev/null and b/libraries/http/src/test/resources/org/apache/zest/library/http/zest-lib-http-unittests-server-cert.jceks differ http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/invocation-cache/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/invocation-cache/build.gradle b/libraries/invocation-cache/build.gradle index 332d3d3..9e79098 100644 --- a/libraries/invocation-cache/build.gradle +++ b/libraries/invocation-cache/build.gradle @@ -22,11 +22,11 @@ description = "Apache Zest⢠Invocation Cache Library provides caching framewor jar { manifest { name = "Apache Zest⢠Library - Invocation Cache" }} 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' ) ) - 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/95d31c05/libraries/invocation-cache/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/invocation-cache/dev-status.xml b/libraries/invocation-cache/dev-status.xml index 7ea746d..8b86f1d 100644 --- a/libraries/invocation-cache/dev-status.xml +++ b/libraries/invocation-cache/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/95d31c05/libraries/jmx/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/jmx/build.gradle b/libraries/jmx/build.gradle index 79193da..e4f9a7a 100644 --- a/libraries/jmx/build.gradle +++ b/libraries/jmx/build.gradle @@ -22,17 +22,17 @@ description = "Apache Zest⢠JMX Library provides Java Management Extension (JM jar { manifest { name = "Apache Zest⢠Library - JMX" }} 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) } task(runSample, dependsOn: 'testClasses', type: JavaExec) { - main = 'org.qi4j.library.jmx.JMXTest' + main = 'org.apache.zest.library.jmx.JMXTest' classpath = sourceSets.test.runtimeClasspath } http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/jmx/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/jmx/dev-status.xml b/libraries/jmx/dev-status.xml index f549c99..595761f 100644 --- a/libraries/jmx/dev-status.xml +++ b/libraries/jmx/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/95d31c05/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ApplicationManagerService.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ApplicationManagerService.java b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ApplicationManagerService.java index 318dfdd..1ef366d 100644 --- a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ApplicationManagerService.java +++ b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ApplicationManagerService.java @@ -59,7 +59,7 @@ import static org.apache.zest.functional.Iterables.first; * </pre> * Use the following snippet to find the ObjectName of a service with a given identity: * <pre> - * ObjectName serviceName = Qi4jMBeans.findService(mbeanServer, applicationName, serviceId); + * ObjectName serviceName = ZestMBeans.findService(mbeanServer, applicationName, serviceId); * </pre> */ @Mixins( ApplicationManagerService.Mixin.class ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ConfigurationManagerService.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ConfigurationManagerService.java b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ConfigurationManagerService.java index 09d1bbd..6c9809d 100644 --- a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ConfigurationManagerService.java +++ b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ConfigurationManagerService.java @@ -41,7 +41,7 @@ import javax.management.NotCompliantMBeanException; import javax.management.ObjectName; import javax.management.ReflectionException; import javax.management.modelmbean.DescriptorSupport; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.activation.Activation; import org.apache.zest.api.activation.ActivatorAdapter; import org.apache.zest.api.activation.Activators; @@ -65,7 +65,7 @@ import org.apache.zest.api.type.EnumType; import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException; import org.apache.zest.api.unitofwork.UnitOfWorkFactory; -import org.apache.zest.spi.Qi4jSPI; +import org.apache.zest.spi.ZestSPI; import static org.apache.zest.functional.Iterables.first; @@ -117,7 +117,7 @@ public interface ConfigurationManagerService Application application; @Structure - Qi4jSPI spi; + ZestSPI spi; @Service Iterable<ServiceReference<?>> configurableServices; @@ -138,7 +138,7 @@ public interface ConfigurationManagerService } // Check if service has configuration - CompositeInstance compositeInstance = Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF.map( (Composite) service ); + CompositeInstance compositeInstance = ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF.map( (Composite) service ); try { Configuration config = compositeInstance.newProxy( Configuration.class ); @@ -204,7 +204,7 @@ public interface ConfigurationManagerService .size() ] ), null, operations.toArray( new MBeanOperationInfo[ operations.size() ] ), null ); Object mbean = new ConfigurableService( configurableService, mbeanInfo, name, properties ); ObjectName configurableServiceName; - ObjectName serviceName = Qi4jMBeans.findServiceName( server, application.name(), name ); + ObjectName serviceName = ZestMBeans.findServiceName( server, application.name(), name ); if( serviceName != null ) { configurableServiceName = new ObjectName( serviceName.toString() + ",name=Configuration" ); @@ -405,7 +405,7 @@ public interface ConfigurationManagerService if( serviceRef.isActive() ) { // Refresh configuration - CompositeInstance compositeInstance = Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF + CompositeInstance compositeInstance = ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF .map( (Composite) serviceRef.get() ); compositeInstance.newProxy( Configuration.class ).refresh(); http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/jmx/src/main/java/org/apache/zest/library/jmx/Qi4jMBeans.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/Qi4jMBeans.java b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/Qi4jMBeans.java deleted file mode 100644 index 4e15155..0000000 --- a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/Qi4jMBeans.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2010, Rickard Ãberg. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.zest.library.jmx; - -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import org.apache.zest.functional.Iterables; -import org.apache.zest.functional.Specification; - -/** - * Helper for working with Zest MBeans. - */ -public class Qi4jMBeans -{ - - public static ObjectName findServiceName( MBeanServer server, String applicationName, String serviceId ) - throws MalformedObjectNameException - { - return Iterables.first( Iterables.filter( new Specification<ObjectName>() - { - @Override - public boolean satisfiedBy( ObjectName item ) - { - return item.getKeyPropertyList().size() == 5; - } - - }, server.queryNames( new ObjectName( "Zest:application=" + applicationName + ",*,service=" + serviceId ), null ) ) ); - } - -} http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ZestMBeans.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ZestMBeans.java b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ZestMBeans.java new file mode 100644 index 0000000..b6adc9f --- /dev/null +++ b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ZestMBeans.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2010, Rickard Ãberg. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.apache.zest.library.jmx; + +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; +import org.apache.zest.functional.Iterables; +import org.apache.zest.functional.Specification; + +/** + * Helper for working with Zest MBeans. + */ +public class ZestMBeans +{ + + public static ObjectName findServiceName( MBeanServer server, String applicationName, String serviceId ) + throws MalformedObjectNameException + { + return Iterables.first( Iterables.filter( new Specification<ObjectName>() + { + @Override + public boolean satisfiedBy( ObjectName item ) + { + return item.getKeyPropertyList().size() == 5; + } + + }, server.queryNames( new ObjectName( "Zest:application=" + applicationName + ",*,service=" + serviceId ), null ) ) ); + } + +} http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/lang-groovy/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/lang-groovy/build.gradle b/libraries/lang-groovy/build.gradle index 13f2578..623be0c 100644 --- a/libraries/lang-groovy/build.gradle +++ b/libraries/lang-groovy/build.gradle @@ -24,11 +24,11 @@ jar { manifest { name = "Apache Zest⢠Library - Scripting - Groovy" }} apply plugin: 'groovy' dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.bootstrap")) + compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) compile(libraries.groovy) - 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/95d31c05/libraries/lang-groovy/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/lang-groovy/dev-status.xml b/libraries/lang-groovy/dev-status.xml index 2a02725..96f842d 100644 --- a/libraries/lang-groovy/dev-status.xml +++ b/libraries/lang-groovy/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/95d31c05/libraries/lang-groovy/src/main/java/org/apache/zest/library/groovy/GroovyMixin.java ---------------------------------------------------------------------- diff --git a/libraries/lang-groovy/src/main/java/org/apache/zest/library/groovy/GroovyMixin.java b/libraries/lang-groovy/src/main/java/org/apache/zest/library/groovy/GroovyMixin.java index f9b740d..8431c08 100644 --- a/libraries/lang-groovy/src/main/java/org/apache/zest/library/groovy/GroovyMixin.java +++ b/libraries/lang-groovy/src/main/java/org/apache/zest/library/groovy/GroovyMixin.java @@ -46,8 +46,8 @@ import org.apache.zest.io.Outputs; * Example: * </p> * <pre><code> - * org/qi4j/samples/hello/domain/HelloWorldSpeaker.groovy - * org/qi4j/samples/hello/domain/HelloWorldSpeaker.sayAgain.groovy + * org/apache/zest/samples/hello/domain/HelloWorldSpeaker.groovy + * org/apache/zest/samples/hello/domain/HelloWorldSpeaker.sayAgain.groovy * </code></pre> * */ http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/GroovyMixinTest.java ---------------------------------------------------------------------- diff --git a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/GroovyMixinTest.java b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/GroovyMixinTest.java index 1e4ebf1..f5f6e9d 100644 --- a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/GroovyMixinTest.java +++ b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/GroovyMixinTest.java @@ -16,9 +16,9 @@ import org.junit.Assert; import org.junit.Test; 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 GroovyMixinTest extends AbstractQi4jTest +public class GroovyMixinTest extends AbstractZestTest { public void assemble( ModuleAssembly module ) throws AssemblyException http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java ---------------------------------------------------------------------- diff --git a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java index defe29a..e12cae7 100644 --- a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java +++ b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java @@ -21,10 +21,10 @@ import org.junit.Assert; import org.junit.Test; 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.bootstrap.SingletonAssembler; -public class HelloSpeakerTest extends AbstractQi4jTest +public class HelloSpeakerTest extends AbstractZestTest { public void assemble( ModuleAssembly module ) throws AssemblyException http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/lang-javascript/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/lang-javascript/build.gradle b/libraries/lang-javascript/build.gradle index 7500b34..8562640 100644 --- a/libraries/lang-javascript/build.gradle +++ b/libraries/lang-javascript/build.gradle @@ -23,12 +23,12 @@ jar { manifest { name = "Apache Zest⢠Library - Scripting - JavaScript" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.bootstrap")) - compile( project( ':org.qi4j.libraries:org.qi4j.library.scripting' )) + compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + compile( project( ':org.apache.zest.libraries:org.apache.zest.library.scripting' )) compile(libraries.javascript) - 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/95d31c05/libraries/lang-javascript/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/lang-javascript/dev-status.xml b/libraries/lang-javascript/dev-status.xml index 58fda09..b25d433 100644 --- a/libraries/lang-javascript/dev-status.xml +++ b/libraries/lang-javascript/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/95d31c05/libraries/lang-javascript/src/main/java/org/apache/zest/library/javascript/JavaScriptMixin.java ---------------------------------------------------------------------- diff --git a/libraries/lang-javascript/src/main/java/org/apache/zest/library/javascript/JavaScriptMixin.java b/libraries/lang-javascript/src/main/java/org/apache/zest/library/javascript/JavaScriptMixin.java index 2acd217..2732676 100644 --- a/libraries/lang-javascript/src/main/java/org/apache/zest/library/javascript/JavaScriptMixin.java +++ b/libraries/lang-javascript/src/main/java/org/apache/zest/library/javascript/JavaScriptMixin.java @@ -36,7 +36,7 @@ import org.apache.zest.library.scripting.ScriptReloadable; * Example: * </p> * <pre><code> - * org/qi4j/samples/hello/domain/HelloWorldSpeaker.say.js + * org/apache/zest/samples/hello/domain/HelloWorldSpeaker.say.js * </code></pre> */ @AppliesTo( JavaScriptMixin.AppliesTo.class ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/lang-javascript/src/test/java/org/apache/zest/library/javascript/JavaScriptMixinTest.java ---------------------------------------------------------------------- diff --git a/libraries/lang-javascript/src/test/java/org/apache/zest/library/javascript/JavaScriptMixinTest.java b/libraries/lang-javascript/src/test/java/org/apache/zest/library/javascript/JavaScriptMixinTest.java index dd24ced..acf218d 100644 --- a/libraries/lang-javascript/src/test/java/org/apache/zest/library/javascript/JavaScriptMixinTest.java +++ b/libraries/lang-javascript/src/test/java/org/apache/zest/library/javascript/JavaScriptMixinTest.java @@ -15,10 +15,10 @@ import org.junit.Assert; import org.junit.Test; 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 JavaScriptMixinTest - extends AbstractQi4jTest + extends AbstractZestTest { public void assemble( ModuleAssembly module ) throws AssemblyException http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/lang-scala/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/build.gradle b/libraries/lang-scala/build.gradle index 9ca2527..63c0e21 100644 --- a/libraries/lang-scala/build.gradle +++ b/libraries/lang-scala/build.gradle @@ -33,12 +33,12 @@ tasks.withType(ScalaCompile) { } dependencies { - compile project( ':org.qi4j.core:org.qi4j.core.bootstrap' ) + compile project( ':org.apache.zest.core:org.apache.zest.core.bootstrap' ) compile libraries.scala - testCompile project( ':org.qi4j.core:org.qi4j.core.testsupport' ) - 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.indexing-rdf' ) - 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/95d31c05/libraries/lang-scala/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/dev-status.xml b/libraries/lang-scala/dev-status.xml index 58fda09..b25d433 100644 --- a/libraries/lang-scala/dev-status.xml +++ b/libraries/lang-scala/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/95d31c05/libraries/lang-scala/src/main/java/org/apache/zest/library/scala/ScalaTraitMixin.java ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/main/java/org/apache/zest/library/scala/ScalaTraitMixin.java b/libraries/lang-scala/src/main/java/org/apache/zest/library/scala/ScalaTraitMixin.java index 0e53d69..da00c58 100644 --- a/libraries/lang-scala/src/main/java/org/apache/zest/library/scala/ScalaTraitMixin.java +++ b/libraries/lang-scala/src/main/java/org/apache/zest/library/scala/ScalaTraitMixin.java @@ -24,7 +24,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.HashMap; import java.util.Map; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.common.AppliesTo; import org.apache.zest.api.common.AppliesToFilter; import org.apache.zest.api.composite.Composite; @@ -51,7 +51,7 @@ public class ScalaTraitMixin public ScalaTraitMixin( @This Composite composite ) { - compositeType = Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).primaryType(); + compositeType = ZestAPI.FUNCTION_DESCRIPTOR_FOR.map( composite ).primaryType(); } @Override http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/locking/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/locking/build.gradle b/libraries/locking/build.gradle index b31c2a4..f149f48 100644 --- a/libraries/locking/build.gradle +++ b/libraries/locking/build.gradle @@ -22,10 +22,10 @@ description = "Apache Zest⢠Locking Library provides lock management for metho jar { manifest { name = "Apache Zest⢠Library - Locking" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.api")) + compile(project(":org.apache.zest.core:org.apache.zest.core.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/95d31c05/libraries/locking/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/locking/dev-status.xml b/libraries/locking/dev-status.xml index f549c99..595761f 100644 --- a/libraries/locking/dev-status.xml +++ b/libraries/locking/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/95d31c05/libraries/locking/src/test/java/org/apache/zest/library/locking/LockingTest.java ---------------------------------------------------------------------- diff --git a/libraries/locking/src/test/java/org/apache/zest/library/locking/LockingTest.java b/libraries/locking/src/test/java/org/apache/zest/library/locking/LockingTest.java index 3204e74..574007f 100644 --- a/libraries/locking/src/test/java/org/apache/zest/library/locking/LockingTest.java +++ b/libraries/locking/src/test/java/org/apache/zest/library/locking/LockingTest.java @@ -19,7 +19,7 @@ import org.apache.zest.api.composite.TransientComposite; import org.apache.zest.api.mixin.Mixins; 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.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit; * JAVADOC */ public class LockingTest - extends AbstractQi4jTest + extends AbstractZestTest { public void assemble( ModuleAssembly module ) throws AssemblyException http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/logging/build.gradle b/libraries/logging/build.gradle index f2dde7e..a6aa417 100644 --- a/libraries/logging/build.gradle +++ b/libraries/logging/build.gradle @@ -22,12 +22,12 @@ description = "Apache Zest⢠Logging Library provides an advanced logging frame jar { manifest { name = "Apache Zest⢠Library - Logging" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.bootstrap")) - compile( project( ':org.qi4j.libraries:org.qi4j.library.constraints' )) + compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + compile( project( ':org.apache.zest.libraries:org.apache.zest.library.constraints' )) - testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) - 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.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/95d31c05/libraries/logging/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/logging/dev-status.xml b/libraries/logging/dev-status.xml index bdf00e7..b316462 100644 --- a/libraries/logging/dev-status.xml +++ b/libraries/logging/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/95d31c05/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/DebugConcern.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/DebugConcern.java b/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/DebugConcern.java index 5e5a4c6..1f55b31 100644 --- a/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/DebugConcern.java +++ b/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/DebugConcern.java @@ -18,7 +18,7 @@ package org.apache.zest.library.logging.debug; import java.io.Serializable; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.common.Optional; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.injection.scope.Service; @@ -29,7 +29,7 @@ import org.apache.zest.library.logging.debug.service.DebuggingService; public class DebugConcern implements Debug { - @Structure private Qi4j api; + @Structure private ZestAPI api; @Optional @Service private DebuggingService loggingService; @This private Composite composite; http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/service/DebugOnConsoleSideEffect.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/service/DebugOnConsoleSideEffect.java b/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/service/DebugOnConsoleSideEffect.java index 9dc7dd0..66c7ae2 100644 --- a/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/service/DebugOnConsoleSideEffect.java +++ b/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/service/DebugOnConsoleSideEffect.java @@ -22,7 +22,7 @@ import java.io.Serializable; import java.lang.reflect.Method; import java.text.MessageFormat; import java.util.ResourceBundle; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.injection.scope.Invocation; import org.apache.zest.api.sideeffect.SideEffectOf; @@ -62,7 +62,7 @@ public class DebugOnConsoleSideEffect extends SideEffectOf<LoggingService> private String getCompositeName( Composite composite ) { - return first( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); + return first( ZestAPI.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); } @Override http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/service/DebuggingServiceMixin.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/service/DebuggingServiceMixin.java b/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/service/DebuggingServiceMixin.java index 1164000..394e79f 100644 --- a/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/service/DebuggingServiceMixin.java +++ b/libraries/logging/src/main/java/org/apache/zest/library/logging/debug/service/DebuggingServiceMixin.java @@ -22,7 +22,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.configuration.Configuration; import org.apache.zest.api.entity.EntityBuilder; @@ -175,6 +175,6 @@ public class DebuggingServiceMixin private String getCompositeName( Composite composite ) { - return first( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); + return first( ZestAPI.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); } } http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/main/java/org/apache/zest/library/logging/log/CategoryLogConcern.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/zest/library/logging/log/CategoryLogConcern.java b/libraries/logging/src/main/java/org/apache/zest/library/logging/log/CategoryLogConcern.java index facfcd6..f514503 100644 --- a/libraries/logging/src/main/java/org/apache/zest/library/logging/log/CategoryLogConcern.java +++ b/libraries/logging/src/main/java/org/apache/zest/library/logging/log/CategoryLogConcern.java @@ -18,7 +18,7 @@ package org.apache.zest.library.logging.log; import java.io.Serializable; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.common.Optional; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.composite.TransientBuilderFactory; @@ -30,7 +30,7 @@ import org.apache.zest.library.logging.log.service.LoggingService; public final class CategoryLogConcern implements CategoryLog { - @Structure private Qi4j api; + @Structure private ZestAPI api; @Optional @Service private LoggingService loggingService; @This private Composite composite; http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/main/java/org/apache/zest/library/logging/log/SimpleLogConcern.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/zest/library/logging/log/SimpleLogConcern.java b/libraries/logging/src/main/java/org/apache/zest/library/logging/log/SimpleLogConcern.java index 0a0eebb..7a8a22d 100644 --- a/libraries/logging/src/main/java/org/apache/zest/library/logging/log/SimpleLogConcern.java +++ b/libraries/logging/src/main/java/org/apache/zest/library/logging/log/SimpleLogConcern.java @@ -18,7 +18,7 @@ package org.apache.zest.library.logging.log; import java.io.Serializable; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.common.Optional; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.injection.scope.Service; @@ -31,7 +31,7 @@ import static org.apache.zest.functional.Iterables.first; public final class SimpleLogConcern implements SimpleLog { - @Structure private Qi4j api; + @Structure private ZestAPI api; @Optional @Service private LoggingService loggingService; private Composite composite; private String category; @@ -39,7 +39,7 @@ public final class SimpleLogConcern public SimpleLogConcern( @This Composite composite ) { this.composite = composite; - Class<?> type = first( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types() ); + Class<?> type = first( ZestAPI.FUNCTION_DESCRIPTOR_FOR.map( composite ).types() ); category = type.getName(); } http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/main/java/org/apache/zest/library/logging/log/StandardLogConcern.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/zest/library/logging/log/StandardLogConcern.java b/libraries/logging/src/main/java/org/apache/zest/library/logging/log/StandardLogConcern.java index 0e23e36..c5fbb47 100644 --- a/libraries/logging/src/main/java/org/apache/zest/library/logging/log/StandardLogConcern.java +++ b/libraries/logging/src/main/java/org/apache/zest/library/logging/log/StandardLogConcern.java @@ -19,7 +19,7 @@ package org.apache.zest.library.logging.log; import java.io.Serializable; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.common.Optional; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.injection.scope.Service; @@ -30,7 +30,7 @@ import org.apache.zest.library.logging.log.service.LoggingService; public class StandardLogConcern implements StandardLog { - @Structure private Qi4j api; + @Structure private ZestAPI api; @Optional @Service private LoggingService loggingService; @This private Composite composite; http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/main/java/org/apache/zest/library/logging/log/service/LogOnConsoleSideEffect.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/zest/library/logging/log/service/LogOnConsoleSideEffect.java b/libraries/logging/src/main/java/org/apache/zest/library/logging/log/service/LogOnConsoleSideEffect.java index 441a234..f809e64 100644 --- a/libraries/logging/src/main/java/org/apache/zest/library/logging/log/service/LogOnConsoleSideEffect.java +++ b/libraries/logging/src/main/java/org/apache/zest/library/logging/log/service/LogOnConsoleSideEffect.java @@ -21,7 +21,7 @@ import java.io.PrintStream; import java.lang.reflect.Method; import java.text.MessageFormat; import java.util.ResourceBundle; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.injection.scope.Invocation; import org.apache.zest.api.sideeffect.SideEffectOf; @@ -54,7 +54,7 @@ public abstract class LogOnConsoleSideEffect extends SideEffectOf<LoggingService private String getCompositeName( Composite composite ) { - return first( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); + return first( ZestAPI.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); } public void log( LogType type, Composite composite, String category, String message, Object param1 ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/main/java/org/apache/zest/library/logging/log/service/LoggingServiceMixin.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/zest/library/logging/log/service/LoggingServiceMixin.java b/libraries/logging/src/main/java/org/apache/zest/library/logging/log/service/LoggingServiceMixin.java index 804f218..e089449 100644 --- a/libraries/logging/src/main/java/org/apache/zest/library/logging/log/service/LoggingServiceMixin.java +++ b/libraries/logging/src/main/java/org/apache/zest/library/logging/log/service/LoggingServiceMixin.java @@ -21,7 +21,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.entity.EntityBuilder; import org.apache.zest.api.entity.EntityComposite; @@ -166,6 +166,6 @@ public abstract class LoggingServiceMixin private String getCompositeName( Composite composite ) { - return first( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); + return first( ZestAPI.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); } } http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/main/java/org/apache/zest/library/logging/trace/AbstractTraceConcern.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/zest/library/logging/trace/AbstractTraceConcern.java b/libraries/logging/src/main/java/org/apache/zest/library/logging/trace/AbstractTraceConcern.java index 727f672..6eb3359 100644 --- a/libraries/logging/src/main/java/org/apache/zest/library/logging/trace/AbstractTraceConcern.java +++ b/libraries/logging/src/main/java/org/apache/zest/library/logging/trace/AbstractTraceConcern.java @@ -19,7 +19,7 @@ package org.apache.zest.library.logging.trace; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.common.Optional; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.concern.ConcernOf; @@ -31,7 +31,7 @@ import org.apache.zest.library.logging.trace.service.TraceService; public abstract class AbstractTraceConcern extends ConcernOf<InvocationHandler> implements InvocationHandler { - @Structure private Qi4j api; + @Structure private ZestAPI api; @Optional @Service protected TraceService traceService; private Composite thisComposite; private Class compositeType; http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/main/java/org/apache/zest/library/logging/trace/service/TraceServiceMixin.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/zest/library/logging/trace/service/TraceServiceMixin.java b/libraries/logging/src/main/java/org/apache/zest/library/logging/trace/service/TraceServiceMixin.java index 239a926..3d07f6a 100644 --- a/libraries/logging/src/main/java/org/apache/zest/library/logging/trace/service/TraceServiceMixin.java +++ b/libraries/logging/src/main/java/org/apache/zest/library/logging/trace/service/TraceServiceMixin.java @@ -21,7 +21,7 @@ package org.apache.zest.library.logging.trace.service; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import org.apache.zest.api.Qi4j; +import org.apache.zest.api.ZestAPI; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.configuration.Configuration; import org.apache.zest.api.entity.EntityBuilder; @@ -104,7 +104,7 @@ public class TraceServiceMixin EntityComposite entity = (EntityComposite) object; String identity = entity.identity().get(); EntityComposite source = (EntityComposite) uow.get( (Class<?>) first( - Qi4j.FUNCTION_DESCRIPTOR_FOR.map( entity ).types() ), identity ); + ZestAPI.FUNCTION_DESCRIPTOR_FOR.map( entity ).types() ), identity ); EntityBuilder<EntityTraceRecordEntity> builder = uow.newEntityBuilder( EntityTraceRecordEntity.class ); EntityTraceRecordEntity state = builder.instance(); setStandardStuff( compositeType, method, args, entryTime, durationNano, state, exception ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/test/java/org/apache/zest/library/logging/DebuggingTest.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/test/java/org/apache/zest/library/logging/DebuggingTest.java b/libraries/logging/src/test/java/org/apache/zest/library/logging/DebuggingTest.java index 427a103..fc4f3dd 100644 --- a/libraries/logging/src/test/java/org/apache/zest/library/logging/DebuggingTest.java +++ b/libraries/logging/src/test/java/org/apache/zest/library/logging/DebuggingTest.java @@ -38,14 +38,14 @@ import org.apache.zest.library.logging.debug.service.DebuggingServiceComposite; import org.apache.zest.spi.entity.EntityState; import org.apache.zest.spi.entitystore.EntityStore; import org.apache.zest.spi.uuid.UuidIdentityGeneratorService; -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.apache.zest.functional.Iterables.first; public class DebuggingTest - extends AbstractQi4jTest + extends AbstractZestTest { public void assemble( ModuleAssembly module ) throws AssemblyException @@ -66,7 +66,7 @@ public class DebuggingTest { // There is no Query capability available for Libraries, since that sits in Extensions. // Obtaining the EntityStore directly is a very ugly hack to get around this problem, and only related - // to the test sitting in qi4j-libraries source repository. + // to the test sitting in libraries/ source repository. // QueryBuilder<DebugRecord> builder = module.newQueryBuilder( DebugRecord.class ); // Query<DebugRecord> query = builder.newQuery( uow ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/logging/src/test/java/org/apache/zest/library/logging/TracingTest.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/test/java/org/apache/zest/library/logging/TracingTest.java b/libraries/logging/src/test/java/org/apache/zest/library/logging/TracingTest.java index 0056537..6438fc4 100644 --- a/libraries/logging/src/test/java/org/apache/zest/library/logging/TracingTest.java +++ b/libraries/logging/src/test/java/org/apache/zest/library/logging/TracingTest.java @@ -37,7 +37,7 @@ import org.apache.zest.library.logging.trace.records.EntityTraceRecordEntity; import org.apache.zest.library.logging.trace.records.ServiceTraceRecordEntity; import org.apache.zest.library.logging.trace.records.TraceRecord; import org.apache.zest.spi.uuid.UuidIdentityGeneratorService; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import java.util.Iterator; import org.apache.zest.test.EntityTestAssembler; @@ -47,7 +47,7 @@ import static org.apache.zest.api.query.QueryExpressions.orderBy; import static org.apache.zest.api.query.QueryExpressions.templateFor; public class TracingTest - extends AbstractQi4jTest + extends AbstractZestTest { public void assemble( ModuleAssembly module ) throws AssemblyException http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/metrics/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/metrics/build.gradle b/libraries/metrics/build.gradle index 7c1ac09..2203423 100644 --- a/libraries/metrics/build.gradle +++ b/libraries/metrics/build.gradle @@ -19,11 +19,11 @@ description = "Apache Zest⢠Metrics Library." jar { manifest { name = "Apache Zest⢠Library - Metrics" }} 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.qi4j.extensions:org.qi4j.extension.metrics-yammer")) + testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.metrics-yammer")) - 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/95d31c05/libraries/metrics/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/metrics/dev-status.xml b/libraries/metrics/dev-status.xml index 04d78d0..49f674b 100644 --- a/libraries/metrics/dev-status.xml +++ b/libraries/metrics/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>beta</codebase> http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/metrics/src/test/java/org/apache/zest/library/metrics/MetricsTest.java ---------------------------------------------------------------------- diff --git a/libraries/metrics/src/test/java/org/apache/zest/library/metrics/MetricsTest.java b/libraries/metrics/src/test/java/org/apache/zest/library/metrics/MetricsTest.java index c604f73..adf1f55 100644 --- a/libraries/metrics/src/test/java/org/apache/zest/library/metrics/MetricsTest.java +++ b/libraries/metrics/src/test/java/org/apache/zest/library/metrics/MetricsTest.java @@ -32,13 +32,13 @@ import org.apache.zest.api.property.Property; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.metrics.yammer.YammerMetricsAssembler; -import org.apache.zest.test.AbstractQi4jTest; +import org.apache.zest.test.AbstractZestTest; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -public class MetricsTest extends AbstractQi4jTest +public class MetricsTest extends AbstractZestTest { private PrintStream reportOut; private ByteArrayOutputStream result; @@ -89,7 +89,7 @@ public class MetricsTest extends AbstractQi4jTest Country underTest = module.newTransient( Country2.class ); String result = runTest( underTest ); result = result.replace( "\r", "" ); - assertThat( lastLine( result, 34 ), equalTo( "org.qi4j.library.metrics.Country.SomeApplication:" ) ); + assertThat( lastLine( result, 34 ), equalTo( "org.apache.zest.library.metrics.Country.SomeApplication:" ) ); assertThat( lastLine( result, 33 ).trim(), equalTo( "name() [TimingCapture]:" ) ); assertThat( lastLine( result, 16 ).trim(), equalTo( "updateName() [TimingCapture]:" ) ); assertTrue( lastLine( result, 5 ).contains( "75% <=" ) ); @@ -106,7 +106,7 @@ public class MetricsTest extends AbstractQi4jTest Country underTest = module.newTransient( Country3.class ); String result = runTest( underTest ); result = result.replace( "\r", "" ); - assertThat( lastLine( result, 17 ), equalTo( "org.qi4j.library.metrics.Country.SomeApplication:" ) ); + assertThat( lastLine( result, 17 ), equalTo( "org.apache.zest.library.metrics.Country.SomeApplication:" ) ); assertThat( lastLine( result, 16 ).trim(), equalTo( "updateName() [TimingCapture]:" ) ); assertTrue( lastLine( result, 5 ).contains( "75% <=" ) ); assertTrue( lastLine( result, 4 ).contains( "95% <=" ) ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/osgi/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/osgi/build.gradle b/libraries/osgi/build.gradle index 887f470..96e104e 100644 --- a/libraries/osgi/build.gradle +++ b/libraries/osgi/build.gradle @@ -22,13 +22,13 @@ description = "Apache Zest⢠OSGi Library provides integration of OSGi and Apac jar { manifest { name = "Apache Zest⢠Library - OSGi Integration" }} dependencies { - compile(project(":org.qi4j.core:org.qi4j.core.api")) + compile(project(":org.apache.zest.core:org.apache.zest.core.api")) compile(libraries.osgi_core) compile(libraries.osgi_compendium) - testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) + testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) testCompile(libraries.mockito) - 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/95d31c05/libraries/osgi/dev-status.xml ---------------------------------------------------------------------- diff --git a/libraries/osgi/dev-status.xml b/libraries/osgi/dev-status.xml index 515291a..af6cfa7 100644 --- a/libraries/osgi/dev-status.xml +++ b/libraries/osgi/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/95d31c05/libraries/osgi/src/main/java/org/apache/zest/library/osgi/OSGiServiceExporter.java ---------------------------------------------------------------------- diff --git a/libraries/osgi/src/main/java/org/apache/zest/library/osgi/OSGiServiceExporter.java b/libraries/osgi/src/main/java/org/apache/zest/library/osgi/OSGiServiceExporter.java index 1af3029..c530234 100644 --- a/libraries/osgi/src/main/java/org/apache/zest/library/osgi/OSGiServiceExporter.java +++ b/libraries/osgi/src/main/java/org/apache/zest/library/osgi/OSGiServiceExporter.java @@ -94,9 +94,9 @@ public interface OSGiServiceExporter { properties = new Properties(); } - properties.put( "org.qi4j.api.service.active", ref.isActive() ); - properties.put( "org.qi4j.api.service.available", ref.isAvailable() ); - properties.put( "org.qi4j.api.service.identity", ref.identity() ); + properties.put( "org.apache.zest.api.service.active", ref.isActive() ); + properties.put( "org.apache.zest.api.service.available", ref.isAvailable() ); + properties.put( "org.apache.zest.api.service.identity", ref.identity() ); int i = 0; for( Class cls : interfaces ) { http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/osgi/src/test/java/org/apache/zest/library/osgi/DocumentationSupport.java ---------------------------------------------------------------------- diff --git a/libraries/osgi/src/test/java/org/apache/zest/library/osgi/DocumentationSupport.java b/libraries/osgi/src/test/java/org/apache/zest/library/osgi/DocumentationSupport.java index bca50d8..075d574 100644 --- a/libraries/osgi/src/test/java/org/apache/zest/library/osgi/DocumentationSupport.java +++ b/libraries/osgi/src/test/java/org/apache/zest/library/osgi/DocumentationSupport.java @@ -31,7 +31,7 @@ public class DocumentationSupport { // START SNIPPET: export - interface MyQi4jService + interface MyZestService extends OSGiEnabledService { // ... @@ -49,7 +49,7 @@ public class DocumentationSupport // START SNIPPET: export module.services( OSGiServiceExporter.class ). setMetaInfo( bundleContext ); - module.services( MyQi4jService.class ); + module.services( MyZestService.class ); } // END SNIPPET: export http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/osgi/src/test/java/org/apache/zest/library/osgi/OSGiServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/osgi/src/test/java/org/apache/zest/library/osgi/OSGiServiceTest.java b/libraries/osgi/src/test/java/org/apache/zest/library/osgi/OSGiServiceTest.java index 691b38d..c3a31be 100644 --- a/libraries/osgi/src/test/java/org/apache/zest/library/osgi/OSGiServiceTest.java +++ b/libraries/osgi/src/test/java/org/apache/zest/library/osgi/OSGiServiceTest.java @@ -24,14 +24,14 @@ import org.apache.zest.api.common.UseDefaults; import org.apache.zest.api.property.Property; 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.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; public class OSGiServiceTest - extends AbstractQi4jTest + extends AbstractZestTest { private BundleContext bundleContext; @@ -49,18 +49,18 @@ public class OSGiServiceTest } @Test - public void givenFelixFrameworkWhenStartingQi4jApplicationExpectServiceToBeRegisteredToOsgiBundleContext() + public void givenFelixFrameworkWhenStartingZestApplicationExpectServiceToBeRegisteredToOsgiBundleContext() { MyService service = module.findService( MyService.class ).get(); service.value().set( 15 ); assertEquals( (Integer) 15, service.value().get() ); String[] expectedClasses = new String[] { - "org.qi4j.library.osgi.OSGiServiceTest$MyService", - "org.qi4j.library.osgi.OSGiEnabledService", - "org.qi4j.api.service.ServiceComposite", - "org.qi4j.api.entity.Identity", - "org.qi4j.api.composite.Composite" + "org.apache.zest.library.osgi.OSGiServiceTest$MyService", + "org.apache.zest.library.osgi.OSGiEnabledService", + "org.apache.zest.api.service.ServiceComposite", + "org.apache.zest.api.entity.Identity", + "org.apache.zest.api.composite.Composite" }; verify( bundleContext ).registerService( expectedClasses, service, null );
