polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject [2/7] polygene-java git commit: :tools:generator JClouds assembly uses a transient provider
Date Mon, 05 Jun 2017 16:13:12 GMT
:tools:generator JClouds assembly uses a transient provider


Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/2310dc01
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/2310dc01
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/2310dc01

Branch: refs/heads/develop
Commit: 2310dc01240d5fbaf3967f70f6e026453c8e4c83
Parents: 952e380
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Mon Jun 5 14:39:45 2017 +0200
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Mon Jun 5 14:39:45 2017 +0200

----------------------------------------------------------------------
 .../templates/RestAPIApplication/bootstrap-test.tmpl  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2310dc01/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
index 984d897..7114e19 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
@@ -36,7 +36,7 @@ import org.apache.polygene.tools.model.descriptor.ApplicationDetailDescriptor;
 import org.apache.polygene.tools.model.descriptor.ApplicationDetailDescriptorBuilder;
 <%
 polygene.needsDelayChecker = false;
-polygene.needsDocker = ['Cassandra', 'JClouds', 'MySQL', 'PostgreSQL', 'Redis', 'Riak'].indexOf(polygene.entitystore)
!= -1 || ['Memcache'].indexOf(polygene.caching) != -1;
+polygene.needsDocker = ['Cassandra', 'MySQL', 'PostgreSQL', 'Redis', 'Riak', 'MongoDB'].indexOf(polygene.entitystore)
!= -1 || ['Memcache'].indexOf(polygene.caching) != -1;
 
 if( polygene.entitystore === 'MySQL' ) {
 %>import java.util.HashMap;
@@ -174,16 +174,10 @@ if(  polygene.entitystore === 'Hazelcast' ) {
 <% }
 if(  polygene.entitystore === 'JClouds' ) {
 %>
-    private void entityStoreSetup(ApplicationAssembly assembly )
+    private void entityStoreSetup( ApplicationAssembly assembly )
     {
+        // Assembly use a transient JClouds provider
     }
-
-    @ClassRule
-    public static final OptionalDockerRule ES_DOCKER = new OptionalDockerRule( DockerRule.builder()
-                                                         .imageName( "scality/s3server:mem-6a8e1cd"
 )
-                                                         .publishAllPorts( true )
-                                                         .waitForTimeout( 120 )
-                                                         .waitFor( WaitFor.logMessageSequence(
"server started" ) ) );
 <% }
 if(  polygene.entitystore === 'Jdbm' ) {
 %>
@@ -320,7 +314,7 @@ if( polygene.needsDocker ) {
     /**
      * This JUnit Rule will skip tests if no Docker service is available.
      */
-    private static class OptionalDockerRule implements TestRule
+    public static class OptionalDockerRule implements TestRule
     {
         private final DockerRuleBuilder dockerRuleBuilder;
         private DockerRule dockerRule;


Mime
View raw message