http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/jmx/src/main/java/org/qi4j/library/jmx/Qi4jMBeans.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/qi4j/library/jmx/Qi4jMBeans.java b/libraries/jmx/src/main/java/org/qi4j/library/jmx/Qi4jMBeans.java index 9ec0e95..fd71a45 100644 --- a/libraries/jmx/src/main/java/org/qi4j/library/jmx/Qi4jMBeans.java +++ b/libraries/jmx/src/main/java/org/qi4j/library/jmx/Qi4jMBeans.java @@ -20,7 +20,7 @@ import org.qi4j.functional.Iterables; import org.qi4j.functional.Specification; /** - * Helper for working with Qi4j MBeans. + * Helper for working with Zest MBeans. */ public class Qi4jMBeans { @@ -36,7 +36,7 @@ public class Qi4jMBeans return item.getKeyPropertyList().size() == 5; } - }, server.queryNames( new ObjectName( "Qi4j:application=" + applicationName + ",*,service=" + serviceId ), null ) ) ); + }, server.queryNames( new ObjectName( "Zest:application=" + applicationName + ",*,service=" + serviceId ), null ) ) ); } }
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/logging/src/main/java/org/qi4j/logging/debug/service/DebugOnConsoleSideEffect.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/qi4j/logging/debug/service/DebugOnConsoleSideEffect.java b/libraries/logging/src/main/java/org/qi4j/logging/debug/service/DebugOnConsoleSideEffect.java index 14fa3e4..8d369aa 100644 --- a/libraries/logging/src/main/java/org/qi4j/logging/debug/service/DebugOnConsoleSideEffect.java +++ b/libraries/logging/src/main/java/org/qi4j/logging/debug/service/DebugOnConsoleSideEffect.java @@ -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( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); } @Override http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/logging/src/main/java/org/qi4j/logging/debug/service/DebuggingServiceMixin.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/qi4j/logging/debug/service/DebuggingServiceMixin.java b/libraries/logging/src/main/java/org/qi4j/logging/debug/service/DebuggingServiceMixin.java index a77307e..b2fd04f 100644 --- a/libraries/logging/src/main/java/org/qi4j/logging/debug/service/DebuggingServiceMixin.java +++ b/libraries/logging/src/main/java/org/qi4j/logging/debug/service/DebuggingServiceMixin.java @@ -175,6 +175,6 @@ public class DebuggingServiceMixin private String getCompositeName( Composite composite ) { - return first(Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); + return first( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); } } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/logging/src/main/java/org/qi4j/logging/log/service/LoggingServiceMixin.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/qi4j/logging/log/service/LoggingServiceMixin.java b/libraries/logging/src/main/java/org/qi4j/logging/log/service/LoggingServiceMixin.java index 9374913..4360467 100644 --- a/libraries/logging/src/main/java/org/qi4j/logging/log/service/LoggingServiceMixin.java +++ b/libraries/logging/src/main/java/org/qi4j/logging/log/service/LoggingServiceMixin.java @@ -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( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types()).getName(); } } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/osgi/src/main/java/org/qi4j/library/osgi/OSGiServiceExporter.java ---------------------------------------------------------------------- diff --git a/libraries/osgi/src/main/java/org/qi4j/library/osgi/OSGiServiceExporter.java b/libraries/osgi/src/main/java/org/qi4j/library/osgi/OSGiServiceExporter.java index 5c41d59..0f3ee7d 100644 --- a/libraries/osgi/src/main/java/org/qi4j/library/osgi/OSGiServiceExporter.java +++ b/libraries/osgi/src/main/java/org/qi4j/library/osgi/OSGiServiceExporter.java @@ -35,7 +35,7 @@ import org.qi4j.functional.Iterables; import static org.qi4j.api.util.Classes.interfacesOf; /** - * Export Qi4j services to an OSGi Bundle. + * Export Zest services to an OSGi Bundle. */ @Mixins( OSGiServiceExporter.OSGiServiceExporterMixin.class ) @Activators( OSGiServiceExporter.Activator.class ) http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/osgi/src/main/java/org/qi4j/library/osgi/OSGiServiceImporter.java ---------------------------------------------------------------------- diff --git a/libraries/osgi/src/main/java/org/qi4j/library/osgi/OSGiServiceImporter.java b/libraries/osgi/src/main/java/org/qi4j/library/osgi/OSGiServiceImporter.java index f6250a7..3f302f6 100644 --- a/libraries/osgi/src/main/java/org/qi4j/library/osgi/OSGiServiceImporter.java +++ b/libraries/osgi/src/main/java/org/qi4j/library/osgi/OSGiServiceImporter.java @@ -30,7 +30,7 @@ import org.qi4j.api.service.ServiceImporterException; import org.qi4j.api.service.ServiceUnavailableException; /** - * Import OSGi services in a Qi4j Module. + * Import OSGi services in a Zest Module. */ public class OSGiServiceImporter implements ServiceImporter http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jEntity.java ---------------------------------------------------------------------- diff --git a/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jEntity.java b/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jEntity.java index e021b55..f6d357c 100644 --- a/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jEntity.java +++ b/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jEntity.java @@ -19,7 +19,7 @@ import org.openrdf.model.impl.URIImpl; /** - * This is the RDF vocabulary for Qi4j Entity data. + * This is the RDF vocabulary for Zest Entity data. */ public interface Qi4jEntity { http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jEntityType.java ---------------------------------------------------------------------- diff --git a/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jEntityType.java b/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jEntityType.java index 96d1367..5a16e25 100644 --- a/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jEntityType.java +++ b/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jEntityType.java @@ -19,7 +19,7 @@ import org.openrdf.model.impl.URIImpl; /** - * This is the RDF vocabulary for Qi4j EntityType data. + * This is the RDF vocabulary for Zest EntityType data. */ public interface Qi4jEntityType { http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jRdf.java ---------------------------------------------------------------------- diff --git a/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jRdf.java b/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jRdf.java index 26ec8b4..98fd120 100644 --- a/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jRdf.java +++ b/libraries/rdf/src/main/java/org/qi4j/library/rdf/Qi4jRdf.java @@ -19,7 +19,7 @@ import org.openrdf.model.impl.URIImpl; /** - * This is the RDF vocabulary for Qi4j. + * This is the RDF vocabulary for Zest. */ public interface Qi4jRdf { http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/rest-client/src/test/java/org/qi4j/library/rest/client/RssReaderTest.java ---------------------------------------------------------------------- diff --git a/libraries/rest-client/src/test/java/org/qi4j/library/rest/client/RssReaderTest.java b/libraries/rest-client/src/test/java/org/qi4j/library/rest/client/RssReaderTest.java index 42e9433..961ef5b 100644 --- a/libraries/rest-client/src/test/java/org/qi4j/library/rest/client/RssReaderTest.java +++ b/libraries/rest-client/src/test/java/org/qi4j/library/rest/client/RssReaderTest.java @@ -54,7 +54,7 @@ import static org.qi4j.test.util.Assume.assumeConnectivity; /** * Reads Qi4j Github commits on develop ATOM feed and prints out all title and detail url for each entry. - * This is an example of how to use the RSS client for something more generic that was not produced by Qi4j REST server + * This is an example of how to use the RSS client for something more generic that was not produced by Zest REST server * library. */ public class RssReaderTest http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/rest/src/main/java/org/qi4j/library/rest/admin/Qi4jServerServlet.java ---------------------------------------------------------------------- diff --git a/libraries/rest/src/main/java/org/qi4j/library/rest/admin/Qi4jServerServlet.java b/libraries/rest/src/main/java/org/qi4j/library/rest/admin/Qi4jServerServlet.java index 8f2dd06..28682fc 100644 --- a/libraries/rest/src/main/java/org/qi4j/library/rest/admin/Qi4jServerServlet.java +++ b/libraries/rest/src/main/java/org/qi4j/library/rest/admin/Qi4jServerServlet.java @@ -21,7 +21,7 @@ import org.restlet.Context; import org.restlet.ext.servlet.ServerServlet; /** - * Integration with Qi4j. Register an object extending Application to use. + * Integration with Zest. Register an object extending Application to use. */ public class Qi4jServerServlet extends ServerServlet http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/servlet/src/main/java/org/qi4j/library/servlet/Qi4jServletSupport.java ---------------------------------------------------------------------- diff --git a/libraries/servlet/src/main/java/org/qi4j/library/servlet/Qi4jServletSupport.java b/libraries/servlet/src/main/java/org/qi4j/library/servlet/Qi4jServletSupport.java index d1c7570..3e404e4 100644 --- a/libraries/servlet/src/main/java/org/qi4j/library/servlet/Qi4jServletSupport.java +++ b/libraries/servlet/src/main/java/org/qi4j/library/servlet/Qi4jServletSupport.java @@ -28,7 +28,7 @@ public final class Qi4jServletSupport */ public static Application application( ServletContext servletContext ) { - return ( Application ) servletContext.getAttribute( APP_IN_CTX ); // TODO try/catch and find a suitable Qi4j exception + return ( Application ) servletContext.getAttribute( APP_IN_CTX ); // TODO try/catch and find a suitable Zest exception } private Qi4jServletSupport() http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/servlet/src/main/java/org/qi4j/library/servlet/lifecycle/AbstractQi4jServletBootstrap.java ---------------------------------------------------------------------- diff --git a/libraries/servlet/src/main/java/org/qi4j/library/servlet/lifecycle/AbstractQi4jServletBootstrap.java b/libraries/servlet/src/main/java/org/qi4j/library/servlet/lifecycle/AbstractQi4jServletBootstrap.java index 43c75fa..2a3607c 100644 --- a/libraries/servlet/src/main/java/org/qi4j/library/servlet/lifecycle/AbstractQi4jServletBootstrap.java +++ b/libraries/servlet/src/main/java/org/qi4j/library/servlet/lifecycle/AbstractQi4jServletBootstrap.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; /** * Abstract ServletContextListener implementing ApplicationAssembler. * - * Extends this class to easily bind a Qi4j Application activation/passivation to your webapp lifecycle. + * Extends this class to easily bind a Zest Application activation/passivation to your webapp lifecycle. * * The {@link Application} is set as a {@link ServletContext} attribute named using a constant. * In your servlets, filters, whatever has access to the {@link ServletContext} use the following code to get a @@ -62,10 +62,10 @@ public abstract class AbstractQi4jServletBootstrap { private static final Logger LOGGER = LoggerFactory.getLogger( Qi4jServlet.class.getPackage().getName() ); - // Qi4j Runtime + // Zest Runtime protected Qi4j api; protected Energy4Java qi4j; - // Qi4j Application + // Zest Application protected ApplicationDescriptor applicationModel; protected Application application; @@ -122,7 +122,7 @@ public abstract class AbstractQi4jServletBootstrap afterApplicationPassivation( application ); } } catch ( Exception ex ) { - LOGGER.warn( "Unable to passivate Qi4j Application.", ex ); + LOGGER.warn( "Unable to passivate Zest Application.", ex ); } } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/Qi4jApplicationBootstrap.java ---------------------------------------------------------------------- diff --git a/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/Qi4jApplicationBootstrap.java b/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/Qi4jApplicationBootstrap.java index dccc63d..a60661b 100644 --- a/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/Qi4jApplicationBootstrap.java +++ b/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/Qi4jApplicationBootstrap.java @@ -22,9 +22,9 @@ import org.qi4j.bootstrap.ModuleAssembly; import org.springframework.context.ApplicationContextAware; /** - * Run a Qi4j Application as a Spring Bean and export its Services to Spring. + * Run a Zest Application as a Spring Bean and export its Services to Spring. * <p> - * Steps to export Qi4j service: + * Steps to export Zest service: * </p> * <ul> * <li>Create spring BeanFactory service of qi4j services to export.</li> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/internal/application/Qi4jBootstrapBeanDefinitionParser.java ---------------------------------------------------------------------- diff --git a/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/internal/application/Qi4jBootstrapBeanDefinitionParser.java b/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/internal/application/Qi4jBootstrapBeanDefinitionParser.java index 14b1389..fb875b3 100644 --- a/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/internal/application/Qi4jBootstrapBeanDefinitionParser.java +++ b/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/internal/application/Qi4jBootstrapBeanDefinitionParser.java @@ -60,7 +60,7 @@ public final class Qi4jBootstrapBeanDefinitionParser bootstrapClass = forName( bootstrapClassString, getClass().getClassLoader() ); } catch ( ClassNotFoundException e ) { - readerContext.error( "Qi4j bootstrap class [" + bootstrapClassString + "] is not found.", anElement ); + readerContext.error( "Zest bootstrap class [" + bootstrapClassString + "] is not found.", anElement ); return null; } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/internal/service/ServiceFactoryBean.java ---------------------------------------------------------------------- diff --git a/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/internal/service/ServiceFactoryBean.java b/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/internal/service/ServiceFactoryBean.java index b5a143a..76c5bff 100644 --- a/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/internal/service/ServiceFactoryBean.java +++ b/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/internal/service/ServiceFactoryBean.java @@ -40,7 +40,7 @@ public final class ServiceFactoryBean if( serviceReference == null ) { - throw new IllegalArgumentException( "Qi4j service with id [" + aServiceId + "] is not found." ); + throw new IllegalArgumentException( "Zest service with id [" + aServiceId + "] is not found." ); } } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/spring/src/main/java/org/qi4j/library/spring/importer/SpringImporterAssembler.java ---------------------------------------------------------------------- diff --git a/libraries/spring/src/main/java/org/qi4j/library/spring/importer/SpringImporterAssembler.java b/libraries/spring/src/main/java/org/qi4j/library/spring/importer/SpringImporterAssembler.java index 43d1ec3..f7f06f9 100644 --- a/libraries/spring/src/main/java/org/qi4j/library/spring/importer/SpringImporterAssembler.java +++ b/libraries/spring/src/main/java/org/qi4j/library/spring/importer/SpringImporterAssembler.java @@ -30,7 +30,7 @@ public class SpringImporterAssembler private Visibility defaultVisibility; /** - * Import all beans from the given ApplicationContext as services in Qi4j, + * Import all beans from the given ApplicationContext as services in Zest, * using Module as Visibility. * * @param context the Spring ApplicationContext @@ -42,7 +42,7 @@ public class SpringImporterAssembler /** - * Import all beans from the given ApplicationContext as services in Qi4j, + * Import all beans from the given ApplicationContext as services in Zest, * using the specified Visibility level. * * @param context the Spring ApplicationContext http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/sql/src/main/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerService.java ---------------------------------------------------------------------- diff --git a/libraries/sql/src/main/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerService.java b/libraries/sql/src/main/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerService.java index 3642f12..5833f53 100644 --- a/libraries/sql/src/main/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerService.java +++ b/libraries/sql/src/main/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerService.java @@ -142,7 +142,7 @@ public interface DataSourceConfigurationManagerService MBeanInfo mbeanInfo = new MBeanInfo( DataSourceConfiguration.class.getName(), name, attributes.toArray( new MBeanAttributeInfo[ attributes.size() ] ), null, operations.toArray( new MBeanOperationInfo[ operations.size() ] ), null ); Object mbean = new ConfigurableDataSource( dataSourceService, mbeanInfo, name, properties ); - ObjectName configurableDataSourceName = new ObjectName( "Qi4j:application=" + application.name() + ",class=Datasource,name=" + name ); + ObjectName configurableDataSourceName = new ObjectName( "Zest:application=" + application.name() + ",class=Datasource,name=" + name ); server.registerMBean( mbean, configurableDataSourceName ); configurationNames.add( configurableDataSourceName ); } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java b/manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java index 9fe59df..87c37c7 100644 --- a/manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java +++ b/manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java @@ -33,8 +33,8 @@ public class Main public static void main( String[] args ) throws Exception { - // Bootstrap Qi4j Runtime - // Create a Qi4j Runtime + // Bootstrap Zest Runtime + // Create a Zest Runtime qi4j = new Energy4Java(); // Instantiate the Application Model. http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/DCISampleApplication_a.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/DCISampleApplication_a.java b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/DCISampleApplication_a.java index 690261d..292684a 100644 --- a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/DCISampleApplication_a.java +++ b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/DCISampleApplication_a.java @@ -35,7 +35,7 @@ import org.qi4j.sample.dcicargo.sample_a.infrastructure.wicket.tabs.TabsPanel; /** * DCI Sample application instance * - * A Wicket application backed by Qi4j. + * A Wicket application backed by Zest. */ public class DCISampleApplication_a extends WicketQi4jApplication http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java index d4dca15..6191377 100644 --- a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java +++ b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java @@ -70,13 +70,13 @@ import static org.qi4j.api.common.Visibility.application; import static org.qi4j.api.structure.Application.Mode.development; /** - * Qi4j assembly of the DCI Sample application (version A) + * Zest assembly of the DCI Sample application (version A) * - * A Qi4j application structure is declared by an assembly that defines which layers and modules + * A Zest application structure is declared by an assembly that defines which layers and modules * the application has and how they are allowed to depend on each other. Each layer could have it's * own assembly file in larger applications (read more at http://qi4j.org/latest/core-bootstrap-assembly.html). * - * The Qi4j assembly doesn't follow a strict 1-1 correlation between the directory hierarchy and + * The Zest assembly doesn't follow a strict 1-1 correlation between the directory hierarchy and * the assembly structures. An example is the Entities: * * Entities can be promoted to Role Players when they are needed to play a Role in a Context. @@ -88,7 +88,7 @@ import static org.qi4j.api.structure.Application.Mode.development; * Context layer. Note that there are still no "physical" upward dependencies from the Entities to * layers above. * - * So dependency structure layers (ie. as shown by Structure101) are not the same as Qi4j layers. + * So dependency structure layers (ie. as shown by Structure101) are not the same as Zest layers. * See more at http://qi4j.org/latest/core-bootstrap-assembly.html * * TRY THIS: Run VisualizeApplicationStructure to see a cool visualization of the assembly below! http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/communication/query/BookingQueries.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/communication/query/BookingQueries.java b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/communication/query/BookingQueries.java index d4e5b33..6a047f3 100644 --- a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/communication/query/BookingQueries.java +++ b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/communication/query/BookingQueries.java @@ -34,7 +34,7 @@ import org.qi4j.sample.dcicargo.sample_a.infrastructure.model.JSONModel; /** * Booking queries * - * This is in a Qi4j composite since we can then conveniently get the routing service injected. + * This is in a Zest composite since we can then conveniently get the routing service injected. * We could choose to implement all query classes like this too. * * Used by the communication layer only. Can change according to ui needs. http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/WicketQi4jApplication.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/WicketQi4jApplication.java b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/WicketQi4jApplication.java index 08dba41..20e3700 100644 --- a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/WicketQi4jApplication.java +++ b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/WicketQi4jApplication.java @@ -46,7 +46,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Base Wicket Web Application containing the Qi4j application. + * Base Wicket Web Application containing the Zest application. */ public class WicketQi4jApplication extends WebApplication @@ -75,10 +75,10 @@ public class WicketQi4jApplication protected EntityToDTOService valueConverter; /** - * Qi4j Assembler + * Zest Assembler * * To let the custom application class (DCISampleApplication_x) focus on starting up the - * Wicket environment, I made a convention of having Qi4j Assembler files in an 'assembly' + * Wicket environment, I made a convention of having Zest Assembler files in an 'assembly' * folder beside the custom application class. * * There's always only one application file, but we could split the assemblage into several @@ -104,7 +104,7 @@ public class WicketQi4jApplication } catch( ClassNotFoundException e ) { - throw new Exception( "Couldn't find Qi4j assembler in path '" + assemblerPath + "'" ); + throw new Exception( "Couldn't find Zest assembler in path '" + assemblerPath + "'" ); } } @@ -141,21 +141,21 @@ public class WicketQi4jApplication { try { - logger.info( "Starting Qi4j application" ); + logger.info( "Starting Zest application" ); Energy4Java qi4j = new Energy4Java(); qi4jApp = qi4j.newApplication( getAssembler() ); qi4jApp.activate(); qi4jModule = qi4jApp.findModule( defaultLayerName(), defaultModuleName() ); - // Qi4j injects @Structure and @Service elements into this application instance + // Zest injects @Structure and @Service elements into this application instance //qi4jModule.newObject( WicketQi4jApplication.class ); qi4jModule.injectTo( this ); - logger.info( "Started Qi4j application" ); + logger.info( "Started Zest application" ); } catch( Exception e ) { - logger.error( "Could not start Qi4j application." ); + logger.error( "Could not start Zest application." ); e.printStackTrace(); System.exit( 100 ); } @@ -220,7 +220,7 @@ public class WicketQi4jApplication } ); } - // Since Qi4j can only add concrete classes in the assembly, we need to implement a (dummy) getHomePage() + // Since Zest can only add concrete classes in the assembly, we need to implement a (dummy) getHomePage() // method here. Override in wicket application class with a real returned page class. @Override public Class<? extends Page> getHomePage() @@ -238,7 +238,7 @@ public class WicketQi4jApplication try { - logger.info( "Passivating Qi4j application" ); + logger.info( "Passivating Zest application" ); qi4jApp.passivate(); } catch( Exception e ) http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/model/QueryModel.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/model/QueryModel.java b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/model/QueryModel.java index cb0639d..9f374ac 100644 --- a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/model/QueryModel.java +++ b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/model/QueryModel.java @@ -23,7 +23,7 @@ import org.qi4j.api.entity.EntityComposite; import org.qi4j.api.query.Query; /** - * Callback Wicket model that holds a Qi4j Query object that can be called when needed to + * Callback Wicket model that holds a Zest Query object that can be called when needed to * retrieve fresh data. */ public abstract class QueryModel<T, U extends EntityComposite> @@ -53,7 +53,7 @@ public abstract class QueryModel<T, U extends EntityComposite> return dtoList; } - // Callback to retrieve the (unserializable) Qi4j Query object + // Callback to retrieve the (unserializable) Zest Query object public abstract Query<U> getQuery(); public T getValue( U entity ) http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/model/ReadOnlyModel.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/model/ReadOnlyModel.java b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/model/ReadOnlyModel.java index 7e76f0c..f357356 100644 --- a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/model/ReadOnlyModel.java +++ b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/model/ReadOnlyModel.java @@ -23,7 +23,7 @@ import org.qi4j.api.structure.Module; import org.qi4j.sample.dcicargo.sample_a.infrastructure.conversion.EntityToDTOService; /** - * Abstract base model for Wicket model objects taking Qi4j objects. + * Abstract base model for Wicket model objects taking Zest objects. */ public abstract class ReadOnlyModel<T> implements IModel<T> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/DCISampleApplication_b.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/DCISampleApplication_b.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/DCISampleApplication_b.java index 4e5a36f..3225e5b 100644 --- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/DCISampleApplication_b.java +++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/DCISampleApplication_b.java @@ -36,7 +36,7 @@ import org.qi4j.sample.dcicargo.sample_b.infrastructure.wicket.tabs.TabsPanel; /** * DCI Sample application instance * - * A Wicket application backed by Qi4j. + * A Wicket application backed by Zest. */ public class DCISampleApplication_b extends WicketQi4jApplication http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/assembly/Assembler.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/assembly/Assembler.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/assembly/Assembler.java index ce354db..f1d0776 100644 --- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/assembly/Assembler.java +++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/assembly/Assembler.java @@ -72,13 +72,13 @@ import static org.qi4j.api.common.Visibility.application; import static org.qi4j.api.structure.Application.Mode.development; /** - * Qi4j assembly of the DCI Sample application (version B) + * Zest assembly of the DCI Sample application (version B) * - * A Qi4j application structure is declared by an assembly that defines which layers and modules + * A Zest application structure is declared by an assembly that defines which layers and modules * the application has and how they are allowed to depend on each other. Each layer could have it's * own assembly file in larger applications. * - * The Qi4j assembly doesn't strictly map 1-1 to the directory hierarchy and the assembly + * The Zest assembly doesn't strictly map 1-1 to the directory hierarchy and the assembly * structures. An example is the Entities: * * Data objects (Entities and ValuesComposites) can be promoted to Role Players when they are http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/BookingQueries.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/BookingQueries.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/BookingQueries.java index 12c3bbb..a224f17 100644 --- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/BookingQueries.java +++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/BookingQueries.java @@ -35,7 +35,7 @@ import org.qi4j.sample.dcicargo.sample_b.infrastructure.model.JSONModel; /** * Booking queries * - * Implemented as a Qi4j composite since we can then conveniently get the routing service injected. + * Implemented as a Zest composite since we can then conveniently get the routing service injected. * We could choose to implement all query classes like this too. * * Used by the communication layer only. Can change according to ui needs. http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/dto/CargoDTO.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/dto/CargoDTO.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/dto/CargoDTO.java index eb24f6e..d9ca4ef 100644 --- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/dto/CargoDTO.java +++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/dto/CargoDTO.java @@ -30,7 +30,7 @@ import org.qi4j.sample.dcicargo.sample_b.infrastructure.conversion.DTO; /** * Cargo DTO * - * Qi4j-comment: + * Zest-comment: * We need the @Unqualified annotation since the CargoDTO interface has other properties than {@link Cargo} * so that properties can not be directly mapped when we convert from entity to immutable value DTO. * With the annotation, property access methods are compared by name instead. http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/dto/HandlingEventDTO.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/dto/HandlingEventDTO.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/dto/HandlingEventDTO.java index 08a9ea2..c0a21b2 100644 --- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/dto/HandlingEventDTO.java +++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/communication/query/dto/HandlingEventDTO.java @@ -29,7 +29,7 @@ import org.qi4j.sample.dcicargo.sample_b.infrastructure.conversion.DTO; /** * HandlingEvent DTO * - * Qi4j-comment: + * Zest-comment: * We need the @Unqualified annotation since the HandlingEventDTO interface has other properties than * {@link HandlingEvent} so that properties can not be directly mapped when we convert from entity to * immutable value DTO. With the annotation, property access methods are compared by name instead. http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/WicketQi4jApplication.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/WicketQi4jApplication.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/WicketQi4jApplication.java index 1057bc6..63dcf0d 100644 --- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/WicketQi4jApplication.java +++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/WicketQi4jApplication.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; /** * WicketQi4jApplication * - * Base Wicket Web Application containing the Qi4j application. + * Base Wicket Web Application containing the Zest application. */ public class WicketQi4jApplication extends WebApplication @@ -63,10 +63,10 @@ public class WicketQi4jApplication protected EntityToDTOService valueConverter; /** - * Qi4j Assembler + * Zest Assembler * * To let the custom application class (DCISampleApplication_x) focus on starting up the - * Wicket environment, I made a convention of having Qi4j Assembler files in an 'assembly' + * Wicket environment, I made a convention of having Zest Assembler files in an 'assembly' * folder beside the custom application class. * * There's always only one application file, but we could split the assemblage into several @@ -93,7 +93,7 @@ public class WicketQi4jApplication } catch( ClassNotFoundException e ) { - throw new Exception( "Couldn't find Qi4j assembler in path '" + assemblerPath + "'" ); + throw new Exception( "Couldn't find Zest assembler in path '" + assemblerPath + "'" ); } } @@ -130,20 +130,20 @@ public class WicketQi4jApplication { try { - logger.info( "Starting Qi4j application" ); + logger.info( "Starting Zest application" ); Energy4Java qi4j = new Energy4Java(); qi4jApp = qi4j.newApplication( getAssembler() ); qi4jApp.activate(); qi4jModule = qi4jApp.findModule( defaultLayerName(), defaultModuleName() ); - // Qi4j injects @Structure and @Service elements into this application instance + // Zest injects @Structure and @Service elements into this application instance qi4jModule.injectTo( this ); - logger.info( "Started Qi4j application" ); + logger.info( "Started Zest application" ); } catch( Exception e ) { - logger.error( "Could not start Qi4j application." ); + logger.error( "Could not start Zest application." ); e.printStackTrace(); System.exit( 100 ); } @@ -202,7 +202,7 @@ public class WicketQi4jApplication } ); } - // Since Qi4j can only add concrete classes in the assembly, we need to implement a (dummy) getHomePage() + // Since Zest can only add concrete classes in the assembly, we need to implement a (dummy) getHomePage() // method here. Override in wicket application class with a real returned page class. @Override public Class<? extends Page> getHomePage() @@ -220,7 +220,7 @@ public class WicketQi4jApplication try { - logger.info( "Passivating Qi4j application" ); + logger.info( "Passivating Zest application" ); qi4jApp.passivate(); } catch( Exception e ) http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/conversion/DTO.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/conversion/DTO.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/conversion/DTO.java index 6d8e973..1ee78b3 100644 --- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/conversion/DTO.java +++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/conversion/DTO.java @@ -25,7 +25,7 @@ import org.qi4j.api.value.ValueComposite; * * Base class for DTOs * - * Qi4j-comment: + * Zest-comment: * ValueComposites that extend DTO are candidates to have association types converted and * assigned in the EntityToDTOService. */ http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/EntityModel.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/EntityModel.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/EntityModel.java index c4c267c..a653103 100644 --- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/EntityModel.java +++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/EntityModel.java @@ -27,10 +27,10 @@ import org.qi4j.sample.dcicargo.sample_b.infrastructure.conversion.DTO; /** * EntityModel * - * A Wicket Model that bridges to our Qi4j data store. + * A Wicket Model that bridges to our Zest data store. * * In Wicket we need to be able to pass around serializable data that can be "detachable". - * Qi4j entities are therefore lazy loaded with a class and identity through our UnitOfWork + * Zest entities are therefore lazy loaded with a class and identity through our UnitOfWork * and then converted to a DTO ValueComposite. */ public class EntityModel<T extends DTO, U extends EntityComposite> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/QueryModel.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/QueryModel.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/QueryModel.java index b25f25d..eabf703 100644 --- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/QueryModel.java +++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/QueryModel.java @@ -25,7 +25,7 @@ import org.qi4j.api.query.Query; /** * QueryModel * - * Callback Wicket model that holds a Qi4j Query object that can be called when needed to + * Callback Wicket model that holds a Zest Query object that can be called when needed to * retrieve fresh data. */ public abstract class QueryModel<T, U extends EntityComposite> @@ -55,7 +55,7 @@ public abstract class QueryModel<T, U extends EntityComposite> return dtoList; } - // Callback to retrieve the (unserializable) Qi4j Query object + // Callback to retrieve the (unserializable) Zest Query object public abstract Query<U> getQuery(); public T getValue( U entity ) http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/ReadOnlyModel.java ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/ReadOnlyModel.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/ReadOnlyModel.java index 862663f..8eadb4f 100644 --- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/ReadOnlyModel.java +++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/model/ReadOnlyModel.java @@ -25,7 +25,7 @@ import org.qi4j.sample.dcicargo.sample_b.infrastructure.conversion.EntityToDTOSe /** * ReadOnlyModel * - * Abstract base model for Wicket model objects taking Qi4j objects. + * Abstract base model for Wicket model objects taking Zest objects. */ public abstract class ReadOnlyModel<T> implements IModel<T> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/rental/src/main/java/org/qi4j/sample/rental/web/QuikitServlet.java ---------------------------------------------------------------------- diff --git a/samples/rental/src/main/java/org/qi4j/sample/rental/web/QuikitServlet.java b/samples/rental/src/main/java/org/qi4j/sample/rental/web/QuikitServlet.java index 0c4a1dc..f43328b 100644 --- a/samples/rental/src/main/java/org/qi4j/sample/rental/web/QuikitServlet.java +++ b/samples/rental/src/main/java/org/qi4j/sample/rental/web/QuikitServlet.java @@ -108,7 +108,7 @@ public class QuikitServlet } catch( Exception e ) { - throw new ServletException( "Can not initialize Qi4j.", e ); + throw new ServletException( "Can not initialize Zest.", e ); } } @@ -150,7 +150,7 @@ public class QuikitServlet } catch( Exception e ) { - throw new RuntimeException( "Problem to passivate Qi4j", e ); + throw new RuntimeException( "Problem to passivate Zest", e ); } } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/samples/sql-support/src/main/java/org/qi4j/sample/sqlsupport/Main.java ---------------------------------------------------------------------- diff --git a/samples/sql-support/src/main/java/org/qi4j/sample/sqlsupport/Main.java b/samples/sql-support/src/main/java/org/qi4j/sample/sqlsupport/Main.java index 9eed9c7..bf529a7 100644 --- a/samples/sql-support/src/main/java/org/qi4j/sample/sqlsupport/Main.java +++ b/samples/sql-support/src/main/java/org/qi4j/sample/sqlsupport/Main.java @@ -60,7 +60,7 @@ public class Main try { application.passivate(); } catch ( Exception ex ) { - System.err.println( "Unable to passivate Qi4j application!" ); + System.err.println( "Unable to passivate Zest application!" ); ex.printStackTrace(); } } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/tests/performance/src/perf/java/org/qi4j/test/performance/runtime/composite/CompositeCreationPerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/qi4j/test/performance/runtime/composite/CompositeCreationPerformanceTest.java b/tests/performance/src/perf/java/org/qi4j/test/performance/runtime/composite/CompositeCreationPerformanceTest.java index 6bda3d0..d287907 100644 --- a/tests/performance/src/perf/java/org/qi4j/test/performance/runtime/composite/CompositeCreationPerformanceTest.java +++ b/tests/performance/src/perf/java/org/qi4j/test/performance/runtime/composite/CompositeCreationPerformanceTest.java @@ -186,7 +186,7 @@ public class CompositeCreationPerformanceTest long end = System.currentTimeMillis(); long time = 1000000L * ( end - start ) / iter; - System.out.println( "Minimum Qi4j Object Creation Time:" + time + " nanoseconds per object" ); + System.out.println( "Minimum Zest Object Creation Time:" + time + " nanoseconds per object" ); return time; } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetType.java ---------------------------------------------------------------------- diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetType.java b/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetType.java index db6cc06..a90ecec 100644 --- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetType.java +++ b/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetType.java @@ -46,7 +46,7 @@ public final class Qi4jFacetType extends FacetType<Qi4jFacet, Qi4jFacetConfigura public Qi4jFacetType() { - super( ID, "Qi4jFacet", "Qi4j Facet" ); + super( ID, "Qi4jFacet", "Zest Facet" ); } public final Qi4jFacetConfiguration createDefaultConfiguration() http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java ---------------------------------------------------------------------- diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java b/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java index 945f909..de96adf 100644 --- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java +++ b/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java @@ -39,7 +39,7 @@ public final class Qi4jFacetEditorTab extends FacetEditorTab @Nls public final String getDisplayName() { - return "Qi4j"; + return "Zest"; } public JComponent createComponent() http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/tools/shell/src/main/java/org/qi4j/tools/shell/Main.java ---------------------------------------------------------------------- diff --git a/tools/shell/src/main/java/org/qi4j/tools/shell/Main.java b/tools/shell/src/main/java/org/qi4j/tools/shell/Main.java index 8da7cff..be15e24 100644 --- a/tools/shell/src/main/java/org/qi4j/tools/shell/Main.java +++ b/tools/shell/src/main/java/org/qi4j/tools/shell/Main.java @@ -44,7 +44,7 @@ public class Main { if( !contains( args, "-q" ) ) { - System.out.println( "Qi4j - Classes are Dead. Long Live Interfaces!" ); + System.out.println( "Zest - Classes are Dead. Long Live Interfaces!" ); System.out.println( "----------------------------------------------\n" ); } if( args.length == 0 ) http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/HelloWorldState.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/HelloWorldState.java b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/HelloWorldState.java index bca11e0..32789b8 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/HelloWorldState.java +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/HelloWorldState.java @@ -23,7 +23,7 @@ package org.qi4j.tutorials.composites.tutorial2; /** * This interface contains only the state * of the HelloWorld object. - * The exceptions will be thrown by Qi4j automatically if + * The exceptions will be thrown by Zest automatically if * null is sent in as values. The parameters would have to be declared * as @Optional if null is allowed. */ http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldMixin.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldMixin.java b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldMixin.java index 1e3216d..ad01382 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldMixin.java +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldMixin.java @@ -23,7 +23,7 @@ package org.qi4j.tutorials.composites.tutorial3; /** * This is the implementation of the HelloWorld * interface. The behaviour and state is mixed. Since parameters - * are mandatory as default in Qi4j there's no need to do null checks. + * are mandatory as default in Zest there's no need to do null checks. */ public class HelloWorldMixin implements HelloWorld http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldState.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldState.java b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldState.java index 86cfb79..68a7e38 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldState.java +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldState.java @@ -21,7 +21,7 @@ package org.qi4j.tutorials.composites.tutorial3; /** * This interface contains only the state * of the HelloWorld Composite. - * The exceptions will be thrown by Qi4j automatically if + * The exceptions will be thrown by Zest automatically if * null is sent in as values. The parameters would have to be declared * as @Optional if null is allowed. */ http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial4/HelloWorldState.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial4/HelloWorldState.java b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial4/HelloWorldState.java index a9e8ef4..d013ed1 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial4/HelloWorldState.java +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial4/HelloWorldState.java @@ -25,7 +25,7 @@ import org.qi4j.api.mixin.Mixins; /** * This interface contains only the state * of the HelloWorld object. - * The exceptions will be thrown by Qi4j automatically if + * The exceptions will be thrown by Zest automatically if * null is sent in as values. The parameters would have to be declared * as @Optional if null is allowed. */ http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/HelloWorldBehaviourMixin.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/HelloWorldBehaviourMixin.java b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/HelloWorldBehaviourMixin.java index 4de402b..5585bef 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/HelloWorldBehaviourMixin.java +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/HelloWorldBehaviourMixin.java @@ -26,7 +26,7 @@ import org.qi4j.api.injection.scope.This; * This is the implementation of the HelloWorld * behaviour interface. * <p> - * This version access the state using Qi4j Properties. + * This version access the state using Zest Properties. * </p> */ public class HelloWorldBehaviourMixin
