[GitHub] cayenne pull request #313: New script for dmg creation. Now available to set...
GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/313 New script for dmg creation. Now available to set background image to⦠⦠dmg. You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne dmg Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/313.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #313 commit f3e64db17a3581d3a442d745948b640fa8fea9f8 Author: Arseni Bulatski Date: 2018-08-27T09:48:36Z New script for dmg creation. Now available to set background image to dmg. ---
[jira] [Updated] (CAY-2459) Modeler: DataMap paste function is not working
[ https://issues.apache.org/jira/browse/CAY-2459?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2459: - Summary: Modeler: DataMap paste function is not working (was: Paste function is not working) > Modeler: DataMap paste function is not working > -- > > Key: CAY-2459 > URL: https://issues.apache.org/jira/browse/CAY-2459 > Project: Cayenne > Issue Type: Bug > Components: Modeler > Environment: OS X >Reporter: Yana >Priority: Major > Labels: pull-request-available > > *Cayenne version: 4.1.M2-SNAPSHOT * > Paste function still isn't working for DataMap: > 1. Modeler Menu => click Project=> click "Create DataMap" > 2. Modeler Menu=> click Edit => click "Copy DataMap"=> click "Peste" > *Actual result:* the paste function is disabled. > *Expected result: *user has the opportunity to paste DataMap. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Assigned] (CAY-2459) Modeler: DataMap paste function is not working
[ https://issues.apache.org/jira/browse/CAY-2459?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev reassigned CAY-2459: Assignee: Nikita Timofeev > Modeler: DataMap paste function is not working > -- > > Key: CAY-2459 > URL: https://issues.apache.org/jira/browse/CAY-2459 > Project: Cayenne > Issue Type: Bug > Components: Modeler > Environment: OS X >Reporter: Yana >Assignee: Nikita Timofeev >Priority: Major > Labels: pull-request-available > > *Cayenne version: 4.1.M2-SNAPSHOT * > Paste function still isn't working for DataMap: > 1. Modeler Menu => click Project=> click "Create DataMap" > 2. Modeler Menu=> click Edit => click "Copy DataMap"=> click "Peste" > *Actual result:* the paste function is disabled. > *Expected result: *user has the opportunity to paste DataMap. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[2/3] cayenne git commit: Merge PR #304
Merge PR #304 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/798663d6 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/798663d6 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/798663d6 Branch: refs/heads/master Commit: 798663d6b07789ee847773ffe5395dcc34ded54f Parents: 69b731b 2a6dde2 Author: Nikita Timofeev Authored: Mon Aug 27 15:24:06 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 15:24:06 2018 +0300 -- RELEASE-NOTES.txt| 1 + .../src/main/java/org/apache/cayenne/modeler/Main.java | 2 +- .../org/apache/cayenne/modeler/action/PasteAction.java | 11 +-- 3 files changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/798663d6/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java --
[3/3] cayenne git commit: CAY-2459 Modeler: DataMap paste function is not working
CAY-2459 Modeler: DataMap paste function is not working Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b3b600bf Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b3b600bf Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b3b600bf Branch: refs/heads/master Commit: b3b600bf9fd02ea54d6cca68346b138d5042e5eb Parents: 798663d Author: Nikita Timofeev Authored: Mon Aug 27 15:25:02 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 15:25:02 2018 +0300 -- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/b3b600bf/RELEASE-NOTES.txt -- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index c368134..c81594e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -20,7 +20,7 @@ Bug Fixes: CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation CAY-2445 Oracle: Problem with ExpressionFactory.notInExp() -CAY-2459 Paste function is not working +CAY-2459 Modeler: DataMap paste function is not working -- Release: 4.1.M2
[jira] [Commented] (CAY-2459) Modeler: DataMap paste function is not working
[ https://issues.apache.org/jira/browse/CAY-2459?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16593581#comment-16593581 ] ASF GitHub Bot commented on CAY-2459: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/304 > Modeler: DataMap paste function is not working > -- > > Key: CAY-2459 > URL: https://issues.apache.org/jira/browse/CAY-2459 > Project: Cayenne > Issue Type: Bug > Components: Modeler > Environment: OS X >Reporter: Yana >Assignee: Nikita Timofeev >Priority: Major > Labels: pull-request-available > > *Cayenne version: 4.1.M2-SNAPSHOT * > Paste function still isn't working for DataMap: > 1. Modeler Menu => click Project=> click "Create DataMap" > 2. Modeler Menu=> click Edit => click "Copy DataMap"=> click "Peste" > *Actual result:* the paste function is disabled. > *Expected result: *user has the opportunity to paste DataMap. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[GitHub] cayenne pull request #304: CAY-2459 Paste function is not working
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/304 ---
[1/3] cayenne git commit: CAY-2459 Paste function is not working
Repository: cayenne
Updated Branches:
refs/heads/master 69b731bf4 -> b3b600bf9
CAY-2459 Paste function is not working
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2a6dde2b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2a6dde2b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2a6dde2b
Branch: refs/heads/master
Commit: 2a6dde2b115db8943a91f8f857daee640378f443
Parents: 36faff5
Author: Arseni Bulatski
Authored: Wed Aug 22 11:14:38 2018 +0300
Committer: Arseni Bulatski
Committed: Wed Aug 22 11:33:52 2018 +0300
--
RELEASE-NOTES.txt| 1 +
.../src/main/java/org/apache/cayenne/modeler/Main.java | 2 +-
.../org/apache/cayenne/modeler/action/PasteAction.java | 11 +--
3 files changed, 11 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a6dde2b/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d2e5421..c368134 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ Bug Fixes:
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
+CAY-2459 Paste function is not working
--
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a6dde2b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
index 5b2e5d2..e0e3c04 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.project.ProjectModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.swing.*;
+import javax.swing.SwingUtilities;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a6dde2b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
index 94162ee..5774847 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
@@ -49,9 +49,9 @@ import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.modeler.util.CayenneTransferable;
import org.apache.cayenne.query.Query;
-import javax.swing.*;
+import javax.swing.KeyStroke;
import javax.swing.undo.UndoableEdit;
-import java.awt.*;
+import java.awt.Toolkit;
import java.awt.datatransfer.FlavorEvent;
import java.awt.datatransfer.FlavorListener;
import java.awt.datatransfer.UnsupportedFlavorException;
@@ -106,6 +106,10 @@ public class PasteAction extends CayenneAction implements
FlavorListener {
Object currentObject = getProjectController().getCurrentObject();
+if(content instanceof DataMap) {
+currentObject =
getProjectController().getProject().getRootNode();
+}
+
if (content != null && currentObject != null) {
DataChannelDescriptor domain = (DataChannelDescriptor)
getProjectController()
.getProject()
@@ -516,6 +520,9 @@ public class PasteAction extends CayenneAction implements
FlavorListener {
(currentObject instanceof DataMap && isTreeLeaf(content))
||
+(currentObject instanceof DataMap && content instanceof
DataMap)
+||
+
(currentObject instanceof DbEntity && (content instanceof
DbAttribute
|| content instanceof DbRelationship ||
isTreeLeaf(content)))
||
[jira] [Closed] (CAY-2459) Modeler: DataMap paste function is not working
[ https://issues.apache.org/jira/browse/CAY-2459?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev closed CAY-2459. Resolution: Fixed > Modeler: DataMap paste function is not working > -- > > Key: CAY-2459 > URL: https://issues.apache.org/jira/browse/CAY-2459 > Project: Cayenne > Issue Type: Bug > Components: Modeler > Environment: OS X >Reporter: Yana >Assignee: Nikita Timofeev >Priority: Major > Labels: pull-request-available > > *Cayenne version: 4.1.M2-SNAPSHOT * > Paste function still isn't working for DataMap: > 1. Modeler Menu => click Project=> click "Create DataMap" > 2. Modeler Menu=> click Edit => click "Copy DataMap"=> click "Peste" > *Actual result:* the paste function is disabled. > *Expected result: *user has the opportunity to paste DataMap. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[2/3] cayenne git commit: CAY-2463 Modeler: DB Schema generation doesn't work
CAY-2463 Modeler: DB Schema generation doesn't work Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c85255d6 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c85255d6 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c85255d6 Branch: refs/heads/master Commit: c85255d661e78d908003b31b4f46149c8330c949 Parents: b3b600b 2f8dcfa Author: Nikita Timofeev Authored: Mon Aug 27 15:46:52 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 15:46:52 2018 +0300 -- RELEASE-NOTES.txt | 1 + .../apache/cayenne/modeler/action/DBWizardAction.java | 14 ++ .../cayenne/modeler/action/LoadDbSchemaAction.java| 1 - .../cayenne/modeler/dialog/db/DataSourceWizard.java | 5 + 4 files changed, 8 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/c85255d6/RELEASE-NOTES.txt -- diff --cc RELEASE-NOTES.txt index c81594e,c56a872..670d8ce --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -20,7 -20,7 +20,8 @@@ Bug Fixes CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation CAY-2445 Oracle: Problem with ExpressionFactory.notInExp() +CAY-2459 Modeler: DataMap paste function is not working + CAY-2463 DB Schema generation doesn't work -- Release: 4.1.M2
[GitHub] cayenne pull request #306: CAY-2463 DB Schema generation doesn't work
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/306 ---
[1/3] cayenne git commit: CAY-2463
Repository: cayenne
Updated Branches:
refs/heads/master b3b600bf9 -> b16ac50dd
CAY-2463
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2f8dcfab
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2f8dcfab
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2f8dcfab
Branch: refs/heads/master
Commit: 2f8dcfab2334a7f3a607658439af8be52a1d8ce8
Parents: 36faff5
Author: Arseni Bulatski
Authored: Wed Aug 22 12:14:35 2018 +0300
Committer: Arseni Bulatski
Committed: Wed Aug 22 12:14:35 2018 +0300
--
RELEASE-NOTES.txt | 1 +
.../apache/cayenne/modeler/action/DBWizardAction.java | 14 ++
.../cayenne/modeler/action/LoadDbSchemaAction.java| 1 -
.../cayenne/modeler/dialog/db/DataSourceWizard.java | 5 +
4 files changed, 8 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2f8dcfab/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d2e5421..c56a872 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ Bug Fixes:
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
+CAY-2463 DB Schema generation doesn't work
--
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2f8dcfab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
index 0fbaac3..4cace46 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
@@ -19,13 +19,6 @@
package org.apache.cayenne.modeler.action;
-import java.sql.Connection;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import javax.swing.JOptionPane;
-
import org.apache.cayenne.dbsync.reverse.dbload.DbLoader;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.dialog.db.DataSourceWizard;
@@ -34,6 +27,12 @@ import org.apache.cayenne.modeler.util.CayenneAction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.swing.*;
+import java.sql.Connection;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
public abstract class DBWizardAction extends
CayenneAction {
private static Logger LOGGER =
LoggerFactory.getLogger(DBWizardAction.class);
@@ -44,7 +43,6 @@ public abstract class DBWizardAction extends Ca
protected DataSourceWizard dataSourceWizardDialog(String title) {
// connect
DataSourceWizard connectWizard = new
DataSourceWizard(getProjectController(), title);
-connectWizard.setProjectController(getProjectController());
if (!connectWizard.startupAction()) {
return null;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2f8dcfab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
index 45604fd..840ec40 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
@@ -71,7 +71,6 @@ public class LoadDbSchemaAction extends CayenneAction {
DBConnectionInfo connectionInfo;
if (!datamapPreferencesExist()) {
final DataSourceWizard connectWizard = new
DataSourceWizard(getProjectController(), "Load Db Schema");
-connectWizard.setProjectController(getProjectController());
if (!connectWizard.startupAction()) {
return;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2f8dcfab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizard.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizard.java
b/modeler/cayenne
[3/3] cayenne git commit: CAY-2463 Modeler: DB Schema generation doesn't work
CAY-2463 Modeler: DB Schema generation doesn't work Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b16ac50d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b16ac50d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b16ac50d Branch: refs/heads/master Commit: b16ac50ddf53e2435c9ef0cdecaf091042cfc99c Parents: c85255d Author: Nikita Timofeev Authored: Mon Aug 27 15:47:08 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 15:47:08 2018 +0300 -- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/b16ac50d/RELEASE-NOTES.txt -- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 670d8ce..38fce29 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -21,7 +21,7 @@ Bug Fixes: CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation CAY-2445 Oracle: Problem with ExpressionFactory.notInExp() CAY-2459 Modeler: DataMap paste function is not working -CAY-2463 DB Schema generation doesn't work +CAY-2463 Modeler: DB Schema generation doesn't work -- Release: 4.1.M2
[jira] [Commented] (CAY-2463) DB Schema generation doesn't work
[ https://issues.apache.org/jira/browse/CAY-2463?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16593602#comment-16593602 ] ASF GitHub Bot commented on CAY-2463: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/306 > DB Schema generation doesn't work > - > > Key: CAY-2463 > URL: https://issues.apache.org/jira/browse/CAY-2463 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.1.M3 >Reporter: Arseni Bulatski >Priority: Major > Labels: pull-request-available > Fix For: 4.1.M3 > > > Exception in thread "AWT-EventQueue-0" > org.apache.cayenne.swing.BindingException: [v.4.1.M3-SNAPSHOT Aug 21 2018 > 14:45:23] Evaluation failed in context: > org.apache.cayenne.modeler.dialog.db.gen.DBGeneratorOptions@484f9418 > at > org.apache.cayenne.swing.BindingBase.processException(BindingBase.java:186) > at org.apache.cayenne.swing.BindingBase.getValue(BindingBase.java:171) > at org.apache.cayenne.swing.ActionBinding.fireAction(ActionBinding.java:80) > at > org.apache.cayenne.swing.ActionBinding$1.actionPerformed(ActionBinding.java:42) > at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2022) > at > javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2348) > at > javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402) > at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259) > at > javax.swing.plaf.basic.BasicButtonListener.mouseReleased(BasicButtonListener.java:252) > at java.awt.Component.processMouseEvent(Component.java:6533) > at javax.swing.JComponent.processMouseEvent(JComponent.java:3324) > at java.awt.Component.processEvent(Component.java:6298) > at java.awt.Container.processEvent(Container.java:2236) > at java.awt.Component.dispatchEventImpl(Component.java:4889) > at java.awt.Container.dispatchEventImpl(Container.java:2294) > at java.awt.Component.dispatchEvent(Component.java:4711) > at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4888) > at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4525) > at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4466) > at java.awt.Container.dispatchEventImpl(Container.java:2280) > at java.awt.Window.dispatchEventImpl(Window.java:2746) > at java.awt.Component.dispatchEvent(Component.java:4711) > at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:758) > at java.awt.EventQueue.access$500(EventQueue.java:97) > at java.awt.EventQueue$3.run(EventQueue.java:709) > at java.awt.EventQueue$3.run(EventQueue.java:703) > at java.security.AccessController.doPrivileged(Native Method) > at > java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:80) > at > java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:90) > at java.awt.EventQueue$4.run(EventQueue.java:731) > at java.awt.EventQueue$4.run(EventQueue.java:729) > at java.security.AccessController.doPrivileged(Native Method) > at > java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:80) > at java.awt.EventQueue.dispatchEvent(EventQueue.java:728) > at > java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:201) > at > java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:116) > at > java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:109) > at java.awt.WaitDispatchSupport$2.run(WaitDispatchSupport.java:184) > at java.awt.WaitDispatchSupport$4.run(WaitDispatchSupport.java:229) > at java.awt.WaitDispatchSupport$4.run(WaitDispatchSupport.java:227) > at java.security.AccessController.doPrivileged(Native Method) > at java.awt.WaitDispatchSupport.enter(WaitDispatchSupport.java:227) > at java.awt.Dialog.show(Dialog.java:1084) > at java.awt.Component.show(Component.java:1671) > at java.awt.Component.setVisible(Component.java:1623) > at java.awt.Window.setVisible(Window.java:1014) > at java.awt.Dialog.setVisible(Dialog.java:1005) > at > org.apache.cayenne.modeler.dialog.db.gen.DBGeneratorOptions.startupAction(DBGeneratorOptions.java:226) > at > org.apache.cayenne.modeler.action.GenerateDBAction.performAction(GenerateDBAction.java:59) > at > org.apache.cayenne.modeler.util.CayenneAction.actionPerformed(CayenneAction.java:171) > at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2022) > at > javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2348) > at > javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402) > at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259) >
[jira] [Updated] (CAY-2449) Modeler: Needless scrollbar in Generate DB Schema result menu
[ https://issues.apache.org/jira/browse/CAY-2449?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2449: - Summary: Modeler: Needless scrollbar in Generate DB Schema result menu (was: Needless scrollbar in the Modeler Menu: Tools: Generate Database Schema) > Modeler: Needless scrollbar in Generate DB Schema result menu > - > > Key: CAY-2449 > URL: https://issues.apache.org/jira/browse/CAY-2449 > Project: Cayenne > Issue Type: Bug > Components: Modeler > Environment: Linux Ubuntu 14.04 >Reporter: Yana >Priority: Minor > Labels: pull-request-available > Attachments: 1.png > > > *Cayenne version: 4.1.M2-SNAPSHOT* > *Steps:* > 1. Open Tools=>Generate Database Schema > 2. In a new popup window press "generate" then "continue" > *Actual result:* you will see a scrollbar over the "Details" section. Near > the text: "Schema generation finished. The following problem(s) were ignored" > !1.png! > *Expected result:* there isn't a scrollbar over the "Details" section. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Closed] (CAY-2463) DB Schema generation doesn't work
[ https://issues.apache.org/jira/browse/CAY-2463?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev closed CAY-2463. Resolution: Fixed Assignee: Nikita Timofeev > DB Schema generation doesn't work > - > > Key: CAY-2463 > URL: https://issues.apache.org/jira/browse/CAY-2463 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.1.M3 >Reporter: Arseni Bulatski >Assignee: Nikita Timofeev >Priority: Major > Labels: pull-request-available > Fix For: 4.1.M3 > > > Exception in thread "AWT-EventQueue-0" > org.apache.cayenne.swing.BindingException: [v.4.1.M3-SNAPSHOT Aug 21 2018 > 14:45:23] Evaluation failed in context: > org.apache.cayenne.modeler.dialog.db.gen.DBGeneratorOptions@484f9418 > at > org.apache.cayenne.swing.BindingBase.processException(BindingBase.java:186) > at org.apache.cayenne.swing.BindingBase.getValue(BindingBase.java:171) > at org.apache.cayenne.swing.ActionBinding.fireAction(ActionBinding.java:80) > at > org.apache.cayenne.swing.ActionBinding$1.actionPerformed(ActionBinding.java:42) > at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2022) > at > javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2348) > at > javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402) > at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259) > at > javax.swing.plaf.basic.BasicButtonListener.mouseReleased(BasicButtonListener.java:252) > at java.awt.Component.processMouseEvent(Component.java:6533) > at javax.swing.JComponent.processMouseEvent(JComponent.java:3324) > at java.awt.Component.processEvent(Component.java:6298) > at java.awt.Container.processEvent(Container.java:2236) > at java.awt.Component.dispatchEventImpl(Component.java:4889) > at java.awt.Container.dispatchEventImpl(Container.java:2294) > at java.awt.Component.dispatchEvent(Component.java:4711) > at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4888) > at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4525) > at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4466) > at java.awt.Container.dispatchEventImpl(Container.java:2280) > at java.awt.Window.dispatchEventImpl(Window.java:2746) > at java.awt.Component.dispatchEvent(Component.java:4711) > at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:758) > at java.awt.EventQueue.access$500(EventQueue.java:97) > at java.awt.EventQueue$3.run(EventQueue.java:709) > at java.awt.EventQueue$3.run(EventQueue.java:703) > at java.security.AccessController.doPrivileged(Native Method) > at > java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:80) > at > java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:90) > at java.awt.EventQueue$4.run(EventQueue.java:731) > at java.awt.EventQueue$4.run(EventQueue.java:729) > at java.security.AccessController.doPrivileged(Native Method) > at > java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:80) > at java.awt.EventQueue.dispatchEvent(EventQueue.java:728) > at > java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:201) > at > java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:116) > at > java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:109) > at java.awt.WaitDispatchSupport$2.run(WaitDispatchSupport.java:184) > at java.awt.WaitDispatchSupport$4.run(WaitDispatchSupport.java:229) > at java.awt.WaitDispatchSupport$4.run(WaitDispatchSupport.java:227) > at java.security.AccessController.doPrivileged(Native Method) > at java.awt.WaitDispatchSupport.enter(WaitDispatchSupport.java:227) > at java.awt.Dialog.show(Dialog.java:1084) > at java.awt.Component.show(Component.java:1671) > at java.awt.Component.setVisible(Component.java:1623) > at java.awt.Window.setVisible(Window.java:1014) > at java.awt.Dialog.setVisible(Dialog.java:1005) > at > org.apache.cayenne.modeler.dialog.db.gen.DBGeneratorOptions.startupAction(DBGeneratorOptions.java:226) > at > org.apache.cayenne.modeler.action.GenerateDBAction.performAction(GenerateDBAction.java:59) > at > org.apache.cayenne.modeler.util.CayenneAction.actionPerformed(CayenneAction.java:171) > at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2022) > at > javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2348) > at > javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402) > at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259) > at javax.swing.AbstractButton.doClick(AbstractButton.java:37
[2/3] cayenne git commit: CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu
CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/584d52c5 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/584d52c5 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/584d52c5 Branch: refs/heads/master Commit: 584d52c5d5d1a5cc3945276f6f37c0cbf5b62ab8 Parents: b16ac50 da6d961 Author: Nikita Timofeev Authored: Mon Aug 27 15:54:32 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 15:54:32 2018 +0300 -- RELEASE-NOTES.txt | 1 + .../dialog/ValidationResultBrowserView.java | 18 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/584d52c5/RELEASE-NOTES.txt -- diff --cc RELEASE-NOTES.txt index 38fce29,682cf91..354d063 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -20,8 -20,7 +20,9 @@@ Bug Fixes CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation CAY-2445 Oracle: Problem with ExpressionFactory.notInExp() +CAY-2459 Modeler: DataMap paste function is not working +CAY-2463 Modeler: DB Schema generation doesn't work + CAY-2449 Needless scrollbar in the Modeler Menu: Tools: Generate Database Schema -- Release: 4.1.M2
[1/3] cayenne git commit: CAY-2449 Needless scrollbar in the Modeler Menu: Tools: Generate Database Schema
Repository: cayenne
Updated Branches:
refs/heads/master b16ac50dd -> 762dfa386
CAY-2449 Needless scrollbar in the Modeler Menu: Tools: Generate Database Schema
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/da6d9611
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/da6d9611
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/da6d9611
Branch: refs/heads/master
Commit: da6d9611f6d5a9543893e2b86f81f6a906ba9841
Parents: 36faff5
Author: Arseni Bulatski
Authored: Wed Aug 22 12:28:22 2018 +0300
Committer: Arseni Bulatski
Committed: Wed Aug 22 12:29:33 2018 +0300
--
RELEASE-NOTES.txt | 1 +
.../dialog/ValidationResultBrowserView.java | 18 +++---
2 files changed, 8 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/da6d9611/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d2e5421..682cf91 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ Bug Fixes:
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
+CAY-2449 Needless scrollbar in the Modeler Menu: Tools: Generate Database
Schema
--
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/da6d9611/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java
index f186c3b..6c143d6 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java
@@ -20,9 +20,9 @@
package org.apache.cayenne.modeler.dialog;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
+import com.jgoodies.forms.builder.PanelBuilder;
+import com.jgoodies.forms.layout.CellConstraints;
+import com.jgoodies.forms.layout.FormLayout;
import javax.swing.JButton;
import javax.swing.JComponent;
@@ -31,10 +31,9 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.ScrollPaneConstants;
-
-import com.jgoodies.forms.builder.PanelBuilder;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
/**
*/
@@ -63,10 +62,7 @@ public class ValidationResultBrowserView extends JDialog {
"fill:min(50dlu;pref):grow",
"fill:20dlu, 9dlu, p, 3dlu, fill:40dlu:grow"));
builder.setDefaultDialogBorder();
-builder.add(new JScrollPane(
-messageLabel,
-ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER), cc.xy(1, 1));
+builder.add(messageLabel, cc.xy(1, 1));
builder.addSeparator("Details", cc.xy(1, 3));
builder.add(new JScrollPane(
errorsDisplay,
[3/3] cayenne git commit: CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu
CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/762dfa38 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/762dfa38 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/762dfa38 Branch: refs/heads/master Commit: 762dfa386c7b73391b6391b314f1ae1c953df8da Parents: 584d52c Author: Nikita Timofeev Authored: Mon Aug 27 15:54:55 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 15:54:55 2018 +0300 -- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/762dfa38/RELEASE-NOTES.txt -- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 354d063..1b4ecf6 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -20,9 +20,9 @@ Bug Fixes: CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation CAY-2445 Oracle: Problem with ExpressionFactory.notInExp() +CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu CAY-2459 Modeler: DataMap paste function is not working CAY-2463 Modeler: DB Schema generation doesn't work -CAY-2449 Needless scrollbar in the Modeler Menu: Tools: Generate Database Schema -- Release: 4.1.M2
[jira] [Commented] (CAY-2449) Modeler: Needless scrollbar in Generate DB Schema result menu
[ https://issues.apache.org/jira/browse/CAY-2449?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16593613#comment-16593613 ] ASF GitHub Bot commented on CAY-2449: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/307 > Modeler: Needless scrollbar in Generate DB Schema result menu > - > > Key: CAY-2449 > URL: https://issues.apache.org/jira/browse/CAY-2449 > Project: Cayenne > Issue Type: Bug > Components: Modeler > Environment: Linux Ubuntu 14.04 >Reporter: Yana >Priority: Minor > Labels: pull-request-available > Attachments: 1.png > > > *Cayenne version: 4.1.M2-SNAPSHOT* > *Steps:* > 1. Open Tools=>Generate Database Schema > 2. In a new popup window press "generate" then "continue" > *Actual result:* you will see a scrollbar over the "Details" section. Near > the text: "Schema generation finished. The following problem(s) were ignored" > !1.png! > *Expected result:* there isn't a scrollbar over the "Details" section. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[GitHub] cayenne pull request #307: CAY-2449 Needless scrollbar in the Modeler Menu: ...
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/307 ---
[1/2] cayenne git commit: CAY-2451 ObjEntity: Edit button doesn't open editor for Relationship
Repository: cayenne
Updated Branches:
refs/heads/master 762dfa386 -> f048b0e45
CAY-2451 ObjEntity: Edit button doesn't open editor for Relationship
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/59ef22bf
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/59ef22bf
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/59ef22bf
Branch: refs/heads/master
Commit: 59ef22bf3f7e362b62009d426f5dc54528b42f12
Parents: 36faff5
Author: Arseni Bulatski
Authored: Wed Aug 22 12:42:30 2018 +0300
Committer: Arseni Bulatski
Committed: Wed Aug 22 12:42:30 2018 +0300
--
RELEASE-NOTES.txt | 1 +
.../cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java | 6 --
2 files changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/59ef22bf/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d2e5421..a49923e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ Bug Fixes:
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
+CAY-2451 ObjEntity: "Edit" button doesn't open editor for Relationship
--
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/59ef22bf/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java
index d9af4ae..b312f87 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java
@@ -41,11 +41,12 @@ import
org.apache.cayenne.modeler.util.NameGeneratorPreferences;
import org.apache.cayenne.util.DeleteRuleUpdater;
import org.apache.cayenne.util.Util;
-import javax.swing.*;
+import javax.swing.JOptionPane;
+import javax.swing.WindowConstants;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
@@ -701,6 +702,7 @@ public class ObjRelationshipInfo extends CayenneController
implements TreeSelect
}
if (getStartEntity() == null) {
+JOptionPane.showMessageDialog(getView(), "Can't map relationship
without source DbEntity. Set source DbEntity.");
throw new CayenneRuntimeException("Can't map relationship without
source DbEntity.");
}
}
[2/2] cayenne git commit: CAY-2451 Modeler: ObjEntity "Edit" button doesn't open editor for Relationship
CAY-2451 Modeler: ObjEntity "Edit" button doesn't open editor for Relationship Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f048b0e4 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f048b0e4 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f048b0e4 Branch: refs/heads/master Commit: f048b0e459120b93ac693dffc8f38eb15ad1213e Parents: 762dfa3 59ef22b Author: Nikita Timofeev Authored: Mon Aug 27 16:34:41 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 16:34:41 2018 +0300 -- RELEASE-NOTES.txt | 1 + .../cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java | 6 -- 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/f048b0e4/RELEASE-NOTES.txt -- diff --cc RELEASE-NOTES.txt index 1b4ecf6,a49923e..f8bb706 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -20,9 -20,7 +20,10 @@@ Bug Fixes CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation CAY-2445 Oracle: Problem with ExpressionFactory.notInExp() -CAY-2451 ObjEntity: "Edit" button doesn't open editor for Relationship +CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu ++CAY-2451 Modeler: ObjEntity "Edit" button doesn't open editor for Relationship +CAY-2459 Modeler: DataMap paste function is not working +CAY-2463 Modeler: DB Schema generation doesn't work -- Release: 4.1.M2
[GitHub] cayenne pull request #308: CAY-2451 ObjEntity: Edit button doesn't open edit...
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/308 ---
[jira] [Commented] (CAY-2451) ObjEntity: "Edit" button doesn't open editor for Relationship
[ https://issues.apache.org/jira/browse/CAY-2451?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16593655#comment-16593655 ] ASF GitHub Bot commented on CAY-2451: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/308 > ObjEntity: "Edit" button doesn't open editor for Relationship > - > > Key: CAY-2451 > URL: https://issues.apache.org/jira/browse/CAY-2451 > Project: Cayenne > Issue Type: Bug > Components: Modeler > Environment: Linux Ubuntu 14.04, OS X >Reporter: Yana >Priority: Major > Labels: pull-request-available > Attachments: Video1.mp4 > > > *Cayenne version: 4.1.M2-SNAPSHOT.* > *Steps:* > 1. Create a new ObjEntity > 2. Don't enter the Table/View field in the Entity tab > 3. Create new attribute > 4. Create new Relationship > 5. Select a new Relationship and press "edit" button > *Actual result:* a new popup window doesn't open with the possibility to edit > the data. > *[^Video1.mp4]* > *Expected result:* a new popup window is opened. User can edit all > information. > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[1/2] cayenne git commit: CAY-2450 Impossible to update Attribute title at the first attempt after syncing ObjEntity with DbEntity
Repository: cayenne
Updated Branches:
refs/heads/master f048b0e45 -> 5a4507ea4
CAY-2450 Impossible to update Attribute title at the first attempt after
syncing ObjEntity with DbEntity
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5541c3ed
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5541c3ed
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5541c3ed
Branch: refs/heads/master
Commit: 5541c3eddedd8066783e3eaa3c4ea9c9402f3629
Parents: 36faff5
Author: Arseni Bulatski
Authored: Wed Aug 22 14:54:41 2018 +0300
Committer: Arseni Bulatski
Committed: Wed Aug 22 14:54:41 2018 +0300
--
RELEASE-NOTES.txt | 1 +
.../modeler/dialog/objentity/ObjAttributeInfoDialog.java | 7 +--
2 files changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5541c3ed/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d2e5421..3523d2d 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ Bug Fixes:
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
+CAY-2450 Impossible to update Attribute title at the first attempt after
syncing ObjEntity with DbEntity
--
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5541c3ed/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
index 2bf61cf..44ae3ca 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
@@ -341,7 +341,9 @@ public class ObjAttributeInfoDialog extends
CayenneController implements TreeSel
public boolean setPath(boolean isChange) {
if (isChange()) {
-
attributeSaved.setType(view.getTypeComboBox().getSelectedItem().toString());
+ if(view.getTypeComboBox().getSelectedItem() != null) {
+
attributeSaved.setType(view.getTypeComboBox().getSelectedItem().toString());
+ }
attributeSaved.setName(view.getAttributeName().getText());
}
@@ -379,7 +381,8 @@ public class ObjAttributeInfoDialog extends
CayenneController implements TreeSel
view.getCurrentPathLabel().setText(pathStr.toString());
if (attribute.getDbAttributePath() != null
- &&
!embeddableNames.contains(view.getTypeComboBox().getSelectedItem().toString()))
{
+&&
((view.getTypeComboBox().getSelectedItem() != null &&
!embeddableNames.contains(view.getTypeComboBox().getSelectedItem().toString()))
+ || view.getTypeComboBox().getSelectedItem() == null)) {
if
(!attribute.getDbAttributePath().equals(attributePath.toString())) {
attributeSaved.setDbAttributePath(attributePath.toString());
[2/2] cayenne git commit: CAY-2450 Modeler: Impossible to update Attribute title after syncing ObjEntity
CAY-2450 Modeler: Impossible to update Attribute title after syncing ObjEntity Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5a4507ea Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5a4507ea Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5a4507ea Branch: refs/heads/master Commit: 5a4507ea454967a12a9a57bd48cd0160f9584a4d Parents: f048b0e 5541c3e Author: Nikita Timofeev Authored: Mon Aug 27 16:48:51 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 16:48:51 2018 +0300 -- RELEASE-NOTES.txt | 1 + .../modeler/dialog/objentity/ObjAttributeInfoDialog.java | 7 +-- 2 files changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5a4507ea/RELEASE-NOTES.txt -- diff --cc RELEASE-NOTES.txt index f8bb706,3523d2d..22445e8 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -20,10 -20,7 +20,11 @@@ Bug Fixes CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation CAY-2445 Oracle: Problem with ExpressionFactory.notInExp() -CAY-2450 Impossible to update Attribute title at the first attempt after syncing ObjEntity with DbEntity +CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu ++CAY-2450 Modeler: Impossible to update Attribute title after syncing ObjEntity +CAY-2451 Modeler: ObjEntity "Edit" button doesn't open editor for Relationship +CAY-2459 Modeler: DataMap paste function is not working +CAY-2463 Modeler: DB Schema generation doesn't work -- Release: 4.1.M2
[GitHub] cayenne pull request #310: CAY-2450 Impossible to update Attribute title at ...
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/310 ---
[jira] [Commented] (CAY-2450) Impossible to update Attribute title at the first attempt after syncing ObjEntity with DbEntity
[ https://issues.apache.org/jira/browse/CAY-2450?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16593676#comment-16593676 ] ASF GitHub Bot commented on CAY-2450: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/310 > Impossible to update Attribute title at the first attempt after syncing > ObjEntity with DbEntity > --- > > Key: CAY-2450 > URL: https://issues.apache.org/jira/browse/CAY-2450 > Project: Cayenne > Issue Type: Bug > Components: Modeler > Environment: Linux Ubuntu 14.04, OS X >Reporter: Yana >Priority: Major > Labels: pull-request-available > Attachments: Video1.mp4 > > > *Cayenne version: 4.1.M2-SNAPSHOT.* > *Steps:* > 1. Create a new db_Entity and ObjEntity > 2. In ObjEntity enter the field Table/View with next data: "db_Entity" > 3. In db_Entity add some DbEntity's Attributes and press "Sync..." button > 4. Switch at the ObjEntity, select available attribute and press "Edit button" > 5. In a popup window try to change the field "Attribute" > 6. Press the button "Done" > *Actual result:* the name of the attribute isn't changed. The button "Done" > is blocked.(P.S. it's changed only when you select the "type" in the pop-up > window!) > [^Video1.mp4] > *Expected result:* user has the possibility to edit in a popup window the > field "Attribute". -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2454) Modeler: Unable to read validation message if it's truncated
[ https://issues.apache.org/jira/browse/CAY-2454?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2454: - Summary: Modeler: Unable to read validation message if it's truncated (was: Impossible to read the whole text about problems in the validation window, when the size of this window is small) > Modeler: Unable to read validation message if it's truncated > > > Key: CAY-2454 > URL: https://issues.apache.org/jira/browse/CAY-2454 > Project: Cayenne > Issue Type: Bug > Components: Modeler > Environment: Linux Ubuntu 14.04 >Reporter: Yana >Priority: Trivial > Labels: pull-request-available > Attachments: 1.png > > > *Cayenne version: 4.1.M2-SNAPSHOT.* > *Steps:* > 1.Open project in Cayenne Modeler > 2.Create new DataMaps > 3.Press File=>Save > *Actual result:* there is a new pop-up window with some validation problems. > When this window has small sizes, the *text isn't displayed fully*. > !1.png! > *Expected result:* the validation *text is displayed fully regardless of the > window's size*. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[2/2] cayenne git commit: CAY-2455 Modeler: Unable to read validation message if it's truncated
CAY-2455 Modeler: Unable to read validation message if it's truncated Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8d662962 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8d662962 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8d662962 Branch: refs/heads/master Commit: 8d6629622fdb2fe419f016b44042ebf0335fb245 Parents: 5a4507e 7c29c3d Author: Nikita Timofeev Authored: Mon Aug 27 16:53:36 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 16:53:36 2018 +0300 -- RELEASE-NOTES.txt | 1 + .../dialog/validator/ValidatorDialog.java | 39 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/8d662962/RELEASE-NOTES.txt -- diff --cc RELEASE-NOTES.txt index 22445e8,4136080..9ea8f78 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -20,11 -20,7 +20,12 @@@ Bug Fixes CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation CAY-2445 Oracle: Problem with ExpressionFactory.notInExp() -CAY-2454 Impossible to read the whole text about problems in the validation window, when the size of this window is small +CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu +CAY-2450 Modeler: Impossible to update Attribute title after syncing ObjEntity +CAY-2451 Modeler: ObjEntity "Edit" button doesn't open editor for Relationship ++CAY-2454 Modeler: Unable to read validation message if it's truncated +CAY-2459 Modeler: DataMap paste function is not working +CAY-2463 Modeler: DB Schema generation doesn't work -- Release: 4.1.M2
[1/2] cayenne git commit: CAY-2454. Impossible to read the whole text about problems in the validation window, when the size of this window is small
Repository: cayenne
Updated Branches:
refs/heads/master 5a4507ea4 -> 8d6629622
CAY-2454. Impossible to read the whole text about problems in the validation
window, when the size of this window is small
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7c29c3d0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7c29c3d0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7c29c3d0
Branch: refs/heads/master
Commit: 7c29c3d0b294e879448683cb6828ced4f4e82e12
Parents: 69b731b
Author: Arseni Bulatski
Authored: Wed Aug 22 16:38:17 2018 +0300
Committer: Arseni Bulatski
Committed: Wed Aug 22 16:38:17 2018 +0300
--
RELEASE-NOTES.txt | 1 +
.../dialog/validator/ValidatorDialog.java | 39 ++--
2 files changed, 20 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/7c29c3d0/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d2e5421..4136080 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ Bug Fixes:
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
+CAY-2454 Impossible to read the whole text about problems in the validation
window, when the size of this window is small
--
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/7c29c3d0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java
index d4fda65..8e83718 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java
@@ -19,16 +19,14 @@
package org.apache.cayenne.modeler.dialog.validator;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.Collections;
-import java.util.List;
+import com.jgoodies.forms.builder.PanelBuilder;
+import com.jgoodies.forms.layout.CellConstraints;
+import com.jgoodies.forms.layout.FormLayout;
+import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.CayenneModelerFrame;
+import org.apache.cayenne.modeler.action.ValidateAction;
+import org.apache.cayenne.modeler.util.CayenneDialog;
+import org.apache.cayenne.validation.ValidationFailure;
import javax.swing.JButton;
import javax.swing.JDialog;
@@ -40,16 +38,16 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
-
-import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.CayenneModelerFrame;
-import org.apache.cayenne.modeler.action.ValidateAction;
-import org.apache.cayenne.modeler.util.CayenneDialog;
-import org.apache.cayenne.validation.ValidationFailure;
-
-import com.jgoodies.forms.builder.PanelBuilder;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Collections;
+import java.util.List;
/**
* Dialog for displaying validation errors.
@@ -217,6 +215,7 @@ public class ValidatorDialog extends CayenneDialog {
if (value != null) {
ValidationFailure info = (ValidationFailure) value;
value = info.getDescription();
+setToolTipText(info.getDescription());
}
setBackground(error ? ERROR_COLOR : WARNING_COLOR);
[GitHub] cayenne pull request #311: CAY-2454. Impossible to read the whole text about...
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/311 ---
[jira] [Commented] (CAY-2454) Modeler: Unable to read validation message if it's truncated
[ https://issues.apache.org/jira/browse/CAY-2454?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16593691#comment-16593691 ] ASF GitHub Bot commented on CAY-2454: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/311 > Modeler: Unable to read validation message if it's truncated > > > Key: CAY-2454 > URL: https://issues.apache.org/jira/browse/CAY-2454 > Project: Cayenne > Issue Type: Bug > Components: Modeler > Environment: Linux Ubuntu 14.04 >Reporter: Yana >Priority: Trivial > Labels: pull-request-available > Attachments: 1.png > > > *Cayenne version: 4.1.M2-SNAPSHOT.* > *Steps:* > 1.Open project in Cayenne Modeler > 2.Create new DataMaps > 3.Press File=>Save > *Actual result:* there is a new pop-up window with some validation problems. > When this window has small sizes, the *text isn't displayed fully*. > !1.png! > *Expected result:* the validation *text is displayed fully regardless of the > window's size*. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[2/4] cayenne git commit: Merge PR #312
Merge PR #312 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3d353959 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3d353959 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3d353959 Branch: refs/heads/master Commit: 3d35395958137c8fdabc827e81101c819c3fa871 Parents: 8d66296 85b879b Author: Nikita Timofeev Authored: Mon Aug 27 16:54:48 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 16:54:48 2018 +0300 -- .../_cayenne-guide/part2/including.adoc | 4 ++ .../_cayenne-guide/part2/objectContext.adoc | 9 .../_cayenne-guide/part4/filtering.adoc | 22 - .../_cayenne-guide/part4/introduction.adoc | 41 .../_cayenne-guide/part4/revEngineering.adoc| 47 --- .../src/docs/asciidoc/_cayenne-guide/part5.adoc | 10 ++-- .../_cayenne-guide/part5/cayenneOsgi.adoc | 43 + .../_cayenne-guide/part5/cayenneRopServer.adoc | 43 + .../_cayenne-guide/part5/cayenneWeb.adoc| 43 + .../asciidoc/_cayenne-guide/part5/jodaTime.adoc | 47 --- .../re-modeler-reverseengineering-dialog.png| Bin 37668 -> 52923 bytes .../_getting-started-db-first/part1-setup.adoc | 2 +- .../part2-rr-setup.adoc | 15 +- .../_getting-started-db-first/part2.adoc| 2 - .../part4-java-classes.adoc | 7 --- .../part2/hessianWebServ.adoc | 9 +++- 16 files changed, 242 insertions(+), 102 deletions(-) --
[3/4] cayenne git commit: Docs update
Docs update
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ec58009b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ec58009b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ec58009b
Branch: refs/heads/master
Commit: ec58009b7eba8524489c1cff2520cd4e41a130b0
Parents: 3d35395
Author: Nikita Timofeev
Authored: Mon Aug 27 17:11:22 2018 +0300
Committer: Nikita Timofeev
Committed: Mon Aug 27 17:11:22 2018 +0300
--
.../_cayenne-guide/part5/cayenneRopServer.adoc | 2 +-
.../docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc | 2 +-
.../_getting-started-db-first/part2-rr-setup.adoc | 13 ++---
3 files changed, 4 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ec58009b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
--
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
index ab943f4..cbc67ae 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
@@ -18,7 +18,7 @@ include::../var.adoc[]
Description
-The goal of this module is to create services for the server-side of an ROP
application based on Caucho Hessian.
+This module creates services for the server side of an
xref:introduction-to-rop[ROP] application.
Including in a project
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ec58009b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc
--
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc
index 87c7f0d..d2847a4 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc
@@ -18,7 +18,7 @@ include::../var.adoc[]
Description
-The goal of this module is to create web application with Cayenne service in
it.
+This module provides basic utilities to bootstrap Cayenne service inside web
application.
Including in a project
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ec58009b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
--
diff --git
a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
index 5f8455c..07e89a7 100644
---
a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
+++
b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
@@ -42,24 +42,15 @@ So let's begin, here is sample settings for the data source:
NOTE: Don't forget to set your actual MySQL login and password
-We have told plugin where cayenne-project.xml will be located.
+We have told plugin where it should load data from, now let's set where it
should store Cayenne model:
[source,xml]
...
${project.basedir}/src/main/resources/cayenne/cayenne-project.xml
-
-- Without cayenneProject option you should create project file manually via
Cayenne Modeler.
-- If cayenneProject is set but no file exists it will be created and DataMap
linked to it.
-- If cayenneProject is and file already exists then DataMap should be linked
to it (if it is new) or update existing one.
-
-We have told plugin where it should load data from, now let's set where it
should store Cayenne model:
-[source,xml]
-
-
-...
${project.basedir}/src/main/resources/datamap.map.xml
+...
And a last small step we need to do is to set default package where our model
classes will be
[4/4] cayenne git commit: Docs update
Docs update
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c04fa437
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c04fa437
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c04fa437
Branch: refs/heads/master
Commit: c04fa437ace90918656a598b463a66208d85d98c
Parents: ec58009
Author: Nikita Timofeev
Authored: Mon Aug 27 17:26:36 2018 +0300
Committer: Nikita Timofeev
Committed: Mon Aug 27 17:26:36 2018 +0300
--
.../part2-project-setup.adoc| 54
.../part2-rr-setup.adoc | 25 -
2 files changed, 24 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c04fa437/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-project-setup.adoc
--
diff --git
a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-project-setup.adoc
b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-project-setup.adoc
deleted file mode 100644
index 4663cb6..000
---
a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-project-setup.adoc
+++ /dev/null
@@ -1,54 +0,0 @@
-// 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.
-=== Creating project
-
-Now we also need to create project file, currently this should be done
manually via Cayenne Modeler.
-
- Setup Modeler Maven plugin
-
-To launch Modeler we'll use ``cayenne-modeler-maven-plugin``.
-To use it just include it in `pom.xml` like we did with
``cayenne-maven-plugin``:
-[source,xml]
-
-
-org.apache.cayenne.plugins
-cayenne-modeler-maven-plugin
-${cayenne.version}
-
-
-
-To launch it simple use console:
-
-$ mvn cayenne-modeler:run
-
-
- Create project
-
-In Modeler start new project and select `File` > ``Import DataMap``.
-In File Select dialog select created `datamap.map.xml` file and click ``Select
DataMap``.
-Now all we need is to save project, click `Save` and select same folder where
`datamap.map.xml` file is
-(it should be selected by default).
-That's all, you should see now `cayenne-project.xml` file in IDEA:
-
-image::tutorial-cayenne-project.png[align="center"]
-
-To use newly created project in Modeler later let's configure plugin to open
it automatically:
-[source,xml]
-
-
-...
-
-
${project.basedir}/src/main/resources/cayenne-project.xml
-
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c04fa437/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
--
diff --git
a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
index 07e89a7..d48f6cf 100644
---
a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
+++
b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
@@ -105,4 +105,27 @@ image::tutorial-new-datamap.png[align="center"]
Great! We now have Cayenne DataMap file that describe model from our database
and cayenne-project.xml file.
-NOTE: If you have some problems with configuration you can always delete
`datamap.map.xml` file and try again.
\ No newline at end of file
+NOTE: If you have some problems with configuration you can always delete
`datamap.map.xml` file and try again.
+
+ Setup Modeler Maven plugin
+
+Cayenne Modeler can be helpful in case you want to make some customizations to
your model, though it's usage optional.
+
+To launch Modeler we'll use ``cayenne-modeler-maven-plugin``.
+Just include it in `pom.xml` like we did with ``cayenne-maven-plugin`` and
tell where your project is:
+[sour
[1/4] cayenne git commit: Upgrade docs
Repository: cayenne
Updated Branches:
refs/heads/master 8d6629622 -> c04fa437a
Upgrade docs
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/85b879bf
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/85b879bf
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/85b879bf
Branch: refs/heads/master
Commit: 85b879bf983320bdf2fa8671b25a00059198b55a
Parents: 69b731b
Author: Arseni Bulatski
Authored: Thu Aug 23 16:04:06 2018 +0300
Committer: Arseni Bulatski
Committed: Thu Aug 23 16:04:06 2018 +0300
--
.../_cayenne-guide/part2/including.adoc | 4 ++
.../_cayenne-guide/part2/objectContext.adoc | 9
.../_cayenne-guide/part4/filtering.adoc | 22 -
.../_cayenne-guide/part4/introduction.adoc | 41
.../_cayenne-guide/part4/revEngineering.adoc| 47 ---
.../src/docs/asciidoc/_cayenne-guide/part5.adoc | 10 ++--
.../_cayenne-guide/part5/cayenneOsgi.adoc | 43 +
.../_cayenne-guide/part5/cayenneRopServer.adoc | 43 +
.../_cayenne-guide/part5/cayenneWeb.adoc| 43 +
.../asciidoc/_cayenne-guide/part5/jodaTime.adoc | 47 ---
.../re-modeler-reverseengineering-dialog.png| Bin 37668 -> 52923 bytes
.../_getting-started-db-first/part1-setup.adoc | 2 +-
.../part2-rr-setup.adoc | 15 +-
.../_getting-started-db-first/part2.adoc| 2 -
.../part4-java-classes.adoc | 7 ---
.../part2/hessianWebServ.adoc | 9 +++-
16 files changed, 242 insertions(+), 102 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/85b879bf/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc
--
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc
index dcda5bb..daa0050 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc
@@ -142,6 +142,10 @@ ${project.basedir}/src/main/resources/my.map.xml
.^|createPropertyNames
.^|boolean
.^|If set to "true", will generate String Property names. Default is "false"
+
+.^|force
+.^|boolean
+.^|If set to "true", will force run from maven/gradle.
|===
Example - a typical class generation scenario, where pairs of classes are
generated with default Maven source destination and superclass package:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/85b879bf/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/objectContext.adoc
--
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/objectContext.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/objectContext.adoc
index 5ee0fdc..02f1855 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/objectContext.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/objectContext.adoc
@@ -347,4 +347,13 @@ Transaction tx = BaseTransaction.getThreadTransaction();
tx.addConnection("mydatanode", myConnection);
+You can control transaction isolation level and propagation logic using
TransactionDescriptor.
+[source, java]
+
+TransactionDescriptor descriptor = new TransactionDescriptor(
+Connection.TRANSACTION_SERIALIZABLE,
+TransactionPropagation.REQUIRES_NEW
+);
+transactionManager.performInTransaction(transactionalOperation, descriptor);
+
http://git-wip-us.apache.org/repos/asf/cayenne/blob/85b879bf/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/filtering.adoc
--
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/filtering.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/filtering.adoc
index 58a2a16..2da1181 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/filtering.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/filtering.adoc
@@ -138,7 +138,7 @@ If you want to do reverse engineering for specific schemas,
just remove unwanted
- Including and Excluding tables, columns and procedures
+ Including and Excluding tables, columns, procedures and relationships
Cayenne reverse engineering let you fine tune table, columns and stored
procedures names that you need to import to your mo
[GitHub] cayenne pull request #312: Upgrade docs
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/312 ---
[2/3] cayenne git commit: Merge PR #313
Merge PR #313 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e0d0c686 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e0d0c686 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e0d0c686 Branch: refs/heads/master Commit: e0d0c686625b02a80fd47415fa3b03c3a7153d5d Parents: c04fa43 f3e64db Author: Nikita Timofeev Authored: Mon Aug 27 17:33:16 2018 +0300 Committer: Nikita Timofeev Committed: Mon Aug 27 17:33:16 2018 +0300 -- assembly/pom.xml| 35 +++-- .../resources/assemblies/assembly-generic.xml | 130 --- .../assembly-generic/assembly-generic.xml | 130 +++ .../main/resources/assemblies/assembly-mac.xml | 128 -- .../assemblies/assembly-mac/assembly-mac.xml| 128 ++ .../assemblies/assembly-mac/background.png | Bin 0 -> 116 bytes .../assemblies/assembly-mac/createDMG.sh| 102 +++ .../main/resources/assemblies/assembly-src.xml | 47 --- .../assemblies/assembly-src/assembly-src.xml| 47 +++ .../resources/assemblies/assembly-windows.xml | 128 -- .../assembly-windows/assembly-windows.xml | 128 ++ 11 files changed, 556 insertions(+), 447 deletions(-) --
[3/3] cayenne git commit: Updated MacOS image with customizable background
Updated MacOS image with customizable background
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c58fced0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c58fced0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c58fced0
Branch: refs/heads/master
Commit: c58fced08d6e49fe895a887153843f482c099050
Parents: e0d0c68
Author: Nikita Timofeev
Authored: Mon Aug 27 18:21:14 2018 +0300
Committer: Nikita Timofeev
Committed: Mon Aug 27 18:21:14 2018 +0300
--
assembly/pom.xml| 25 +---
.../assembly-generic/assembly-generic.xml | 130 ---
.../assemblies/assembly-mac/assembly-mac.xml| 128 --
.../assemblies/assembly-mac/background.png | Bin 116 -> 0 bytes
.../assemblies/assembly-mac/createDMG.sh| 102 ---
.../assemblies/assembly-src/assembly-src.xml| 47 ---
.../assembly-windows/assembly-windows.xml | 128 --
.../assemblies/generic/assembly-generic.xml | 130 +++
.../resources/assemblies/mac/assembly-mac.xml | 128 ++
.../resources/assemblies/mac/background.png | Bin 0 -> 4552 bytes
.../main/resources/assemblies/mac/create-dmg.sh | 91 +
.../resources/assemblies/src/assembly-src.xml | 47 +++
.../assemblies/windows/assembly-windows.xml | 128 ++
13 files changed, 529 insertions(+), 555 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c89a28c..b7890b1 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -199,7 +199,7 @@
-
src/main/resources/assemblies/assembly-src/assembly-src.xml
+
src/main/resources/assemblies/src/assembly-src.xml
cayenne-${project.version}-src
@@ -284,7 +284,7 @@
-
src/main/resources/assemblies/assembly-generic/assembly-generic.xml
+
src/main/resources/assemblies/generic/assembly-generic.xml
cayenne-${project.version}
@@ -341,7 +341,7 @@
-
src/main/resources/assemblies/assembly-mac/assembly-mac.xml
+
src/main/resources/assemblies/mac/assembly-mac.xml
cayenne-${project.version}-macosx
false
@@ -373,28 +373,13 @@
-
chmod-script
-
package
-
-
exec
-
-
-
/bin/chmod
-
-
755
-
[1/3] cayenne git commit: New script for dmg creation. Now available to set background image to dmg.
Repository: cayenne
Updated Branches:
refs/heads/master c04fa437a -> c58fced08
New script for dmg creation. Now available to set background image to dmg.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f3e64db1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f3e64db1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f3e64db1
Branch: refs/heads/master
Commit: f3e64db17a3581d3a442d745948b640fa8fea9f8
Parents: 69b731b
Author: Arseni Bulatski
Authored: Mon Aug 27 12:48:36 2018 +0300
Committer: Arseni Bulatski
Committed: Mon Aug 27 12:48:36 2018 +0300
--
assembly/pom.xml| 35 +++--
.../resources/assemblies/assembly-generic.xml | 130 ---
.../assembly-generic/assembly-generic.xml | 130 +++
.../main/resources/assemblies/assembly-mac.xml | 128 --
.../assemblies/assembly-mac/assembly-mac.xml| 128 ++
.../assemblies/assembly-mac/background.png | Bin 0 -> 116 bytes
.../assemblies/assembly-mac/createDMG.sh| 102 +++
.../main/resources/assemblies/assembly-src.xml | 47 ---
.../assemblies/assembly-src/assembly-src.xml| 47 +++
.../resources/assemblies/assembly-windows.xml | 128 --
.../assembly-windows/assembly-windows.xml | 128 ++
11 files changed, 556 insertions(+), 447 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index e48f362..c89a28c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -199,7 +199,7 @@
-
src/main/resources/assemblies/assembly-src.xml
+
src/main/resources/assemblies/assembly-src/assembly-src.xml
cayenne-${project.version}-src
@@ -284,7 +284,7 @@
-
src/main/resources/assemblies/assembly-generic.xml
+
src/main/resources/assemblies/assembly-generic/assembly-generic.xml
cayenne-${project.version}
@@ -341,7 +341,7 @@
-
src/main/resources/assemblies/assembly-mac.xml
+
src/main/resources/assemblies/assembly-mac/assembly-mac.xml
cayenne-${project.version}-macosx
false
@@ -372,7 +372,21 @@
-
+
+
chmod-script
+
package
+
+
exec
+
+
+
/bin/chmod
+
+
[GitHub] cayenne pull request #313: New script for dmg creation. Now available to set...
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/313 ---
