Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/746d6205 Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/746d6205 Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/746d6205 Branch: refs/heads/develop Commit: 746d6205c2557d7fb04fe683ccc7c86a4a466cc6 Parents: f4218ec 79b3290 Author: Niclas Hedhman <[email protected]> Authored: Wed Jul 8 11:14:58 2015 +0300 Committer: Niclas Hedhman <[email protected]> Committed: Wed Jul 8 11:14:58 2015 +0300 ---------------------------------------------------------------------- build.gradle | 40 ++++- core/LICENSE | 177 ------------------- core/NOTICE | 21 --- .../main/java/org/qi4j/spi/module/package.html | 21 +++ extensions/LICENSE | 177 ------------------- extensions/cache-ehcache/NOTICE | 17 -- extensions/entitystore-file/NOTICE | 16 -- extensions/entitystore-hazelcast/NOTICE | 18 -- extensions/entitystore-jclouds/build.gradle | 1 + extensions/entitystore-jdbm/NOTICE | 18 -- extensions/entitystore-preferences/NOTICE | 16 -- extensions/entitystore-sql/NOTICE | 22 --- .../sql/DerbySQLEntityStoreTest.java | 3 +- .../entitystore/sql/H2SQLEntityStoreTest.java | 3 +- .../entitystore/sql/SQLiteEntityStoreTest.java | 3 +- extensions/entitystore-voldemort/NOTICE | 163 ----------------- extensions/entitystore-voldemort/build.gradle | 5 - .../entitystore/voldemort/assembly/package.html | 21 +++ .../org/qi4j/entitystore/voldemort/package.html | 21 +++ extensions/indexing-rdf/NOTICE | 42 ----- extensions/indexing-sql/NOTICE | 17 -- extensions/metrics-yammer/NOTICE | 18 -- extensions/migration/NOTICE | 17 -- extensions/reindexer/NOTICE | 17 -- libraries.gradle | 108 ++++++----- libraries/LICENSE | 177 ------------------- libraries/NOTICE | 111 ------------ libraries/lang-jruby/README.txt | 4 +- libraries/lang-scala/build.gradle | 8 +- libraries/lang-scala/dev-status.xml | 2 +- libraries/lang-scala/src/docs/lang-scala.txt | 89 ++++++++++ .../org/qi4j/lang/scala/ScalaTraitMixin.java | 68 ++++--- .../scala/ExclamationGenericConcern.scala | 3 +- .../qi4j/sample/scala/HelloThereConcern.scala | 7 +- .../qi4j/sample/scala/HelloWorldComposite.scala | 2 + .../sample/scala/HelloWorldCompositeTest.java | 11 +- .../qi4j/sample/scala/HelloWorldMixin2.scala | 4 +- .../org/qi4j/sample/scala/TestEntity.scala | 4 +- .../org/qi4j/sample/scala/TestService.scala | 4 +- .../qi4j/library/scheduler/SchedulerMixin.java | 7 +- .../library/scheduler/schedule/Schedule.java | 2 +- .../scheduler/schedule/cron/CronSchedule.java | 8 +- .../org/qi4j/library/scheduler/FooTask.java | 6 +- .../org/qi4j/library/scripting/package.html | 21 +++ libraries/sql-c3p0/build.gradle | 28 --- libraries/sql-c3p0/dev-status.xml | 35 ---- .../c3p0/C3P0DataSourceServiceAssembler.java | 33 ---- .../sql/c3p0/C3P0DataSourceServiceImporter.java | 100 ----------- .../java/org/qi4j/library/sql/c3p0/package.html | 21 --- libraries/sql-liquibase/build.gradle | 2 +- .../sql/liquibase/LiquibaseServiceTest.java | 4 +- libraries/sql/build.gradle | 1 - libraries/sql/src/docs/sql.txt | 18 +- .../qi4j/library/sql/DocumentationSupport.java | 10 -- ...taSourceConfigurationManagerServiceTest.java | 4 +- manual/build.gradle | 10 +- samples/sql-support/build.gradle | 2 +- .../sql-support/src/main/resources/logback.xml | 41 ----- settings.gradle | 1 - src/bin-dist/NOTICE.txt | 2 +- src/bin-dist/README.txt | 20 +-- tutorials/introduction/tenminutes/LICENSE | 177 ------------------- tutorials/introduction/tenminutes/NOTICE | 17 -- tutorials/introduction/thirtyminutes/LICENSE | 177 ------------------- tutorials/introduction/thirtyminutes/NOTICE | 17 -- tutorials/introduction/twohours/LICENSE | 177 ------------------- tutorials/introduction/twohours/NOTICE | 17 -- tutorials/introduction/twominutes/LICENSE | 177 ------------------- tutorials/introduction/twominutes/NOTICE | 17 -- 69 files changed, 386 insertions(+), 2242 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/746d6205/libraries/scheduler/src/main/java/org/qi4j/library/scheduler/SchedulerMixin.java ---------------------------------------------------------------------- diff --cc libraries/scheduler/src/main/java/org/qi4j/library/scheduler/SchedulerMixin.java index c2b81b5,7e3b0bf..c3f8f61 --- a/libraries/scheduler/src/main/java/org/qi4j/library/scheduler/SchedulerMixin.java +++ b/libraries/scheduler/src/main/java/org/qi4j/library/scheduler/SchedulerMixin.java @@@ -221,11 -218,13 +221,13 @@@ public class SchedulerMixi { corePoolSize = workersCount / 4; } - // Throws IllegalArgument if corePoolSize or keepAliveTime less than zero, or if workersCount less than or equal to zero, or if corePoolSize greater than workersCount. + // Throws IllegalArgument if corePoolSize or keepAliveTime less than zero, + // or if workersCount less than or equal to zero, + // or if corePoolSize greater than workersCount. taskExecutor = new ThreadPoolExecutor( corePoolSize, workersCount, - 0, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue<Runnable>( workQueueSize ), - threadFactory, rejectionHandler ); + 0, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue<Runnable>( workQueueSize ), + threadFactory, rejectionHandler ); taskExecutor.prestartAllCoreThreads(); managementExecutor = new ScheduledThreadPoolExecutor( 2, threadFactory, rejectionHandler ); loadSchedules();
