polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject [1/3] zest-sandbox git commit: Cleanup Zest Sandbox - Use Qi4j 1.4.1
Date Sun, 19 Apr 2015 17:06:14 GMT
Repository: zest-sandbox
Updated Branches:
  refs/heads/feature/sandbox-cleanup 23b1f5d95 -> 562f2ca3b


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/feature/sandbox-cleanup
Commit: af38f7083e6ea1bd8cb2143ad5333392bef8d777
Parents: 23b1f5d
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Sun Apr 19 17:41:05 2015 +0200
Committer: Paul Merlin <paulmerlin@apache.org>
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<EntityState, EntityStoreException> 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<QualifiedName, List<EntityReference>> result = new HashMap<QualifiedName,
List<EntityReference>>();
-        Iterable<ManyAssociationType> assocs = entityType.manyAssociations();
-        for( ManyAssociationType associationType : assocs )
+        Iterable<AssociationType> 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 @@
   	<dependency>
   		<groupId>org.qi4j.core</groupId>
   		<artifactId>org.qi4j.core.api</artifactId>
-  		<version>${version.qi4j-core}</version>
   	</dependency>
   	<dependency>
   		<groupId>org.qi4j.library</groupId>
   		<artifactId>org.qi4j.library.constraints</artifactId>
-  		<version>${version.qi4j-core}</version>
+        <version>${version.qi4j}</version>
   	</dependency>
   	<dependency>
   		<groupId>org.qi4j.core</groupId>
   		<artifactId>org.qi4j.core.testsupport</artifactId>
-  		<version>${version.qi4j-core}</version>
   		<scope>test</scope>
   	</dependency>
   	<dependency>
   		<groupId>org.qi4j.core</groupId>
   		<artifactId>org.qi4j.core.runtime</artifactId>
-  		<version>${version.qi4j-core}</version>
   		<scope>test</scope>
   	</dependency>
   </dependencies>
-  <properties>
-  	<version.qi4j-core>1.3</version.qi4j-core>
-  </properties>
 
   <build>
    <plugins>

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 @@
   </repositories>
 
   <properties>
-    <version.qi4j>1.3</version.qi4j>
+    <version.qi4j>1.4.1</version.qi4j>
   </properties>
 
   <dependencyManagement>


Mime
View raw message