You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2016/04/14 03:38:34 UTC
[1/4] zest-java git commit: added comment highlighting bug
Repository: zest-java
Updated Branches:
refs/heads/ZEST-105 5c1a40090 -> 612f952a3
added comment highlighting bug
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/626991f4
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/626991f4
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/626991f4
Branch: refs/heads/ZEST-105
Commit: 626991f4f7f0b2fd96b3af977fa8250edfb36b55
Parents: 8a6ddd2
Author: Kent Sølvsten <so...@apache.org>
Authored: Mon Dec 21 22:47:07 2015 +0100
Committer: Kent Sølvsten <so...@apache.org>
Committed: Mon Dec 21 22:47:07 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/zest/test/indexing/model/Address.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/626991f4/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java
old mode 100644
new mode 100755
index 9ab3410..8de630a
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java
@@ -21,7 +21,7 @@ import org.apache.zest.api.property.Property;
import org.apache.zest.api.value.ValueComposite;
public interface Address
- extends ValueComposite
+ extends ValueComposite // necessary, @See ZEST-137
{
Property<String> line1();
[2/4] zest-java git commit: Upgrade Gradle version from 2.5 to 2.11
Posted by ni...@apache.org.
Upgrade Gradle version from 2.5 to 2.11
Tested most of the build features
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/2ae805e4
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/2ae805e4
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/2ae805e4
Branch: refs/heads/ZEST-105
Commit: 2ae805e40e797f9b27cce09ffcd244f48254b315
Parents: 626991f
Author: Paul Merlin <pa...@apache.org>
Authored: Tue Feb 9 20:17:27 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Tue Feb 9 20:17:27 2016 +0100
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/2ae805e4/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index df6eeb6..f9298c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1033,5 +1033,5 @@ task release {
// 2) /gradlew.bat which is the windows bat script for for executing builds
// 3) /gradle/wrapper which is a directory named by the "jarPath" config which contains other needed files.
task wrapper( type: Wrapper ) {
- gradleVersion = '2.5'
+ gradleVersion = '2.11'
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/2ae805e4/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 48f202a..fafa8dd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
[4/4] zest-java git commit: Fixed testcases that seems to have always
been wrong... Should be double checked by someone else.
Posted by ni...@apache.org.
Fixed testcases that seems to have always been wrong... Should be double checked by someone else.
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/612f952a
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/612f952a
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/612f952a
Branch: refs/heads/ZEST-105
Commit: 612f952a338ef93e305b90321de04b5ccc9c7930
Parents: 962badc
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Thu Apr 14 09:37:50 2016 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Thu Apr 14 09:37:50 2016 +0800
----------------------------------------------------------------------
.../bootstrap/layered/LayeredLayerAssembler.java | 12 ++++++------
.../test/indexing/AbstractNamedQueryTest.java | 18 ++++++++++--------
.../zest/test/indexing/AbstractQueryTest.java | 8 ++++----
.../apache/zest/test/indexing/NameableAssert.java | 4 +++-
.../org/apache/zest/test/indexing/TestData.java | 1 +
5 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/612f952a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/layered/LayeredLayerAssembler.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/layered/LayeredLayerAssembler.java b/core/bootstrap/src/main/java/org/apache/zest/bootstrap/layered/LayeredLayerAssembler.java
index ccec8d2..46a3a83 100644
--- a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/layered/LayeredLayerAssembler.java
+++ b/core/bootstrap/src/main/java/org/apache/zest/bootstrap/layered/LayeredLayerAssembler.java
@@ -28,15 +28,15 @@ public abstract class LayeredLayerAssembler
{
private HashMap<Class<? extends ModuleAssembler>, ModuleAssembler> assemblers = new HashMap<>();
- protected ModuleAssembly createModule( LayerAssembly layer, Class<? extends ModuleAssembler> modulerAssemblerClass )
+ protected ModuleAssembly createModule( LayerAssembly layer, Class<? extends ModuleAssembler> moduleAssemblerClass )
{
try
{
- ModuleAssembler moduleAssembler = instantiateAssembler( layer, modulerAssemblerClass );
- String moduleName = createModuleName( modulerAssemblerClass );
- LayeredApplicationAssembler.setNameIfPresent( modulerAssemblerClass, moduleName );
+ ModuleAssembler moduleAssembler = instantiateAssembler( layer, moduleAssemblerClass );
+ String moduleName = createModuleName( moduleAssemblerClass );
+ LayeredApplicationAssembler.setNameIfPresent( moduleAssemblerClass, moduleName );
ModuleAssembly module = layer.module( moduleName );
- assemblers.put( modulerAssemblerClass, moduleAssembler );
+ assemblers.put( moduleAssemblerClass, moduleAssembler );
ModuleAssembly assembly = moduleAssembler.assemble( layer, module );
if( assembly == null )
{
@@ -46,7 +46,7 @@ public abstract class LayeredLayerAssembler
}
catch( Exception e )
{
- throw new IllegalArgumentException( "Unable to instantiate module with " + modulerAssemblerClass.getSimpleName(), e );
+ throw new IllegalArgumentException( "Unable to instantiate module with " + moduleAssemblerClass.getSimpleName(), e );
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/612f952a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractNamedQueryTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractNamedQueryTest.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractNamedQueryTest.java
index cac1c7e..ecfbc2a 100755
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractNamedQueryTest.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractNamedQueryTest.java
@@ -112,8 +112,8 @@ public abstract class AbstractNamedQueryTest
.newQueryBuilder( Nameable.class )
.where( queries.get( "script03" ) ) );
System.out.println( "*** script03: " + query );
- verifyUnorderedResults( query, "Joe Doe", "Ann Doe", "Jack Doe", "Penang", "Kuala Lumpur", "Cooking", "Gaming",
- "Programming", "Cars" );
+ verifyUnorderedResults( query, "Joe Doe", "Felix", "Ann Doe", "Jack Doe", "Penang", "Kuala Lumpur", "Cooking",
+ "Gaming", "Programming", "Cars" );
}
@Test
@@ -267,14 +267,15 @@ public abstract class AbstractNamedQueryTest
throws EntityFinderException
{
Nameable nameable = templateFor( Nameable.class );
+ Predicate<Composite> predicate = queries.get( "script17" );
final Query<Nameable> query = unitOfWork.newQuery( this.moduleInstance
.newQueryBuilder( Nameable.class )
- .where( queries.get( "script17" ) ) );
+ .where( predicate ) );
query.orderBy( orderBy( nameable.name() ) );
query.firstResult( 3 );
query.maxResults( 3 );
System.out.println( "*** script17: " + query );
- verifyOrderedResults( query, "Gaming", "Jack Doe", "Joe Doe" );
+ verifyOrderedResults( query, "Felix", "Gaming", "Jack Doe" );
}
@Test
@@ -282,13 +283,14 @@ public abstract class AbstractNamedQueryTest
throws EntityFinderException
{
Nameable nameable = templateFor( Nameable.class );
+ Predicate<Composite> predicate = queries.get( "script18" );
final Query<Nameable> query = unitOfWork.newQuery( this.moduleInstance
.newQueryBuilder( Nameable.class )
- .where( queries.get( "script18" ) ) );
+ .where( predicate ) );
query.orderBy( orderBy( nameable.name() ) );
System.out.println( "*** script18: " + query );
- verifyOrderedResults( query, "Ann Doe", "Cars", "Cooking", "Gaming", "Jack Doe", "Joe Doe", "Kuala Lumpur",
- "Penang", "Programming" );
+ verifyOrderedResults( query, "Ann Doe", "Cars", "Cooking", "Felix", "Gaming", "Jack Doe", "Joe Doe",
+ "Kuala Lumpur", "Penang", "Programming" );
}
@Test
@@ -301,7 +303,7 @@ public abstract class AbstractNamedQueryTest
.where( queries.get( "script19" ) ) );
query.orderBy( orderBy( nameable.name() ) );
System.out.println( "*** script19: " + query );
- verifyOrderedResults( query, "Gaming", "Jack Doe", "Joe Doe", "Kuala Lumpur", "Penang", "Programming" );
+ verifyOrderedResults( query, "Felix", "Gaming", "Jack Doe", "Joe Doe", "Kuala Lumpur", "Penang", "Programming" );
}
@Test
http://git-wip-us.apache.org/repos/asf/zest-java/blob/612f952a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractQueryTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractQueryTest.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractQueryTest.java
index 852094a..b442434 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractQueryTest.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractQueryTest.java
@@ -117,7 +117,7 @@ public abstract class AbstractQueryTest
QueryBuilder<Nameable> qb = this.moduleInstance.newQueryBuilder( Nameable.class );
Query<Nameable> query = unitOfWork.newQuery( qb );
System.out.println( "*** script03: " + query );
- verifyUnorderedResults( query, "Joe Doe", "Ann Doe", "Jack Doe", "Penang", "Kuala Lumpur", "Cooking", "Gaming",
+ verifyUnorderedResults( query, "Felix", "Joe Doe", "Ann Doe", "Jack Doe", "Penang", "Kuala Lumpur", "Cooking", "Gaming",
"Programming", "Cars" );
}
@@ -314,7 +314,7 @@ public abstract class AbstractQueryTest
query.firstResult( 3 );
query.maxResults( 2 );
System.out.println( "*** script17: " + query );
- verifyOrderedResults( query, "Gaming", "Jack Doe" );
+ verifyOrderedResults( query, "Felix", "Gaming" );
}
@Test
@@ -327,7 +327,7 @@ public abstract class AbstractQueryTest
Query<Nameable> query = unitOfWork.newQuery( qb );
query.orderBy( orderBy( nameable.name() ) );
System.out.println( "*** script18: " + query );
- verifyOrderedResults( query, "Ann Doe", "Cars", "Cooking", "Gaming", "Jack Doe", "Joe Doe", "Kuala Lumpur",
+ verifyOrderedResults( query, "Ann Doe", "Cars", "Cooking", "Felix", "Gaming", "Jack Doe", "Joe Doe", "Kuala Lumpur",
"Penang", "Programming" );
}
@@ -341,7 +341,7 @@ public abstract class AbstractQueryTest
Query<Nameable> query = unitOfWork.newQuery( qb.where( gt( nameable.name(), "D" ) ) );
query.orderBy( orderBy( nameable.name() ) );
System.out.println( "*** script19: " + query );
- verifyOrderedResults( query, "Gaming", "Jack Doe", "Joe Doe", "Kuala Lumpur", "Penang", "Programming" );
+ verifyOrderedResults( query, "Felix", "Gaming", "Jack Doe", "Joe Doe", "Kuala Lumpur", "Penang", "Programming" );
}
@Test
http://git-wip-us.apache.org/repos/asf/zest-java/blob/612f952a/core/testsupport/src/main/java/org/apache/zest/test/indexing/NameableAssert.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/NameableAssert.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/NameableAssert.java
index e6f8c52..32ee9db 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/NameableAssert.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/NameableAssert.java
@@ -19,6 +19,7 @@ package org.apache.zest.test.indexing;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -97,7 +98,8 @@ public class NameableAssert
public static String[] allNames()
{
- return world.values().toArray( new String[ world.size() ] );
+ Collection<String> values = world.values();
+ return values.toArray( new String[ world.size() ] );
}
public static void verifyUnorderedResults( final Iterable<? extends Nameable> results, final String... names )
http://git-wip-us.apache.org/repos/asf/zest-java/blob/612f952a/core/testsupport/src/main/java/org/apache/zest/test/indexing/TestData.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/TestData.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/TestData.java
index 48cd6b5..e765eb0 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/TestData.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/TestData.java
@@ -238,6 +238,7 @@ public class TestData
Cat felix = catBuilder.instance();
felix.name().set( "Felix" );
catBuilder.newInstance();
+ NameableAssert.trace( felix );
}
unitOfWork.complete();
}
[3/4] zest-java git commit: Merged develop branch.
Posted by ni...@apache.org.
Merged develop branch.
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/962badce
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/962badce
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/962badce
Branch: refs/heads/ZEST-105
Commit: 962badcea188f48da722cba396fb2478375065e7
Parents: 5c1a400 2ae805e
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Wed Apr 13 23:49:10 2016 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Wed Apr 13 23:49:10 2016 +0800
----------------------------------------------------------------------
build.gradle | 2 +-
.../src/main/java/org/apache/zest/test/indexing/model/Address.java | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/962badce/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java
----------------------------------------------------------------------
diff --cc core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java
index 1d5c03a,8de630a..60aa742
mode 100644,100755..100755
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/model/Address.java
@@@ -20,7 -20,8 +20,7 @@@ package org.apache.zest.test.indexing.m
import org.apache.zest.api.property.Property;
import org.apache.zest.api.value.ValueComposite;
--public interface Address
- extends ValueComposite // necessary, @See ZEST-137
++public interface Address extends ValueComposite // necessary, @See ZEST-137
{
Property<String> line1();