You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/12/11 12:13:57 UTC
[1/5] cayenne git commit: CAY-2165 Explicit "contribution" API for
easier expansion of DI collections and maps
Repository: cayenne
Updated Branches:
refs/heads/master dba3dc4b4 -> 22f6bd256
CAY-2165 Explicit "contribution" API for easier expansion of DI collections and maps
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/850eb19a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/850eb19a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/850eb19a
Branch: refs/heads/master
Commit: 850eb19a97ab2e3f862b0e0fd4a3b936bc9a320c
Parents: dba3dc4
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sun Dec 11 14:49:30 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sun Dec 11 14:49:30 2016 +0300
----------------------------------------------------------------------
.../cayenne/java8/CayenneJava8Module.java | 4 +-
.../apache/cayenne/joda/CayenneJodaModule.java | 20 +-
.../configuration/server/ServerModule.java | 233 ++++++++++---------
.../server/DataDomainProviderTest.java | 4 +-
.../server/DefaultDbAdapterFactoryTest.java | 8 +-
.../unit/di/server/ServerCaseModule.java | 4 +-
.../tools/configuration/ToolsModule.java | 5 +-
7 files changed, 144 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/850eb19a/cayenne-java8/src/main/java/org/apache/cayenne/java8/CayenneJava8Module.java
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/main/java/org/apache/cayenne/java8/CayenneJava8Module.java b/cayenne-java8/src/main/java/org/apache/cayenne/java8/CayenneJava8Module.java
index 563c3c0..7a565a6 100644
--- a/cayenne-java8/src/main/java/org/apache/cayenne/java8/CayenneJava8Module.java
+++ b/cayenne-java8/src/main/java/org/apache/cayenne/java8/CayenneJava8Module.java
@@ -20,6 +20,7 @@
package org.apache.cayenne.java8;
import org.apache.cayenne.configuration.Constants;
+import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.java8.access.types.LocalDateTimeType;
@@ -33,8 +34,7 @@ public class CayenneJava8Module implements Module {
@Override
public void configure(Binder binder) {
- binder
- .bindList(Constants.SERVER_DEFAULT_TYPES_LIST)
+ ServerModule.contributeDefaultExtendedTypes(binder)
.add(new LocalDateType())
.add(new LocalTimeType())
.add(new LocalDateTimeType());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/850eb19a/cayenne-joda/src/main/java/org/apache/cayenne/joda/CayenneJodaModule.java
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/main/java/org/apache/cayenne/joda/CayenneJodaModule.java b/cayenne-joda/src/main/java/org/apache/cayenne/joda/CayenneJodaModule.java
index d37e994..0d88053 100644
--- a/cayenne-joda/src/main/java/org/apache/cayenne/joda/CayenneJodaModule.java
+++ b/cayenne-joda/src/main/java/org/apache/cayenne/joda/CayenneJodaModule.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.joda;
*/
import org.apache.cayenne.configuration.Constants;
+import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.joda.access.types.DateTimeType;
@@ -32,17 +33,20 @@ import org.apache.cayenne.joda.access.types.LocalTimeType;
/**
* Include this module when creating a ServerRuntime in order to add support for
* joda-time ObjAttributes.
- *
+ *
* @since 4.0
*/
public class CayenneJodaModule implements Module {
- public CayenneJodaModule() {
- }
+ public CayenneJodaModule() {
+ }
- @Override
- public void configure(Binder binder) {
- binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST).add(new DateTimeType()).add(new LocalDateType())
- .add(new LocalTimeType()).add(new LocalDateTimeType());
- }
+ @Override
+ public void configure(Binder binder) {
+ ServerModule.contributeDefaultExtendedTypes(binder)
+ .add(new DateTimeType())
+ .add(new LocalDateType())
+ .add(new LocalTimeType())
+ .add(new LocalDateTimeType());
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/850eb19a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
index 286edce..5f188de 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
@@ -31,24 +31,7 @@ import org.apache.cayenne.access.translator.batch.BatchTranslatorFactory;
import org.apache.cayenne.access.translator.batch.DefaultBatchTranslatorFactory;
import org.apache.cayenne.access.translator.select.DefaultSelectTranslatorFactory;
import org.apache.cayenne.access.translator.select.SelectTranslatorFactory;
-import org.apache.cayenne.access.types.BigDecimalType;
-import org.apache.cayenne.access.types.BigIntegerType;
-import org.apache.cayenne.access.types.BooleanType;
-import org.apache.cayenne.access.types.ByteArrayType;
-import org.apache.cayenne.access.types.ByteType;
-import org.apache.cayenne.access.types.CalendarType;
-import org.apache.cayenne.access.types.CharType;
-import org.apache.cayenne.access.types.DateType;
-import org.apache.cayenne.access.types.DoubleType;
-import org.apache.cayenne.access.types.FloatType;
-import org.apache.cayenne.access.types.IntegerType;
-import org.apache.cayenne.access.types.LongType;
-import org.apache.cayenne.access.types.ShortType;
-import org.apache.cayenne.access.types.TimeType;
-import org.apache.cayenne.access.types.TimestampType;
-import org.apache.cayenne.access.types.UUIDType;
-import org.apache.cayenne.access.types.UtilDateType;
-import org.apache.cayenne.access.types.VoidType;
+import org.apache.cayenne.access.types.*;
import org.apache.cayenne.ashwood.AshwoodEntitySorter;
import org.apache.cayenne.cache.MapQueryCacheProvider;
import org.apache.cayenne.cache.QueryCache;
@@ -107,130 +90,152 @@ import java.util.GregorianCalendar;
/**
* A DI module containing all Cayenne server runtime configuration.
- *
+ *
* @since 3.1
*/
public class ServerModule implements Module {
- private static final int DEFAULT_MAX_ID_QUALIFIER_SIZE = 10000;
-
- protected String[] configurationLocations;
-
- /**
- * Creates a ServerModule with at least one configuration location. For
- * multi-module projects additional locations can be specified as well.
- */
- public ServerModule(String... configurationLocations) {
-
- if (configurationLocations == null) {
- configurationLocations = new String[0];
- }
-
- this.configurationLocations = configurationLocations;
- }
-
- public void configure(Binder binder) {
-
- // configure global stack properties
- binder.bindMap(Constants.PROPERTIES_MAP).put(Constants.SERVER_MAX_ID_QUALIFIER_SIZE_PROPERTY,
- String.valueOf(DEFAULT_MAX_ID_QUALIFIER_SIZE));
-
- binder.bind(JdbcEventLogger.class).to(CommonsJdbcEventLogger.class);
- binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
- binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
-
- // configure known DbAdapter detectors in reverse order of popularity.
- // Users can
- // add their own to install custom adapters automatically
-
- binder.bindList(Constants.SERVER_ADAPTER_DETECTORS_LIST).add(FirebirdSniffer.class).add(OpenBaseSniffer.class)
- .add(FrontBaseSniffer.class).add(IngresSniffer.class).add(SQLiteSniffer.class).add(DB2Sniffer.class)
- .add(H2Sniffer.class).add(HSQLDBSniffer.class).add(SybaseSniffer.class).add(DerbySniffer.class)
- .add(SQLServerSniffer.class).add(OracleSniffer.class).add(PostgresSniffer.class)
- .add(MySQLSniffer.class);
-
- // configure a filter chain with only one TransactionFilter as default
- binder.bindList(Constants.SERVER_DOMAIN_FILTERS_LIST)
+ private static final int DEFAULT_MAX_ID_QUALIFIER_SIZE = 10000;
+
+ protected String[] configurationLocations;
+
+ /**
+ * Provides access to a DI collection builder for default adapter-agnostic {@link ExtendedType}'s.
+ *
+ * @param binder DI binder passed to the module during injector startup.
+ * @return ListBuilder for ExtendedTypes.
+ * @since 4.0
+ */
+ public static ListBuilder<ExtendedType> contributeDefaultExtendedTypes(Binder binder) {
+ return binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST);
+ }
+
+ /**
+ * Provides access to a DI collection builder for user-provided {@link ExtendedType}'s.
+ *
+ * @param binder DI binder passed to the module during injector startup.
+ * @return ListBuilder for ExtendedTypes.
+ * @since 4.0
+ */
+ public static ListBuilder<ExtendedType> contributeUserExtendedTypes(Binder binder) {
+ return binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ }
+
+ /**
+ * Creates a ServerModule with at least one configuration location. For
+ * multi-module projects additional locations can be specified as well.
+ */
+ public ServerModule(String... configurationLocations) {
+
+ if (configurationLocations == null) {
+ configurationLocations = new String[0];
+ }
+
+ this.configurationLocations = configurationLocations;
+ }
+
+ public void configure(Binder binder) {
+
+ // configure global stack properties
+ binder.bindMap(Constants.PROPERTIES_MAP).put(Constants.SERVER_MAX_ID_QUALIFIER_SIZE_PROPERTY,
+ String.valueOf(DEFAULT_MAX_ID_QUALIFIER_SIZE));
+
+ binder.bind(JdbcEventLogger.class).to(CommonsJdbcEventLogger.class);
+ binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
+ binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
+
+ // configure known DbAdapter detectors in reverse order of popularity.
+ // Users can
+ // add their own to install custom adapters automatically
+
+ binder.bindList(Constants.SERVER_ADAPTER_DETECTORS_LIST).add(FirebirdSniffer.class).add(OpenBaseSniffer.class)
+ .add(FrontBaseSniffer.class).add(IngresSniffer.class).add(SQLiteSniffer.class).add(DB2Sniffer.class)
+ .add(H2Sniffer.class).add(HSQLDBSniffer.class).add(SybaseSniffer.class).add(DerbySniffer.class)
+ .add(SQLServerSniffer.class).add(OracleSniffer.class).add(PostgresSniffer.class)
+ .add(MySQLSniffer.class);
+
+ // configure a filter chain with only one TransactionFilter as default
+ binder.bindList(Constants.SERVER_DOMAIN_FILTERS_LIST)
.add(TransactionFilter.class);
- // configure extended types
- binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST).add(new VoidType()).add(new BigDecimalType())
- .add(new BigIntegerType()).add(new BooleanType()).add(new ByteArrayType(false, true))
- .add(new ByteType(false)).add(new CharType(false, true)).add(new DateType()).add(new DoubleType())
- .add(new FloatType()).add(new IntegerType()).add(new LongType()).add(new ShortType(false))
- .add(new TimeType()).add(new TimestampType()).add(new UtilDateType())
- .add(new CalendarType<GregorianCalendar>(GregorianCalendar.class))
- .add(new CalendarType<Calendar>(Calendar.class)).add(new UUIDType());
- binder.bindList(Constants.SERVER_USER_TYPES_LIST);
- binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
+ // configure extended types
+ contributeDefaultExtendedTypes(binder).add(new VoidType()).add(new BigDecimalType())
+ .add(new BigIntegerType()).add(new BooleanType()).add(new ByteArrayType(false, true))
+ .add(new ByteType(false)).add(new CharType(false, true)).add(new DateType()).add(new DoubleType())
+ .add(new FloatType()).add(new IntegerType()).add(new LongType()).add(new ShortType(false))
+ .add(new TimeType()).add(new TimestampType()).add(new UtilDateType())
+ .add(new CalendarType<GregorianCalendar>(GregorianCalendar.class))
+ .add(new CalendarType<Calendar>(Calendar.class)).add(new UUIDType());
+ contributeUserExtendedTypes(binder);
+ binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
- // configure explicit configurations
- ListBuilder<Object> locationsListBuilder = binder.bindList(Constants.SERVER_PROJECT_LOCATIONS_LIST);
- for (String location : configurationLocations) {
- locationsListBuilder.add(location);
- }
+ // configure explicit configurations
+ ListBuilder<Object> locationsListBuilder = binder.bindList(Constants.SERVER_PROJECT_LOCATIONS_LIST);
+ for (String location : configurationLocations) {
+ locationsListBuilder.add(location);
+ }
- binder.bind(ConfigurationNameMapper.class).to(DefaultConfigurationNameMapper.class);
+ binder.bind(ConfigurationNameMapper.class).to(DefaultConfigurationNameMapper.class);
- binder.bind(EventManager.class).to(DefaultEventManager.class);
+ binder.bind(EventManager.class).to(DefaultEventManager.class);
- binder.bind(QueryCache.class).toProvider(MapQueryCacheProvider.class);
+ binder.bind(QueryCache.class).toProvider(MapQueryCacheProvider.class);
- // a service to provide the main stack DataDomain
- binder.bind(DataDomain.class).toProvider(DataDomainProvider.class);
+ // a service to provide the main stack DataDomain
+ binder.bind(DataDomain.class).toProvider(DataDomainProvider.class);
- binder.bind(DataNodeFactory.class).to(DefaultDataNodeFactory.class);
+ binder.bind(DataNodeFactory.class).to(DefaultDataNodeFactory.class);
- // will return DataDomain for request for a DataChannel
- binder.bind(DataChannel.class).toProvider(DomainDataChannelProvider.class);
+ // will return DataDomain for request for a DataChannel
+ binder.bind(DataChannel.class).toProvider(DomainDataChannelProvider.class);
- binder.bind(ObjectContextFactory.class).to(DataContextFactory.class);
+ binder.bind(ObjectContextFactory.class).to(DataContextFactory.class);
- binder.bind(TransactionFactory.class).to(DefaultTransactionFactory.class);
+ binder.bind(TransactionFactory.class).to(DefaultTransactionFactory.class);
- // a service to load project XML descriptors
- binder.bind(DataChannelDescriptorLoader.class).to(XMLDataChannelDescriptorLoader.class);
- binder.bind(DataChannelDescriptorMerger.class).to(DefaultDataChannelDescriptorMerger.class);
+ // a service to load project XML descriptors
+ binder.bind(DataChannelDescriptorLoader.class).to(XMLDataChannelDescriptorLoader.class);
+ binder.bind(DataChannelDescriptorMerger.class).to(DefaultDataChannelDescriptorMerger.class);
- // a service to load DataMap XML descriptors
- binder.bind(DataMapLoader.class).to(XMLDataMapLoader.class);
+ // a service to load DataMap XML descriptors
+ binder.bind(DataMapLoader.class).to(XMLDataMapLoader.class);
- // a locator of resources, such as XML descriptors
+ // a locator of resources, such as XML descriptors
binder.bind(ResourceLocator.class).to(ClassLoaderResourceLocator.class);
binder.bind(Key.get(ResourceLocator.class, Constants.SERVER_RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
- // a global properties object
- binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
+ // a global properties object
+ binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
- // a service to load DataSourceFactories. DelegatingDataSourceFactory
- // will attempt to find the actual worker factory dynamically on each
- // call depending on DataNodeDescriptor data and the environment
- binder.bind(DataSourceFactory.class).to(DelegatingDataSourceFactory.class);
+ // a service to load DataSourceFactories. DelegatingDataSourceFactory
+ // will attempt to find the actual worker factory dynamically on each
+ // call depending on DataNodeDescriptor data and the environment
+ binder.bind(DataSourceFactory.class).to(DelegatingDataSourceFactory.class);
- binder.bind(SchemaUpdateStrategyFactory.class).to(DefaultSchemaUpdateStrategyFactory.class);
+ binder.bind(SchemaUpdateStrategyFactory.class).to(DefaultSchemaUpdateStrategyFactory.class);
- // a default DBAdapterFactory used to load custom and automatic
- // DbAdapters
- binder.bind(DbAdapterFactory.class).to(DefaultDbAdapterFactory.class);
+ // a default DBAdapterFactory used to load custom and automatic
+ // DbAdapters
+ binder.bind(DbAdapterFactory.class).to(DefaultDbAdapterFactory.class);
- // binding AshwoodEntitySorter without scope, as this is a stateful
- // object and is
- // configured by the owning domain
- binder.bind(EntitySorter.class).to(AshwoodEntitySorter.class).withoutScope();
+ // binding AshwoodEntitySorter without scope, as this is a stateful
+ // object and is
+ // configured by the owning domain
+ binder.bind(EntitySorter.class).to(AshwoodEntitySorter.class).withoutScope();
- binder.bind(BatchTranslatorFactory.class).to(DefaultBatchTranslatorFactory.class);
- binder.bind(SelectTranslatorFactory.class).to(DefaultSelectTranslatorFactory.class);
+ binder.bind(BatchTranslatorFactory.class).to(DefaultBatchTranslatorFactory.class);
+ binder.bind(SelectTranslatorFactory.class).to(DefaultSelectTranslatorFactory.class);
- // a default ObjectMapRetainStrategy used to create objects map for
- // ObjectStore
- binder.bind(ObjectMapRetainStrategy.class).to(DefaultObjectMapRetainStrategy.class);
+ // a default ObjectMapRetainStrategy used to create objects map for
+ // ObjectStore
+ binder.bind(ObjectMapRetainStrategy.class).to(DefaultObjectMapRetainStrategy.class);
- // a default ObjectStoreFactory used to create ObjectStores for contexts
- binder.bind(ObjectStoreFactory.class).to(DefaultObjectStoreFactory.class);
+ // a default ObjectStoreFactory used to create ObjectStores for contexts
+ binder.bind(ObjectStoreFactory.class).to(DefaultObjectStoreFactory.class);
- binder.bind(TransactionManager.class).to(DefaultTransactionManager.class);
- binder.bind(RowReaderFactory.class).to(DefaultRowReaderFactory.class);
+ binder.bind(TransactionManager.class).to(DefaultTransactionManager.class);
+ binder.bind(RowReaderFactory.class).to(DefaultRowReaderFactory.class);
- binder.bind(SQLTemplateProcessor.class).to(VelocitySQLTemplateProcessor.class);
- }
+ binder.bind(SQLTemplateProcessor.class).to(VelocitySQLTemplateProcessor.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/850eb19a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
index b8f4f7e..aa85465 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
@@ -152,8 +152,8 @@ public class DataDomainProviderTest {
binder.bindList(Constants.SERVER_PROJECT_LOCATIONS_LIST).add(testConfigName);
// configure extended types
- binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST);
- binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ ServerModule.contributeDefaultExtendedTypes(binder);
+ ServerModule.contributeUserExtendedTypes(binder);
binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
binder.bind(EventManager.class).toInstance(eventManager);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/850eb19a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
index e3621d7..d2f8dc3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
@@ -108,8 +108,8 @@ public class DefaultDbAdapterFactoryTest {
public void configure(Binder binder) {
binder.bindMap(Constants.PROPERTIES_MAP);
- binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST);
- binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ ServerModule.contributeDefaultExtendedTypes(binder);
+ ServerModule.contributeUserExtendedTypes(binder);
binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
binder.bind(JdbcEventLogger.class).to(CommonsJdbcEventLogger.class);
@@ -145,8 +145,8 @@ public class DefaultDbAdapterFactoryTest {
public void configure(Binder binder) {
binder.bindMap(Constants.PROPERTIES_MAP);
- binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST);
- binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ ServerModule.contributeDefaultExtendedTypes(binder);
+ ServerModule.contributeUserExtendedTypes(binder);
binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
binder.bind(JdbcEventLogger.class).to(CommonsJdbcEventLogger.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/850eb19a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
index abe2a2e..c4475dd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
@@ -52,6 +52,7 @@ import org.apache.cayenne.configuration.ObjectStoreFactory;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.configuration.XMLDataMapLoader;
import org.apache.cayenne.configuration.server.DataSourceFactory;
+import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.conn.DataSourceInfo;
import org.apache.cayenne.dba.DbAdapter;
@@ -157,8 +158,7 @@ public class ServerCaseModule implements Module {
binder.bindMap(Constants.PROPERTIES_MAP);
// configure extended types
- binder
- .bindList(Constants.SERVER_DEFAULT_TYPES_LIST)
+ ServerModule.contributeDefaultExtendedTypes(binder)
.add(new VoidType())
.add(new BigDecimalType())
.add(new BigIntegerType())
http://git-wip-us.apache.org/repos/asf/cayenne/blob/850eb19a/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/ToolsModule.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/ToolsModule.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/ToolsModule.java
index b800ea2..ef8b048 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/ToolsModule.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/ToolsModule.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.configuration.server.DataSourceFactory;
import org.apache.cayenne.configuration.server.DbAdapterFactory;
import org.apache.cayenne.configuration.server.DefaultDbAdapterFactory;
+import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.dba.db2.DB2Sniffer;
import org.apache.cayenne.dba.derby.DerbySniffer;
import org.apache.cayenne.dba.firebird.FirebirdSniffer;
@@ -79,8 +80,8 @@ public class ToolsModule implements Module {
// configure empty global stack properties
binder.bindMap(Constants.PROPERTIES_MAP);
- binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST);
- binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ ServerModule.contributeDefaultExtendedTypes(binder);
+ ServerModule.contributeUserExtendedTypes(binder);
binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
[3/5] cayenne git commit: removing reverse-engineering book ..
Posted by aa...@apache.org.
removing reverse-engineering book ..
we started writing a more Cayenne-centric and contextual version inside cayenne-guide
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2a2de3b4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2a2de3b4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2a2de3b4
Branch: refs/heads/master
Commit: 2a2de3b48238153037bd9078e9561698dec334d6
Parents: 1cab1bb
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sun Dec 11 15:02:26 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sun Dec 11 15:02:26 2016 +0300
----------------------------------------------------------------------
.../getting-started-reverse-engineering/pom.xml | 40 ---
.../src/docbkx/index.xml | 42 ---
.../src/docbkx/reverse-engineering-ch1.xml | 308 -------------------
.../src/docbkx/reverse-engineering-ch2.xml | 206 -------------
.../images/customer-order-ordered_product.png | Bin 29330 -> 0 bytes
.../src/images/customer-order.png | Bin 16562 -> 0 bytes
.../src/images/customer1.png | Bin 9652 -> 0 bytes
.../src/images/customer2.png | Bin 11504 -> 0 bytes
docs/docbook/pom.xml | 1 -
9 files changed, 597 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a2de3b4/docs/docbook/getting-started-reverse-engineering/pom.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-reverse-engineering/pom.xml b/docs/docbook/getting-started-reverse-engineering/pom.xml
deleted file mode 100644
index 3641fa7..0000000
--- a/docs/docbook/getting-started-reverse-engineering/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.cayenne.docs</groupId>
- <artifactId>cayenne-docbook</artifactId>
- <version>4.0.M5-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>getting-started-reverse-engineering</artifactId>
-
- <packaging>jar</packaging>
- <name>getting-started-reverse-engineering: Docbook: Getting Started with Cayenne RE</name>
-
- <build>
- <resources>
- <resource>
- <directory>target/site</directory>
- </resource>
- </resources>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a2de3b4/docs/docbook/getting-started-reverse-engineering/src/docbkx/index.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-reverse-engineering/src/docbkx/index.xml b/docs/docbook/getting-started-reverse-engineering/src/docbkx/index.xml
deleted file mode 100644
index dd8288a..0000000
--- a/docs/docbook/getting-started-reverse-engineering/src/docbkx/index.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you 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.
--->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
- xml:id="getting-started-reverse-engineering" xmlns:xi="http://www.w3.org/2001/XInclude">
- <info>
- <title>Getting Started with Cayenne Reverse Engineering</title>
- <copyright>
- <year>2011-<?dbtimestamp format="Y"?></year>
- <holder>Apache Software Foundation and individual authors</holder>
- </copyright>
- <legalnotice>
- <title>License</title>
- <para>Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to you 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</para>
-
- <para>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.</para>
- </legalnotice>
- </info>
- <xi:include href="reverse-engineering-ch1.xml"/>
- <xi:include href="reverse-engineering-ch2.xml"/>
-</book>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a2de3b4/docs/docbook/getting-started-reverse-engineering/src/docbkx/reverse-engineering-ch1.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-reverse-engineering/src/docbkx/reverse-engineering-ch1.xml b/docs/docbook/getting-started-reverse-engineering/src/docbkx/reverse-engineering-ch1.xml
deleted file mode 100644
index eb6dd33..0000000
--- a/docs/docbook/getting-started-reverse-engineering/src/docbkx/reverse-engineering-ch1.xml
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you 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.
--->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
- <title>Introduction and Basic Usage</title>
- <section xml:id="introduction">
- <title>Introduction</title>
- <para>In Java development there is a well known problem about synchronization Java domain
- model and relationship model in database. Let\u2019s assume you are working on one of
- a shopping application, some of your domain model classes would be Product, Order,
- Shopping Cart and Customer. Considering the above sentence, we have a Java class and database
- table name called \u201cCustomer\u201d.</para>
- <para>Java Class:</para>
- <programlisting language="java">public class Customer {
-
- private int id;
- private String name;
-
- public Customer(){
- // to do your instance initialization stuff here
- }
-
- public Customer(int id,String name){
- this.id = id;
- this.name = name;
- }
-
- // getter and setter method goes here
-
-}</programlisting>
- <para>Database:</para>
- <programlisting language="sql">CREATE TABLE `customer` (
-`id` INT(11) NOT NULL,
-`name` VARCHAR(45) DEFAULT NULL,
-PRIMARY KEY (`id`));</programlisting>
- <para>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="images/customer1.png" scalefit="1" width="100%"/>
- </imageobject>
- </inlinemediaobject>
- </para>
-
- <para>Let\u2019s assume you have to split Customer model \u201cname\u201d field as First name and Last Name
- due to the client requirement. In that case you have to update both Java class and table model manually.
- </para>
- <para>Java Class:</para>
- <programlisting language="java">public class Customer {
-
- private int id;
- private String firstname;
- private String lastname;
- public Customer(){
- // to do your instance initialization stuff here
- }
-
- public Customer(int id,String fname,String lname){
- this.id = id;
- this.firstname = fname;
- this.lastname = lname;
- }
-
- // getter and setter method goes here
-}</programlisting>
- <para>Database:</para>
- <programlisting language="sql">CREATE TABLE `customer` (
-`id` INT(11) NOT NULL,
-`firstname` VARCHAR(45) DEFAULT NULL,
-`lastname` VARCHAR(45) DEFAULT NULL,
-PRIMARY KEY (`id`));</programlisting>
- <para>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="images/customer2.png" scalefit="1" width="100%"/>
- </imageobject>
- </inlinemediaobject>
- </para>
- <para>
- In the above example, synchronization of domain model and database relationship model is manually
- updated by Java developers. In this situation we have to keep both copies of Java classes and
- database tables up to date manually. If you change something in db, that changes should be reflected
- in Java classes. Likewise all Java classes changes should be reflected in database.
- Although it can be automated manually, it will take some cost of time.
- </para>
- <para>
- However, Cayenne automates this process with a minimum cost of time. It has two options for this automation process:
- <itemizedlist>
- <listitem>
- <para>Forward Engineering - Generating db schema according to the Java classes.</para>
- </listitem>
- <listitem>
- <para>Reverse Engineering - Updating Java classes according to the database schema.</para>
- </listitem>
- </itemizedlist>
-
- The reverse engineering tool is called CDBImport.
- </para>
- </section>
- <section xml:id="basic-usage">
- <title>Basic Usage</title>
- <para>
- CDBImport is a Maven/Ant plugin that helps you to do reverse engineering. In other words it helps you to synchronize
- database structure with your Cayenne mapping config. It does not update Java classes by itself, but it synchronizes db
- and data access layer representation in Cayenne mapping file with actual database state.
- Most common practice to complete reverse engineering is to use CDBImport followed by CGen Maven plugin,
- which does class generation according to the Cayenne mapping file updates.
- </para>
- <para>
- You could use CDBImport Maven plugin by declaring and configuring it in your pom.xml.
- See an example with comments below:
- </para>
- <programlisting language="xml"><profile>
- <!-- Here we define a profile with cdbimport and cgen configurations.
- For sure you could define all plugins in general build section, but it will be time consuming
- during each build to load database structure and check it for changes. Also, you will probably want to
- control when exactly reverse engineering happens in order to correct its results if necessary. -->
- <id>ormsync</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cayenne.plugins</groupId>
- <artifactId>maven-cayenne-plugin</artifactId>
- <version><?eval ${project.version}?></version>
- <executions>
- <execution>
- <id>ormsync</id>
- <goals>
- <!-- Again, cdbimport is a part of reverse engineering process.
- Next step is generating Java classes according to their mapping by cgen. -->
- <goal>cdbimport</goal>
- <goal>cgen</goal>
- </goals>
- <configuration>
- <!-- At first, we have to define database connection information
- from which the structure will be loaded. -->
- <driver>com.mysql.jdbc.Driver</driver>
- <url>jdbc:mysql://127.0.0.1:3306/test</url>
- <username>root</username>
- <!--<password>password</password>-->
- <!-- Next step is to define mapping file, which we are going to use.
- If it doesn't exist, it will be created automatically after the first plugin execution.
- Here you could also define some mapping properties. It isn't necessary for cdbimport task, but it will be used by cgen. -->
- <map>${project.basedir}/src/main/resources/shopping.map.xml</map>
- <defaultPackage>org.apache.cayenne.shopping</defaultPackage>
- <superPkg>org.apache.cayenne.shopping.auto</superPkg>
- <!-- Last part of configuration is reverse engineering tuning.
- Here we just define which catalogs we want to process and which tables should be excluded.
- You could find detailed description of possible configurations in the <link xlink:href="http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#mvn-cdbimport">documentation</link>. -->
- <reverseEngineering>
- <catalog>
- <name>test</name>
- <excludeTable>system_patch</excludeTable>
- <excludeTable>v_*</excludeTable>
- <excludeTable>*_view</excludeTable>
- </catalog>
- </reverseEngineering>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <!-- Also, you have to add JDBC driver dependency. -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.28</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-</profile></programlisting>
- <para>
- Let\u2019s consider that shopping application consists of the following tables and relationships in database.
- Initially, we are going to take customer, order tables and one foreign key relationship between them.
- </para>
- <para>Database:</para>
- <programlisting language="sql">CREATE TABLE `customer` (
-`id` INT(11) NOT NULL,
-`name` VARCHAR(50) DEFAULT NULL,
-PRIMARY KEY (`id`));
-
-CREATE TABLE `order` (
-`id` INT(11) NOT NULL,
-`amount` DECIMAL(6,2) DEFAULT NULL,
-`customer_id` INT(11) DEFAULT NULL,
-PRIMARY KEY (`id`),
-KEY `fk_customers_id_idx` (`customer_id`),
-CONSTRAINT `fk_customers_id_refference` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`id`)
-ON DELETE CASCADE ON UPDATE CASCADE);</programlisting>
- <para>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="images/customer-order.png" scalefit="1" width="100%"/>
- </imageobject>
- </inlinemediaobject>
- </para>
- <para>
- Now, please arrange the profile above for your custom DB settings. That\u2019s all you need to do for reverse
- engineering with Cayenne. Now you are able to run the reverse engineering task as described below.
- </para>
- <screen><prompt>$</prompt> mvn compile -Pormsync</screen>
- <para>The output should look like this:</para>
- <screen>[INFO] Scanning for projects...
-[INFO]
-[INFO] ------------------------------------------------------------------------
-[INFO] Building MySQLTest 0.0.1-SNAPSHOT
-[INFO] ------------------------------------------------------------------------
-[INFO]
-[INFO] --- maven-cayenne-plugin:4.0.M3:cdbimport (ormsync) @ MySQLTest ---
-Aug 16, 2016 3:36:41 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 3:36:41 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 3:36:41 PM org.apache.cayenne.log.CommonsJdbcEventLogger log
-INFO: Detected and installed adapter: org.apache.cayenne.dba.mysql.MySQLAdapter
-Aug 16, 2016 3:36:41 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 3:36:41 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 3:36:41 PM org.apache.cayenne.access.DbLoader load
-INFO: Schema loading...
-Aug 16, 2016 3:36:41 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 3:36:41 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 3:36:41 PM org.apache.cayenne.log.CommonsJdbcEventLogger log
-INFO: Detected and installed adapter: org.apache.cayenne.dba.mysql.MySQLAdapter
-[INFO] Table: test.customer
-[INFO] Table: test.order
-[INFO] Db Relationship : toOne (order.customer_id, customer.id)
-[INFO] Db Relationship : toMany (customer.id, order.customer_id)
-[INFO]
-[INFO] Map file does not exist. Loaded db model will be saved into '**/MySQLTest/src/main/resources/shopping.map.xml'
-[INFO]
-[INFO] --- maven-cayenne-plugin:4.0.M3:cgen (ormsync) @ MySQLTest ---
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_Customer.java
-[INFO] Generating class file:**/MySQLTest/src/main/java/org/apache/cayenne/shopping/Customer.java
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_Order.java
-[INFO] Generating class file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/Order.java
-[INFO]</screen>
- <para>
- Above output demonstrates what was loaded from database (test.order, test.customer tables and customer_id relationships)
- by cdbimport task and which classes was generated by cgen task.
- </para>
- <para>
- In the example we assume that you don't have a mapping file. But if you have, it will contain the relationship between
- Java class and database table. Note that if there is no mapping file, Cayenne will generate it automatically and store it
- under the resource folder specified by <map> property.
- </para>
-
- <para>
- Notice that cdbimport updates only one file in your source code: mapping file that you pointed in <map> maven option.
- If you do reverse engineering again (mvn compile -Pormsync), plug-in will load all information from database but say that
- no changes are detected. On the other hand, cgen task will regenerate superclasses (_Customer.java, _Order.java),
- but not subclasses (Customer.java, Order.java).
- </para>
- <para>Console will provide the following output:</para>
- <screen>[INFO] Scanning for projects...
-[INFO]
-[INFO] ------------------------------------------------------------------------
-[INFO] Building MySQLTest 0.0.1-SNAPSHOT
-[INFO] ------------------------------------------------------------------------
-[INFO]
-[INFO] --- maven-cayenne-plugin:4.0.M3:cdbimport (ormsync) @ MySQLTest ---
-Aug 16, 2016 4:44:33 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 4:44:33 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 4:44:33 PM org.apache.cayenne.log.CommonsJdbcEventLogger log
-INFO: Detected and installed adapter: org.apache.cayenne.dba.mysql.MySQLAdapter
-Aug 16, 2016 4:44:33 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 4:44:33 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 4:44:33 PM org.apache.cayenne.access.DbLoader load
-INFO: Schema loading...
-Aug 16, 2016 4:44:33 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 4:44:34 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 4:44:34 PM org.apache.cayenne.log.CommonsJdbcEventLogger log
-INFO: Detected and installed adapter: org.apache.cayenne.dba.mysql.MySQLAdapter
-[INFO] Table: test.customer
-[INFO] Table: test.order
-[INFO] Db Relationship : toOne (order.customer_id, customer.id)
-[INFO] Db Relationship : toMany (customer.id, order.customer_id)
-[INFO]
-[INFO] Detected changes: No changes to import.
-[INFO]
-[INFO] --- maven-cayenne-plugin:4.0.M3:cgen (ormsync) @ MySQLTest ---
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_Customer.java
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_Order.java
-[INFO]</screen>
- </section>
-</chapter>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a2de3b4/docs/docbook/getting-started-reverse-engineering/src/docbkx/reverse-engineering-ch2.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-reverse-engineering/src/docbkx/reverse-engineering-ch2.xml b/docs/docbook/getting-started-reverse-engineering/src/docbkx/reverse-engineering-ch2.xml
deleted file mode 100644
index 65d06c0..0000000
--- a/docs/docbook/getting-started-reverse-engineering/src/docbkx/reverse-engineering-ch2.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you 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.
--->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
- <title>A few hands-on examples</title>
- <section xml:id="renaming-table-column-example">
- <title>Renaming table column example</title>
- <para>
- Let's rename "name" column from the Customer table to the "first_name".
- </para>
- <para>
- Database:
- </para>
- <programlisting language="sql">ALTER TABLE `customer`
-CHANGE COLUMN `name` `first_name` VARCHAR(50) NULL DEFAULT NULL ;</programlisting>
- <para>
- Now we can do reverse engineering again by the command we already know:
- </para>
- <screen><prompt>$</prompt> mvn compile -Pormsync</screen>
- <para>The output should look like this:</para>
- <screen>[INFO] Scanning for projects...
-[INFO]
-[INFO] ------------------------------------------------------------------------
-[INFO] Building MySQLTest 0.0.1-SNAPSHOT
-[INFO] ------------------------------------------------------------------------
-[INFO]
-[INFO] --- maven-cayenne-plugin:4.0.M3:cdbimport (ormsync) @ MySQLTest ---
-Aug 16, 2016 5:07:31 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 5:07:32 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 5:07:32 PM org.apache.cayenne.log.CommonsJdbcEventLogger log
-INFO: Detected and installed adapter: org.apache.cayenne.dba.mysql.MySQLAdapter
-Aug 16, 2016 5:07:32 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 5:07:32 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 5:07:32 PM org.apache.cayenne.access.DbLoader load
-INFO: Schema loading...
-Aug 16, 2016 5:07:32 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 5:07:32 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 5:07:32 PM org.apache.cayenne.log.CommonsJdbcEventLogger log
-INFO: Detected and installed adapter: org.apache.cayenne.dba.mysql.MySQLAdapter
-[INFO] Table: test.customer
-[INFO] Table: test.order
-[INFO] Db Relationship : toOne (order.customer_id, customer.id)
-[INFO] Db Relationship : toMany (customer.id, order.customer_id)
-[INFO]
-[INFO] Detected changes:
-[INFO] Add Column customer.first_name
-[INFO] Drop Column customer.name
-[INFO]
-[INFO] Migration Complete Successfully.
-[INFO]
-[INFO] --- maven-cayenne-plugin:4.0.M3:cgen (ormsync) @ MySQLTest ---
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_Customer.java
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_Order.java
-[INFO]</screen>
- <para>
- As you could see, cdbimport task found and applied our changes to the model. Then, superclasses was updated by
- cgen task to catch our changes. Notice that Cayenne treated a column renaming change as dropping and adding
- a new column, because it can\u2019t really track the renaming change.
- </para>
- </section>
- <section xml:id="renaming-objattribute-example">
- <title>Renaming ObjAttribute example</title>
- <para>
- Let\u2019s rename an "amount" ObjAttribute name to "totalPrice" in Order ObjectEntity. After running
- reverse engineering task, the output will show you no changes to import:
- </para>
- <screen>[INFO] Scanning for projects...
-[INFO]
-[INFO] ------------------------------------------------------------------------
-[INFO] Building MySQLTest 0.0.1-SNAPSHOT
-[INFO] ------------------------------------------------------------------------
-[INFO]
-[INFO] --- maven-cayenne-plugin:4.0.M3:cdbimport (ormsync) @ MySQLTest ---
-Aug 16, 2016 5:26:53 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 5:26:53 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 5:26:53 PM org.apache.cayenne.log.CommonsJdbcEventLogger log
-INFO: Detected and installed adapter: org.apache.cayenne.dba.mysql.MySQLAdapter
-Aug 16, 2016 5:26:53 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 5:26:53 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 5:26:53 PM org.apache.cayenne.access.DbLoader load
-INFO: Schema loading...
-Aug 16, 2016 5:26:53 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 5:26:53 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 5:26:53 PM org.apache.cayenne.log.CommonsJdbcEventLogger log
-INFO: Detected and installed adapter: org.apache.cayenne.dba.mysql.MySQLAdapter
-[INFO] Table: test.customer
-[INFO] Table: test.order
-[INFO] Db Relationship : toOne (order.customer_id, customer.id)
-[INFO] Db Relationship : toMany (customer.id, order.customer_id)
-[INFO]
-[INFO] Detected changes: No changes to import.
-[INFO]
-[INFO] --- maven-cayenne-plugin:4.0.M3:cgen (ormsync) @ MySQLTest ---
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_Customer.java
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_Order.java
-[INFO]</screen>
- <para>
- As you could see, cdbimport task didn't detect any changes. Whenever you change anything in \u201cobj-attribute\u201d xml element
- it will not reflect anything on the database side. But your changes will be reflected in auto generated java classes
- by cgen task.
- </para>
- </section>
- <section xml:id="adding-table-relationships-example">
- <title>Adding table and relationships example</title>
- <para>
- In this section we are going to add a new table "ordered_product" with foreign key relationships between the existing tables.
- So our schema will look as follows:
- </para>
- <para>
- SQL
- </para>
- <programlisting language="sql">CREATE TABLE `ordered_product` (
-`customer_order_id` INT(11) NOT NULL,
-`product_id` INT(11) DEFAULT NULL,
-`quantity` SMALLINT(6) DEFAULT NULL,
-PRIMARY KEY (`customer_order_id`),
-KEY `fk_product_references_idx` (`product_id`),
-CONSTRAINT `fk_order_references` FOREIGN KEY (`customer_order_id`) REFERENCES `order` (`id`)
-ON DELETE CASCADE ON UPDATE CASCADE);</programlisting>
- <para>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="images/customer-order-ordered_product.png" scalefit="1" width="100%"/>
- </imageobject>
- </inlinemediaobject>
- </para>
- <para>
- After running the reverse engineering task again as described in the previous examples, the new output will
- show a few actual DB operations:
- </para>
- <screen>[INFO] Scanning for projects...
-[INFO]
-[INFO] ------------------------------------------------------------------------
-[INFO] Building MySQLTest 0.0.1-SNAPSHOT
-[INFO] ------------------------------------------------------------------------
-[INFO]
-[INFO] --- maven-cayenne-plugin:4.0.M3:cdbimport (ormsync) @ MySQLTest ---
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.log.CommonsJdbcEventLogger log
-INFO: Detected and installed adapter: org.apache.cayenne.dba.mysql.MySQLAdapter
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.access.DbLoader load
-INFO: Schema loading...
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.datasource.DriverDataSource logConnect
-INFO: Connecting to 'jdbc:mysql://127.0.0.1:3306/test' as 'root'
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.datasource.DriverDataSource getConnection
-INFO: +++ Connecting: SUCCESS.
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.log.CommonsJdbcEventLogger log
-INFO: Detected and installed adapter: org.apache.cayenne.dba.mysql.MySQLAdapter
-[INFO] Table: test.customer
-[INFO] Table: test.order
-[INFO] Table: test.ordered_product
-[INFO] Db Relationship : toOne (ordered_product.customer_order_id, order.id)
-[INFO] Db Relationship : toOne (order.id, ordered_product.customer_order_id)
-[INFO] Db Relationship : toOne (order.customer_id, customer.id)
-[INFO] Db Relationship : toMany (customer.id, order.customer_id)
-[INFO]
-[INFO] Detected changes:
-[INFO] Add Relationship customerOrder order->ordered_product.customer_order_id
-[INFO] Create Table ordered_product
-[INFO]
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.util.EntityMergeSupport addMissingRelationships
-WARNING: Can't find ObjEntity for ordered_product
-Aug 16, 2016 5:43:52 PM org.apache.cayenne.util.EntityMergeSupport addMissingRelationships
-WARNING: Db Relationship (Db Relationship : toOne (order.id, ordered_product.customer_order_id)) will have GUESSED Obj Relationship reflection.
-[INFO] Migration Complete Successfully.
-[INFO]
-[INFO] --- maven-cayenne-plugin:4.0.M3:cgen (ormsync) @ MySQLTest ---
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_Customer.java
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_Order.java
-[INFO] Generating superclass file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/auto/_OrderedProduct.java
-[INFO] Generating class file: **/MySQLTest/src/main/java/org/apache/cayenne/shopping/OrderedProduct.java
-[INFO]</screen>
- </section>
-</chapter>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a2de3b4/docs/docbook/getting-started-reverse-engineering/src/images/customer-order-ordered_product.png
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-reverse-engineering/src/images/customer-order-ordered_product.png b/docs/docbook/getting-started-reverse-engineering/src/images/customer-order-ordered_product.png
deleted file mode 100644
index d471065..0000000
Binary files a/docs/docbook/getting-started-reverse-engineering/src/images/customer-order-ordered_product.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a2de3b4/docs/docbook/getting-started-reverse-engineering/src/images/customer-order.png
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-reverse-engineering/src/images/customer-order.png b/docs/docbook/getting-started-reverse-engineering/src/images/customer-order.png
deleted file mode 100644
index 1aef34e..0000000
Binary files a/docs/docbook/getting-started-reverse-engineering/src/images/customer-order.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a2de3b4/docs/docbook/getting-started-reverse-engineering/src/images/customer1.png
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-reverse-engineering/src/images/customer1.png b/docs/docbook/getting-started-reverse-engineering/src/images/customer1.png
deleted file mode 100644
index 777ef19..0000000
Binary files a/docs/docbook/getting-started-reverse-engineering/src/images/customer1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a2de3b4/docs/docbook/getting-started-reverse-engineering/src/images/customer2.png
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-reverse-engineering/src/images/customer2.png b/docs/docbook/getting-started-reverse-engineering/src/images/customer2.png
deleted file mode 100644
index 5c535fb..0000000
Binary files a/docs/docbook/getting-started-reverse-engineering/src/images/customer2.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a2de3b4/docs/docbook/pom.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/pom.xml b/docs/docbook/pom.xml
index c9e1d14..89a9e1b 100644
--- a/docs/docbook/pom.xml
+++ b/docs/docbook/pom.xml
@@ -34,7 +34,6 @@
<module>cayenne-guide</module>
<module>getting-started</module>
<module>getting-started-rop</module>
- <module>getting-started-reverse-engineering</module>
<module>upgrade-guide</module>
</modules>
[2/5] cayenne git commit: adding module artifactIds to their names to
make it easier to identify modules in build logs
Posted by aa...@apache.org.
adding module artifactIds to their names to make it easier to identify modules in build logs
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1cab1bb7
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1cab1bb7
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1cab1bb7
Branch: refs/heads/master
Commit: 1cab1bb79954e97abdc228b84075a70d5be3ec2f
Parents: 850eb19
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sun Dec 11 15:00:59 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sun Dec 11 15:00:59 2016 +0300
----------------------------------------------------------------------
assembly/pom.xml | 2 +-
build-tools/cayenne-checkers/pom.xml | 2 +-
build-tools/cayenne-coverage/pom.xml | 1 +
build-tools/cayenne-legal/pom.xml | 2 +-
build-tools/cayenne-test-utilities/pom.xml | 2 +-
build-tools/pom.xml | 2 +-
cayenne-client-jetty/pom.xml | 2 +-
cayenne-client/pom.xml | 2 +-
cayenne-crypto/pom.xml | 2 +-
cayenne-dbcp2/pom.xml | 2 +-
cayenne-dbsync/pom.xml | 2 +-
cayenne-di/pom.xml | 2 +-
cayenne-java8/pom.xml | 2 +-
cayenne-joda/pom.xml | 2 +-
cayenne-lifecycle/pom.xml | 2 +-
cayenne-project/pom.xml | 2 +-
cayenne-protostuff/pom.xml | 2 +-
cayenne-server/pom.xml | 2 +-
cayenne-tools/pom.xml | 2 +-
docs/doc/pom.xml | 2 +-
docs/docbook/cayenne-guide/pom.xml | 2 +-
docs/docbook/docbook-stylesheets/pom.xml | 2 +-
docs/docbook/getting-started-reverse-engineering/pom.xml | 2 +-
docs/docbook/getting-started-rop/pom.xml | 2 +-
docs/docbook/getting-started/pom.xml | 2 +-
docs/docbook/pom.xml | 2 +-
docs/docbook/upgrade-guide/pom.xml | 2 +-
docs/pom.xml | 2 +-
itests/cayenne-tools-itest/pom.xml | 2 +-
itests/pom.xml | 2 +-
modeler/cayenne-modeler-generic-ext/pom.xml | 2 +-
modeler/cayenne-modeler-generic/pom.xml | 2 +-
modeler/cayenne-modeler-mac-ext/pom.xml | 2 +-
modeler/cayenne-modeler-mac/pom.xml | 2 +-
modeler/cayenne-modeler-win-ext/pom.xml | 2 +-
modeler/cayenne-modeler-win/pom.xml | 2 +-
modeler/cayenne-modeler/pom.xml | 2 +-
modeler/cayenne-wocompat/pom.xml | 2 +-
modeler/pom.xml | 2 +-
plugins/maven-cayenne-modeler-plugin/pom.xml | 2 +-
plugins/maven-cayenne-plugin/pom.xml | 2 +-
plugins/pom.xml | 2 +-
pom.xml | 2 +-
tutorials/pom.xml | 2 +-
tutorials/tutorial-rop-client-http2/pom.xml | 2 +-
tutorials/tutorial-rop-client/pom.xml | 2 +-
tutorials/tutorial-rop-server-http2/pom.xml | 2 +-
tutorials/tutorial-rop-server/pom.xml | 2 +-
tutorials/tutorial/pom.xml | 2 +-
49 files changed, 49 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6940d5a..47d73ea 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.cayenne.assembly</groupId>
<artifactId>cayenne-assembly</artifactId>
<packaging>pom</packaging>
- <name>Cayenne Release Assembly</name>
+ <name>cayenne-assembly: Cayenne Release Assembly</name>
<description>An assembly of Cayenne into a generically runnable package.</description>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/build-tools/cayenne-checkers/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/cayenne-checkers/pom.xml b/build-tools/cayenne-checkers/pom.xml
index 409f60d..0b932ed 100644
--- a/build-tools/cayenne-checkers/pom.xml
+++ b/build-tools/cayenne-checkers/pom.xml
@@ -30,7 +30,7 @@
<artifactId>cayenne-checkers</artifactId>
<packaging>jar</packaging>
- <name>Cayenne Code Checkers</name>
+ <name>cayenne-checkers: Cayenne Code Checkers</name>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/build-tools/cayenne-coverage/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/cayenne-coverage/pom.xml b/build-tools/cayenne-coverage/pom.xml
index 09b842b..2a15c13 100644
--- a/build-tools/cayenne-coverage/pom.xml
+++ b/build-tools/cayenne-coverage/pom.xml
@@ -28,6 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cayenne-coverage</artifactId>
+ <name>cayenne-coverage</name>
<properties>
<cayenne.version>${parent.version}</cayenne.version>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/build-tools/cayenne-legal/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/cayenne-legal/pom.xml b/build-tools/cayenne-legal/pom.xml
index 9c2fbd5..43a4245 100644
--- a/build-tools/cayenne-legal/pom.xml
+++ b/build-tools/cayenne-legal/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-legal</artifactId>
- <name>Cayenne License and Notice Bundle</name>
+ <name>cayenne-legal: Cayenne License and Notice Bundle</name>
<description>Cayenne License and Notice Bundle</description>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/build-tools/cayenne-test-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/cayenne-test-utilities/pom.xml b/build-tools/cayenne-test-utilities/pom.xml
index 11fdf75..7a0459a 100644
--- a/build-tools/cayenne-test-utilities/pom.xml
+++ b/build-tools/cayenne-test-utilities/pom.xml
@@ -29,7 +29,7 @@
<description>Common Unit Test Utilities</description>
<artifactId>cayenne-test-utilities</artifactId>
- <name>Common Unit Test Utilities</name>
+ <name>cayenne-test-utilities: Common Unit Test Utilities</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 524d9b2..324e4f5 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>build-tools-parent</artifactId>
- <name>Cayenne Build Tools Parent</name>
+ <name>build-tools-parent: Cayenne Build Tools Parent</name>
<packaging>pom</packaging>
<modules>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-client-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client-jetty/pom.xml b/cayenne-client-jetty/pom.xml
index 4421af8..0f1b41c 100644
--- a/cayenne-client-jetty/pom.xml
+++ b/cayenne-client-jetty/pom.xml
@@ -19,7 +19,7 @@
</parent>
<artifactId>cayenne-client-jetty</artifactId>
- <name>Cayenne ROP Client (Jetty)</name>
+ <name>cayenne-client-jetty: Cayenne ROP Client (Jetty)</name>
<packaging>jar</packaging>
<properties>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-client/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml
index cfdfca7..2d16644 100644
--- a/cayenne-client/pom.xml
+++ b/cayenne-client/pom.xml
@@ -18,7 +18,7 @@
</parent>
<artifactId>cayenne-client</artifactId>
<packaging>jar</packaging>
- <name>Cayenne ROP Client</name>
+ <name>cayenne-client: Cayenne ROP Client</name>
<dependencies>
<!-- Compile dependencies -->
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-crypto/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-crypto/pom.xml b/cayenne-crypto/pom.xml
index ea3d2ca..c1156ec 100644
--- a/cayenne-crypto/pom.xml
+++ b/cayenne-crypto/pom.xml
@@ -17,7 +17,7 @@
<version>4.0.M5-SNAPSHOT</version>
</parent>
<artifactId>cayenne-crypto</artifactId>
- <name>Cayenne Cryptography Extensions</name>
+ <name>cayenne-crypto: Cayenne Cryptography Extensions</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-dbcp2/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbcp2/pom.xml b/cayenne-dbcp2/pom.xml
index bb85c8f..b44c5af 100644
--- a/cayenne-dbcp2/pom.xml
+++ b/cayenne-dbcp2/pom.xml
@@ -17,7 +17,7 @@
<version>4.0.M5-SNAPSHOT</version>
</parent>
<artifactId>cayenne-dbcp2</artifactId>
- <name>Cayenne DBCP2 Extension</name>
+ <name>cayenne-dbcp2: Cayenne DBCP2 Extension</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-dbsync/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml
index ef02fc7..c30b951 100644
--- a/cayenne-dbsync/pom.xml
+++ b/cayenne-dbsync/pom.xml
@@ -29,7 +29,7 @@
<artifactId>cayenne-dbsync</artifactId>
<packaging>jar</packaging>
- <name>Cayenne Database Synchronization Tools</name>
+ <name>cayenne-dbsync: Cayenne Database Synchronization Tools</name>
<dependencies>
<dependency>
<groupId>org.apache.cayenne</groupId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-di/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-di/pom.xml b/cayenne-di/pom.xml
index e077b71..12fd6fd 100644
--- a/cayenne-di/pom.xml
+++ b/cayenne-di/pom.xml
@@ -18,7 +18,7 @@
</parent>
<artifactId>cayenne-di</artifactId>
<packaging>jar</packaging>
- <name>Cayenne Dependency Injection Container</name>
+ <name>cayenne-di: Cayenne Dependency Injection Container</name>
<description>Cayenne Dependency Injection Container</description>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-java8/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-java8/pom.xml b/cayenne-java8/pom.xml
index 8524bda..978601a 100644
--- a/cayenne-java8/pom.xml
+++ b/cayenne-java8/pom.xml
@@ -17,7 +17,7 @@
<version>4.0.M5-SNAPSHOT</version>
</parent>
<artifactId>cayenne-java8</artifactId>
- <name>Cayenne Java8 Extensions</name>
+ <name>cayenne-java8: Cayenne Java8 Extensions</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-joda/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-joda/pom.xml b/cayenne-joda/pom.xml
index 60993f8..009ea2d 100644
--- a/cayenne-joda/pom.xml
+++ b/cayenne-joda/pom.xml
@@ -25,7 +25,7 @@
<version>4.0.M5-SNAPSHOT</version>
</parent>
<artifactId>cayenne-joda</artifactId>
- <name>Cayenne Joda Extensions</name>
+ <name>cayenne-joda: Cayenne Joda Extensions</name>
<packaging>jar</packaging>
<dependencyManagement>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-lifecycle/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/pom.xml b/cayenne-lifecycle/pom.xml
index b25b5be..106cfd4 100644
--- a/cayenne-lifecycle/pom.xml
+++ b/cayenne-lifecycle/pom.xml
@@ -17,7 +17,7 @@
<version>4.0.M5-SNAPSHOT</version>
</parent>
<artifactId>cayenne-lifecycle</artifactId>
- <name>Cayenne Lifecycle Utilities</name>
+ <name>cayenne-lifecycle: Cayenne Lifecycle Utilities</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-project/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-project/pom.xml b/cayenne-project/pom.xml
index 87b029f..2452cdb 100644
--- a/cayenne-project/pom.xml
+++ b/cayenne-project/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>cayenne-project</artifactId>
- <name>Cayenne Project</name>
+ <name>cayenne-project: Cayenne Project</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-protostuff/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-protostuff/pom.xml b/cayenne-protostuff/pom.xml
index 0173c15..969e9d0 100644
--- a/cayenne-protostuff/pom.xml
+++ b/cayenne-protostuff/pom.xml
@@ -18,7 +18,7 @@
</parent>
<artifactId>cayenne-protostuff</artifactId>
<packaging>jar</packaging>
- <name>Cayenne Protostuff Extension</name>
+ <name>cayenne-protostuff: Cayenne Protostuff Extension</name>
<properties>
<protostuff.version>1.4.3</protostuff.version>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-server/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index 736d7d5..913ceca 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -25,7 +25,7 @@
<version>4.0.M5-SNAPSHOT</version>
</parent>
<artifactId>cayenne-server</artifactId>
- <name>Cayenne Server</name>
+ <name>cayenne-server: Cayenne Server</name>
<description>Cayenne Server</description>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/cayenne-tools/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-tools/pom.xml b/cayenne-tools/pom.xml
index 809d8d3..eb9a6e7 100644
--- a/cayenne-tools/pom.xml
+++ b/cayenne-tools/pom.xml
@@ -29,7 +29,7 @@
<artifactId>cayenne-tools</artifactId>
<packaging>jar</packaging>
- <name>Cayenne Tools</name>
+ <name>cayenne-tools: Cayenne Tools</name>
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/docs/doc/pom.xml
----------------------------------------------------------------------
diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml
index 91dbc35..c516044 100644
--- a/docs/doc/pom.xml
+++ b/docs/doc/pom.xml
@@ -29,7 +29,7 @@
<artifactId>cayenne-doc</artifactId>
<packaging>jar</packaging>
- <name>Cayenne Documentation</name>
+ <name>cayenne-doc: Cayenne Documentation</name>
<description>Cayenne documentation sans Docbook docs, including API, RELEASE-NOTES, etc.</description>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/docs/docbook/cayenne-guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/cayenne-guide/pom.xml b/docs/docbook/cayenne-guide/pom.xml
index fced1f7..367ddf5 100644
--- a/docs/docbook/cayenne-guide/pom.xml
+++ b/docs/docbook/cayenne-guide/pom.xml
@@ -27,5 +27,5 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cayenne-guide</artifactId>
- <name>Docbook: Cayenne Guide</name>
+ <name>cayenne-guide: Docbook - Cayenne Guide</name>
</project>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/docs/docbook/docbook-stylesheets/pom.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/docbook-stylesheets/pom.xml b/docs/docbook/docbook-stylesheets/pom.xml
index 68b3bbf..be7dc5c 100644
--- a/docs/docbook/docbook-stylesheets/pom.xml
+++ b/docs/docbook/docbook-stylesheets/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>docbook-stylesheets</artifactId>
- <name>Docbook: Cayenne Stylesheets</name>
+ <name>docbook-stylesheets: Docbook - Cayenne Stylesheets</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/docs/docbook/getting-started-reverse-engineering/pom.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-reverse-engineering/pom.xml b/docs/docbook/getting-started-reverse-engineering/pom.xml
index 95dba9c..3641fa7 100644
--- a/docs/docbook/getting-started-reverse-engineering/pom.xml
+++ b/docs/docbook/getting-started-reverse-engineering/pom.xml
@@ -28,7 +28,7 @@
<artifactId>getting-started-reverse-engineering</artifactId>
<packaging>jar</packaging>
- <name>Docbook: Getting Started with Cayenne RE</name>
+ <name>getting-started-reverse-engineering: Docbook: Getting Started with Cayenne RE</name>
<build>
<resources>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/docs/docbook/getting-started-rop/pom.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-rop/pom.xml b/docs/docbook/getting-started-rop/pom.xml
index 02f86c9..cd2f4f8 100644
--- a/docs/docbook/getting-started-rop/pom.xml
+++ b/docs/docbook/getting-started-rop/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>getting-started-rop</artifactId>
<packaging>jar</packaging>
- <name>Docbook: Getting Started with Cayenne ROP</name>
+ <name>getting-started-rop: Docbook - Getting Started with Cayenne ROP</name>
<build>
<resources>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/docs/docbook/getting-started/pom.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started/pom.xml b/docs/docbook/getting-started/pom.xml
index cbc56f2..212be3f 100644
--- a/docs/docbook/getting-started/pom.xml
+++ b/docs/docbook/getting-started/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>getting-started</artifactId>
<packaging>jar</packaging>
- <name>Docbook: Getting Started with Cayenne</name>
+ <name>getting-started: Docbook - Getting Started with Cayenne</name>
<build>
<resources>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/docs/docbook/pom.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/pom.xml b/docs/docbook/pom.xml
index 95e921d..c9e1d14 100644
--- a/docs/docbook/pom.xml
+++ b/docs/docbook/pom.xml
@@ -47,7 +47,7 @@
<artifactId>cayenne-docbook</artifactId>
<packaging>pom</packaging>
- <name>Cayenne Docbook Documentation</name>
+ <name>cayenne-docbook: Cayenne Docbook Documentation</name>
<build>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/docs/docbook/upgrade-guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/upgrade-guide/pom.xml b/docs/docbook/upgrade-guide/pom.xml
index 57e1eca..bd4dab7 100644
--- a/docs/docbook/upgrade-guide/pom.xml
+++ b/docs/docbook/upgrade-guide/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>upgrade-guide</artifactId>
- <name>Docbook: Cayenne New Features and Upgrade Guide</name>
+ <name>upgrade-guide: Docbook - Cayenne New Features and Upgrade Guide</name>
<build>
<resources>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index 9762467..f9c3a62 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.cayenne.docs</groupId>
<artifactId>cayenne-docs-parent</artifactId>
- <name>Cayenne Documenation Parent</name>
+ <name>cayenne-docs-parent: Cayenne Documenation Parent</name>
<packaging>pom</packaging>
<modules>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/itests/cayenne-tools-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/cayenne-tools-itest/pom.xml b/itests/cayenne-tools-itest/pom.xml
index 0ccc1df..423d629 100644
--- a/itests/cayenne-tools-itest/pom.xml
+++ b/itests/cayenne-tools-itest/pom.xml
@@ -26,7 +26,7 @@
<description>Integration Tests - Cayenne Tools</description>
<artifactId>cayenne-tools-itest</artifactId>
- <name>Integration Tests - Cayenne Tools</name>
+ <name>cayenne-tools-itest: Integration Tests - Cayenne Tools</name>
<packaging>jar</packaging>
<properties>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index f567d27..8c73f5d 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.cayenne.itests</groupId>
<artifactId>cayenne-itests-parent</artifactId>
- <name>Cayenne Integration Tests Parent</name>
+ <name>cayenne-itests-parent: Cayenne Integration Tests Parent</name>
<packaging>pom</packaging>
<modules>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/modeler/cayenne-modeler-generic-ext/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic-ext/pom.xml b/modeler/cayenne-modeler-generic-ext/pom.xml
index 36c5c30..d5e27f4 100644
--- a/modeler/cayenne-modeler-generic-ext/pom.xml
+++ b/modeler/cayenne-modeler-generic-ext/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-generic-ext</artifactId>
- <name>Cayenne Modeler Generic and Windows Extensions</name>
+ <name>cayenne-modeler-generic-ext: Cayenne Modeler Generic and Windows Extensions</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/modeler/cayenne-modeler-generic/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic/pom.xml b/modeler/cayenne-modeler-generic/pom.xml
index 5b53311..b93a15c 100644
--- a/modeler/cayenne-modeler-generic/pom.xml
+++ b/modeler/cayenne-modeler-generic/pom.xml
@@ -20,7 +20,7 @@
</parent>
<artifactId>cayenne-modeler-generic</artifactId>
- <name>Cayenne Modeler Generic</name>
+ <name>cayenne-modeler-generic: Cayenne Modeler Generic</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/modeler/cayenne-modeler-mac-ext/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac-ext/pom.xml b/modeler/cayenne-modeler-mac-ext/pom.xml
index 514cbb2..a1236de 100644
--- a/modeler/cayenne-modeler-mac-ext/pom.xml
+++ b/modeler/cayenne-modeler-mac-ext/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-mac-ext</artifactId>
- <name>Cayenne Modeler Mac OS X Extensions</name>
+ <name>cayenne-modeler-mac-ext: Cayenne Modeler Mac OS X Extensions</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/modeler/cayenne-modeler-mac/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac/pom.xml b/modeler/cayenne-modeler-mac/pom.xml
index f973a5b..304415b 100644
--- a/modeler/cayenne-modeler-mac/pom.xml
+++ b/modeler/cayenne-modeler-mac/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-mac</artifactId>
- <name>Cayenne Modeler Mac OS X</name>
+ <name>cayenne-modeler-mac: Cayenne Modeler Mac OS X</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/modeler/cayenne-modeler-win-ext/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win-ext/pom.xml b/modeler/cayenne-modeler-win-ext/pom.xml
index f3cbe79..d787f6a 100644
--- a/modeler/cayenne-modeler-win-ext/pom.xml
+++ b/modeler/cayenne-modeler-win-ext/pom.xml
@@ -27,7 +27,7 @@
<version>4.0.M5-SNAPSHOT</version>
</parent>
- <name>Cayenne Modeler Win Extensions</name>
+ <name>cayenne-modeler-win-ext: Cayenne Modeler Win Extensions</name>
<packaging>jar</packaging>
<artifactId>cayenne-modeler-win-ext</artifactId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/modeler/cayenne-modeler-win/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win/pom.xml b/modeler/cayenne-modeler-win/pom.xml
index bd8a955..50cd5c9 100644
--- a/modeler/cayenne-modeler-win/pom.xml
+++ b/modeler/cayenne-modeler-win/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-win</artifactId>
- <name>Cayenne Modeler Windows</name>
+ <name>cayenne-modeler-win: Cayenne Modeler Windows</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/modeler/cayenne-modeler/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml
index e217f3c..68827c9 100644
--- a/modeler/cayenne-modeler/pom.xml
+++ b/modeler/cayenne-modeler/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler</artifactId>
- <name>Cayenne Modeler</name>
+ <name>cayenne-modeler: Cayenne Modeler</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/modeler/cayenne-wocompat/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/pom.xml b/modeler/cayenne-wocompat/pom.xml
index 5b13645..9c62f2d 100644
--- a/modeler/cayenne-wocompat/pom.xml
+++ b/modeler/cayenne-wocompat/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>cayenne-wocompat</artifactId>
- <name>Cayenne WebObjects Compatibility Library</name>
+ <name>cayenne-wocompat: Cayenne WebObjects Compatibility Library</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/modeler/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/pom.xml b/modeler/pom.xml
index 68d06b4..5296812 100644
--- a/modeler/pom.xml
+++ b/modeler/pom.xml
@@ -29,7 +29,7 @@
<artifactId>cayenne-modeler-parent</artifactId>
<groupId>org.apache.cayenne.modeler</groupId>
- <name>Cayenne Modeler Parent</name>
+ <name>cayenne-modeler-parent: Cayenne Modeler Parent</name>
<packaging>pom</packaging>
<modules>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/plugins/maven-cayenne-modeler-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-modeler-plugin/pom.xml b/plugins/maven-cayenne-modeler-plugin/pom.xml
index a8e1a19..f3b05d1 100644
--- a/plugins/maven-cayenne-modeler-plugin/pom.xml
+++ b/plugins/maven-cayenne-modeler-plugin/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-cayenne-modeler-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>Cayenne Modeler Maven Plugin</name>
+ <name>maven-cayenne-modeler-plugin: Cayenne Modeler Maven Plugin</name>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/plugins/maven-cayenne-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/pom.xml b/plugins/maven-cayenne-plugin/pom.xml
index 4cfb39a..3c0a5f2 100644
--- a/plugins/maven-cayenne-plugin/pom.xml
+++ b/plugins/maven-cayenne-plugin/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-cayenne-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>Cayenne Maven Plugin</name>
+ <name>maven-cayenne-plugin: Cayenne Maven Plugin</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index a6b8a10..4edb066 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -18,7 +18,7 @@
</parent>
<groupId>org.apache.cayenne.plugins</groupId>
<artifactId>cayenne-plugins-parent</artifactId>
- <name>Cayenne Maven Plugins</name>
+ <name>cayenne-plugins-parent: Cayenne Maven Plugins parent</name>
<packaging>pom</packaging>
<modules>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 137e82a..3c4fa6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
- <name>Cayenne</name>
+ <name>cayenne-parent: Top-level parent of Cayenne mdoules</name>
<version>4.0.M5-SNAPSHOT</version>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/tutorials/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
index 57c66f9..97788f1 100644
--- a/tutorials/pom.xml
+++ b/tutorials/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.cayenne.tutorials</groupId>
<artifactId>cayenne-tutorials-parent</artifactId>
- <name>Cayenne Tutorials</name>
+ <name>cayenne-tutorials-parent: Cayenne Tutorials</name>
<packaging>pom</packaging>
<modules>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/tutorials/tutorial-rop-client-http2/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-client-http2/pom.xml b/tutorials/tutorial-rop-client-http2/pom.xml
index ab4e061..c6a13fc 100644
--- a/tutorials/tutorial-rop-client-http2/pom.xml
+++ b/tutorials/tutorial-rop-client-http2/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>tutorial-rop-client-http2</artifactId>
- <name>Cayenne ROP HTTP/2 Client Tutorial</name>
+ <name>tutorial-rop-client-http2: Cayenne ROP HTTP/2 Client Tutorial</name>
<packaging>jar</packaging>
<properties>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/tutorials/tutorial-rop-client/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-client/pom.xml b/tutorials/tutorial-rop-client/pom.xml
index e9bcd0e..53795f0 100644
--- a/tutorials/tutorial-rop-client/pom.xml
+++ b/tutorials/tutorial-rop-client/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>tutorial-rop-client</artifactId>
- <name>Cayenne ROP Client Tutorial</name>
+ <name>tutorial-rop-client: Cayenne ROP Client Tutorial</name>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/tutorials/tutorial-rop-server-http2/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-server-http2/pom.xml b/tutorials/tutorial-rop-server-http2/pom.xml
index e338ce5..260511b 100644
--- a/tutorials/tutorial-rop-server-http2/pom.xml
+++ b/tutorials/tutorial-rop-server-http2/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>tutorial-rop-server-http2</artifactId>
- <name>Cayenne ROP HTTP/2 Server Tutorial</name>
+ <name>tutorial-rop-server-http2: Cayenne ROP HTTP/2 Server Tutorial</name>
<packaging>jar</packaging>
<properties>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/tutorials/tutorial-rop-server/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-server/pom.xml b/tutorials/tutorial-rop-server/pom.xml
index b2afbed..3a48ae2 100644
--- a/tutorials/tutorial-rop-server/pom.xml
+++ b/tutorials/tutorial-rop-server/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>tutorial-rop-server</artifactId>
- <name>Cayenne ROP Server Tutorial</name>
+ <name>tutorial-rop-server: Cayenne ROP Server Tutorial</name>
<packaging>war</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cab1bb7/tutorials/tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial/pom.xml b/tutorials/tutorial/pom.xml
index d818dda..764bcd0 100644
--- a/tutorials/tutorial/pom.xml
+++ b/tutorials/tutorial/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>tutorial</artifactId>
- <name>Cayenne Tutorial</name>
+ <name>tutorial: ayenne Tutorial</name>
<dependencies>
<dependency>
[5/5] cayenne git commit: shorten pom naming
Posted by aa...@apache.org.
shorten pom naming
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/22f6bd25
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/22f6bd25
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/22f6bd25
Branch: refs/heads/master
Commit: 22f6bd256f8a1838fbec9f4c3080be3d5823dc03
Parents: 67550ec
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sun Dec 11 15:13:30 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sun Dec 11 15:13:30 2016 +0300
----------------------------------------------------------------------
cayenne-dbsync/pom.xml | 2 +-
modeler/cayenne-modeler-generic-ext/pom.xml | 2 +-
modeler/cayenne-modeler-generic/pom.xml | 2 +-
modeler/cayenne-modeler-mac-ext/pom.xml | 2 +-
modeler/cayenne-modeler-mac/pom.xml | 2 +-
modeler/cayenne-modeler-win-ext/pom.xml | 2 +-
modeler/cayenne-modeler-win/pom.xml | 2 +-
modeler/cayenne-modeler/pom.xml | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/22f6bd25/cayenne-dbsync/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml
index f033300..c004ce0 100644
--- a/cayenne-dbsync/pom.xml
+++ b/cayenne-dbsync/pom.xml
@@ -29,7 +29,7 @@
<artifactId>cayenne-dbsync</artifactId>
<packaging>jar</packaging>
- <name>cayenne-dbsync: Cayenne Database Synchronization Tools</name>
+ <name>cayenne-dbsync: Database Synchronization Tools</name>
<dependencies>
<dependency>
<groupId>org.apache.cayenne</groupId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/22f6bd25/modeler/cayenne-modeler-generic-ext/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic-ext/pom.xml b/modeler/cayenne-modeler-generic-ext/pom.xml
index d5e27f4..3302239 100644
--- a/modeler/cayenne-modeler-generic-ext/pom.xml
+++ b/modeler/cayenne-modeler-generic-ext/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-generic-ext</artifactId>
- <name>cayenne-modeler-generic-ext: Cayenne Modeler Generic and Windows Extensions</name>
+ <name>cayenne-modeler-generic-ext: Modeler Generic Extensions</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/22f6bd25/modeler/cayenne-modeler-generic/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic/pom.xml b/modeler/cayenne-modeler-generic/pom.xml
index b93a15c..64e003c 100644
--- a/modeler/cayenne-modeler-generic/pom.xml
+++ b/modeler/cayenne-modeler-generic/pom.xml
@@ -20,7 +20,7 @@
</parent>
<artifactId>cayenne-modeler-generic</artifactId>
- <name>cayenne-modeler-generic: Cayenne Modeler Generic</name>
+ <name>cayenne-modeler-generic: Modeler Generic Assembly</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/22f6bd25/modeler/cayenne-modeler-mac-ext/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac-ext/pom.xml b/modeler/cayenne-modeler-mac-ext/pom.xml
index a1236de..c65cb8b 100644
--- a/modeler/cayenne-modeler-mac-ext/pom.xml
+++ b/modeler/cayenne-modeler-mac-ext/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-mac-ext</artifactId>
- <name>cayenne-modeler-mac-ext: Cayenne Modeler Mac OS X Extensions</name>
+ <name>cayenne-modeler-mac-ext: Modeler MacOS Extensions</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/22f6bd25/modeler/cayenne-modeler-mac/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac/pom.xml b/modeler/cayenne-modeler-mac/pom.xml
index 304415b..8a58ff9 100644
--- a/modeler/cayenne-modeler-mac/pom.xml
+++ b/modeler/cayenne-modeler-mac/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-mac</artifactId>
- <name>cayenne-modeler-mac: Cayenne Modeler Mac OS X</name>
+ <name>cayenne-modeler-mac: Modeler MacOS Assembly</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/22f6bd25/modeler/cayenne-modeler-win-ext/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win-ext/pom.xml b/modeler/cayenne-modeler-win-ext/pom.xml
index d787f6a..6ec5de3 100644
--- a/modeler/cayenne-modeler-win-ext/pom.xml
+++ b/modeler/cayenne-modeler-win-ext/pom.xml
@@ -27,7 +27,7 @@
<version>4.0.M5-SNAPSHOT</version>
</parent>
- <name>cayenne-modeler-win-ext: Cayenne Modeler Win Extensions</name>
+ <name>cayenne-modeler-win-ext: Modeler Win Extensions</name>
<packaging>jar</packaging>
<artifactId>cayenne-modeler-win-ext</artifactId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/22f6bd25/modeler/cayenne-modeler-win/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win/pom.xml b/modeler/cayenne-modeler-win/pom.xml
index 50cd5c9..88f9e5d 100644
--- a/modeler/cayenne-modeler-win/pom.xml
+++ b/modeler/cayenne-modeler-win/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-win</artifactId>
- <name>cayenne-modeler-win: Cayenne Modeler Windows</name>
+ <name>cayenne-modeler-win: Modeler Windows Assembly</name>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/22f6bd25/modeler/cayenne-modeler/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml
index 68827c9..1274d7f 100644
--- a/modeler/cayenne-modeler/pom.xml
+++ b/modeler/cayenne-modeler/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler</artifactId>
- <name>cayenne-modeler: Cayenne Modeler</name>
+ <name>cayenne-modeler: Cayenne Modeler Core</name>
<packaging>jar</packaging>
<dependencies>
[4/5] cayenne git commit: cayenne-dbsync tests should be bridged to
SLF instead of JUL
Posted by aa...@apache.org.
cayenne-dbsync tests should be bridged to SLF instead of JUL
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/67550ecd
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/67550ecd
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/67550ecd
Branch: refs/heads/master
Commit: 67550ecdbd52f6c15b2b05fda5c4dab856fa92fd
Parents: 2a2de3b
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sun Dec 11 15:10:10 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sun Dec 11 15:10:10 2016 +0300
----------------------------------------------------------------------
cayenne-dbsync/pom.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/67550ecd/cayenne-dbsync/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml
index c30b951..f033300 100644
--- a/cayenne-dbsync/pom.xml
+++ b/cayenne-dbsync/pom.xml
@@ -64,6 +64,21 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.cayenne.build-tools</groupId>