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

2018-02-05 Thread santiago-a-vidal
GitHub user santiago-a-vidal opened a pull request:

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

Refactoring complex methods of classes BaseGraphBuilder and ProjectTreeView

Related to no particular issue. This is a behavior-preserving refactoring.

Summary of this pull request:

• We are evaluating a research prototype called Bandago that assists in 
the refactoring of complex methods. Bandago is an Eclipse plugin that 
automatically identifies and refactors a type of code smell called Brain 
Method. A Brain Method centralizes the intelligence of a class and manifests 
itself as a long and complex method that is difficult to understand and 
maintain We have applied Bandago to 2 complex methods of your project, and we 
would like to receive feedback.
• Bandago is very conservative and you should not observe many source 
code changes (only in the affected class).
• The source code (after the refactoring) should behave equivalently to 
the original one.
• As a sanity check, we have run tests before and after Bandago performed 
the refactoring(s) on the project. All tests passed.
• The goal of the refactorings applied is to improve the legibility of 
the refactored method.
• In this case, Bandago refactored the method BaseGraphBuilder.buildGraph 
 extracting fragments of its code into the new methods addIsolatedObjetcs, 
addMouseListeners, and setLayout. Also, the method 
ProjectTreeView.initController() was refactored extracting fragments of its 
code into the new methods setupMediator and initTreeSelectionListener.

Thanks in advance for your help in this evaluation!


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/santiago-a-vidal/cayenne BandagoRefactorings

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cayenne/pull/266.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 #266


commit 221bed687134243da14e220daa8df3686bdb183d
Author: Santiago Vidal 
Date:   2018-02-05T13:33:49Z

Brain methods of classes BaseGraphBuilder and ProjectTreeView
automatically refactored with Bandago




---


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

2018-02-05 Thread Apache Jenkins Server
See 


Changes:

[ancarseni] CAY-2403

[ancarseni] CAY-2404

--
[...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 58s
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)

[jira] [Closed] (CAY-2404) Move itests to maven-plugin

2018-02-05 Thread Nikita Timofeev (JIRA)

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

Nikita Timofeev closed CAY-2404.

Resolution: Fixed
  Assignee: Nikita Timofeev

> Move itests to maven-plugin
> ---
>
> Key: CAY-2404
> URL: https://issues.apache.org/jira/browse/CAY-2404
> Project: Cayenne
>  Issue Type: Task
>Reporter: Arseni Bulatski
>Assignee: Nikita Timofeev
>Priority: Minor
>  Labels: pull-request-available
> Fix For: 4.1.M2
>
>




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


[jira] [Commented] (CAY-2404) Move itests to maven-plugin

2018-02-05 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/CAY-2404?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16352177#comment-16352177
 ] 

ASF GitHub Bot commented on CAY-2404:
-

Github user asfgit closed the pull request at:

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


> Move itests to maven-plugin
> ---
>
> Key: CAY-2404
> URL: https://issues.apache.org/jira/browse/CAY-2404
> Project: Cayenne
>  Issue Type: Task
>Reporter: Arseni Bulatski
>Priority: Minor
>  Labels: pull-request-available
> Fix For: 4.1.M2
>
>




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


[2/9] cayenne git commit: CAY-2403

