[jira] [Created] (CAY-2405) Broken prefetch of entity with inheritance and attribute with custom java type

2018-02-07 Thread Nikita Timofeev (JIRA) 
Nikita Timofeev created CAY-2405:


 Summary: Broken prefetch of entity with inheritance and attribute 
with custom java type
 Key: CAY-2405
 URL: https://issues.apache.org/jira/browse/CAY-2405
 Project: Cayenne
  Issue Type: Bug
  Components: Core Library
Affects Versions: 4.1.M1, 4.0.B2
Reporter: Nikita Timofeev
Assignee: Nikita Timofeev
 Fix For: 4.0.B3, 4.1.M2


This is a rare combination of query parameters, but it is perfectly valid.
 * Prerequisites:
 ** ObjEntity *A* with some set of attributes
 ** ObjEntity *B* inherited from A with one additional attribute with {{Enum}} 
type (it can be any type that isn't matched directly with underlying DB type)
 ** ObjEntity *C* that have a relationship with *A*

 * Query:
 ** Select *C* with prefetch of *A*

 * Outcome:
 ** {{IllegalArgumentException}} when converting result set into objects

It seems like java type of this additional attribute is not taken into account 
and defined by {{DbAttribute}} type only.

P.S. This one was found in {{cayenne-client}} stack in *4.0.B2* version, it is 
hard to find directly as underlying data storage hides conversion error until 
attribute is fetched directly.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Created] (CAY-2407) Modeler: add prefetch support for the SQLTemplate query

2018-02-07 Thread Nikita Timofeev (JIRA) 
Nikita Timofeev created CAY-2407:


 Summary: Modeler: add prefetch support for the SQLTemplate query
 Key: CAY-2407
 URL: https://issues.apache.org/jira/browse/CAY-2407
 Project: Cayenne
  Issue Type: Improvement
  Components: Modeler
Reporter: Nikita Timofeev
 Fix For: 4.1.M2


Recommended way of using queries defined in Modeler is {{MappedSelect}} and 
{{MappedExec}}, however you can't define prefetch when selecting objects if 
underlying query is {{SQLTemplate}}.

So one way of resolving this problem is to add prefetch settings to 
{{SQLTemplate}} editor in the Modeler.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Updated] (CAY-2406) Add prefetch-related API to SQLSelect

2018-02-07 Thread Nikita Timofeev (JIRA) 

 [ 
https://issues.apache.org/jira/browse/CAY-2406?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikita Timofeev updated CAY-2406:
-
Fix Version/s: 4.1.M2

> Add prefetch-related API to SQLSelect
> -
>
> Key: CAY-2406
> URL: https://issues.apache.org/jira/browse/CAY-2406
> Project: Cayenne
>  Issue Type: Improvement
>  Components: Core Library
>Reporter: Nikita Timofeev
>Priority: Major
> Fix For: 4.1.M2
>
>




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Updated] (CAY-2406) Add prefetch-related API to SQLSelect

2018-02-07 Thread Nikita Timofeev (JIRA) 

 [ 
https://issues.apache.org/jira/browse/CAY-2406?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikita Timofeev updated CAY-2406:
-
Description: 
This one is self-descriptory. There is just no prefetch capabilities in 
{{SQLSelect}} query. 

Should be pretty straightforward as underlying {{SQLTemplate}} already supports 
it.

> Add prefetch-related API to SQLSelect
> -
>
> Key: CAY-2406
> URL: https://issues.apache.org/jira/browse/CAY-2406
> Project: Cayenne
>  Issue Type: Improvement
>  Components: Core Library
>Reporter: Nikita Timofeev
>Priority: Major
> Fix For: 4.1.M2
>
>
> This one is self-descriptory. There is just no prefetch capabilities in 
> {{SQLSelect}} query. 
> Should be pretty straightforward as underlying {{SQLTemplate}} already 
> supports it.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Created] (CAY-2406) Add prefetch-related API to SQLSelect

2018-02-07 Thread Nikita Timofeev (JIRA) 
Nikita Timofeev created CAY-2406:


 Summary: Add prefetch-related API to SQLSelect
 Key: CAY-2406
 URL: https://issues.apache.org/jira/browse/CAY-2406
 Project: Cayenne
  Issue Type: Improvement
  Components: Core Library
Reporter: Nikita Timofeev






--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Jenkins build is back to normal : cayenne-master » hsql,JDK 1.8 (latest),ubuntu #793

2018-02-07 Thread Apache Jenkins Server 
See

cayenne git commit: Clean up client superclass template Enable force update of generated test classes

2018-02-07 Thread ntimofeev 
Repository: cayenne
Updated Branches:
  refs/heads/master 750d3d551 -> e591f4d1f


Clean up client superclass template
Enable force update of generated test classes


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e591f4d1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e591f4d1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e591f4d1

Branch: refs/heads/master
Commit: e591f4d1fb897b6e173822696ca68773d296f20a
Parents: 750d3d5
Author: Nikita Timofeev 
Authored: Wed Feb 7 11:37:00 2018 +0300
Committer: Nikita Timofeev 
Committed: Wed Feb 7 11:37:00 2018 +0300

--
 .../templates/v4_1/client-superclass.vm | 83 ++--
 cayenne-crypto/pom.xml  |  1 +
 .../apache/cayenne/crypto/db/auto/_Table1.java  | 38 +
 .../apache/cayenne/crypto/db/auto/_Table2.java  | 12 +--
 .../apache/cayenne/crypto/db/auto/_Table3.java  |  6 +-
 .../apache/cayenne/crypto/db/auto/_Table4.java  | 19 +++--
 .../apache/cayenne/crypto/db/auto/_Table5.java  | 39 +
 .../apache/cayenne/crypto/db/auto/_Table6.java  | 26 +++---
 cayenne-protostuff/pom.xml  |  1 +
 .../persistent/auto/_ClientMtTable1.java| 13 +--
 .../persistent/auto/_ClientMtTable2.java|  5 +-
 11 files changed, 135 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/e591f4d1/cayenne-cgen/src/main/resources/templates/v4_1/client-superclass.vm
