You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/12/11 11:37:25 UTC
[1/5] cayenne git commit: Disable logs in all modules. Provide
property for passing log level in tests.
Repository: cayenne
Updated Branches:
refs/heads/master 15d6d2fdc -> f72430e00
Disable logs in all modules. Provide property for passing log level in tests.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/fee9eb4f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/fee9eb4f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/fee9eb4f
Branch: refs/heads/master
Commit: fee9eb4fc320faa2b64f629be989a15d45cace25
Parents: fecb67f
Author: Ruslan Ibragimov <ru...@ibragimov.by>
Authored: Fri Dec 2 19:59:27 2016 +0300
Committer: Ruslan Ibragimov <ru...@ibragimov.by>
Committed: Fri Dec 2 19:59:27 2016 +0300
----------------------------------------------------------------------
.travis.yml | 6 +++---
cayenne-server/src/test/resources/simplelogger.properties | 7 -------
pom.xml | 6 ++++++
3 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fee9eb4f/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 7a0a05a..306b217 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Since 4GB not enought for build, we use 'sudo' environment with 7.5GB RAM
+# Since 4GB not enough for build, we use 'sudo' environment with 7.5GB RAM
# Downside: It's starts a little bit slower
# How to fix: Change build setting or fix code.
# https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
@@ -15,9 +15,9 @@ jdk:
- oraclejdk7
script:
- - mvn verify -q -DcayenneTestConnection=$DB_PROFILE
+ - mvn verify -q -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR
-# prevent Travis from uneeded "mvn install" run
+# prevent Travis from unneeded "mvn install" run
install: /bin/true
cache:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fee9eb4f/cayenne-server/src/test/resources/simplelogger.properties
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/simplelogger.properties b/cayenne-server/src/test/resources/simplelogger.properties
deleted file mode 100644
index 5c5a4a8..0000000
--- a/cayenne-server/src/test/resources/simplelogger.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# SLF4J's SimpleLogger configuration file
-# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
-
-# Default logging detail level for all instances of SimpleLogger.
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, defaults to "info".
-org.slf4j.simpleLogger.defaultLogLevel=error
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fee9eb4f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dd7b689..1577a37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -890,12 +890,18 @@
<name>cayenneJdbcDriver</name>
<value>${cayenneJdbcDriver}</value>
</property>
+ <org.slf4j.simpleLogger.defaultLogLevel>${cayenneLogLevel}</org.slf4j.simpleLogger.defaultLogLevel>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <org.slf4j.simpleLogger.defaultLogLevel>${cayenneLogLevel}</org.slf4j.simpleLogger.defaultLogLevel>
+ </systemPropertyVariables>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
[4/5] cayenne git commit: Add licence.
Posted by aa...@apache.org.
Add licence.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3c3c95c7
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3c3c95c7
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3c3c95c7
Branch: refs/heads/master
Commit: 3c3c95c735a5dea09073ecc7cb71f88883a71941
Parents: 2688091
Author: Ruslan Ibragimov <ru...@ibragimov.by>
Authored: Tue Dec 6 16:41:39 2016 +0300
Committer: Ruslan Ibragimov <ru...@ibragimov.by>
Committed: Tue Dec 6 16:41:39 2016 +0300
----------------------------------------------------------------------
.travis.yml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3c3c95c7/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 306b217..b749010 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,18 @@
+# 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.
+
# Since 4GB not enough for build, we use 'sudo' environment with 7.5GB RAM
# Downside: It's starts a little bit slower
# How to fix: Change build setting or fix code.
[2/5] cayenne git commit: Merge remote-tracking branch
'upstream/master'
Posted by aa...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e71732b4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e71732b4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e71732b4
Branch: refs/heads/master
Commit: e71732b4feee8a532c7d3cf99bd1a36319c3992a
Parents: fee9eb4 865ee2b
Author: Ruslan Ibragimov <ru...@ibragimov.by>
Authored: Fri Dec 2 20:06:33 2016 +0300
Committer: Ruslan Ibragimov <ru...@ibragimov.by>
Committed: Fri Dec 2 20:06:33 2016 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/CayenneContextIT.java | 13 +++++++-
.../cayenne/remote/ClientChannelTest.java | 32 +++++++++++++++-----
.../http/HessianROPSerializationServiceIT.java | 19 ++++++++++++
.../org/apache/cayenne/crypto/db/Table4.java | 19 ++++++++++++
.../org/apache/cayenne/dbsync/DbSyncModule.java | 19 ++++++++++++
...stCommitFilter_ListenerInducedChangesIT.java | 19 ++++++++++++
.../project/upgrade/v9/reverseEngineering.xml | 18 +++++++++++
.../protostuff/persistent/ClientMtTable1.java | 19 ++++++++++++
.../protostuff/persistent/ClientMtTable2.java | 19 ++++++++++++
.../rop/protostuff/persistent/MtTable1.java | 19 ++++++++++++
.../rop/protostuff/persistent/MtTable2.java | 19 ++++++++++++
.../apache/cayenne/dbimport/package-info.java | 19 ++++++++++++
.../DataContextObjectIdQuery_PolymorphicIT.java | 19 ++++++++++++
...aContextRelationshipQuery_PolymorphicIT.java | 19 ++++++++++++
.../access/DataContextSharedCacheEmpiricIT.java | 13 +++++++-
.../org/apache/cayenne/access/DataDomainIT.java | 25 +++++++++------
.../apache/cayenne/access/DataRowStoreIT.java | 24 ++++++++++++---
.../rop/server/ROPServletTest.java | 20 +++++++++---
.../datasource/ManagedPoolingDataSourceIT.java | 19 ++++++++++++
.../cayenne/event/DefaultEventManagerTest.java | 6 ++++
.../apache/cayenne/event/EventBridgeTest.java | 25 ++++++++++++---
.../testdo/inheritance_vertical/IvAbstract.java | 19 ++++++++++++
.../testdo/inheritance_vertical/IvBase.java | 19 ++++++++++++
.../testdo/inheritance_vertical/IvConcrete.java | 19 ++++++++++++
.../testdo/inheritance_vertical/IvImpl.java | 19 ++++++++++++
.../testdo/inheritance_vertical/IvOther.java | 19 ++++++++++++
.../testdo/inheritance_vertical/IvSub3.java | 19 ++++++++++++
.../dbimport/reverseEngineering-expected.xml | 18 +++++++++++
.../cayenne/modeler/dialog/db/templateXML.xml | 18 +++++++++++
.../tutorial/persistent/client/Artist.java | 19 ++++++++++++
.../tutorial/persistent/client/Gallery.java | 19 ++++++++++++
.../tutorial/persistent/client/Painting.java | 19 ++++++++++++
.../cayenne/tutorial/persistent/Artist.java | 19 ++++++++++++
.../cayenne/tutorial/persistent/Gallery.java | 19 ++++++++++++
.../cayenne/tutorial/persistent/Painting.java | 19 ++++++++++++
.../tutorial/persistent/client/Artist.java | 19 ++++++++++++
.../tutorial/persistent/client/Gallery.java | 19 ++++++++++++
.../tutorial/persistent/client/Painting.java | 19 ++++++++++++
38 files changed, 692 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
[5/5] cayenne git commit: Merge branch '149'
Posted by aa...@apache.org.
Merge branch '149'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f72430e0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f72430e0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f72430e0
Branch: refs/heads/master
Commit: f72430e0074fc28fe1f3a3a61a52cb4d43373661
Parents: 15d6d2f 3c3c95c
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sun Dec 11 14:35:03 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sun Dec 11 14:35:03 2016 +0300
----------------------------------------------------------------------
.travis.yml | 6 ++---
.../src/test/resources/simplelogger.properties | 24 --------------------
pom.xml | 6 +++++
3 files changed, 9 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72430e0/.travis.yml
----------------------------------------------------------------------
diff --cc .travis.yml
index f555401,b749010..5ae1b17
--- a/.travis.yml
+++ b/.travis.yml
@@@ -13,7 -13,7 +13,7 @@@
# See the License for the specific language governing permissions and
# limitations under the License.
- # Since 4GB not enought for build, we use 'sudo' environment with 7.5GB RAM
-# Since 4GB not enough for build, we use 'sudo' environment with 7.5GB RAM
++# Since 4GB is not enough for the build, we use 'sudo' environment with 7.5GB RAM
# Downside: It's starts a little bit slower
# How to fix: Change build setting or fix code.
# https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72430e0/pom.xml
----------------------------------------------------------------------
[3/5] cayenne git commit: Merge remote-tracking branch
'upstream/master'
Posted by aa...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/26880919
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/26880919
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/26880919
Branch: refs/heads/master
Commit: 268809194224dbce10df5eb5d207e759bde67896
Parents: e71732b 263ac1c
Author: Ruslan Ibragimov <ru...@ibragimov.by>
Authored: Mon Dec 5 14:26:32 2016 +0300
Committer: Ruslan Ibragimov <ru...@ibragimov.by>
Committed: Mon Dec 5 14:26:32 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/access/DataRowStoreIT.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------