2018-02-05 Thread ntimofeev
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ab1fd0bf/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPBridge.java
--
diff --git 
a/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPBridge.java 
b/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPBridge.java
new file mode 100644
index 000..d506d6c
--- /dev/null
+++ b/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPBridge.java
@@ -0,0 +1,308 @@
+/*
+ *   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.
+ /
+
+package org.apache.cayenne.event;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.util.Base64Codec;
+import org.apache.cayenne.util.Util;
+import org.jivesoftware.smack.GroupChat;
+import org.jivesoftware.smack.PacketListener;
+import org.jivesoftware.smack.SSLXMPPConnection;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.Packet;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * An EventBridge implementation based on XMPP protocol and Smack XMPP client 
library.
+ * What's good about XMPP (Extensible Messaging and Presence Protocol, an IETF 
standard
+ * protocol that grew up from Jabber IM) is that generally it has fewer or no 
deployment
+ * limitations (unlike JMS and JGroups that are generally a good solution for 
local
+ * controlled networks). Also it provides lots of additional information for 
free, such as
+ * presence, and much more.
+ * 
+ * This implementation is based on Smack XMPP client library from JiveSoftware.
+ * 
+ * 
+ * @since 1.2
+ */
+public class XMPPBridge extends EventBridge {
+
+public static final String XMPP_HOST_PROPERTY = 
"cayenne.XMPPBridge.xmppHost";
+
+/**
+ * An optional property, port 5222 is used as default XMPP port.
+ */
+public static final String XMPP_PORT_PROPERTY = 
"cayenne.XMPPBridge.xmppPort";
+
+/**
+ * An optional property, "conference" is used as default chat service.
+ */
+public static final String XMPP_CHAT_SERVICE_PROPERTY = 
"cayenne.XMPPBridge.xmppChatService";
+
+public static final String XMPP_SECURE_CONNECTION_PROPERTY = 
"cayenne.XMPPBridge.xmppSecure";
+public static final String XMPP_LOGIN_PROPERTY = 
"cayenne.XMPPBridge.xmppLogin";
+public static final String XMPP_PASSWORD_PROPERTY = 
"cayenne.XMPPBridge.xmppPassword";
+
+static final String DEFAULT_CHAT_SERVICE = "conference";
+static final int DEFAULT_XMPP_PORT = 5222;
+static final int DEFAULT_XMPP_SECURE_PORT = 5223;
+
+protected boolean secureConnection;
+protected String loginId;
+protected String password;
+protected String xmppHost;
+protected int xmppPort;
+protected String chatService;
+protected String sessionHandle;
+
+protected XMPPConnection connection;
+protected GroupChat groupChat;
+protected boolean connected;
+
+/**
+ * Creates an XMPPBridge. External subject will be used as the chat group 
name.
+ */
+public XMPPBridge(EventSubject localSubject, String externalSubject) {
+this(Collections.singleton(localSubject), externalSubject);
+}
+
+/**
+ * Creates an XMPPBridge. External subject will be used as the chat group 
name.
+ */
+public XMPPBridge(Collection localSubjects, String 
externalSubject) {
+super(localSubjects, externalSubject);
+
+// generate a unique session handle... users can override it to use a 
specific
+// handle...
+this.sessionHandle = "cayenne-xmpp-" + System.currentTimeMillis();
+}
+
+public XMPPBridge(Collection localSubjects, String 
externalSubject, Map properties) {
+this(localSubjects, externalSubject);
+
+this.chatService = 

[3/9] cayenne git commit: CAY-2403

2018-02-05 Thread ntimofeev
CAY-2403


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

Branch: refs/heads/master
Commit: ab1fd0bf471954b94aba1aeda0c149175de50929
Parents: 023547e
Author: Arseni Bulatski 
Authored: Fri Feb 2 15:24:03 2018 +0300
Committer: Arseni Bulatski 
Committed: Fri Feb 2 15:24:03 2018 +0300

--
 RELEASE-NOTES.txt   |   1 +
 cayenne-jgroups/pom.xml |  82 +
 .../org/apache/cayenne/event/JGroupsModule.java |  63 
 .../event/JGroupsServerModuleProvider.java  |  50 +++
 .../apache/cayenne/event/JavaGroupsBridge.java  | 231 ++
 .../cayenne/event/JavaGroupsBridgeFactory.java  |  49 +++
 .../cayenne/event/JavaGroupsBridgeProvider.java |  50 +++
 ...iguration.server.CayenneServerModuleProvider |  20 ++
 .../event/CayenneJGroupsModuleProviderTest.java |  36 +++
 .../event/JavaGroupsBridgeFactoryTest.java  |  84 +
 .../event/JavaGroupsBridgeProviderTest.java |  97 ++
 cayenne-jms/pom.xml |  81 +
 .../org/apache/cayenne/event/JMSBridge.java | 280 +
 .../apache/cayenne/event/JMSBridgeFactory.java  |  39 +++
 .../apache/cayenne/event/JMSBridgeProvider.java |  50 +++
 .../org/apache/cayenne/event/JMSModule.java |  54 
 .../cayenne/event/JMSServerModuleProvider.java  |  50 +++
 ...iguration.server.CayenneServerModuleProvider |  20 ++
 .../event/CayenneJMSModuleProviderTest.java |  36 +++
 .../cayenne/event/JMSBridgeFactoryTest.java |  77 +
 .../cayenne/event/JMSBridgeProviderTest.java|  87 ++
 cayenne-xmpp/pom.xml|  86 ++
 .../org/apache/cayenne/event/XMPPBridge.java| 308 +++
 .../apache/cayenne/event/XMPPBridgeFactory.java |  41 +++
 .../cayenne/event/XMPPBridgeProvider.java   |  50 +++
 .../org/apache/cayenne/event/XMPPModule.java|  71 +
 .../cayenne/event/XMPPServerModuleProvider.java |  50 +++
 ...iguration.server.CayenneServerModuleProvider |  20 ++
 .../event/CayenneXMPPModuleProviderTest.java|  36 +++
 .../cayenne/event/XMPPBridgeFactoryTest.java|  72 +
 .../cayenne/event/XMPPBridgeProviderTest.java   | 105 +++
 .../apache/cayenne/event/XMPPBridgeTest.java|  54 
 eventbridges/cayenne-jgroups/pom.xml|  41 ---
 .../org/apache/cayenne/event/JGroupsModule.java |  63 
 .../event/JGroupsServerModuleProvider.java  |  50 ---
 .../apache/cayenne/event/JavaGroupsBridge.java  | 231 --
 .../cayenne/event/JavaGroupsBridgeFactory.java  |  49 ---
 .../cayenne/event/JavaGroupsBridgeProvider.java |  50 ---
 ...iguration.server.CayenneServerModuleProvider |  20 --
 .../event/CayenneJGroupsModuleProviderTest.java |  36 ---
 .../event/JavaGroupsBridgeFactoryTest.java  |  84 -
 .../event/JavaGroupsBridgeProviderTest.java |  97 --
 eventbridges/cayenne-jms/pom.xml|  41 ---
 .../org/apache/cayenne/event/JMSBridge.java | 280 -
 .../apache/cayenne/event/JMSBridgeFactory.java  |  39 ---
 .../apache/cayenne/event/JMSBridgeProvider.java |  50 ---
 .../org/apache/cayenne/event/JMSModule.java |  54 
 .../cayenne/event/JMSServerModuleProvider.java  |  50 ---
 ...iguration.server.CayenneServerModuleProvider |  20 --
 .../event/CayenneJMSModuleProviderTest.java |  36 ---
 .../cayenne/event/JMSBridgeFactoryTest.java |  77 -
 .../cayenne/event/JMSBridgeProviderTest.java|  87 --
 eventbridges/cayenne-xmpp/pom.xml   |  46 ---
 .../org/apache/cayenne/event/XMPPBridge.java| 308 ---
 .../apache/cayenne/event/XMPPBridgeFactory.java |  41 ---
 .../cayenne/event/XMPPBridgeProvider.java   |  50 ---
 .../org/apache/cayenne/event/XMPPModule.java|  71 -
 .../cayenne/event/XMPPServerModuleProvider.java |  50 ---
 ...iguration.server.CayenneServerModuleProvider |  20 --
 .../event/CayenneXMPPModuleProviderTest.java|  36 ---
 .../cayenne/event/XMPPBridgeFactoryTest.java|  72 -
 .../cayenne/event/XMPPBridgeProviderTest.java   | 105 ---
 .../apache/cayenne/event/XMPPBridgeTest.java|  54 
 eventbridges/pom.xml|  82 -
 pom.xml |   4 +-
 65 files changed, 2433 insertions(+), 2391 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/ab1fd0bf/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 746012c..dbf604a 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -21,6 

[GitHub] cayenne pull request #265: CAY-2404

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

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


---


[6/9] cayenne git commit: CAY-2404

2018-02-05 Thread ntimofeev
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6378c41f/maven-plugins/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
--
diff --git 
a/maven-plugins/cayenne-tools-itest/src/test/resources/testmap-client.map.xml 
b/maven-plugins/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
new file mode 100644
index 000..87145d5
--- /dev/null
+++ 
b/maven-plugins/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
@@ -0,0 +1,730 @@
+
+http://cayenne.apache.org/schema/10/modelMap;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap 
http://cayenne.apache.org/schema/10/modelMap.xsd;
+project-version="10">
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+  

[8/9] cayenne git commit: CAY-2404

2018-02-05 Thread ntimofeev
CAY-2404


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

Branch: refs/heads/master
Commit: 6378c41f7ced5961c892e132110a357872f3fb58
Parents: 023547e
Author: Arseni Bulatski 
Authored: Fri Feb 2 15:55:39 2018 +0300
Committer: Arseni Bulatski 
Committed: Mon Feb 5 10:01:44 2018 +0300

--
 RELEASE-NOTES.txt   |   1 +
 itests/cayenne-tools-itest/pom.xml  | 178 -
 .../tools/CayenneGeneratorIntegrationTest.java  | 186 -
 .../src/test/resources/cayenne-client.xml   |   5 -
 .../src/test/resources/embeddable.map.xml   |  27 -
 .../apache/cayenne/tools/cgen-dependent.map.xml |  19 -
 .../org/apache/cayenne/tools/cgen.map.xml   |  15 -
 .../org/apache/cayenne/tools/velotemplate.vm|  13 -
 .../src/test/resources/testmap-client.map.xml   | 730 --
 .../src/test/resources/testmap.map.xml  | 735 ---
 itests/pom.xml  |  57 --
 maven-plugins/cayenne-tools-itest/pom.xml   | 178 +
 .../tools/CayenneGeneratorIntegrationTest.java  | 186 +
 .../src/test/resources/cayenne-client.xml   |   5 +
 .../src/test/resources/embeddable.map.xml   |  27 +
 .../apache/cayenne/tools/cgen-dependent.map.xml |  19 +
 .../org/apache/cayenne/tools/cgen.map.xml   |  15 +
 .../org/apache/cayenne/tools/velotemplate.vm|  13 +
 .../src/test/resources/testmap-client.map.xml   | 730 ++
 .../src/test/resources/testmap.map.xml  | 735 +++
 maven-plugins/pom.xml   |   8 +
 pom.xml |   1 -
 22 files changed, 1917 insertions(+), 1966 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/6378c41f/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 746012c..6ec11fb 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -21,6 +21,7 @@ CAY-2393 Add sqlserver-docker profile to automate tests on 
SQLServer
 CAY-2394 Upgrade to Apache Velocity 2.0
 CAY-2395 cdbimport: add option to create project file
 CAY-2396 Upgrade maven-assembly-plugin to 3.1.0
+CAY-2404 Move itests to maven-plugins
 
 Bug Fixes:
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/6378c41f/itests/cayenne-tools-itest/pom.xml
--
diff --git a/itests/cayenne-tools-itest/pom.xml 
b/itests/cayenne-tools-itest/pom.xml
deleted file mode 100644
index 89607a8..000
--- a/itests/cayenne-tools-itest/pom.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-
-   
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
-
-   4.0.0
-
-   
-   org.apache.cayenne.itests
-   cayenne-itests-parent
-   4.1.M2-SNAPSHOT
-   
-
-   Integration Tests - Cayenne Tools
-   cayenne-tools-itest
-   cayenne-tools-itest: Tools integration tests
-   jar
-   
-   
-   
${project.build.testSourceDirectory}/../resources
-   
${project.build.directory}/generated-tests
-   
-
-   
-   
-   junit
-   junit
-   compile
-   
-
-   
-   org.apache.cayenne.build-tools
-   cayenne-test-utilities
-   ${project.version}
-   compile
-   
-
-   
-   org.apache.cayenne
-   cayenne-di
-   ${project.version}
-   
-
-   
-   org.apache.cayenne
-   cayenne-server
-   ${project.version}
-   
-
-   
-
-   
-   
-   
-   
-   org.apache.cayenne.plugins
-   cayenne-maven-plugin
-   ${project.version}
-   
-   
-   single-classes-cust-template
-   
-cgen
-
-   
- ${testResourceDir}/testmap.map.xml
- 

[4/9] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/264' into asf-master

2018-02-05 Thread ntimofeev
Merge remote-tracking branch 'remotes/parent/pr/264' 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/efee1d3f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/efee1d3f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/efee1d3f

Branch: refs/heads/master
Commit: efee1d3fabd543d3a257162ab187b087147e9e3b
Parents: d8a944b ab1fd0b
Author: Nikita Timofeev 
Authored: Fri Feb 2 16:25:22 2018 +0300
Committer: Nikita Timofeev 
Committed: Fri Feb 2 16:25:22 2018 +0300

--
 RELEASE-NOTES.txt   |   1 +
 cayenne-jgroups/pom.xml |  82 +
 .../org/apache/cayenne/event/JGroupsModule.java |  63 
 .../event/JGroupsServerModuleProvider.java  |  50 +++
 .../apache/cayenne/event/JavaGroupsBridge.java  | 231 ++
 .../cayenne/event/JavaGroupsBridgeFactory.java  |  49 +++
 .../cayenne/event/JavaGroupsBridgeProvider.java |  50 +++
 ...iguration.server.CayenneServerModuleProvider |  20 ++
 .../event/CayenneJGroupsModuleProviderTest.java |  36 +++
 .../event/JavaGroupsBridgeFactoryTest.java  |  84 +
 .../event/JavaGroupsBridgeProviderTest.java |  97 ++
 cayenne-jms/pom.xml |  81 +
 .../org/apache/cayenne/event/JMSBridge.java | 280 +
 .../apache/cayenne/event/JMSBridgeFactory.java  |  39 +++
 .../apache/cayenne/event/JMSBridgeProvider.java |  50 +++
 .../org/apache/cayenne/event/JMSModule.java |  54 
 .../cayenne/event/JMSServerModuleProvider.java  |  50 +++
 ...iguration.server.CayenneServerModuleProvider |  20 ++
 .../event/CayenneJMSModuleProviderTest.java |  36 +++
 .../cayenne/event/JMSBridgeFactoryTest.java |  77 +
 .../cayenne/event/JMSBridgeProviderTest.java|  87 ++
 cayenne-xmpp/pom.xml|  86 ++
 .../org/apache/cayenne/event/XMPPBridge.java| 308 +++
 .../apache/cayenne/event/XMPPBridgeFactory.java |  41 +++
 .../cayenne/event/XMPPBridgeProvider.java   |  50 +++
 .../org/apache/cayenne/event/XMPPModule.java|  71 +
 .../cayenne/event/XMPPServerModuleProvider.java |  50 +++
 ...iguration.server.CayenneServerModuleProvider |  20 ++
 .../event/CayenneXMPPModuleProviderTest.java|  36 +++
 .../cayenne/event/XMPPBridgeFactoryTest.java|  72 +
 .../cayenne/event/XMPPBridgeProviderTest.java   | 105 +++
 .../apache/cayenne/event/XMPPBridgeTest.java|  54 
 eventbridges/cayenne-jgroups/pom.xml|  41 ---
 .../org/apache/cayenne/event/JGroupsModule.java |  63 
 .../event/JGroupsServerModuleProvider.java  |  50 ---
 .../apache/cayenne/event/JavaGroupsBridge.java  | 231 --
 .../cayenne/event/JavaGroupsBridgeFactory.java  |  49 ---
 .../cayenne/event/JavaGroupsBridgeProvider.java |  50 ---
 ...iguration.server.CayenneServerModuleProvider |  20 --
 .../event/CayenneJGroupsModuleProviderTest.java |  36 ---
 .../event/JavaGroupsBridgeFactoryTest.java  |  84 -
 .../event/JavaGroupsBridgeProviderTest.java |  97 --
 eventbridges/cayenne-jms/pom.xml|  41 ---
 .../org/apache/cayenne/event/JMSBridge.java | 280 -
 .../apache/cayenne/event/JMSBridgeFactory.java  |  39 ---
 .../apache/cayenne/event/JMSBridgeProvider.java |  50 ---
 .../org/apache/cayenne/event/JMSModule.java |  54 
 .../cayenne/event/JMSServerModuleProvider.java  |  50 ---
 ...iguration.server.CayenneServerModuleProvider |  20 --
 .../event/CayenneJMSModuleProviderTest.java |  36 ---
 .../cayenne/event/JMSBridgeFactoryTest.java |  77 -
 .../cayenne/event/JMSBridgeProviderTest.java|  87 --
 eventbridges/cayenne-xmpp/pom.xml   |  46 ---
 .../org/apache/cayenne/event/XMPPBridge.java| 308 ---
 .../apache/cayenne/event/XMPPBridgeFactory.java |  41 ---
 .../cayenne/event/XMPPBridgeProvider.java   |  50 ---
 .../org/apache/cayenne/event/XMPPModule.java|  71 -
 .../cayenne/event/XMPPServerModuleProvider.java |  50 ---
 ...iguration.server.CayenneServerModuleProvider |  20 --
 .../event/CayenneXMPPModuleProviderTest.java|  36 ---
 .../cayenne/event/XMPPBridgeFactoryTest.java|  72 -
 .../cayenne/event/XMPPBridgeProviderTest.java   | 105 ---
 .../apache/cayenne/event/XMPPBridgeTest.java|  54 
 eventbridges/pom.xml|  82 -
 pom.xml |   4 +-
 65 files changed, 2433 insertions(+), 2391 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/efee1d3f/pom.xml
--



[1/9] cayenne git commit: CAY-2403

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


http://git-wip-us.apache.org/repos/asf/cayenne/blob/ab1fd0bf/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSModule.java
--
diff --git 
a/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSModule.java
 
b/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSModule.java
deleted file mode 100644
index b532bc5..000
--- 
a/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSModule.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- /
-
-package org.apache.cayenne.event;
-
-import org.apache.cayenne.di.Binder;
-import org.apache.cayenne.di.MapBuilder;
-import org.apache.cayenne.di.Module;
-
-/**
- * @since 4.0
- */
-public class JMSModule implements Module {
-
-/**
- * A DI container key for the MapString, String storing
- * {@link org.apache.cayenne.event.JMSBridge} properties
- *
- * @since 4.0
- */
-public static final String JMS_BRIDGE_PROPERTIES_MAP = 
"cayenne.server.jms_bridge";
-
-public static void contributeTopicConnectionFactory(Binder binder, String 
factory) {
-
contributeProperties(binder).put(JMSBridge.TOPIC_CONNECTION_FACTORY_PROPERTY, 
factory);
-}
-
-private static MapBuilder contributeProperties(Binder binder) {
-return binder.bindMap(String.class, JMS_BRIDGE_PROPERTIES_MAP);
-}
-
-@Override
-public void configure(Binder binder) {
-// init properties' defaults
-contributeTopicConnectionFactory(binder, 
JMSBridge.TOPIC_CONNECTION_FACTORY_DEFAULT);
-
-binder.bind(EventBridge.class).toProvider(JMSBridgeProvider.class);
-}
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/ab1fd0bf/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSServerModuleProvider.java
--
diff --git 
a/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSServerModuleProvider.java
 
b/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSServerModuleProvider.java
deleted file mode 100644
index 6979d21..000
--- 
a/eventbridges/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSServerModuleProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- /
-
-package org.apache.cayenne.event;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
-import org.apache.cayenne.configuration.server.ServerModule;
-import org.apache.cayenne.di.Module;
-
-/**
- * @since 4.0
- */
-public class JMSServerModuleProvider implements CayenneServerModuleProvider {
-
-@Override
-public Module module() {
-return new JMSModule();
-}
-
-@Override
-public Class moduleType() {
-return JMSModule.class;
-}
-
-@SuppressWarnings("unchecked")
-@Override
-public Collection overrides() {
-Collection modules = 

[5/9] cayenne git commit: CAY-2404

2018-02-05 Thread ntimofeev
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6378c41f/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
--
diff --git 
a/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml 
b/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
new file mode 100644
index 000..e426dda
--- /dev/null
+++ b/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
@@ -0,0 +1,735 @@
+
+http://cayenne.apache.org/schema/10/modelMap;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap 
http://cayenne.apache.org/schema/10/modelMap.xsd;
+project-version="10">
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   

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

2018-02-05 Thread ntimofeev
Merge remote-tracking branch 'remotes/parent/pr/265' 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/750d3d55
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/750d3d55
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/750d3d55

Branch: refs/heads/master
Commit: 750d3d551913f5c8cb325f6075853627668e5f55
Parents: efee1d3 6378c41
Author: Nikita Timofeev 
Authored: Mon Feb 5 12:28:29 2018 +0300
Committer: Nikita Timofeev 
Committed: Mon Feb 5 12:28:29 2018 +0300

--
 RELEASE-NOTES.txt   |   1 +
 itests/cayenne-tools-itest/pom.xml  | 178 -
 .../tools/CayenneGeneratorIntegrationTest.java  | 186 -
 .../src/test/resources/cayenne-client.xml   |   5 -
 .../src/test/resources/embeddable.map.xml   |  27 -
 .../apache/cayenne/tools/cgen-dependent.map.xml |  19 -
 .../org/apache/cayenne/tools/cgen.map.xml   |  15 -
 .../org/apache/cayenne/tools/velotemplate.vm|  13 -
 .../src/test/resources/testmap-client.map.xml   | 730 --
 .../src/test/resources/testmap.map.xml  | 735 ---
 itests/pom.xml  |  57 --
 maven-plugins/cayenne-tools-itest/pom.xml   | 178 +
 .../tools/CayenneGeneratorIntegrationTest.java  | 186 +
 .../src/test/resources/cayenne-client.xml   |   5 +
 .../src/test/resources/embeddable.map.xml   |  27 +
 .../apache/cayenne/tools/cgen-dependent.map.xml |  19 +
 .../org/apache/cayenne/tools/cgen.map.xml   |  15 +
 .../org/apache/cayenne/tools/velotemplate.vm|  13 +
 .../src/test/resources/testmap-client.map.xml   | 730 ++
 .../src/test/resources/testmap.map.xml  | 735 +++
 maven-plugins/pom.xml   |   8 +
 pom.xml |   1 -
 22 files changed, 1917 insertions(+), 1966 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/750d3d55/RELEASE-NOTES.txt
--
diff --cc RELEASE-NOTES.txt
index dbf604a,6ec11fb..37878eb
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -21,7 -21,7 +21,8 @@@ CAY-2393 Add sqlserver-docker profile t
  CAY-2394 Upgrade to Apache Velocity 2.0
  CAY-2395 cdbimport: add option to create project file
  CAY-2396 Upgrade maven-assembly-plugin to 3.1.0
 +CAY-2403 Extract eventbridges to top level
+ CAY-2404 Move itests to maven-plugins
  
  Bug Fixes:
  

http://git-wip-us.apache.org/repos/asf/cayenne/blob/750d3d55/pom.xml
--
diff --cc pom.xml
index 1c088e3,f405f96..e3a1199
--- a/pom.xml
+++ b/pom.xml
@@@ -70,10 -74,7 +70,9 @@@
cayenne-web
cayenne-osgi
cayenne-rop-server
 -  eventbridges
 +  cayenne-jgroups
 +  cayenne-jms
 +  cayenne-xmpp
-   itests
maven-plugins
modeler
tutorials



[7/9] cayenne git commit: CAY-2404

2018-02-05 Thread ntimofeev
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6378c41f/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
--
diff --git a/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml 
b/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
deleted file mode 100644
index e426dda..000
--- a/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
+++ /dev/null
@@ -1,735 +0,0 @@
-
-http://cayenne.apache.org/schema/10/modelMap;
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap 
http://cayenne.apache.org/schema/10/modelMap.xsd;
-project-version="10">
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-