Repository: cayenne Updated Branches: refs/heads/master 39804098a -> 53395c629
CAY-2116 Split schema synchronization code in a separate module * fixing old default bindings in the Maven Mojo Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/53395c62 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/53395c62 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/53395c62 Branch: refs/heads/master Commit: 53395c6292de628f77ab66071372a3064797608d Parents: 3980409 Author: Andrus Adamchik <[email protected]> Authored: Thu Oct 6 10:19:44 2016 +0300 Committer: Andrus Adamchik <[email protected]> Committed: Thu Oct 6 10:19:44 2016 +0300 ---------------------------------------------------------------------- .../cayenne/dbsync/naming/ObjectNameGenerator.java | 1 + .../java/org/apache/cayenne/tools/DbImporterMojo.java | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/53395c62/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/ObjectNameGenerator.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/ObjectNameGenerator.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/ObjectNameGenerator.java index 0383c8e..63c7952 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/ObjectNameGenerator.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/ObjectNameGenerator.java @@ -45,6 +45,7 @@ public interface ObjectNameGenerator { /** * Generates a name for DbRelationship derived from the DB foreign key name. */ + // TODO: the class is called Object* , but here it is generating a DB-layer name... Better naming? String dbRelationshipName(ExportedKey key, boolean toMany); /** http://git-wip-us.apache.org/repos/asf/cayenne/blob/53395c62/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java index d2123ce..bce53b6 100644 --- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java +++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java @@ -103,18 +103,15 @@ public class DbImporterMojo extends AbstractMojo { private String meaningfulPkTables; /** - * Java class implementing org.apache.cayenne.map.naming.NamingStrategy. - * This is used to specify how ObjEntities will be mapped from the imported - * DB schema. - * <p> - * The default is a basic naming strategy. + * Object layer naming generator implementation. Should be fully qualified Java class name implementing + * "org.apache.cayenne.dbsync.naming.ObjectNameGenerator". The default is + * "org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator". * * @parameter namingStrategy="namingStrategy" - * default-value="org.apache.cayenne.map.naming.DefaultObjectNameGenerator" + * default-value="org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator" */ private String namingStrategy; - /** * Database user password. *
