cayenne git commit: Enable travis
Repository: cayenne
Updated Branches:
refs/heads/STABLE-3.1 bf01e60ec -> af1e4eef5
Enable travis
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/af1e4eef
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/af1e4eef
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/af1e4eef
Branch: refs/heads/STABLE-3.1
Commit: af1e4eef5274767c84712d37d117a63006a19a14
Parents: bf01e60
Author: Nikita Timofeev
Authored: Tue Jul 10 18:03:19 2018 +0300
Committer: Nikita Timofeev
Committed: Tue Jul 10 18:03:19 2018 +0300
--
.travis.yml | 7 ++-
pom.xml | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/af1e4eef/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 95d9993..6fe402e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,12 @@ jdk:
- oraclejdk8
script:
- - travis_wait 30 mvn verify -q -DcayenneTestConnection=$DB_PROFILE
+ - |
+travis_wait 30 mvn verify -q -pl \
+!docs/doc,!docs/asciidoc,!docs/asciidoc/cayenne-guide, \
+
!docs/asciidoc/getting-started-guide,!docs/asciidoc/getting-started-rop,!docs/asciidoc/upgrade-guide,
\
+!docs/asciidoc/cayenne-asciidoc-extension,!assembly \
+-DcayenneLogLevel=ERROR -DcayenneTestConnection=$DB_PROFILE
# prevent Travis from unneeded "mvn install" run
install: true
http://git-wip-us.apache.org/repos/asf/cayenne/blob/af1e4eef/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b032820..63b45c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -689,6 +689,7 @@
cayenneJdbcDriver
${cayenneJdbcDriver}
+
${cayenneLogLevel}
[2/2] cayenne git commit: Enable travis
Enable travis Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/bf01e60e Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/bf01e60e Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/bf01e60e Branch: refs/heads/STABLE-3.1 Commit: bf01e60ec14a7b6123b1c957d2a362b7238d76b6 Parents: 5714108 Author: Nikita Timofeev Authored: Tue Jul 10 17:21:24 2018 +0300 Committer: Nikita Timofeev Committed: Tue Jul 10 17:21:24 2018 +0300 -- .travis.yml | 32 1 file changed, 32 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/bf01e60e/.travis.yml -- diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..95d9993 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,32 @@ +# 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. + +group: deprecated-2017Q2 # needed for jdk 7 + +language: java + +env: + - DB_PROFILE=hsql + - DB_PROFILE=derby + +jdk: + - oraclejdk7 + - oraclejdk8 + +script: + - travis_wait 30 mvn verify -q -DcayenneTestConnection=$DB_PROFILE + +# prevent Travis from unneeded "mvn install" run +install: true
[1/2] cayenne git commit: Disable XML external entities
Repository: cayenne
Updated Branches:
refs/heads/STABLE-3.1 1e9c4837d -> bf01e60ec
Disable XML external entities
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5714108e
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5714108e
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5714108e
Branch: refs/heads/STABLE-3.1
Commit: 5714108e8a4dabbc89957f562ad46035064ef731
Parents: 1e9c483
Author: Nikita Timofeev
Authored: Tue Jul 10 17:21:11 2018 +0300
Committer: Nikita Timofeev
Committed: Tue Jul 10 17:21:11 2018 +0300
--
.../src/main/java/org/apache/cayenne/util/Util.java | 3 +++
.../src/main/java/org/apache/cayenne/xml/XMLUtil.java| 11 +++
.../org/apache/cayenne/project/unit/Project2Case.java| 11 +++
3 files changed, 25 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5714108e/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java
--
diff --git
a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java
b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java
index f926430..429258c 100644
---
a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java
+++
b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java
@@ -402,6 +402,9 @@ public class Util {
// Create a JAXP SAXParser
SAXParser saxParser = spf.newSAXParser();
+spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl;,
true);
+
spf.setFeature("http://xml.org/sax/features/external-general-entities;, false);
+
spf.setFeature("http://xml.org/sax/features/external-parameter-entities;,
false);
// Get the encapsulated SAX XMLReader
XMLReader reader = saxParser.getXMLReader();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5714108e/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLUtil.java
--
diff --git
a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLUtil.java
b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLUtil.java
index 4982d3e..8dcd4b9 100644
---
a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLUtil.java
+++
b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLUtil.java
@@ -59,6 +59,17 @@ class XMLUtil {
static DocumentBuilder newBuilder() throws CayenneRuntimeException {
if (sharedFactory == null) {
sharedFactory = DocumentBuilderFactory.newInstance();
+sharedFactory.setNamespaceAware(false);
+sharedFactory.setExpandEntityReferences(false);
+sharedFactory.setXIncludeAware(false);
+try {
+
sharedFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl;,
true);
+
sharedFactory.setFeature("http://xml.org/sax/features/external-general-entities;,
false);
+
sharedFactory.setFeature("http://xml.org/sax/features/external-parameter-entities;,
false);
+
sharedFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd;,
false);
+} catch (ParserConfigurationException ex) {
+throw new CayenneRuntimeException("Unable to configure
DocumentBuilderFactory", ex);
+}
}
try {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5714108e/framework/cayenne-project/src/test/java/org/apache/cayenne/project/unit/Project2Case.java
--
diff --git
a/framework/cayenne-project/src/test/java/org/apache/cayenne/project/unit/Project2Case.java
b/framework/cayenne-project/src/test/java/org/apache/cayenne/project/unit/Project2Case.java
index 4252b18..07f122d 100644
---
a/framework/cayenne-project/src/test/java/org/apache/cayenne/project/unit/Project2Case.java
+++
b/framework/cayenne-project/src/test/java/org/apache/cayenne/project/unit/Project2Case.java
@@ -42,6 +42,17 @@ public class Project2Case extends TestCase {
*/
protected Document toDOMTree(File file) {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+dbf.setNamespaceAware(false);
+dbf.setExpandEntityReferences(false);
+dbf.setXIncludeAware(false);
+try {
+
dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl;, true);
+
dbf.setFeature("http://xml.org/sax/features/external-general-entities;, false);
+
[GitHub] cayenne pull request #294: CAY-2438 Split DataChannel filter into two indepe...
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/294 ---
[jira] [Commented] (CAY-2438) Split DataChannel filter into two independent filters
[
https://issues.apache.org/jira/browse/CAY-2438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16538620#comment-16538620
]
ASF GitHub Bot commented on CAY-2438:
-
Github user asfgit closed the pull request at:
https://github.com/apache/cayenne/pull/294
> Split DataChannel filter into two independent filters
> -
>
> Key: CAY-2438
> URL: https://issues.apache.org/jira/browse/CAY-2438
> Project: Cayenne
> Issue Type: Improvement
> Components: Core Library
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Major
> Labels: pull-request-available
> Fix For: 4.2.M1
>
>
> Split {{DataChannelFilter}} filter into two independent filters -
> {{DataChannelQueryFilter}} and {{DataChannelSyncFilter}}
> This will likely introduce minor incompatibility: contribution of custom
> filters that are linked with {{TransactionFIlter}} will likely need change.
> Independent filters should be fully functional (except for deprecation
> warning).
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[1/3] cayenne git commit: Split DataChannelFilter into Query and Sync filters
Repository: cayenne
Updated Branches:
refs/heads/master df5d38f7a -> a639980d2
Split DataChannelFilter into Query and Sync filters
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7475b4e0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7475b4e0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7475b4e0
Branch: refs/heads/master
Commit: 7475b4e09159e5fc5af8d9dadc1243bfb84b61aa
Parents: 22c2e78
Author: Nikita Timofeev
Authored: Tue May 29 18:36:41 2018 +0300
Committer: Nikita Timofeev
Committed: Fri Jun 8 16:18:26 2018 +0300
--
.../invalidation/CacheInvalidationFilter.java | 44 ++---
.../invalidation/CacheInvalidationModule.java | 2 +-
.../cayenne/commitlog/CommitLogFilter.java | 22 +--
.../commitlog/CommitLogModuleExtender.java | 4 +-
...jectIdRelationshipBatchFaultingStrategy.java | 2 +-
.../ObjectIdRelationshipFilter.java | 30 +---
.../ObjectIdRelationshipHandlerTest.java| 14 +-
.../org/apache/cayenne/DataChannelFilter.java | 47 --
.../apache/cayenne/DataChannelFilterChain.java | 9 +-
.../apache/cayenne/DataChannelQueryFilter.java | 32
.../cayenne/DataChannelQueryFilterChain.java| 31
.../apache/cayenne/DataChannelSyncFilter.java | 35
.../org/apache/cayenne/access/DataDomain.java | 168 +--
.../apache/cayenne/configuration/Constants.java | 5 +-
.../server/DataDomainProvider.java | 28
.../configuration/server/ServerModule.java | 32 +++-
.../apache/cayenne/tx/TransactionFilter.java| 36 ++--
.../apache/cayenne/MockDataChannelFilter.java | 44 -
.../cayenne/access/DataDomainFiltersIT.java | 143 +---
.../server/DataDomainProviderTest.java | 2 +
.../unit/di/server/ServerCaseModule.java| 4 +
21 files changed, 413 insertions(+), 321 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/7475b4e0/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationFilter.java
--
diff --git
a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationFilter.java
b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationFilter.java
index 85063e7..2d7eb15 100644
---
a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationFilter.java
+++
b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationFilter.java
@@ -19,12 +19,10 @@
package org.apache.cayenne.cache.invalidation;
-import org.apache.cayenne.DataChannel;
-import org.apache.cayenne.DataChannelFilter;
-import org.apache.cayenne.DataChannelFilterChain;
+import org.apache.cayenne.DataChannelSyncFilter;
+import org.apache.cayenne.DataChannelSyncFilterChain;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.Persistent;
-import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.annotation.PrePersist;
import org.apache.cayenne.annotation.PreRemove;
import org.apache.cayenne.annotation.PreUpdate;
@@ -32,7 +30,6 @@ import org.apache.cayenne.cache.QueryCache;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.graph.GraphDiff;
-import org.apache.cayenne.query.Query;
import java.util.Collection;
import java.util.Collections;
@@ -45,7 +42,7 @@ import java.util.function.Function;
/**
*
- * A {@link DataChannelFilter} that invalidates cache groups.
+ * A {@link DataChannelSyncFilter} that invalidates cache groups.
* Use custom rules for invalidation provided via DI.
*
*
@@ -62,7 +59,7 @@ import java.util.function.Function;
* @see InvalidationHandler
* @since 4.0 enhanced to support custom handlers.
*/
-public class CacheInvalidationFilter implements DataChannelFilter {
+public class CacheInvalidationFilter implements DataChannelSyncFilter {
private final Provider cacheProvider;
private final List handlers;
@@ -78,16 +75,9 @@ public class CacheInvalidationFilter implements
DataChannelFilter {
this.handlers = handlers;
}
-public void init(DataChannel channel) {
-// noop
-}
-
-public QueryResponse onQuery(ObjectContext originatingContext, Query
query, DataChannelFilterChain filterChain) {
-return filterChain.onQuery(originatingContext, query);
-}
-
+@Override
public GraphDiff onSync(ObjectContext originatingContext, GraphDiff
changes,
-int syncType, DataChannelFilterChain filterChain) {
+int syncType, DataChannelSyncFilterChain
filterChain) {
[2/3] cayenne git commit: CAY-2438 Split DataChannel filter into two independent filters
CAY-2438 Split DataChannel filter into two independent filters
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b2d3b393
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b2d3b393
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b2d3b393
Branch: refs/heads/master
Commit: b2d3b393610652ab3d51bf88c43c80b324ef0820
Parents: 7475b4e
Author: Nikita Timofeev
Authored: Wed May 30 14:38:23 2018 +0300
Committer: Nikita Timofeev
Committed: Fri Jun 8 16:18:39 2018 +0300
--
RELEASE-NOTES.txt | 1 +
UPGRADE.txt | 6 ++-
.../apache/cayenne/DataChannelQueryFilter.java | 24 +++
.../cayenne/DataChannelQueryFilterChain.java| 2 +
.../apache/cayenne/DataChannelSyncFilter.java | 34 +++
.../cayenne/DataChannelSyncFilterChain.java | 5 +++
.../org/apache/cayenne/access/DataDomain.java | 12 --
.../cayenne/access/DataDomainFiltersIT.java | 45
8 files changed, 124 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b2d3b393/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index b7d8a7c..482f979 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -35,6 +35,7 @@ CAY-2414 Modeler: new icon design
CAY-2415 Transaction isolation and propagation support
CAY-2416 Change TreeMap for HashMap to store data in Cayenne model classes
CAY-2422 Modeler: Open driver setup window on driver load error
+CAY-2438 Split DataChannel filter into two independent filters
CAY-2440 cdbimport: allow cross-schema relationships
Bug Fixes:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b2d3b393/UPGRADE.txt
--
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 6b2f3d1..2dfbd9b 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -5,7 +5,11 @@ IMPORTANT: be sure to read all notes for the intermediate
releases between your
current release and the release you are upgrading to.
---
UPGRADING TO 4.1.M2
-* Per CAY-2400 Cayenne-DBCP2 was deprecated
+
+* Per CAY-2438 DataChannelFilter filter was deprecated and two new independent
filters are introduced:
+ DataChannelSyncFilter and DataChannelQueryFilter.
+
+* Per CAY-2400 Cayenne-DBCP2 integration was deprecated
* Per CAY-2377 All code deprecated in Cayenne 4.0 was removed, please review
your code before upgrading.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b2d3b393/cayenne-server/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
--
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
b/cayenne-server/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
index 04f0ef1..ec1b55f 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
@@ -22,11 +22,35 @@ package org.apache.cayenne;
import org.apache.cayenne.query.Query;
/**
+ * An interface of a filter that allows to intercept DataChannel query
operations.
+ * Query filters allow to implement chains of custom processors around a
DataChannel.
+ *
+ * Example: {@code
+ * public class MyQueryFilter implements DataChannelQueryFilter {
+ * public QueryResponse onQuery(ObjectContext originatingContext, Query
query,
+ * DataChannelQueryFilterChain filterChain) {
+ * System.out.println("Do something before query");
+ * // process query or return some custom response
+ * QueryResponse response = filterChain.onQuery(originatingContext,
query);
+ * System.out.println("Do something after query");
+ * return response;
+ * }
+ * }}
+ *
+ * @see DataChannelSyncFilter
+ * @see
org.apache.cayenne.configuration.server.ServerModule#contributeDomainQueryFilters(org.apache.cayenne.di.Binder)
+ *
* @since 4.1
*/
@FunctionalInterface
public interface DataChannelQueryFilter {
+/**
+ * @param originatingContext originating context of query
+ * @param query that is processed
+ * @param filterChain chain of query filters to invoke after this filter
+ * @return query response
+ */
QueryResponse onQuery(ObjectContext originatingContext, Query query,
DataChannelQueryFilterChain filterChain);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b2d3b393/cayenne-server/src/main/java/org/apache/cayenne/DataChannelQueryFilterChain.java
[3/3] cayenne git commit: Merge PR #294
Merge PR #294 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a639980d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a639980d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a639980d Branch: refs/heads/master Commit: a639980d24dda39c6cac42237d7a7422f199f81a Parents: df5d38f b2d3b39 Author: Nikita Timofeev Authored: Tue Jul 10 16:48:04 2018 +0300 Committer: Nikita Timofeev Committed: Tue Jul 10 16:48:04 2018 +0300 -- RELEASE-NOTES.txt | 1 + UPGRADE.txt | 6 +- .../invalidation/CacheInvalidationFilter.java | 44 ++--- .../invalidation/CacheInvalidationModule.java | 2 +- .../cayenne/commitlog/CommitLogFilter.java | 22 +-- .../commitlog/CommitLogModuleExtender.java | 4 +- ...jectIdRelationshipBatchFaultingStrategy.java | 2 +- .../ObjectIdRelationshipFilter.java | 30 +--- .../ObjectIdRelationshipHandlerTest.java| 14 +- .../org/apache/cayenne/DataChannelFilter.java | 47 +++-- .../apache/cayenne/DataChannelFilterChain.java | 9 +- .../apache/cayenne/DataChannelQueryFilter.java | 56 ++ .../cayenne/DataChannelQueryFilterChain.java| 33 .../apache/cayenne/DataChannelSyncFilter.java | 69 +++ .../cayenne/DataChannelSyncFilterChain.java | 5 + .../org/apache/cayenne/access/DataDomain.java | 176 -- .../apache/cayenne/configuration/Constants.java | 5 +- .../server/DataDomainProvider.java | 28 +++ .../configuration/server/ServerModule.java | 32 +++- .../apache/cayenne/tx/TransactionFilter.java| 36 ++-- .../apache/cayenne/MockDataChannelFilter.java | 44 - .../cayenne/access/DataDomainFiltersIT.java | 180 +-- .../server/DataDomainProviderTest.java | 2 + .../unit/di/server/ServerCaseModule.java| 4 + 24 files changed, 531 insertions(+), 320 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/a639980d/RELEASE-NOTES.txt -- diff --cc RELEASE-NOTES.txt index ed9c4f4,482f979..8ae3d03 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -35,8 -35,8 +35,9 @@@ CAY-2414 Modeler: new icon desig CAY-2415 Transaction isolation and propagation support CAY-2416 Change TreeMap for HashMap to store data in Cayenne model classes CAY-2422 Modeler: Open driver setup window on driver load error + CAY-2438 Split DataChannel filter into two independent filters CAY-2440 cdbimport: allow cross-schema relationships +CAY-2439 Error deleting dbEntity when show only dbEntities filter is set Bug Fixes:
cayenne git commit: Increase travis timeout
Repository: cayenne Updated Branches: refs/heads/STABLE-4.0 7a0ec83ba -> 816629569 Increase travis timeout Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/81662956 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/81662956 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/81662956 Branch: refs/heads/STABLE-4.0 Commit: 816629569a38b2ddcf3841e608ddda28ea848ca7 Parents: 7a0ec83 Author: Nikita Timofeev Authored: Tue Jul 10 14:32:33 2018 +0300 Committer: Nikita Timofeev Committed: Tue Jul 10 14:32:33 2018 +0300 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/81662956/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 3879d27..fb8d48d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ matrix: script: # exclude JavaDocs and assembly from build, to pass on Java 11 - - travis_wait mvn verify -q $EXCLUDE_MODULES -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR + - travis_wait 30 mvn verify -q $EXCLUDE_MODULES -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR # prevent Travis from unneeded "mvn install" run install: true
[jira] [Updated] (CAY-2418) Modeler: unable to edit entity selected via Search
[ https://issues.apache.org/jira/browse/CAY-2418?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2418: - Fix Version/s: 4.0.RC2 > Modeler: unable to edit entity selected via Search > -- > > Key: CAY-2418 > URL: https://issues.apache.org/jira/browse/CAY-2418 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.1.M1, 4.0.RC1 >Reporter: ana benko >Assignee: Nikita Timofeev >Priority: Minor > Labels: pull-request-available > Fix For: 4.0.RC2, 4.1.M2 > > > # Open Modeler -> New Project > # Reengineer db schema > # Perform search > # In Search Results select dbEntity relationship; or objEntity attribute or > relationship. Click OK > # Click Edit button (edit attribute, edit relationship, etc - depending on > selection) > -> nothing happens. Edit window is not opened > note: switch between entities, and open Edit entity window -> OK > Issue does not seem to appear once Edit window was successfully opened -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2427) Undo: undo throws exeption
[ https://issues.apache.org/jira/browse/CAY-2427?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2427: - Fix Version/s: 4.0.RC2 > Undo: undo throws exeption > -- > > Key: CAY-2427 > URL: https://issues.apache.org/jira/browse/CAY-2427 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.0.RC1, 4.1.M2 >Reporter: ana benko >Assignee: Nikita Timofeev >Priority: Major > Labels: pull-request-available > Fix For: 4.0.RC2, 4.1.M2 > > > Undo throws errors from time to time, below is one of the ways to reproduce: > > # Create DbEntity > # Create attributes (don't set max length) > # Create ObjEntity from DbEntity. Save > -> max length missing warning appears > # Open DbEntity, set max length > # Click Sysn DbEntity with ObjEntity > # Open ObjEntity. Save > # Click Edit -> Undo > -> Cayenne Modeler Error appears > CayenneModeler Info > Version: 4.0.B3-SNAPSHOT > Build Date: Ð°Ð¿Ñ 02 2018 17:59:09 > Exception: > = > javax.swing.undo.CannotUndoException > at > javax.swing.undo.AbstractUndoableEdit.undo(AbstractUndoableEdit.java:110) > at javax.swing.undo.CompoundEdit.undo(CompoundEdit.java:59) > at javax.swing.undo.CompoundEdit.undo(CompoundEdit.java:63) > at javax.swing.undo.UndoManager.undoTo(UndoManager.java:335) > at javax.swing.undo.UndoManager.undo(UndoManager.java:413) > at > org.apache.cayenne.modeler.undo.CayenneUndoManager.undo(CayenneUndoManager.java:84) > at > org.apache.cayenne.modeler.action.UndoAction.performAction(UndoAction.java:57) > 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:376) > at > javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833) > at > javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877) > at > java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289) > 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.pumpEventsForHierarchy(EventDispatchThread.java:105) > at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101) > at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:93) > at java.awt.EventDispatchThread.run(EventDispatchThread.java:82) -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Closed] (CAY-2430) Redo throws NPE
[ https://issues.apache.org/jira/browse/CAY-2430?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev closed CAY-2430. Resolution: Fixed Assignee: Nikita Timofeev Fix Version/s: 4.1.M2 4.0.RC2 > Redo throws NPE > --- > > Key: CAY-2430 > URL: https://issues.apache.org/jira/browse/CAY-2430 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.0.RC1, 4.1.M2 >Reporter: ana benko >Assignee: Nikita Timofeev >Priority: Major > Labels: pull-request-available > Fix For: 4.0.RC2, 4.1.M2 > > > Redo throws NPE > Exception occurs in different cases, below is the simplest way to reproduce > # Add stored procedure > # Remove stored procedure > # Select Undo > # Select Redo > -> Cayenne Modeler error appears > > Log: > Apr 14, 2018 7:47:52 AM ERROR: CayenneModeler Error > java.lang.NullPointerException > at > org.apache.cayenne.modeler.action.RemoveAction.removeDataMapFromDataNode(RemoveAction.java:463) > at > org.apache.cayenne.modeler.undo.RemoveUndoableEdit.redo(RemoveUndoableEdit.java:215) > at javax.swing.undo.UndoManager.redoTo(UndoManager.java:351) > at javax.swing.undo.UndoManager.redo(UndoManager.java:458) > at > org.apache.cayenne.modeler.undo.CayenneUndoManager.redo(CayenneUndoManager.java:65) > at > org.apache.cayenne.modeler.action.RedoAction.performAction(RedoAction.java:65) > 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:376) > at > javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833) > at > javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877) > at > java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289) > 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.pumpEventsForHierarchy(EventDispatchThread.java:105) > at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101) > at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:93) > at java.awt.EventDispatchThread.run(EventDispatchThread.java:82) -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CAY-2418) Modeler: unable to edit entity selected via Search
[ https://issues.apache.org/jira/browse/CAY-2418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16538248#comment-16538248 ] ASF GitHub Bot commented on CAY-2418: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/299 > Modeler: unable to edit entity selected via Search > -- > > Key: CAY-2418 > URL: https://issues.apache.org/jira/browse/CAY-2418 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.1.M1, 4.0.RC1 >Reporter: ana benko >Assignee: Nikita Timofeev >Priority: Minor > Labels: pull-request-available > Fix For: 4.1.M2 > > > # Open Modeler -> New Project > # Reengineer db schema > # Perform search > # In Search Results select dbEntity relationship; or objEntity attribute or > relationship. Click OK > # Click Edit button (edit attribute, edit relationship, etc - depending on > selection) > -> nothing happens. Edit window is not opened > note: switch between entities, and open Edit entity window -> OK > Issue does not seem to appear once Edit window was successfully opened -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[6/7] cayenne git commit: Merge PR #300
Merge PR #300 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7e9d4c0a Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7e9d4c0a Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7e9d4c0a Branch: refs/heads/STABLE-4.0 Commit: 7e9d4c0a1701649bc68630ef664cfb92c421181a Parents: 39326db d5f14a8 Author: Nikita Timofeev Authored: Tue Jul 10 11:23:01 2018 +0300 Committer: Nikita Timofeev Committed: Tue Jul 10 11:23:01 2018 +0300 -- RELEASE-NOTES.txt | 1 + .../java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/7e9d4c0a/RELEASE-NOTES.txt -- diff --cc RELEASE-NOTES.txt index 4c2ec13,69142a7..2d9952f --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -46,10 -46,9 +46,11 @@@ CAY-2392 Modeler: Unable to remove Data CAY-2401 Modeler: NPE in ObjEntity sync action CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class +CAY-2418 Modeler: unable to edit entity selected via Search CAY-2420 Modeler: search is not performed for Stored Procedures +CAY-2427 Modeler: Undo throws exeption CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS + CAY-2430 Redo throws NPE -- Release: 4.0.B2
[2/7] cayenne git commit: CAY-2427 Undo: undo throws exeption
CAY-2427 Undo: undo throws exeption
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/94db9226
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/94db9226
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/94db9226
Branch: refs/heads/STABLE-4.0
Commit: 94db9226bf1466069c22a3c75e496c8c492adbb9
Parents: 8d4c83a
Author: Arseni Bulatski
Authored: Tue Jul 10 11:04:14 2018 +0300
Committer: Arseni Bulatski
Committed: Tue Jul 10 11:04:14 2018 +0300
--
RELEASE-NOTES.txt| 1 +
.../cayenne/modeler/action/DbEntitySyncAction.java | 15 +++
2 files changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/94db9226/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 1d85638..8599c3b 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -47,6 +47,7 @@ CAY-2401 Modeler: NPE in ObjEntity sync action
CAY-2405 Broken prefetch of entity with inheritance and attribute with custom
java type
CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited
class
CAY-2420 Modeler: search is not performed for Stored Procedures
+CAY-2427 Modeler: Undo throws exeption
CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/94db9226/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
index b774233..822e95a 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.modeler.action;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.dbsync.merge.context.EntityMergeSupport;
import org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator;
+import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjEntity;
@@ -99,6 +100,7 @@ public class DbEntitySyncAction extends CayenneAction {
// filter out inherited entities, as we need to add
attributes only to the roots
filterInheritedEntities(entities);
+ boolean hasChanges = false;
for(ObjEntity entity : entities) {
DbEntitySyncUndoableEdit.EntitySyncUndoableListener listener = undoableEdit.new
EntitySyncUndoableListener(
@@ -106,21 +108,26 @@ public class DbEntitySyncAction extends CayenneAction {
merger.addEntityMergeListener(listener);
+ Collection meaningfulFKs =
merger.getMeaningfulFKs(entity);
+
// TODO: addition or removal of model objects
should be reflected in listener callbacks...
// we should not be trying to introspect the
merger
- if (merger.isRemovingMeaningfulFKs()) {
- undoableEdit.addEdit(undoableEdit.new
MeaningfulFKsUndoableEdit(entity, merger
-
.getMeaningfulFKs(entity)));
+ if (merger.isRemovingMeaningfulFKs() &&
!meaningfulFKs.isEmpty()) {
+ undoableEdit.addEdit(undoableEdit.new
MeaningfulFKsUndoableEdit(entity, meaningfulFKs));
+ hasChanges = true;
}
if (merger.synchronizeWithDbEntity(entity)) {
mediator.fireObjEntityEvent(new
EntityEvent(this, entity, MapEvent.CHANGE));
+ hasChanges = true;
}
merger.removeEntityMergeListener(listener);
}
- application.getUndoManager().addEdit(undoableEdit);
+ if(hasChanges) {
+
application.getUndoManager().addEdit(undoableEdit);
+ }
}
}
[GitHub] cayenne pull request #299: CAY-2418 Modeler: unable to edit entity selected ...
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/299 ---
[jira] [Commented] (CAY-2430) Redo throws NPE
[ https://issues.apache.org/jira/browse/CAY-2430?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16538249#comment-16538249 ] ASF GitHub Bot commented on CAY-2430: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/300 > Redo throws NPE > --- > > Key: CAY-2430 > URL: https://issues.apache.org/jira/browse/CAY-2430 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.0.RC1, 4.1.M2 >Reporter: ana benko >Priority: Major > Labels: pull-request-available > > Redo throws NPE > Exception occurs in different cases, below is the simplest way to reproduce > # Add stored procedure > # Remove stored procedure > # Select Undo > # Select Redo > -> Cayenne Modeler error appears > > Log: > Apr 14, 2018 7:47:52 AM ERROR: CayenneModeler Error > java.lang.NullPointerException > at > org.apache.cayenne.modeler.action.RemoveAction.removeDataMapFromDataNode(RemoveAction.java:463) > at > org.apache.cayenne.modeler.undo.RemoveUndoableEdit.redo(RemoveUndoableEdit.java:215) > at javax.swing.undo.UndoManager.redoTo(UndoManager.java:351) > at javax.swing.undo.UndoManager.redo(UndoManager.java:458) > at > org.apache.cayenne.modeler.undo.CayenneUndoManager.redo(CayenneUndoManager.java:65) > at > org.apache.cayenne.modeler.action.RedoAction.performAction(RedoAction.java:65) > 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:376) > at > javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833) > at > javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877) > at > java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289) > 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.pumpEventsForHierarchy(EventDispatchThread.java:105) > at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101) > at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:93) > at java.awt.EventDispatchThread.run(EventDispatchThread.java:82) -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[4/7] cayenne git commit: Merge PR #298
Merge PR #298 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7077ed0d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7077ed0d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7077ed0d Branch: refs/heads/STABLE-4.0 Commit: 7077ed0d5eca3820989e38372d18273a32ad3c2f Parents: 8d4c83a 94db922 Author: Nikita Timofeev Authored: Tue Jul 10 11:21:16 2018 +0300 Committer: Nikita Timofeev Committed: Tue Jul 10 11:21:16 2018 +0300 -- RELEASE-NOTES.txt| 1 + .../cayenne/modeler/action/DbEntitySyncAction.java | 15 +++ 2 files changed, 12 insertions(+), 4 deletions(-) --
[jira] [Commented] (CAY-2427) Undo: undo throws exeption
[ https://issues.apache.org/jira/browse/CAY-2427?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16538247#comment-16538247 ] ASF GitHub Bot commented on CAY-2427: - Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/298 > Undo: undo throws exeption > -- > > Key: CAY-2427 > URL: https://issues.apache.org/jira/browse/CAY-2427 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.0.RC1, 4.1.M2 >Reporter: ana benko >Assignee: Nikita Timofeev >Priority: Major > Labels: pull-request-available > Fix For: 4.1.M2 > > > Undo throws errors from time to time, below is one of the ways to reproduce: > > # Create DbEntity > # Create attributes (don't set max length) > # Create ObjEntity from DbEntity. Save > -> max length missing warning appears > # Open DbEntity, set max length > # Click Sysn DbEntity with ObjEntity > # Open ObjEntity. Save > # Click Edit -> Undo > -> Cayenne Modeler Error appears > CayenneModeler Info > Version: 4.0.B3-SNAPSHOT > Build Date: Ð°Ð¿Ñ 02 2018 17:59:09 > Exception: > = > javax.swing.undo.CannotUndoException > at > javax.swing.undo.AbstractUndoableEdit.undo(AbstractUndoableEdit.java:110) > at javax.swing.undo.CompoundEdit.undo(CompoundEdit.java:59) > at javax.swing.undo.CompoundEdit.undo(CompoundEdit.java:63) > at javax.swing.undo.UndoManager.undoTo(UndoManager.java:335) > at javax.swing.undo.UndoManager.undo(UndoManager.java:413) > at > org.apache.cayenne.modeler.undo.CayenneUndoManager.undo(CayenneUndoManager.java:84) > at > org.apache.cayenne.modeler.action.UndoAction.performAction(UndoAction.java:57) > 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:376) > at > javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833) > at > javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877) > at > java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289) > 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.pumpEventsForHierarchy(EventDispatchThread.java:105) > at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101) > at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:93) > at java.awt.EventDispatchThread.run(EventDispatchThread.java:82) -- This
[3/7] cayenne git commit: CAY-2418 Modeler: unable to edit entity selected via Search
CAY-2418 Modeler: unable to edit entity selected via Search Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c77c8517 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c77c8517 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c77c8517 Branch: refs/heads/STABLE-4.0 Commit: c77c85172cff47deaa5241b169f0c3189d0e0e00 Parents: 8d4c83a Author: Arseni Bulatski Authored: Tue Jul 10 10:46:46 2018 +0300 Committer: Arseni Bulatski Committed: Tue Jul 10 11:09:53 2018 +0300 -- RELEASE-NOTES.txt| 1 + .../cayenne/modeler/editor/ObjEntityRelationshipPanel.java | 4 ++-- .../modeler/editor/dbentity/DbEntityRelationshipPanel.java | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/c77c8517/RELEASE-NOTES.txt -- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 1d85638..df6328f 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -46,6 +46,7 @@ CAY-2392 Modeler: Unable to remove DataNode CAY-2401 Modeler: NPE in ObjEntity sync action CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class +CAY-2418 Modeler: unable to edit entity selected via Search CAY-2420 Modeler: search is not performed for Stored Procedures CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS http://git-wip-us.apache.org/repos/asf/cayenne/blob/c77c8517/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java -- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java index c7c3788..b48a68e 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java @@ -45,7 +45,6 @@ import org.apache.cayenne.modeler.util.DbRelationshipPathComboBoxEditor; import org.apache.cayenne.modeler.util.ModelerUtil; import org.apache.cayenne.modeler.util.PanelFactory; import org.apache.cayenne.modeler.util.UIUtil; -import org.apache.cayenne.swing.components.image.FilteredIconFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +69,6 @@ import javax.swing.table.TableColumn; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; -import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Collection; @@ -204,6 +202,8 @@ public class ObjEntityRelationshipPanel extends JPanel implements ObjEntityDispl } table.select(newSel); +parentPanel.getResolve().removeActionListener(getResolver()); +parentPanel.getResolve().addActionListener(getResolver()); } /** http://git-wip-us.apache.org/repos/asf/cayenne/blob/c77c8517/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java -- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java index ca25022..13122ac 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java @@ -190,6 +190,8 @@ public class DbEntityRelationshipPanel extends JPanel implements DbEntityDisplay } table.select(newSel); +parentPanel.getResolve().removeActionListener(getResolver()); +parentPanel.getResolve().addActionListener(getResolver()); } /**
[GitHub] cayenne pull request #298: CAY-2427 Undo: undo throws exeption
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/298 ---
[GitHub] cayenne pull request #300: CAY-2430. Redo throws NPE
Github user asfgit closed the pull request at: https://github.com/apache/cayenne/pull/300 ---
[1/7] cayenne git commit: CAY-2430. Redo throws NPE
Repository: cayenne
Updated Branches:
refs/heads/STABLE-4.0 8d4c83abe -> 7a0ec83ba
CAY-2430. Redo throws NPE
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d5f14a8d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d5f14a8d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d5f14a8d
Branch: refs/heads/STABLE-4.0
Commit: d5f14a8d16aefd6703531c95e4808cc53fb92d2d
Parents: 8d4c83a
Author: Arseni Bulatski
Authored: Tue Jul 10 10:50:48 2018 +0300
Committer: Arseni Bulatski
Committed: Tue Jul 10 10:50:48 2018 +0300
--
RELEASE-NOTES.txt | 1 +
.../java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java | 2 ++
2 files changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d5f14a8d/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 1d85638..69142a7 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -48,6 +48,7 @@ CAY-2405 Broken prefetch of entity with inheritance and
attribute with custom ja
CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited
class
CAY-2420 Modeler: search is not performed for Stored Procedures
CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS
+CAY-2430 Redo throws NPE
--
Release: 4.0.B2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d5f14a8d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
--
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
index fd22b74..fe662b2 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
@@ -211,6 +211,7 @@ public class RemoveUndoableEdit extends CayenneUndoableEdit
{
break;
case PROCEDURE:
action.removeProcedure(map, procedure);
+break;
case MAP_FROM_NODE:
action.removeDataMapFromDataNode(dataNode, map);
break;
@@ -222,6 +223,7 @@ public class RemoveUndoableEdit extends CayenneUndoableEdit
{
break;
case EMBEDDABLE:
action.removeEmbeddable(map, embeddable);
+break;
}
}
[7/7] cayenne git commit: Release notes
Release notes Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7a0ec83b Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7a0ec83b Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7a0ec83b Branch: refs/heads/STABLE-4.0 Commit: 7a0ec83ba99216225662924bf3cd73a8f0ac9907 Parents: 7e9d4c0 Author: Nikita Timofeev Authored: Tue Jul 10 11:29:55 2018 +0300 Committer: Nikita Timofeev Committed: Tue Jul 10 11:29:55 2018 +0300 -- RELEASE-NOTES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/7a0ec83b/RELEASE-NOTES.txt -- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 2d9952f..c7474b3 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -16,6 +16,9 @@ Changes/New Features: Bug Fixes: +CAY-2418 Modeler: unable to edit entity selected via Search +CAY-2427 Modeler: Undo throws exception +CAY-2430 Modeler: Redo throws NPE CAY-2435 cdbimport: procedure parameters are not imported CAY-2436 NPE in CayenneRuntimeException constructor CAY-2442 Broken EventBridge providers implementations @@ -46,11 +49,8 @@ CAY-2392 Modeler: Unable to remove DataNode CAY-2401 Modeler: NPE in ObjEntity sync action CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class -CAY-2418 Modeler: unable to edit entity selected via Search CAY-2420 Modeler: search is not performed for Stored Procedures -CAY-2427 Modeler: Undo throws exeption CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS -CAY-2430 Redo throws NPE -- Release: 4.0.B2
[5/7] cayenne git commit: Merge PR #299
Merge PR #299 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/39326db2 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/39326db2 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/39326db2 Branch: refs/heads/STABLE-4.0 Commit: 39326db2d2b2b7c466390aa5a02f8622918b Parents: 7077ed0 c77c851 Author: Nikita Timofeev Authored: Tue Jul 10 11:22:21 2018 +0300 Committer: Nikita Timofeev Committed: Tue Jul 10 11:22:21 2018 +0300 -- RELEASE-NOTES.txt| 1 + .../cayenne/modeler/editor/ObjEntityRelationshipPanel.java | 4 ++-- .../modeler/editor/dbentity/DbEntityRelationshipPanel.java | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/39326db2/RELEASE-NOTES.txt -- diff --cc RELEASE-NOTES.txt index 8599c3b,df6328f..4c2ec13 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -46,8 -46,8 +46,9 @@@ CAY-2392 Modeler: Unable to remove Data CAY-2401 Modeler: NPE in ObjEntity sync action CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class + CAY-2418 Modeler: unable to edit entity selected via Search CAY-2420 Modeler: search is not performed for Stored Procedures +CAY-2427 Modeler: Undo throws exeption CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS --
[jira] [Commented] (CAY-2430) Redo throws NPE
[ https://issues.apache.org/jira/browse/CAY-2430?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16538235#comment-16538235 ] ASF GitHub Bot commented on CAY-2430: - GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/300 CAY-2430. Redo throws NPE You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne CAY-2430 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/300.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 #300 commit d5f14a8d16aefd6703531c95e4808cc53fb92d2d Author: Arseni Bulatski Date: 2018-07-10T07:50:48Z CAY-2430. Redo throws NPE > Redo throws NPE > --- > > Key: CAY-2430 > URL: https://issues.apache.org/jira/browse/CAY-2430 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.0.RC1, 4.1.M2 >Reporter: ana benko >Priority: Major > Labels: pull-request-available > > Redo throws NPE > Exception occurs in different cases, below is the simplest way to reproduce > # Add stored procedure > # Remove stored procedure > # Select Undo > # Select Redo > -> Cayenne Modeler error appears > > Log: > Apr 14, 2018 7:47:52 AM ERROR: CayenneModeler Error > java.lang.NullPointerException > at > org.apache.cayenne.modeler.action.RemoveAction.removeDataMapFromDataNode(RemoveAction.java:463) > at > org.apache.cayenne.modeler.undo.RemoveUndoableEdit.redo(RemoveUndoableEdit.java:215) > at javax.swing.undo.UndoManager.redoTo(UndoManager.java:351) > at javax.swing.undo.UndoManager.redo(UndoManager.java:458) > at > org.apache.cayenne.modeler.undo.CayenneUndoManager.redo(CayenneUndoManager.java:65) > at > org.apache.cayenne.modeler.action.RedoAction.performAction(RedoAction.java:65) > 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:376) > at > javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833) > at > javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877) > at > java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289) > 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 >
[GitHub] cayenne pull request #300: CAY-2430. Redo throws NPE
GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/300 CAY-2430. Redo throws NPE You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne CAY-2430 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/300.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 #300 commit d5f14a8d16aefd6703531c95e4808cc53fb92d2d Author: Arseni Bulatski Date: 2018-07-10T07:50:48Z CAY-2430. Redo throws NPE ---
[jira] [Commented] (CAY-2418) Modeler: unable to edit entity selected via Search
[ https://issues.apache.org/jira/browse/CAY-2418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16538232#comment-16538232 ] ASF GitHub Bot commented on CAY-2418: - GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/299 CAY-2418 Modeler: unable to edit entity selected via Search You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne CAY-2418 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/299.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 #299 commit c77c85172cff47deaa5241b169f0c3189d0e0e00 Author: Arseni Bulatski Date: 2018-07-10T07:46:46Z CAY-2418 Modeler: unable to edit entity selected via Search > Modeler: unable to edit entity selected via Search > -- > > Key: CAY-2418 > URL: https://issues.apache.org/jira/browse/CAY-2418 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.1.M1, 4.0.RC1 >Reporter: ana benko >Assignee: Nikita Timofeev >Priority: Minor > Labels: pull-request-available > Fix For: 4.1.M2 > > > # Open Modeler -> New Project > # Reengineer db schema > # Perform search > # In Search Results select dbEntity relationship; or objEntity attribute or > relationship. Click OK > # Click Edit button (edit attribute, edit relationship, etc - depending on > selection) > -> nothing happens. Edit window is not opened > note: switch between entities, and open Edit entity window -> OK > Issue does not seem to appear once Edit window was successfully opened -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[GitHub] cayenne pull request #299: CAY-2418 Modeler: unable to edit entity selected ...
GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/299 CAY-2418 Modeler: unable to edit entity selected via Search You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne CAY-2418 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/299.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 #299 commit c77c85172cff47deaa5241b169f0c3189d0e0e00 Author: Arseni Bulatski Date: 2018-07-10T07:46:46Z CAY-2418 Modeler: unable to edit entity selected via Search ---
[jira] [Commented] (CAY-2427) Undo: undo throws exeption
[ https://issues.apache.org/jira/browse/CAY-2427?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16538230#comment-16538230 ] ASF GitHub Bot commented on CAY-2427: - GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/298 CAY-2427 Undo: undo throws exeption You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne CAY-2427 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/298.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 #298 commit 94db9226bf1466069c22a3c75e496c8c492adbb9 Author: Arseni Bulatski Date: 2018-07-10T08:04:14Z CAY-2427 Undo: undo throws exeption > Undo: undo throws exeption > -- > > Key: CAY-2427 > URL: https://issues.apache.org/jira/browse/CAY-2427 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.0.RC1, 4.1.M2 >Reporter: ana benko >Assignee: Nikita Timofeev >Priority: Major > Labels: pull-request-available > Fix For: 4.1.M2 > > > Undo throws errors from time to time, below is one of the ways to reproduce: > > # Create DbEntity > # Create attributes (don't set max length) > # Create ObjEntity from DbEntity. Save > -> max length missing warning appears > # Open DbEntity, set max length > # Click Sysn DbEntity with ObjEntity > # Open ObjEntity. Save > # Click Edit -> Undo > -> Cayenne Modeler Error appears > CayenneModeler Info > Version: 4.0.B3-SNAPSHOT > Build Date: Ð°Ð¿Ñ 02 2018 17:59:09 > Exception: > = > javax.swing.undo.CannotUndoException > at > javax.swing.undo.AbstractUndoableEdit.undo(AbstractUndoableEdit.java:110) > at javax.swing.undo.CompoundEdit.undo(CompoundEdit.java:59) > at javax.swing.undo.CompoundEdit.undo(CompoundEdit.java:63) > at javax.swing.undo.UndoManager.undoTo(UndoManager.java:335) > at javax.swing.undo.UndoManager.undo(UndoManager.java:413) > at > org.apache.cayenne.modeler.undo.CayenneUndoManager.undo(CayenneUndoManager.java:84) > at > org.apache.cayenne.modeler.action.UndoAction.performAction(UndoAction.java:57) > 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:376) > at > javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833) > at > javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877) > at > java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289) > 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 >
[GitHub] cayenne pull request #298: CAY-2427 Undo: undo throws exeption
GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/298 CAY-2427 Undo: undo throws exeption You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne CAY-2427 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/298.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 #298 commit 94db9226bf1466069c22a3c75e496c8c492adbb9 Author: Arseni Bulatski Date: 2018-07-10T08:04:14Z CAY-2427 Undo: undo throws exeption ---
