Return-Path: X-Original-To: apmail-zest-commits-archive@minotaur.apache.org Delivered-To: apmail-zest-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 581D717CF0 for ; Mon, 20 Apr 2015 08:08:07 +0000 (UTC) Received: (qmail 72770 invoked by uid 500); 20 Apr 2015 08:08:07 -0000 Delivered-To: apmail-zest-commits-archive@zest.apache.org Received: (qmail 72712 invoked by uid 500); 20 Apr 2015 08:08:07 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 72639 invoked by uid 99); 20 Apr 2015 08:08:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 08:08:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DAE99E0562; Mon, 20 Apr 2015 08:08:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@zest.apache.org Date: Mon, 20 Apr 2015 08:08:08 -0000 Message-Id: <86e801afa6664d32affcfc4543254700@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/10] zest-sandbox git commit: Cleanup Zest Sandbox - Use Qi4j 1.4.1 Cleanup Zest Sandbox - Use Qi4j 1.4.1 Project: http://git-wip-us.apache.org/repos/asf/zest-sandbox/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-sandbox/commit/af38f708 Tree: http://git-wip-us.apache.org/repos/asf/zest-sandbox/tree/af38f708 Diff: http://git-wip-us.apache.org/repos/asf/zest-sandbox/diff/af38f708 Branch: refs/heads/develop Commit: af38f7083e6ea1bd8cb2143ad5333392bef8d777 Parents: 23b1f5d Author: Paul Merlin Authored: Sun Apr 19 17:41:05 2015 +0200 Committer: Paul Merlin Committed: Sun Apr 19 17:41:05 2015 +0200 ---------------------------------------------------------------------- .../cassandra/CassandraEntityStoreTest.java | 2 +- .../org/qi4j/entitystore/jndi/JndiEntityState.java | 6 ++++++ .../qi4j/entitystore/jndi/JndiEntityStoreMixin.java | 8 ++++---- .../main/java/org/qi4j/entitystore/jndi/JndiUow.java | 14 ++++++++++---- .../org/qi4j/entitystore/s3/S3EntityStoreTest.java | 2 +- .../qi4j/entitystore/swift/SwiftEntityStoreTest.java | 2 +- libraries/entityproxy/pom.xml | 8 +------- pom.xml | 2 +- 8 files changed, 25 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/af38f708/extensions/entitystore-cassandra/src/test/java/org/qi4j/entitystore/cassandra/CassandraEntityStoreTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-cassandra/src/test/java/org/qi4j/entitystore/cassandra/CassandraEntityStoreTest.java b/extensions/entitystore-cassandra/src/test/java/org/qi4j/entitystore/cassandra/CassandraEntityStoreTest.java index 595d620..9baaaf6 100644 --- a/extensions/entitystore-cassandra/src/test/java/org/qi4j/entitystore/cassandra/CassandraEntityStoreTest.java +++ b/extensions/entitystore-cassandra/src/test/java/org/qi4j/entitystore/cassandra/CassandraEntityStoreTest.java @@ -6,7 +6,7 @@ import org.apache.thrift.transport.TTransportException; import org.junit.BeforeClass; import org.qi4j.bootstrap.AssemblyException; import org.qi4j.bootstrap.ModuleAssembly; -import org.qi4j.test.entity.AbstractEntityStoreTest; +import org.qi4j.core.testsupport.AbstractEntityStoreTest; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/af38f708/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityState.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityState.java b/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityState.java index fa0a333..34f6181 100644 --- a/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityState.java +++ b/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityState.java @@ -28,6 +28,7 @@ import org.qi4j.api.common.QualifiedName; import java.util.Map; import java.util.List; import java.util.HashMap; +import org.qi4j.spi.entity.NamedAssociationState; public class JndiEntityState implements EntityState @@ -136,6 +137,11 @@ public class JndiEntityState return null; } + public NamedAssociationState getNamedAssociation( QualifiedName qn ) + { + return null; + } + public void refresh() { } http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/af38f708/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreMixin.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreMixin.java b/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreMixin.java index 2bf2f74..e0b1fa9 100644 --- a/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreMixin.java +++ b/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreMixin.java @@ -109,10 +109,10 @@ public class JndiEntityStoreMixin setup = null; } - public EntityStoreUnitOfWork newUnitOfWork( Usecase usecase, ModuleSPI module ) - { - return new JndiUow( setup, usecase, module ); - } + public EntityStoreUnitOfWork newUnitOfWork( Usecase usecase, ModuleSPI module, long currentTime ) + { + return new JndiUow( setup, usecase, module, currentTime ); + } public Input entityStates( ModuleSPI module ) { http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/af38f708/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiUow.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiUow.java b/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiUow.java index 80d51e3..da72ee0 100644 --- a/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiUow.java +++ b/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiUow.java @@ -36,7 +36,6 @@ import org.qi4j.spi.entity.EntityState; import org.qi4j.spi.entity.EntityStatus; import org.qi4j.spi.entity.EntityType; import org.qi4j.spi.entity.association.AssociationType; -import org.qi4j.spi.entity.association.ManyAssociationType; import org.qi4j.spi.entitystore.EntityNotFoundException; import org.qi4j.spi.entitystore.EntityStoreException; import org.qi4j.spi.entitystore.EntityStoreUnitOfWork; @@ -54,17 +53,19 @@ public class JndiUow implements EntityStoreUnitOfWork RESTRICTED_PROPERTIES.add( "identity" ); } + private long currentTime; private Usecase usecase; private Module module; private String uowIdentity; private JndiSetup setup; - public JndiUow( JndiSetup setup, Usecase usecase, Module module ) + public JndiUow( JndiSetup setup, Usecase usecase, Module module, long currentTime ) { this.setup = setup; uowIdentity = UUID.randomUUID().toString(); this.usecase = usecase; this.module = module; + this.currentTime = currentTime; } public String identity() @@ -72,6 +73,11 @@ public class JndiUow implements EntityStoreUnitOfWork return uowIdentity; } + public long currentTime() + { + return currentTime; + } + public EntityState newEntityState( EntityReference anIdentity, EntityDescriptor entityDescriptor ) throws EntityStoreException { @@ -216,8 +222,8 @@ public class JndiUow implements EntityStoreUnitOfWork throws NamingException { Map> result = new HashMap>(); - Iterable assocs = entityType.manyAssociations(); - for( ManyAssociationType associationType : assocs ) + Iterable assocs = entityType.manyAssociations(); + for( AssociationType associationType : assocs ) { QualifiedName qualifiedName = associationType.qualifiedName(); String associationName = qualifiedName.name(); http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/af38f708/extensions/entitystore-s3/src/test/java/org/qi4j/entitystore/s3/S3EntityStoreTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-s3/src/test/java/org/qi4j/entitystore/s3/S3EntityStoreTest.java b/extensions/entitystore-s3/src/test/java/org/qi4j/entitystore/s3/S3EntityStoreTest.java index 57d6fe8..71f26dc 100644 --- a/extensions/entitystore-s3/src/test/java/org/qi4j/entitystore/s3/S3EntityStoreTest.java +++ b/extensions/entitystore-s3/src/test/java/org/qi4j/entitystore/s3/S3EntityStoreTest.java @@ -21,7 +21,7 @@ import org.qi4j.api.common.Visibility; import org.qi4j.bootstrap.AssemblyException; import org.qi4j.bootstrap.ModuleAssembly; import org.qi4j.entitystore.memory.MemoryEntityStoreService; -import org.qi4j.test.entity.AbstractEntityStoreTest; +import org.qi4j.core.testsupport.AbstractEntityStoreTest; /** * Amazon S3 EntityStore test http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/af38f708/extensions/entitystore-swift/src/test/java/org/qi4j/entitystore/swift/SwiftEntityStoreTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-swift/src/test/java/org/qi4j/entitystore/swift/SwiftEntityStoreTest.java b/extensions/entitystore-swift/src/test/java/org/qi4j/entitystore/swift/SwiftEntityStoreTest.java index e9e91df..79d90f2 100644 --- a/extensions/entitystore-swift/src/test/java/org/qi4j/entitystore/swift/SwiftEntityStoreTest.java +++ b/extensions/entitystore-swift/src/test/java/org/qi4j/entitystore/swift/SwiftEntityStoreTest.java @@ -22,7 +22,7 @@ import org.qi4j.api.common.Visibility; import org.qi4j.bootstrap.AssemblyException; import org.qi4j.bootstrap.ModuleAssembly; import org.qi4j.entitystore.memory.MemoryEntityStoreService; -import org.qi4j.test.entity.AbstractEntityStoreTest; +import org.qi4j.core.testsupport.AbstractEntityStoreTest; import org.qi4j.spi.uuid.UuidIdentityGeneratorService; public class SwiftEntityStoreTest extends AbstractEntityStoreTest http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/af38f708/libraries/entityproxy/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/entityproxy/pom.xml b/libraries/entityproxy/pom.xml index 012d95c..e046310 100644 --- a/libraries/entityproxy/pom.xml +++ b/libraries/entityproxy/pom.xml @@ -13,29 +13,23 @@ org.qi4j.core org.qi4j.core.api - ${version.qi4j-core} org.qi4j.library org.qi4j.library.constraints - ${version.qi4j-core} + ${version.qi4j} org.qi4j.core org.qi4j.core.testsupport - ${version.qi4j-core} test org.qi4j.core org.qi4j.core.runtime - ${version.qi4j-core} test - - 1.3 - http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/af38f708/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b7be1bd..0a5e4f2 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - 1.3 + 1.4.1