You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/01/29 14:01:59 UTC
[1/3] cayenne git commit: Update Modeler icons
Repository: cayenne
Updated Branches:
refs/heads/master b83cc3e6d -> 5cbb4f089
Update Modeler icons
(cherry picked from commit 3ef87c2)
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9a33f10e
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9a33f10e
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9a33f10e
Branch: refs/heads/master
Commit: 9a33f10e369f608141be32ff650d84b4842d04cf
Parents: b83cc3e
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Jan 29 12:01:44 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Jan 29 16:47:27 2018 +0300
----------------------------------------------------------------------
.../japplication/resources/CayenneModeler.icns | Bin 131884 -> 170190 bytes
.../japplication/resources/CayenneModeler.ico | Bin 370070 -> 370070 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9a33f10e/modeler/cayenne-modeler-mac/src/japplication/resources/CayenneModeler.icns
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac/src/japplication/resources/CayenneModeler.icns b/modeler/cayenne-modeler-mac/src/japplication/resources/CayenneModeler.icns
index e564423..e4d27ea 100644
Binary files a/modeler/cayenne-modeler-mac/src/japplication/resources/CayenneModeler.icns and b/modeler/cayenne-modeler-mac/src/japplication/resources/CayenneModeler.icns differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9a33f10e/modeler/cayenne-modeler-win/src/japplication/resources/CayenneModeler.ico
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win/src/japplication/resources/CayenneModeler.ico b/modeler/cayenne-modeler-win/src/japplication/resources/CayenneModeler.ico
index 5b15553..6e6fb32 100644
Binary files a/modeler/cayenne-modeler-win/src/japplication/resources/CayenneModeler.ico and b/modeler/cayenne-modeler-win/src/japplication/resources/CayenneModeler.ico differ
[3/3] cayenne git commit: CAY-2401 Modeler: NPE in ObjEntity sync
action
Posted by nt...@apache.org.
CAY-2401 Modeler: NPE in ObjEntity sync action
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5cbb4f08
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5cbb4f08
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5cbb4f08
Branch: refs/heads/master
Commit: 5cbb4f0891a55a9c48206582e8142d90d6f72b5b
Parents: 29ef71c
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Jan 29 17:01:34 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Jan 29 17:01:34 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../dbsync/merge/context/EntityMergeSupport.java | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5cbb4f08/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 4f15920..a41b221 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -32,6 +32,7 @@ CAY-2388 Modeler: Visualization issues with undo/redo actions for attributes and
CAY-2389 DbEntity qualifier with DbPath expression translates into wrong SQL
CAY-2392 Modeler: Unable to remove DataNode
CAY-2397 Modeler: Unable to set enum:value as Entity qualifier
+CAY-2401 Modeler: NPE in ObjEntity sync action
----------------------------------
Release: 4.1.M1
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5cbb4f08/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
index 09bdae3..0b405d1 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
@@ -429,6 +429,23 @@ public class EntityMergeSupport {
for(int i=0; i<collection1.size(); i++) {
DbAttribute attr1 = iterator1.next();
DbAttribute attr2 = iterator2.next();
+ // attribute can be null, see DbJoin.getSource() and DbJoin.getTarget()
+ if(attr1 == null) {
+ if(attr2 != null) {
+ return false;
+ }
+ continue;
+ }
+ if(attr2 == null) {
+ return false;
+ }
+ // name is unlikely to be null, but we don't want NPE anyway
+ if(attr1.getName() == null) {
+ if(attr2.getName() != null) {
+ return false;
+ }
+ continue;
+ }
if(!attr1.getName().equals(attr2.getName())) {
return false;
}
[2/3] cayenne git commit: New version of JApp plugin with new
launchers for Mac and Windows
Posted by nt...@apache.org.
New version of JApp plugin with new launchers for Mac and Windows
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/29ef71cd
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/29ef71cd
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/29ef71cd
Branch: refs/heads/master
Commit: 29ef71cd6ad72a80c9e1ef5a0b11b4a85dbb2586
Parents: 9a33f10
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Jan 29 16:58:20 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Jan 29 16:58:20 2018 +0300
----------------------------------------------------------------------
assembly/pom.xml | 2 +-
modeler/cayenne-modeler-mac/pom.xml | 4 ++--
pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/29ef71cd/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7c2101d..48884e0 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -367,7 +367,7 @@
<executable>/bin/chmod</executable>
<arguments>
<argument>755</argument>
- <argument>target/cayenne-${project.version}-macosx/CayenneModeler.app/Contents/MacOS/JavaAppLauncher</argument>
+ <argument>target/cayenne-${project.version}-macosx/CayenneModeler.app/Contents/MacOS/CayenneModeler</argument>
</arguments>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/29ef71cd/modeler/cayenne-modeler-mac/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac/pom.xml b/modeler/cayenne-modeler-mac/pom.xml
index aea09d5..03c2a11 100644
--- a/modeler/cayenne-modeler-mac/pom.xml
+++ b/modeler/cayenne-modeler-mac/pom.xml
@@ -103,8 +103,8 @@
<mainClass>org.apache.cayenne.modeler.osx.OSXMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.icns</icon>
<os>mac</os>
- <jvm>1.7+</jvm>
- <jvmOptions>-Xmx500m -Dapple.laf.useScreenMenuBar=true -Xdock:name=CayenneModeler</jvmOptions>
+ <jvm>1.8+</jvm>
+ <jvmOptions>-Xmx500m -Dapple.laf.useScreenMenuBar=true</jvmOptions>
</configuration>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/29ef71cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 91639b5..0d2bd8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -822,7 +822,7 @@
<plugin>
<groupId>org.objectstyle.japp</groupId>
<artifactId>japp-maven-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>