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 2014/10/30 16:33:23 UTC
[1/2] git commit: CAY-1964 | Fix convertAdditionalDataMaps() in
CayenneGeneratorMojo.java
Repository: cayenne
Updated Branches:
refs/heads/STABLE-3.1 d05135700 -> 76ee3bc2d
CAY-1964 | Fix convertAdditionalDataMaps() in CayenneGeneratorMojo.java
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/551972cd
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/551972cd
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/551972cd
Branch: refs/heads/STABLE-3.1
Commit: 551972cdbbe6c03d9b23b2193a7d86c517bce854
Parents: d051357
Author: Savva Kolbechev <s....@gmail.com>
Authored: Thu Oct 30 16:01:29 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Thu Oct 30 18:28:08 2014 +0300
----------------------------------------------------------------------
.../cayenne/tools/CayenneGeneratorMojo.java | 23 ++++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/551972cd/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java b/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
index 9d0f524..1e50a81 100644
--- a/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
+++ b/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
@@ -29,6 +29,9 @@ import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import java.io.File;
+import java.io.FilenameFilter;
+
/**
* Maven mojo to perform class generation from data map. This class is an Maven
* adapter to DefaultClassGenerator class.
@@ -239,15 +242,21 @@ public class CayenneGeneratorMojo extends AbstractMojo {
if (!additionalMaps.isDirectory()) {
throw new MojoFailureException(
- "'additionalMaps' must be a directory containing only datamap files.");
+ "'additionalMaps' must be a directory.");
}
- String[] maps = additionalMaps.list();
- File[] dataMaps = new File[maps.length];
- for (int i = 0; i < maps.length; i++) {
- dataMaps[i] = new File(maps[i]);
- }
- return dataMaps;
+ FilenameFilter mapFilter = new FilenameFilter() {
+
+ public boolean accept(File dir, String name) {
+ if (name != null &&
+ name.toLowerCase().endsWith(".map.xml")) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ };
+ return additionalMaps.listFiles(mapFilter);
}
/**
[2/2] git commit: CAY-1964 | Fix convertAdditionalDataMaps() in
CayenneGeneratorMojo.java
Posted by aa...@apache.org.
CAY-1964 | Fix convertAdditionalDataMaps() in CayenneGeneratorMojo.java
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/76ee3bc2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/76ee3bc2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/76ee3bc2
Branch: refs/heads/STABLE-3.1
Commit: 76ee3bc2d8583cbe3fa2ae7cc3640b59e7a060c4
Parents: 551972c
Author: Savva Kolbechev <s....@gmail.com>
Authored: Thu Oct 30 16:01:29 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Thu Oct 30 18:29:19 2014 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/76ee3bc2/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 9a4c17e..d3cea59 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -8,6 +8,16 @@ To browse individual bug reports check out project issue tracker:
https://issues.apache.org/jira/browse/CAY
----------------------------------
+Release: 3.1.1
+Date: not yet released
+----------------------------------
+Changes/New Features Since 3.1
+
+Bug Fixes Since 3.1:
+
+CAY-1964 Fix convertAdditionalDataMaps() in CayenneGeneratorMojo.java
+
+----------------------------------
Release: 3.1-final
Date: not yet released
----------------------------------