--
diff --git 
a/cayenne-cgen/src/main/resources/templates/v4_1/client-superclass.vm 
b/cayenne-cgen/src/main/resources/templates/v4_1/client-superclass.vm
index f8c9cbe..0b2ae34 100644
--- a/cayenne-cgen/src/main/resources/templates/v4_1/client-superclass.vm
+++ b/cayenne-cgen/src/main/resources/templates/v4_1/client-superclass.vm
@@ -89,7 +89,7 @@ public abstract class ${superClassName} extends 
${baseClassName} {
 public static final Property<$type> 
${stringUtils.capitalizedAsConstant($rel.Name)} = 
Property.create("${rel.Name}", ${stringUtils.stripGeneric($type)}.class);
 #end
 #else
-#set( $type = "$importUtils.formatJavaType(${rel.TargetEntity.ClassName})" 
)
+#set( $type = 
"$importUtils.formatJavaType(${rel.TargetEntity.ClientClassName})" )
 public static final Property<$type> 
${stringUtils.capitalizedAsConstant($rel.Name)} = 
Property.create("${rel.Name}", ${stringUtils.stripGeneric($type)}.class);
 #end
 #end
@@ -112,44 +112,43 @@ public abstract class ${superClassName} extends 
${baseClassName} {
 
 ## Create attribute set/get methods
 #foreach( $attr in ${object.DeclaredAttributes} )
+#set( $attrName = $stringUtils.formatVariableName(${attr.Name}))
 #if ( $importUtils.isBoolean(${attr.Type}) )
 public boolean is${stringUtils.capitalized($attr.Name)}() {
 if(objectContext != null) {
 objectContext.prepareForAccess(this, "${attr.Name}", false);
 }
 
-return ${attr.Name};
+return $attrName;
 }
+
 #else 
 public $importUtils.formatJavaType(${attr.Type}) 
get${stringUtils.capitalized($attr.Name)}() {
 if(objectContext != null) {
 objectContext.prepareForAccess(this, "${attr.Name}", false);
 }
 
-return ${attr.Name};
+return $attrName;
 }
+
 #end
 #if ("true" != "${object.isReadOnly()}")
-public void 
set${stringUtils.capitalized($attr.Name)}($importUtils.formatJavaType(${attr.Type})
 $stringUtils.formatVariableName(${attr.Name})) {
+public void 
set${stringUtils.capitalized($attr.Name)}($importUtils.formatJavaType(${attr.Type})
 $attrName) {
 if(objectContext != null) {
 objectContext.prepareForAccess(this, "${attr.Name}", false);
+objectContext.propertyChanged(this, "${attr.Name}", 
this.$attrName, $attrName);
 }
 
-Object oldValue = this.${stringUtils.formatVariableName($attr.Name)};
-// notify objectContext about simple property change
-if(objectContext != null) {
-objectContext.propertyChanged(this, "${attr.Name}", oldValue, 
$stringUtils.formatVariableName(${attr.Name}));
-}
-
-this.${stringUtils.formatVariableName($attr.Name)} = 
${stringUtils.formatVariableName($attr.Name)};
+this.$attrName = $attrName;
 }
-#end
 
 #end
+#end
 ##
 ##
 ## Create list add/remove/get methods
 #foreach( $rel in ${object.DeclaredRelationships} )
+#set( $relName = $stringUtils.formatVariableName(${rel.Name}))
 #if( $rel.ToMany )
 #if ( ${rel.CollectionType} == "java.util.Map")
 public 
$importUtils.formatJavaType($rel.CollectionType)<$importUtils.formatJavaType($entityUtils.getMapKeyType($rel)),

cayenne git commit: Add generics to value holders

2018-02-07 Thread ntimofeev 
Repository: cayenne
Updated Branches:
  refs/heads/master e591f4d1f -> 234d97980


Add generics to value holders


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/234d9798
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/234d9798
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/234d9798

Branch: refs/heads/master
Commit: 234d97980a75bc70e822b6b0762049c50ba361a7
Parents: e591f4d
Author: Nikita Timofeev 
Authored: Wed Feb 7 13:32:37 2018 +0300
Committer: Nikita Timofeev 
Committed: Wed Feb 7 13:32:37 2018 +0300

--
 .../templates/v4_1/client-superclass.vm |  14 +-
 .../persistent/auto/_ClientMtTable1.java|   6 +-
 .../persistent/auto/_ClientMtTable2.java|   8 +-
 .../remote/service/BaseRemoteService.java   |  14 +-
 .../java/org/apache/cayenne/ValueHolder.java|  10 +-
 .../cayenne/access/PrefetchProcessorNode.java   |   5 +-
 .../org/apache/cayenne/access/ToManyList.java   |  14 +-
 .../java/org/apache/cayenne/exp/Expression.java |   2 +-
 .../util/PersistentObjectCollection.java|   6 +-
 .../cayenne/util/PersistentObjectHolder.java|  29 ++--
 .../cayenne/util/PersistentObjectList.java  | 142 +++
 .../apache/cayenne/util/RelationshipFault.java  |  16 +--
 12 files changed, 143 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/234d9798/cayenne-cgen/src/main/resources/templates/v4_1/client-superclass.vm
--
diff --git 
a/cayenne-cgen/src/main/resources/templates/v4_1/client-superclass.vm 
b/cayenne-cgen/src/main/resources/templates/v4_1/client-superclass.vm
index 0b2ae34..5d21ba0 100644
--- a/cayenne-cgen/src/main/resources/templates/v4_1/client-superclass.vm
+++ b/cayenne-cgen/src/main/resources/templates/v4_1/client-superclass.vm
@@ -106,7 +106,7 @@ public abstract class ${superClassName} extends 
${baseClassName} {
 protected 
$importUtils.formatJavaType($rel.CollectionType)<$importUtils.formatJavaType($rel.TargetEntity.ClientClassName)>
 ${rel.Name};
 #end
 #else
-protected ValueHolder ${rel.Name};
+protected 
ValueHolder<$importUtils.formatJavaType($rel.TargetEntity.ClientClassName)> 
${rel.Name};
 #end
 #end
 
@@ -161,7 +161,7 @@ public abstract class ${superClassName} extends 
${baseClassName} {
 #if ( ${rel.CollectionType} == "java.util.Map")
throw new RuntimeException("Map relationships cannot be 
accessed for transient objects");
 #else
-   this.$relName = new PersistentObjectList(this, "${rel.Name}");
+   this.$relName = new PersistentObjectList<>(this, "${rel.Name}");
 #end
}
 
@@ -195,7 +195,7 @@ public abstract class ${superClassName} extends 
${baseClassName} {
 if(objectContext != null) {
 objectContext.prepareForAccess(this, "${rel.Name}", true);
 } else if (this.$relName == null) {
-   this.$relName = new PersistentObjectList(this, "${rel.Name}");
+   this.$relName = new PersistentObjectList<>(this, "${rel.Name}");
}
 
 this.${relName}.add(object);
@@ -205,7 +205,7 @@ public abstract class ${superClassName} extends 
${baseClassName} {
 if(objectContext != null) {
 objectContext.prepareForAccess(this, "${rel.Name}", true);
 } else if (this.$relName == null) {
-   this.$relName = new PersistentObjectList(this, "${rel.Name}");
+   this.$relName = new PersistentObjectList<>(this, "${rel.Name}");
}
 
 this.${relName}.remove(object);
@@ -218,10 +218,10 @@ public abstract class ${superClassName} extends 
${baseClassName} {
 if(objectContext != null) {
 objectContext.prepareForAccess(this, "$rel.Name", true);
 } else if (this.$relName == null) {
-   this.$relName = new PersistentObjectHolder(this, "$rel.Name");
+   this.$relName = new PersistentObjectHolder<>(this, "$rel.Name");
}
 
-return 
($importUtils.formatJavaType(${rel.TargetEntity.ClientClassName})) 
${relName}.getValue();
+return ${relName}.getValue();
 }
 
 #if ( !${object.isReadOnly()} && !$rel.ReadOnly )
@@ -230,7 +230,7 @@ public abstract class ${superClassName} extends 
${baseClassName} {
 objectContext.prepareForAccess(this, "$rel.Name", true);
 objectContext.propertyChanged(this, "$rel.Name", 
this.${relName}.getValueDirectly(), $relName);
 } else if (this.$relName == null) {
-   this.$relName = new PersistentObjectHolder(this, "$rel.Name");
+   this.$relName = new PersistentObjectHolder<>(this, "$rel.Name");
}

Build failed in Jenkins: cayenne-master » hsql,JDK 1.8 (latest),ubuntu #794

2018-02-07 Thread Apache Jenkins Server 
See 


Changes:

[stariy95] Add generics to value holders

--
[...truncated 9.41 MB...]
:clean
:compileJava
:licenseFiles
:pluginDescriptors
:versionFile
:processResources
:classes
:jar
:assemble
:pluginUnderTestMetadata
:compileTestJava
:processTestResources
:testClasses
:test

org.apache.cayenne.tools.DbImportIT > emptyDbTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:62

org.apache.cayenne.tools.DbImportIT > simpleDbTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:80

org.apache.cayenne.tools.DbImportIT > withProjectTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:127

org.apache.cayenne.tools.DbImportIT > notConfiguredTaskFailure FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:49

org.apache.cayenne.tools.DbImportIT > excludeRelDbTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:105

org.apache.cayenne.tools.GradlePluginIT > testGradleVersionsCompatibility FAILED
java.lang.AssertionError at GradlePluginIT.java:78

org.apache.cayenne.tools.DbGenerateTaskIT > defaultConfigTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbGenerateTaskIT.java:65

org.apache.cayenne.tools.DbGenerateTaskIT > notConfiguredTaskFailure FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbGenerateTaskIT.java:43

org.apache.cayenne.tools.DbGenerateTaskIT > customConfigTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbGenerateTaskIT.java:91

org.apache.cayenne.tools.CgenTaskIT > classGeneratingWithCustomConfigSuccess 
FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
CgenTaskIT.java:70

org.apache.cayenne.tools.CgenTaskIT > classGeneratingWithDefaultConfigSuccess 
FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
CgenTaskIT.java:48

32 tests completed, 11 failed
:test FAILED

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':test'.
> There were failing tests. See the report at: 
> file:///home/jenkins/jenkins-slave/workspace/cayenne-master/cayenneTestConnection/hsql/jdk/JDK%201.8%20(latest)/slave/ubuntu/cayenne-gradle-plugin/build/reports/tests/test/index.html

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug 
option to get more log output.

* Get more help at https://help.gradle.org

BUILD FAILED in 50s
11 actionable tasks: 11 executed
[ERROR] Command execution failed.
org.apache.commons.exec.ExecuteException: Process exited with an error: 1 (Exit 
value: 1)
at org.apache.commons.exec.DefaultExecutor.executeInternal 
(DefaultExecutor.java:404)
at org.apache.commons.exec.DefaultExecutor.execute 
(DefaultExecutor.java:166)
at org.codehaus.mojo.exec.ExecMojo.executeCommandLine (ExecMojo.java:804)
at org.codehaus.mojo.exec.ExecMojo.executeCommandLine (ExecMojo.java:751)
at org.codehaus.mojo.exec.ExecMojo.execute (ExecMojo.java:313)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo 
(DefaultBuildPluginManager.java:134)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute 
(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute 
(MojoExecutor.java:154)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute 
(MojoExecutor.java:146)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject 
(LifecycleModuleBuilder.java:117)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject 
(LifecycleModuleBuilder.java:81)
at 
org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build
 (SingleThreadedBuilder.java:51)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute 
(LifecycleStarter.java:128)
at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:309)
at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:194)
at org.apache.maven.DefaultMaven.execute (DefaultMaven.java:107)
at org.apache.maven.cli.MavenCli.execute (MavenCli.java:955)
at org.apache.maven.cli.MavenCli.doMain (MavenCli.java:290)
at org.apache.maven.cli.MavenCli.main (MavenCli.java:194)
at sun.reflect.NativeMethodAccessorImpl.invoke0 (Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke 
(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke 
(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke (Method.java:498)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced 
(Launcher.java:289)

[GitHub] cayenne pull request #267: Unknown tag in XML parser

2018-02-07 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/267


---

[2/2] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/267' into asf-master

2018-02-07 Thread ntimofeev 
Merge remote-tracking branch 'remotes/parent/pr/267' into asf-master


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e88edcf5
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e88edcf5
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e88edcf5

Branch: refs/heads/master
Commit: e88edcf58864c9d5457de484903958eb8dbf6f83
Parents: 234d979 40bcac7
Author: Nikita Timofeev 
Authored: Wed Feb 7 14:47:53 2018 +0300
Committer: Nikita Timofeev 
Committed: Wed Feb 7 14:47:53 2018 +0300

--
 .../cayenne/configuration/xml/DataChannelChildrenHandler.java| 4 
 1 file changed, 4 insertions(+)
--

[1/2] cayenne git commit: Unknown tag in XML parser

2018-02-07 Thread ntimofeev 
Repository: cayenne
Updated Branches:
  refs/heads/master 234d97980 -> e88edcf58


Unknown tag in XML parser


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/40bcac77
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/40bcac77
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/40bcac77

Branch: refs/heads/master
Commit: 40bcac77a03e7a7ecb8df930a0aac6017430bf3c
Parents: d8a944b
Author: Arseni Bulatski 
Authored: Tue Feb 6 11:50:34 2018 +0300
Committer: Arseni Bulatski 
Committed: Tue Feb 6 11:50:34 2018 +0300

--
 .../cayenne/configuration/xml/DataChannelChildrenHandler.java| 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/40bcac77/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
--
diff --git 
a/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
 
b/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
index e351fac..99d1f7a 100644
--- 
a/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
+++ 
b/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
@@ -40,6 +40,7 @@ final class DataChannelChildrenHandler extends 
NamespaceAwareNestedTagHandler {
 static final String NODE_TAG = "node";
 static final String PROPERTY_TAG = "property";
 static final String DATA_MAP_TAG = "data-map";
+static final String DOMAIN_TAG = "domain";
 
 
 private XMLDataChannelDescriptorLoader xmlDataChannelDescriptorLoader;
@@ -67,6 +68,9 @@ final class DataChannelChildrenHandler extends 
NamespaceAwareNestedTagHandler {
 case NODE_TAG:
 addNode(attributes);
 return true;
+
+case DOMAIN_TAG:
+return true;
 }
 
 return false;

[1/2] cayenne git commit: Add suppressions to checkstyle

2018-02-07 Thread ntimofeev 
Repository: cayenne
Updated Branches:
  refs/heads/master e88edcf58 -> 383cfb0d0


Add suppressions to checkstyle


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5cc51157
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5cc51157
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5cc51157

Branch: refs/heads/master
Commit: 5cc51157dee908266f8e7b715acf5536ec8452ce
Parents: 750d3d5
Author: Arseni Bulatski 
Authored: Tue Feb 6 17:46:12 2018 +0300
Committer: Arseni Bulatski 
Committed: Tue Feb 6 17:46:12 2018 +0300

--
 .../cayenne-checkstyle-suppression.xml  | 37 
 .../cayenne-checkstyle-suppression.xml  | 45 
 cayenne-server/pom.xml  | 40 -
 pom.xml | 25 +++
 4 files changed, 53 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/5cc51157/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml
--
diff --git 
a/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml
 
b/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml
new file mode 100644
index 000..7f6ec0c
--- /dev/null
+++ 
b/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5cc51157/cayenne-server/cayenne-checkstyle-suppression.xml
--
diff --git a/cayenne-server/cayenne-checkstyle-suppression.xml 
b/cayenne-server/cayenne-checkstyle-suppression.xml
deleted file mode 100644
index 2c8bb34..000
--- a/cayenne-server/cayenne-checkstyle-suppression.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5cc51157/cayenne-server/pom.xml
--
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index 8bda80e..6f0a8c2 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -303,45 +303,5 @@



-
-code-quality
-
-
-
-
-maven-checkstyle-plugin
-
-
${project.basedir}/cayenne-checkstyle-suppression.xml
-
-
-
-maven-pmd-plugin
-
-
-
**/ExpressionParserTreeConstants.java
-**/JavaCharStream.java
-
**/JJTExpressionParserState.java
-**/ParseException.java
-**/Token.java
-**/TokenMgrError.java
-**/ExpressionParser.java
-
**/ExpressionParserConstants.java
-
**/ExpressionParserTokenManager.java
-**/SimpleNode.java
-**/ParseException.java
-**/Parser.java.java
-**/ParserConstants.java
-**/ParserTokenManager.java
-**/SimpleCharStream.java
-**/TokenMgrError.java
-
org/apache/cayenne/ejbql/parser/*
-   
org/apache/cayenne/exp/parser/*
-   
org/apache/cayenne/template/parser/*
-
-
-
-
-
-
 
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5cc51157/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e3a1199..c6ad426 100644
--- a/pom.xml
+++ b/pom.xml
@@ -967,14 +967,14 @@

org.apache.maven.plugins

maven-checkstyle-plugin

-

[GitHub] cayenne pull request #268: Add suppressions to checkstyle

2018-02-07 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/268


---

[2/2] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/268' into asf-master

2018-02-07 Thread ntimofeev 
Merge remote-tracking branch 'remotes/parent/pr/268' into asf-master


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/383cfb0d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/383cfb0d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/383cfb0d

Branch: refs/heads/master
Commit: 383cfb0d0f77273dbe007a4f3220a53464bc36ac
Parents: e88edcf 5cc5115
Author: Nikita Timofeev 
Authored: Wed Feb 7 14:48:36 2018 +0300
Committer: Nikita Timofeev 
Committed: Wed Feb 7 14:48:36 2018 +0300

--
 .../cayenne-checkstyle-suppression.xml  | 37 
 .../cayenne-checkstyle-suppression.xml  | 45 
 cayenne-server/pom.xml  | 40 -
 pom.xml | 25 +++
 4 files changed, 53 insertions(+), 94 deletions(-)
--

cayenne git commit: Minor update and styling

2018-02-07 Thread ntimofeev 
Repository: cayenne
Updated Branches:
  refs/heads/master c11adead8 -> 4a8a8425e


Minor update and styling


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4a8a8425
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4a8a8425
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4a8a8425

Branch: refs/heads/master
Commit: 4a8a8425e210d79055344ba2925991cdd23d153e
Parents: c11adea
Author: Nikita Timofeev 
Authored: Wed Feb 7 16:42:08 2018 +0300
Committer: Nikita Timofeev 
Committed: Wed Feb 7 16:42:08 2018 +0300

--
 .../asciidoc/_cayenne-guide/part5/commitLog.adoc| 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/4a8a8425/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/commitLog.adoc
--
diff --git 
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/commitLog.adoc
 
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/commitLog.adoc
index e08b9ea..b7ae82d 100644
--- 
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/commitLog.adoc
+++ 
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/commitLog.adoc
@@ -45,8 +45,8 @@ compile 'org.apache.cayenne:cayenne-commitlog:{version}'
 
 In order to use `commitlog` module you need to perform three steps:
 
-1) Mark all entities which changes you are interested in with 
`@org.apache.cayenne.commitlog.CommitLog` annotation
-
+. Mark all entities which changes you are interested in with 
`@org.apache.cayenne.commitlog.CommitLog` annotation
++
 [source, Java]
 
 @CommitLog(ignoredProperties = {"somePrivatePropertyToSkip"})
@@ -55,11 +55,11 @@ public class MyEntity extends _MyEntity {
 }
 
 
-2) Implement `CommitLogListener` interface.
-
+. Implement `CommitLogListener` interface.
++
 [source, java]
 
- CommitLogListener {
+public class MyCommitLogListener implements CommitLogListener {
 @Override
 public void onPostCommit(ObjectContext originatingContext, ChangeMap 
changes) {
 // ChangeMap will contain all information about changes happened in 
performed commit
@@ -72,8 +72,8 @@ public class MyEntity extends _MyEntity {
 }
 
 
-3) Inject your listener into `ServerRuntime`
-
+. Register your listener implementation.
++
 [source, java]
 
 ServerRuntime.builder()
@@ -81,4 +81,6 @@ ServerRuntime.builder()
 .addListener(MyCommitLogListener.class)
 .module())
 
++
+NOTE: You can use several listeners, but they all will get same changes.

cayenne git commit: Minor update and styling

2018-02-07 Thread ntimofeev 
Repository: cayenne
Updated Branches:
  refs/heads/STABLE-4.0 0b8774d91 -> f6772c064


Minor update and styling

(cherry picked from commit 4a8a842)


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f6772c06
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f6772c06
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f6772c06

Branch: refs/heads/STABLE-4.0
Commit: f6772c0643dab3e24622d4332231bb80930cc9ac
Parents: 0b8774d
Author: Nikita Timofeev 
Authored: Wed Feb 7 16:42:08 2018 +0300
Committer: Nikita Timofeev 
Committed: Wed Feb 7 16:42:55 2018 +0300

--
 .../asciidoc/_cayenne-guide/part5/commitLog.adoc| 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6772c06/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/commitLog.adoc
--
diff --git 
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/commitLog.adoc
 
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/commitLog.adoc
index 5f43f66..9fc9f19 100644
--- 
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/commitLog.adoc
+++ 
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/commitLog.adoc
@@ -45,8 +45,8 @@ compile 'org.apache.cayenne:cayenne-commitlog:{version}'
 
 In order to use `commitlog` module you need to perform three steps:
 
-1) Mark all entities which changes you are interested in with 
`@org.apache.cayenne.commitlog.CommitLog` annotation
-
+. Mark all entities which changes you are interested in with 
`@org.apache.cayenne.commitlog.CommitLog` annotation
++
 [source, Java]
 
 @CommitLog(ignoredProperties = {"somePrivatePropertyToSkip"})
@@ -55,11 +55,11 @@ public class MyEntity extends _MyEntity {
 }
 
 
-2) Implement `CommitLogListener` interface.
-
+. Implement `CommitLogListener` interface.
++
 [source, java]
 
- CommitLogListener {
+public class MyCommitLogListener implements CommitLogListener {
 @Override
 public void onPostCommit(ObjectContext originatingContext, ChangeMap 
changes) {
 // ChangeMap will contain all information about changes happened in 
performed commit
@@ -72,8 +72,8 @@ public class MyEntity extends _MyEntity {
 }
 
 
-3) Inject your listener into `ServerRuntime`
-
+. Register your listener implementation.
++
 [source, java]
 
 ServerRuntime.builder()
@@ -81,4 +81,6 @@ ServerRuntime.builder()
 .addListener(MyCommitLogListener.class)
 .module())
 
++
+NOTE: You can use several listeners, but they all will get same changes.

cayenne-website git commit: Minor docs update

2018-02-07 Thread ntimofeev 
Repository: cayenne-website
Updated Branches:
  refs/heads/master 44b03baec -> 9ee7afa02


Minor docs update


Project: http://git-wip-us.apache.org/repos/asf/cayenne-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne-website/commit/9ee7afa0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne-website/tree/9ee7afa0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne-website/diff/9ee7afa0

Branch: refs/heads/master
Commit: 9ee7afa022cd4a8b15e788df6d35156c20441e25
Parents: 44b03ba
Author: Nikita Timofeev 
Authored: Wed Feb 7 16:49:26 2018 +0300
Committer: Nikita Timofeev 
Committed: Wed Feb 7 16:49:26 2018 +0300

--
 .../site/content/docs/4.0/cayenne-guide.html| 54 +++-
 .../site/content/docs/4.1/cayenne-guide.html| 54 +++-
 2 files changed, 62 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/9ee7afa0/src/main/site/content/docs/4.0/cayenne-guide.html
--
diff --git a/src/main/site/content/docs/4.0/cayenne-guide.html 
b/src/main/site/content/docs/4.0/cayenne-guide.html
index 553e1af..f3de622 100644
--- a/src/main/site/content/docs/4.0/cayenne-guide.html
+++ b/src/main/site/content/docs/4.0/cayenne-guide.html
@@ -4850,23 +4850,21 @@ public class MyEntity extends _MyEntity {
  
  In order to use commitlog module you need to perform 
three steps: 
  
- 
- 1) Mark all entities which changes you are interested in with 
@org.apache.cayenne.commitlog.CommitLog annotation 
- 
- 
-  
-  @CommitLog(ignoredProperties = {"somePrivatePropertyToSkip"})
+ 
+  
+   Mark all entities which changes you are interested in with 
@org.apache.cayenne.commitlog.CommitLog annotation 
+
+ 
+ @CommitLog(ignoredProperties = {"somePrivatePropertyToSkip"})
 public class MyEntity extends _MyEntity {
 // ...
 } 
-  
- 
- 
- 2) Implement CommitLogListener interface. 
- 
- 
-  
-   CommitLogListener {
+ 
+ 
+   Implement CommitLogListener interface. 
+
+ 
+ public class MyCommitLogListener implements CommitLogListener {
 @Override
 public void onPostCommit(ObjectContext originatingContext, ChangeMap 
changes) {
 // ChangeMap will contain all information about changes happened in 
performed commit
@@ -4877,18 +4875,28 @@ public class MyEntity extends _MyEntity {
 .forEach(id - System.out.println("Inserted new entity with id: 
" + id));
 }
 } 
-  
- 
- 
- 3) Inject your listener into ServerRuntime 
- 
- 
-  
-  ServerRuntime.builder()
+ 
+ 
+   Register your listener implementation. 
+
+ 
+ ServerRuntime.builder()
 .addModule(CommitLogModule.extend()
 .addListener(MyCommitLogListener.class)
 .module()) 
-  
+ 
+
+
+ 
+ 
+   
+  
+You can use several listeners, but they all 
will get same changes.  
+   
+ 
+ 
+ 
+  
  
 


http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/9ee7afa0/src/main/site/content/docs/4.1/cayenne-guide.html
--
diff --git a/src/main/site/content/docs/4.1/cayenne-guide.html 
b/src/main/site/content/docs/4.1/cayenne-guide.html
index 81c0cba..6f7ebdb 100644
--- a/src/main/site/content/docs/4.1/cayenne-guide.html
+++ b/src/main/site/content/docs/4.1/cayenne-guide.html
@@ -4831,23 +4831,21 @@ public class MyEntity extends _MyEntity {
  
  In order to use commitlog module you need to perform 
three steps: 
  
- 
- 1) Mark all entities which changes you are interested in with 
@org.apache.cayenne.commitlog.CommitLog annotation 
- 
- 
-  
-  @CommitLog(ignoredProperties = {"somePrivatePropertyToSkip"})
+ 
+  
+   Mark all entities which changes you are interested in with 
@org.apache.cayenne.commitlog.CommitLog annotation 
+
+ 
+ @CommitLog(ignoredProperties = {"somePrivatePropertyToSkip"})
 public class MyEntity extends _MyEntity {
 // ...
 } 
-  
- 
- 
- 2) Implement CommitLogListener interface. 
- 
- 
-  
-   CommitLogListener {
+ 
+ 
+   Implement CommitLogListener interface. 
+
+ 
+ public class MyCommitLogListener implements CommitLogListener {
 @Override
 public void onPostCommit(ObjectContext originatingContext, ChangeMap 
changes) {
 // ChangeMap will contain all information about changes happened in 
performed commit
@@

cayenne-website git commit: Minor commit-log module docs update

2018-02-07 Thread ntimofeev 
Repository: cayenne-website
Updated Branches:
  refs/heads/asf-site c7255d565 -> fa83fd279


Minor commit-log module docs update


Project: http://git-wip-us.apache.org/repos/asf/cayenne-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne-website/commit/fa83fd27
Tree: http://git-wip-us.apache.org/repos/asf/cayenne-website/tree/fa83fd27
Diff: http://git-wip-us.apache.org/repos/asf/cayenne-website/diff/fa83fd27

Branch: refs/heads/asf-site
Commit: fa83fd279e0e0fdc416fc586ed8c1f483ae5066f
Parents: c7255d5
Author: Nikita Timofeev 
Authored: Wed Feb 7 16:55:58 2018 +0300
Committer: Nikita Timofeev 
Committed: Wed Feb 7 16:55:58 2018 +0300

--
 docs/4.0/cayenne-guide/index.html | 54 +++---
 docs/4.1/cayenne-guide/index.html | 54 +++---
 2 files changed, 62 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/fa83fd27/docs/4.0/cayenne-guide/index.html
--
diff --git a/docs/4.0/cayenne-guide/index.html 
b/docs/4.0/cayenne-guide/index.html
index 7218732..4eabde6 100644
--- a/docs/4.0/cayenne-guide/index.html
+++ b/docs/4.0/cayenne-guide/index.html
@@ -5019,23 +5019,21 @@ public class MyEntity extends _MyEntity {
  
  In order to use commitlog module you need to perform 
three steps: 
  
- 
- 1) Mark all entities which changes you are interested in with 
@org.apache.cayenne.commitlog.CommitLog annotation 
- 
- 
-  
-  @CommitLog(ignoredProperties = {"somePrivatePropertyToSkip"})
+ 
+  
+   Mark all entities which changes you are interested in with 
@org.apache.cayenne.commitlog.CommitLog annotation 
+
+ 
+ @CommitLog(ignoredProperties = {"somePrivatePropertyToSkip"})
 public class MyEntity extends _MyEntity {
 // ...
 } 
-  
- 
- 
- 2) Implement CommitLogListener interface. 
- 
- 
-  
-   CommitLogListener {
+ 
+ 
+   Implement CommitLogListener interface. 
+
+ 
+ public class MyCommitLogListener implements CommitLogListener {
 @Override
 public void onPostCommit(ObjectContext originatingContext, ChangeMap 
changes) {
 // ChangeMap will contain all information about changes happened in 
performed commit
@@ -5046,18 +5044,28 @@ public class MyEntity extends _MyEntity {
 .forEach(id - System.out.println("Inserted new entity with id: 
" + id));
 }
 } 
-  
- 
- 
- 3) Inject your listener into ServerRuntime 
- 
- 
-  
-  ServerRuntime.builder()
+ 
+ 
+   Register your listener implementation. 
+
+ 
+ ServerRuntime.builder()
 .addModule(CommitLogModule.extend()
 .addListener(MyCommitLogListener.class)
 .module()) 
-  
+ 
+
+
+ 
+ 
+   
+  
+You can use several listeners, but they all 
will get same changes.  
+   
+ 
+ 
+ 
+  
  
 


http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/fa83fd27/docs/4.1/cayenne-guide/index.html
--
diff --git a/docs/4.1/cayenne-guide/index.html 
b/docs/4.1/cayenne-guide/index.html
index 38f5f36..cd652af 100644
--- a/docs/4.1/cayenne-guide/index.html
+++ b/docs/4.1/cayenne-guide/index.html
@@ -5004,23 +5004,21 @@ public class MyEntity extends _MyEntity {
  
  In order to use commitlog module you need to perform 
three steps: 
  
- 
- 1) Mark all entities which changes you are interested in with 
@org.apache.cayenne.commitlog.CommitLog annotation 
- 
- 
-  
-  @CommitLog(ignoredProperties = {"somePrivatePropertyToSkip"})
+ 
+  
+   Mark all entities which changes you are interested in with 
@org.apache.cayenne.commitlog.CommitLog annotation 
+
+ 
+ @CommitLog(ignoredProperties = {"somePrivatePropertyToSkip"})
 public class MyEntity extends _MyEntity {
 // ...
 } 
-  
- 
- 
- 2) Implement CommitLogListener interface. 
- 
- 
-  
-   CommitLogListener {
+ 
+ 
+   Implement CommitLogListener interface. 
+
+ 
+ public class MyCommitLogListener implements CommitLogListener {
 @Override
 public void onPostCommit(ObjectContext originatingContext, ChangeMap 
changes) {
 // ChangeMap will contain all information about changes happened in 
performed commit
@@ -5031,18 +5029,28 @@ public class MyEntity extends _MyEntity {
 .forEach(id - System.out.println("Inserted new entity with id:

Build failed in Jenkins: cayenne-master » hsql,JDK 1.8 (latest),ubuntu #796

2018-02-07 Thread Apache Jenkins Server 
See 


Changes:

[stariy95] Minor update and styling

--
[...truncated 9.40 MB...]
:clean
:compileJava
:licenseFiles
:pluginDescriptors
:versionFile
:processResources
:classes
:jar
:assemble
:pluginUnderTestMetadata
:compileTestJava
:processTestResources
:testClasses
:test

org.apache.cayenne.tools.DbImportIT > emptyDbTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:62

org.apache.cayenne.tools.DbImportIT > simpleDbTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:80

org.apache.cayenne.tools.DbImportIT > withProjectTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:127

org.apache.cayenne.tools.DbImportIT > notConfiguredTaskFailure FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:49

org.apache.cayenne.tools.DbImportIT > excludeRelDbTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:105

org.apache.cayenne.tools.GradlePluginIT > testGradleVersionsCompatibility FAILED
java.lang.AssertionError at GradlePluginIT.java:78

org.apache.cayenne.tools.DbGenerateTaskIT > defaultConfigTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbGenerateTaskIT.java:65

org.apache.cayenne.tools.DbGenerateTaskIT > notConfiguredTaskFailure FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbGenerateTaskIT.java:43

org.apache.cayenne.tools.DbGenerateTaskIT > customConfigTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbGenerateTaskIT.java:91

org.apache.cayenne.tools.CgenTaskIT > classGeneratingWithCustomConfigSuccess 
FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
CgenTaskIT.java:70

org.apache.cayenne.tools.CgenTaskIT > classGeneratingWithDefaultConfigSuccess 
FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
CgenTaskIT.java:48

32 tests completed, 11 failed
:test FAILED

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':test'.
> There were failing tests. See the report at: 
> file:///home/jenkins/jenkins-slave/workspace/cayenne-master/cayenneTestConnection/hsql/jdk/JDK%201.8%20(latest)/slave/ubuntu/cayenne-gradle-plugin/build/reports/tests/test/index.html

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug 
option to get more log output.

* Get more help at https://help.gradle.org

BUILD FAILED in 52s
11 actionable tasks: 11 executed
[ERROR] Command execution failed.
org.apache.commons.exec.ExecuteException: Process exited with an error: 1 (Exit 
value: 1)
at org.apache.commons.exec.DefaultExecutor.executeInternal 
(DefaultExecutor.java:404)
at org.apache.commons.exec.DefaultExecutor.execute 
(DefaultExecutor.java:166)
at org.codehaus.mojo.exec.ExecMojo.executeCommandLine (ExecMojo.java:804)
at org.codehaus.mojo.exec.ExecMojo.executeCommandLine (ExecMojo.java:751)
at org.codehaus.mojo.exec.ExecMojo.execute (ExecMojo.java:313)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo 
(DefaultBuildPluginManager.java:134)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute 
(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute 
(MojoExecutor.java:154)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute 
(MojoExecutor.java:146)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject 
(LifecycleModuleBuilder.java:117)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject 
(LifecycleModuleBuilder.java:81)
at 
org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build
 (SingleThreadedBuilder.java:51)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute 
(LifecycleStarter.java:128)
at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:309)
at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:194)
at org.apache.maven.DefaultMaven.execute (DefaultMaven.java:107)
at org.apache.maven.cli.MavenCli.execute (MavenCli.java:955)
at org.apache.maven.cli.MavenCli.doMain (MavenCli.java:290)
at org.apache.maven.cli.MavenCli.main (MavenCli.java:194)
at sun.reflect.NativeMethodAccessorImpl.invoke0 (Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke 
(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke 
(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke (Method.java:498)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced 
(Launcher.java:289)
at

Jenkins build is back to normal : cayenne-master » hsql,JDK 1.8 (latest),ubuntu #795

2018-02-07 Thread Apache Jenkins Server 
See

[3/3] cayenne git commit: Code cleanup

2018-02-07 Thread ntimofeev 
Code cleanup


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c11adead
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c11adead
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c11adead

Branch: refs/heads/master
Commit: c11adead8319b8fb62e4bafcc24284913144041d
Parents: e8cae77
Author: Nikita Timofeev 
Authored: Wed Feb 7 15:13:07 2018 +0300
Committer: Nikita Timofeev 
Committed: Wed Feb 7 15:13:07 2018 +0300

--
 .../apache/cayenne/modeler/ProjectTreeView.java | 80 ++--
 .../cayenne/modeler/graph/BaseGraphBuilder.java | 51 +++--
 2 files changed, 51 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/c11adead/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
--
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
index fc1a938..90ceb58 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
@@ -97,7 +97,6 @@ import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.event.TreeWillExpandListener;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.ExpandVetoException;
 import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
@@ -148,40 +147,10 @@ public class ProjectTreeView extends JTree implements 
DomainDisplayListener,
 }
 
 private void initController() {
-   initTreeSelectionListener();
-
-treeWillExpandListener = new TreeWillExpandListener() {
-@Override
-public void treeWillExpand(TreeExpansionEvent e) throws 
ExpandVetoException {
-TreePath path = e.getPath();
-if (!isPathSelected(path) && !isSelectionEmpty()) {
-setSelectionPath(path);
-}
-}
-
-@Override
-public void treeWillCollapse(TreeExpansionEvent e) throws 
ExpandVetoException {
-TreePath path = e.getPath();
-if (!isPathSelected(path) && !isSelectionEmpty()) {
-setSelectionPath(path);
-}
-}
-};
-
-addTreeSelectionListener(treeSelectionListener);
-addTreeWillExpandListener(treeWillExpandListener);
-
+initTreeSelectionListener();
+initTreeExpandListener();
 addMouseListener(new MouseClickHandler());
-
 setupMediator();
-mediator.addQueryListener(this);
-mediator.addQueryDisplayListener(this);
-mediator.addMultipleObjectsDisplayListener(this);
-
-mediator.getApplication().getActionManager().setupCutCopyPaste(
-this,
-CutAction.class,
-CopyAction.class);
 }
 
private void initTreeSelectionListener() {
@@ -224,14 +193,37 @@ public class ProjectTreeView extends JTree implements 
DomainDisplayListener,
  */
 private ConfigurationNode createProjectPath(TreePath treePath) {
 Object[] path = treePath.getPath();
-ConfigurationNode projectPath = (ConfigurationNode) 
((DefaultMutableTreeNode) path[path.length - 1])
-.getUserObject();
-
-return projectPath;
+DefaultMutableTreeNode treeNode = 
(DefaultMutableTreeNode)path[path.length - 1];
+return (ConfigurationNode) treeNode.getUserObject();
 }
 };
+
+addTreeSelectionListener(treeSelectionListener);
}
 
+   private void initTreeExpandListener() {
+treeWillExpandListener = new TreeWillExpandListener() {
+@Override
+public void treeWillExpand(TreeExpansionEvent e) {
+TreePath path = e.getPath();
+if (!isPathSelected(path) && !isSelectionEmpty()) {
+setSelectionPath(path);
+}
+}
+
+@Override
+public void treeWillCollapse(TreeExpansionEvent e) {
+TreePath path = e.getPath();
+if (!isPathSelected(path) && !isSelectionEmpty()) {
+setSelectionPath(path);
+}
+}
+};
+
+
+addTreeWillExpandListener(treeWillExpandListener);
+}
+
private void setupMediator() {

[1/3] cayenne git commit: Brain methods of classes BaseGraphBuilder and ProjectTreeView automatically refactored with Bandago

2018-02-07 Thread ntimofeev 
Repository: cayenne
Updated Branches:
  refs/heads/master 383cfb0d0 -> c11adead8


Brain methods of classes BaseGraphBuilder and ProjectTreeView
automatically refactored with Bandago

Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/221bed68
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/221bed68
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/221bed68

Branch: refs/heads/master
Commit: 221bed687134243da14e220daa8df3686bdb183d
Parents: 750d3d5
Author: Santiago Vidal 
Authored: Mon Feb 5 10:33:49 2018 -0300
Committer: Santiago Vidal 
Committed: Mon Feb 5 10:33:49 2018 -0300

--
 .../apache/cayenne/modeler/ProjectTreeView.java | 76 +
 .../cayenne/modeler/graph/BaseGraphBuilder.java | 90 +++-
 2 files changed, 94 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/221bed68/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
--
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
index 9e38d81..fc1a938 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
@@ -148,7 +148,44 @@ public class ProjectTreeView extends JTree implements 
DomainDisplayListener,
 }
 
 private void initController() {
-treeSelectionListener = new TreeSelectionListener() {
+   initTreeSelectionListener();
+
+treeWillExpandListener = new TreeWillExpandListener() {
+@Override
+public void treeWillExpand(TreeExpansionEvent e) throws 
ExpandVetoException {
+TreePath path = e.getPath();
+if (!isPathSelected(path) && !isSelectionEmpty()) {
+setSelectionPath(path);
+}
+}
+
+@Override
+public void treeWillCollapse(TreeExpansionEvent e) throws 
ExpandVetoException {
+TreePath path = e.getPath();
+if (!isPathSelected(path) && !isSelectionEmpty()) {
+setSelectionPath(path);
+}
+}
+};
+
+addTreeSelectionListener(treeSelectionListener);
+addTreeWillExpandListener(treeWillExpandListener);
+
+addMouseListener(new MouseClickHandler());
+
+setupMediator();
+mediator.addQueryListener(this);
+mediator.addQueryDisplayListener(this);
+mediator.addMultipleObjectsDisplayListener(this);
+
+mediator.getApplication().getActionManager().setupCutCopyPaste(
+this,
+CutAction.class,
+CopyAction.class);
+}
+
+   private void initTreeSelectionListener() {
+   treeSelectionListener = new TreeSelectionListener() {
 
 public void valueChanged(TreeSelectionEvent e) {
 TreePath[] paths = getSelectionPaths();
@@ -193,31 +230,10 @@ public class ProjectTreeView extends JTree implements 
DomainDisplayListener,
 return projectPath;
 }
 };
+   }
 
-treeWillExpandListener = new TreeWillExpandListener() {
-@Override
-public void treeWillExpand(TreeExpansionEvent e) throws 
ExpandVetoException {
-TreePath path = e.getPath();
-if (!isPathSelected(path) && !isSelectionEmpty()) {
-setSelectionPath(path);
-}
-}
-
-@Override
-public void treeWillCollapse(TreeExpansionEvent e) throws 
ExpandVetoException {
-TreePath path = e.getPath();
-if (!isPathSelected(path) && !isSelectionEmpty()) {
-setSelectionPath(path);
-}
-}
-};
-
-addTreeSelectionListener(treeSelectionListener);
-addTreeWillExpandListener(treeWillExpandListener);
-
-addMouseListener(new MouseClickHandler());
-
-mediator.addDomainListener(this);
+   private void setupMediator() {
+   mediator.addDomainListener(this);
 mediator.addDomainDisplayListener(this);
 mediator.addDataNodeListener(this);
 mediator.addDataNodeDisplayListener(this);
@@ -231,15 +247,7 @@ public class ProjectTreeView extends JTree implements 
DomainDisplayListener,
 mediator.addEmbeddableListener(this);
 mediator.addProcedureListener(this);

[GitHub] cayenne pull request #266: Refactoring complex methods of classes BaseGraphB...

2018-02-07 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/266


---

[2/3] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/266' into asf-master

2018-02-07 Thread ntimofeev 
Merge remote-tracking branch 'remotes/parent/pr/266' into asf-master


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e8cae770
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e8cae770
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e8cae770

Branch: refs/heads/master
Commit: e8cae770ed781c96bb949737a805b84e29bf1536
Parents: 383cfb0 221bed6
Author: Nikita Timofeev 
Authored: Wed Feb 7 14:55:42 2018 +0300
Committer: Nikita Timofeev 
Committed: Wed Feb 7 14:55:42 2018 +0300

--
 .../apache/cayenne/modeler/ProjectTreeView.java | 76 +
 .../cayenne/modeler/graph/BaseGraphBuilder.java | 90 +++-
 2 files changed, 94 insertions(+), 72 deletions(-)
--