update to act-1.8.8-RC4; bump version to 1.6.0

greenlaw110 · greenlaw110 · commit 5d25ba6d8d8f · 2018-05-13T14:40:14.000+10:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # act-ebean-java7 CHANGE LOG
 
+1.6.0 - 13/May/2018
+* update act to 1.8.8-RC4
+* Disable Ebean classpath search #21
+* Register global mapping filter to avoid copying ebean enhanced fields #20
+
+
 1.5.3 - 02/Apr/2018
 * update act to 1.8.5
 * update act-sql-common to 1.3.3
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 
   <artifactId>act-ebean-java7</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.4-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
 
   <name>ACT Ebean</name>
   <description>Provides SQL database access through Ebean ORM library (java 7+)</description>
@@ -35,7 +35,7 @@
   <parent>
     <groupId>org.actframework</groupId>
     <artifactId>parent</artifactId>
-    <version>1.8.5</version>
+    <version>1.8.8-RC4</version>
   </parent>
 
   <properties>
diff --git a/src/main/java/act/db/ebean/EbeanPlugin.java b/src/main/java/act/db/ebean/EbeanPlugin.java
@@ -33,6 +33,7 @@
 import com.avaje.ebean.TxScope;
 import com.avaje.ebeaninternal.api.HelpScopeTrans;
 import com.avaje.ebeaninternal.api.ScopeTrans;
+import org.osgl.OsglConfig;
 import osgl.version.Version;
 
 import java.util.EventObject;
@@ -44,6 +45,12 @@ public class EbeanPlugin extends DbPlugin {
 
     private static final ThreadLocal<ScopeTrans> txHolder = new ThreadLocal<>();
 
+    @Override
+    public void register() {
+        super.register();
+        registerGlobalMappingFilter();
+    }
+
     @Override
     protected void applyTo(App app) {
         super.applyTo(app);
@@ -83,4 +90,9 @@ public DbService initDbService(String id, App app, Map<String, String> conf) {
 
         return new EbeanService(id, app, conf);
     }
+
+    private void registerGlobalMappingFilter() {
+        OsglConfig.addGlobalMappingFilter("starts:_ebean_");
+    }
+
 }
diff --git a/src/main/java/act/db/ebean/util/EbeanConfigAdaptor.java b/src/main/java/act/db/ebean/util/EbeanConfigAdaptor.java
@@ -67,6 +67,7 @@ public ServerConfig adaptFrom(SqlDbServiceConfig actConfig, act.db.sql.DataSourc
             }
         }
 
+        config.setDisableClasspathSearch(true);
         return config;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ public ServerConfig adaptFrom(SqlDbServiceConfig actConfig, act.db.sql.DataSourc`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ config.setDisableClasspathSearch(true);`
`70`	`71`	`return config;`
`71`	`72`	`}`
`72`	`73`