[maven-release-plugin] prepare release ebean-spring-txn-12.2.1

Update pom ebean version

README.md

@@ -1,4 +1,29 @@
-avaje-ebeanorm-spring
+ebean-spring-txn
 =====================
 
-Spring integration with EbeanORM
+Integration with Spring managed transactions.
+
+This project provides an Ebean `ExternalTransactionManager` specifically
+to integrate with Springs JDBC Transaction manager.
+
+## To use
+
+```java
+ServerConfig serverConfig = new ServerConfig();
+
+// set SpringJdbcTransactionManager ... as the external transaction manager
+serverConfig.setExternalTransactionManager(new SpringJdbcTransactionManager());
+
+...
+EbeanServer server = EbeanServerFactory.create(serverConfig);
+
+```
+
+## Notes
+
+You can use Ebean in Spring/Spring Boot *without* this and that case Ebean
+manages the Transactions itself. With Ebean managing the transactions there 
+are some benefits with more control over JDBC batch, getGeneratedKeys
+and a simpler abstraction (as Spring transactions is designed to manage
+multiple resources such as JDBC Transactions and JPA EntityManager and Ebean
+only needs to manage JDBC Transactions).

pom.xml

@@ -1,91 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.avaje</groupId>
-    <artifactId>avaje-javaparent</artifactId>
-    <version>1.2</version>
+    <artifactId>java8-oss</artifactId>
+    <version>2.1</version>
   </parent>
 
-  <groupId>org.avaje.ebeanorm</groupId>
-  <artifactId>avaje-ebeanorm-spring</artifactId>
-  <name>avaje-ebeanorm-spring</name>
-  <version>4.5.3</version>
+  <groupId>io.ebean</groupId>
+  <artifactId>ebean-spring-txn</artifactId>
+  <version>12.2.1</version>
+
+  <name>ebean-spring-txn</name>
   <packaging>jar</packaging>
-  <description>Support for Spring transactions and IOC setup of Ebean server config</description>
+  <description>Ebean support for Spring transactions</description>
 
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring.framework.version>4.1.7.RELEASE</spring.framework.version>
+    <spring.framework.version>4.3.4.RELEASE</spring.framework.version>
+    <spring.boot.version>1.4.2.RELEASE</spring.boot.version>
   </properties>
 
-  <url>http://www.avaje.org</url>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+  <url>http://ebean-orm.github.io/</url>
 
   <scm>
-    <connection>scm:git:https://github.com/ebean-orm/avaje-ebeanorm-spring.git</connection>
-    <developerConnection>scm:git:https://github.com/ebean-orm/avaje-ebeanorm-spring.git</developerConnection>
-    <url>https://github.com/ebean-orm/avaje-ebeanorm-spring.git</url>
+    <developerConnection>scm:git:git@github.com:ebean-orm/ebean-spring-txn.git</developerConnection>
+    <tag>ebean-spring-txn-12.2.1</tag>
   </scm>
 
   <dependencies>
-
     <dependency>
-      <groupId>org.avaje.ebeanorm</groupId>
-      <artifactId>avaje-ebeanorm</artifactId>
-      <version>[6,7)</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje.ebeanorm</groupId>
-      <artifactId>avaje-ebeanorm-agent</artifactId>
-      <version>[4.5,5)</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-agentloader</artifactId>
-      <version>2.1.2</version>
-    </dependency>
-
-    <!-- Spring -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${spring.framework.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>${spring.framework.version}</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aspects</artifactId>
-      <version>${spring.framework.version}</version>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean</artifactId>
+      <version>12.2.1</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
+    <!-- Provided: Spring, Spring Boot -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
@@ -114,116 +72,64 @@
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.12</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje.composite</groupId>
-      <artifactId>avaje-composite-testing-ebean</artifactId>
-      <version>4.1</version>
-      <type>pom</type>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-test</artifactId>
+      <version>${spring.boot.version}</version>
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.1.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.4.196</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>[1.7,)</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
     <plugins>
+
       <plugin>
-        <groupId>org.avaje.ebeanorm</groupId>
-        <artifactId>avaje-ebeanorm-mavenenhancer</artifactId>
-        <version>4.5.3</version>
-        <executions>
-          <execution>
-            <id>main</id>
-            <phase>process-test-classes</phase>
-            <configuration>
-              <classSource>target/test-classes</classSource>
-              <packages>com.avaje.**</packages>
-              <transformArgs>debug=9</transformArgs>
-            </configuration>
-            <goals>
-              <goal>enhance</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
+        <groupId>io.repaint.maven</groupId>
+        <artifactId>tiles-maven-plugin</artifactId>
+        <version>2.16</version>
+        <extensions>true</extensions>
         <configuration>
-          <archive>
-            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
+          <tiles>
+            <tile>io.ebean.tile:enhancement:12.2.1</tile>
+          </tiles>
         </configuration>
       </plugin>
+
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings 
-          only. It has no influence on the Maven build itself. -->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>
-                      org.avaje.ebeanorm
-                    </groupId>
-                    <artifactId>
-                      avaje-ebeanorm-mavenenhancer
-                    </artifactId>
-                    <versionRange>
-                      [3,4)
-                    </versionRange>
-                    <goals>
-                      <goal>enhance</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.9.1</version>
-          <configuration>
-            <source>1.8</source>
-            <doclet>org.avaje.doclet.PygmentsDoclet</doclet>
-            <docletArtifact>
-              <groupId>org.avaje</groupId>
-              <artifactId>pygments-doclet</artifactId>
-              <version>1.0.0</version>
-            </docletArtifact>
-            <additionalparam>
-              -Xdoclint:none
-            </additionalparam>
-            <linksource>true</linksource>
-          </configuration>
-
-          <executions>
-            <execution>
-              <id>attach-javadocs</id>
-              <goals>
-                <goal>jar</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        
-      </plugins>
-    </pluginManagement>
   </build>
+
 </project>

src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java

@@ -1,46 +0,0 @@
-package com.avaje.ebean.springsupport;
-
-import org.avaje.agentloader.AgentLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * To Setup Enhancement in Spring
- * <bean class="org.ebean.AgentLoaderSupport">
- * <property name="debug" value="1" />
- * <property name="packages" value="org.ebean.**" />
- * </bean>
- * Created by guor on 2015/5/11.
- */
-public class AgentLoaderSupport implements InitializingBean {
-
-  private Logger logger = LoggerFactory.getLogger(getClass());
-
-  private int debug;
-  private String packages;
-
-  public int getDebug() {
-    return debug;
-  }
-
-  public void setDebug(int debug) {
-    this.debug = debug;
-  }
-
-  public String getPackages() {
-    return packages;
-  }
-
-  public void setPackages(String packages) {
-    this.packages = packages;
-  }
-
-  @Override
-  public void afterPropertiesSet() throws Exception {
-    String args = "debug=" + getDebug() + ";packages=" + getPackages();
-    if (!AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent", args)) {
-      logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
-    }
-  }
-}

src/main/java/io/ebean/spring/txn/SpringJdbcTransaction.java

@@ -18,12 +18,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-package com.avaje.ebean.springsupport.txn;
+package io.ebean.spring.txn;
 
 import org.springframework.jdbc.datasource.ConnectionHolder;
 
-import com.avaje.ebeaninternal.server.transaction.ExternalJdbcTransaction;
-import com.avaje.ebeaninternal.server.transaction.TransactionManager;
+import io.ebeaninternal.server.transaction.ExternalJdbcTransaction;
+import io.ebeaninternal.server.transaction.TransactionManager;
 
 public class SpringJdbcTransaction extends ExternalJdbcTransaction {
 

src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java

@@ -1,44 +1,22 @@
-/**
- * Copyright (C) 2009 the original author or authors
- * <p>
- * This file is part of Ebean.
- * <p>
- * Ebean is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- * <p>
- * Ebean is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * <p>
- * You should have received a copy of the GNU Lesser General Public License
- * along with Ebean; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package com.avaje.ebean.springsupport.txn;
-
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.persistence.PersistenceException;
-import javax.sql.DataSource;
+package io.ebean.spring.txn;
 
+import io.ebean.TxScope;
+import io.ebean.config.ExternalTransactionManager;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.transaction.TransactionManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.datasource.ConnectionHolder;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationAdapter;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
-import com.avaje.ebean.config.ExternalTransactionManager;
-import com.avaje.ebeaninternal.api.SpiTransaction;
-import com.avaje.ebeaninternal.server.transaction.DefaultTransactionThreadLocal;
-import com.avaje.ebeaninternal.server.transaction.TransactionManager;
+import javax.persistence.PersistenceException;
+import javax.sql.DataSource;
+import java.util.List;
 
 /**
- * A Spring aware TransactionScopeManager.
- *
+ * A Spring-aware {@link ExternalTransactionManager}.
  * <p>
  * Will look for Spring transactions and use them if they exist.
  * </p>
@@ -46,9 +24,9 @@ import com.avaje.ebeaninternal.server.transaction.TransactionManager;
  * @since 18.05.2009
  * @author E Mc Greal
  */
-public class SpringAwareJdbcTransactionManager implements ExternalTransactionManager {
+public class SpringJdbcTransactionManager implements ExternalTransactionManager {
 
-  private final static Logger logger = Logger.getLogger(SpringAwareJdbcTransactionManager.class.getName());
+  private static final Logger log = LoggerFactory.getLogger(SpringJdbcTransactionManager.class);
 
   /**
    * The data source.
@@ -60,28 +38,22 @@ public class SpringAwareJdbcTransactionManager implements ExternalTransactionMan
    */
   private TransactionManager transactionManager;
 
-  /**
-   *  The EbeanServer name.
-   */
-  private String serverName;
-
   /**
    * Instantiates a new spring aware transaction scope manager.
    */
-  public SpringAwareJdbcTransactionManager() {
+  public SpringJdbcTransactionManager() {
   }
 
   /**
    * Initialise this with the Ebean internal transaction manager.
    */
+  @Override
   public void setTransactionManager(Object txnMgr) {
 
     // RB: At this stage not exposing TransactionManager to
     // the public API and hence the Object type and casting here
-
     this.transactionManager = (TransactionManager) txnMgr;
     this.dataSource = transactionManager.getDataSource();
-    this.serverName = transactionManager.getServerName();
   }
 
   /**
@@ -90,6 +62,7 @@ public class SpringAwareJdbcTransactionManager implements ExternalTransactionMan
    * Returns null if there is no current spring transaction (lazy loading outside a spring txn etc).
    * </p>
    */
+  @Override
   public Object getCurrentTransaction() {
 
     // Get the current Spring ConnectionHolder associated to the current spring managed transaction
@@ -97,24 +70,18 @@ public class SpringAwareJdbcTransactionManager implements ExternalTransactionMan
 
     if (holder == null || !holder.isSynchronizedWithTransaction()) {
       // no current Spring transaction
-      SpiTransaction currentEbeanTransaction = DefaultTransactionThreadLocal.get(serverName);
-      if (currentEbeanTransaction != null) {
-        // NOT expecting this so log WARNING
-        String msg = "SpringTransaction - no current spring txn BUT using current Ebean one " + currentEbeanTransaction.getId();
-        logger.log(Level.WARNING, msg);
-
-      } else if (logger.isLoggable(Level.FINEST)) {
-        logger.log(Level.FINEST, "Spring Txn - no current transaction ");
+      SpiTransaction currentEbeanTransaction = transactionManager.getInScope();
+      if (currentEbeanTransaction == null || !currentEbeanTransaction.isActive()) {
+        return null;
+      } else {
+        return currentEbeanTransaction;
       }
-      return currentEbeanTransaction;
     }
 
     SpringTxnListener springTxnLister = getSpringTxnListener();
-
     if (springTxnLister != null) {
       // we have already seen this transaction
       return springTxnLister.getTransaction();
-
     } else {
       // This is a new spring transaction that we have not seen before.
       // "wrap" it in a SpringJdbcTransaction for use with Ebean
@@ -124,9 +91,7 @@ public class SpringAwareJdbcTransactionManager implements ExternalTransactionMan
       springTxnLister = createSpringTxnListener(newTrans);
       TransactionSynchronizationManager.registerSynchronization(springTxnLister);
 
-      // also put in Ebean ThreadLocal
-      DefaultTransactionThreadLocal.set(serverName, newTrans);
-      return newTrans;
+      return transactionManager.externalBeginTransaction(newTrans, TxScope.required());
     }
   }
 
@@ -142,9 +107,9 @@ public class SpringAwareJdbcTransactionManager implements ExternalTransactionMan
       List<TransactionSynchronization> synchronizations = TransactionSynchronizationManager.getSynchronizations();
       if (synchronizations != null) {
         // search for our specific listener
-        for (int i = 0; i < synchronizations.size(); i++) {
-          if (synchronizations.get(i) instanceof SpringTxnListener) {
-            return (SpringTxnListener) synchronizations.get(i);
+        for (TransactionSynchronization synchronization : synchronizations) {
+          if (synchronization instanceof SpringTxnListener) {
+            return (SpringTxnListener) synchronization;
           }
         }
       }
@@ -180,21 +145,23 @@ public class SpringAwareJdbcTransactionManager implements ExternalTransactionMan
 
     private final SpringJdbcTransaction transaction;
 
-    private final String serverName;
-
     private SpringTxnListener(TransactionManager transactionManager, SpringJdbcTransaction t) {
       this.transactionManager = transactionManager;
       this.transaction = t;
-      this.serverName = transactionManager.getServerName();
     }
 
     /**
      * Return the associated Ebean wrapped transaction.
      */
-    public SpringJdbcTransaction getTransaction() {
+    SpringJdbcTransaction getTransaction() {
       return transaction;
     }
 
+    @Override
+    public void flush() {
+      transaction.flushBatch();
+    }
+
     @Override
     public void beforeCommit(boolean readOnly) {
       // Future note: for JPA2 locking we will
@@ -206,27 +173,22 @@ public class SpringAwareJdbcTransactionManager implements ExternalTransactionMan
 
       switch (status) {
         case STATUS_COMMITTED:
-          if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Spring Txn [" + transaction.getId() + "] committed");
-          }
+          log.debug("Spring Txn [{}] committed", transaction.getId());
           transactionManager.notifyOfCommit(transaction);
           break;
 
         case STATUS_ROLLED_BACK:
-          if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Spring Txn [" + transaction.getId() + "] rollback");
-          }
+          log.debug("Spring Txn [{}] rollback", transaction.getId());
           transactionManager.notifyOfRollback(transaction, null);
           break;
 
         default:
           // this should never happen
-          String msg = "Invalid status " + status;
-          throw new PersistenceException(msg);
+          throw new PersistenceException("Invalid status " + status);
       }
 
       // Remove this transaction object as it is completed
-      DefaultTransactionThreadLocal.replace(serverName, null);
+      transactionManager.externalRemoveTransaction();
     }
   }
 }

src/main/resources/META-INF/MANIFEST.MF

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Premain-Class: com.avaje.ebean.enhance.agent.Transformer
-Bundle-ManifestVersion: 2
-Bundle-Name: Ebean-ORM-SPRING
-Bundle-SymbolicName: com.avaje.ebean.springsupport
-Bundle-Version: 4.1.9
-Bundle-ClassPath: .
-Bundle-Vendor: avaje
-Export-Package:  com.avaje.ebean.springsupport.factory,
- com.avaje.ebean.springsupport.txn
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: com.avaje.ebean;bundle-version="4.1.9",
- org.springframework.beans;bundle-version="3.1.0",
- org.springframework.context;bundle-version="3.1.0",
- org.slf4j.api;bundle-version="1.7.2"
-Import-Package: javax.persistence;version="2.0.0"
-
-

src/test/java/com/avaje/test/springsupport/Account.java

@@ -1,57 +0,0 @@
-/**
- * Copyright (C) 2009 the original author or authors
- * <p>
- * This file is part of Ebean.
- * <p>
- * Ebean is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- * <p>
- * Ebean is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * <p>
- * You should have received a copy of the GNU Lesser General Public License
- * along with Ebean; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package com.avaje.test.springsupport;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-
-/**
- * The Class Account.
- * @since 18.05.2009
- * @author E Mc Greal
- */
-@Entity
-public class Account {
-
-  /** The id. */
-  @Id
-  private Long id;
-
-  /** The user. */
-  @OneToOne
-  private User user;
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public User getUser() {
-    return user;
-  }
-
-  public void setUser(User user) {
-    this.user = user;
-  }
-}

src/test/java/com/avaje/test/springsupport/Role.java

@@ -1,61 +0,0 @@
-/**
- * Copyright (C) 2009 the original author or authors
- * <p>
- * This file is part of Ebean.
- * <p>
- * Ebean is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- * <p>
- * Ebean is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * <p>
- * You should have received a copy of the GNU Lesser General Public License
- * along with Ebean; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package com.avaje.test.springsupport;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-
-/**
- * The Class Role.
- * @since 18.05.2009
- * @author E Mc Greal
- */
-@Entity
-public class Role {
-
-  @Id
-  Long id;
-
-  @ManyToMany
-  private Set<User> users;
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public Set<User> getUsers() {
-    return users;
-  }
-
-  public void setUsers(Set<User> users) {
-    this.users = users;
-  }
-
-
-}

src/test/java/com/avaje/test/springsupport/User.java

@@ -1,78 +0,0 @@
-/**
- * Copyright (C) 2009 the original author or authors
- *
- * This file is part of Ebean.
- *
- * Ebean is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * Ebean is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Ebean; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package com.avaje.test.springsupport;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToOne;
-import java.util.Set;
-
-/**
- * The Class User.
- * @since 18.05.2009
- * @author E Mc Greal
- */
-@Entity
-public class User {
-	@Id
-	long oid;
-
-	private String name;
-
-	@ManyToMany
-	private Set<Role> roles;
-
-	@OneToOne(mappedBy="user")
-	private Account account;
-
-	public long getOid() {
-		return oid;
-	}
-
-	public void setOid(long oid) {
-		this.oid = oid;
-	}
-
-	public Set<Role> getRoles() {
-		return roles;
-	}
-
-	public void setRoles(Set<Role> roles) {
-		this.roles = roles;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Account getAccount() {
-		return account;
-	}
-
-	public void setAccount(Account account) {
-		this.account = account;
-	}
-
-}

src/test/java/com/avaje/test/springsupport/UserService.java

@@ -1,35 +0,0 @@
-/**
- * Copyright (C) 2009 the original author or authors
- *
- * This file is part of Ebean.
- *
- * Ebean is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * Ebean is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Ebean; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package com.avaje.test.springsupport;
-
-/**
- * The Interface UserService.
- * @since 18.05.2009
- * @author E Mc Greal
- */
-public interface UserService {
-
-  void save(User user);
-
-	User find(long id);
-
-  void batchInsert();
-}

src/test/java/com/avaje/test/springsupport/UserServiceImpl.java

@@ -1,97 +0,0 @@
-/**
- * Copyright (C) 2009 the original author or authors
- *
- * This file is part of Ebean.
- *
- * Ebean is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * Ebean is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Ebean; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package com.avaje.test.springsupport;
-
-import com.avaje.ebean.Transaction;
-import com.avaje.ebean.config.PersistBatch;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.avaje.ebean.EbeanServer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The Class UserServiceImpl.
- *
- * @since 18.05.2009
- * @author E Mc Greal
- */
-public class UserServiceImpl implements UserService {
-
-	/** The ebean server. */
-	@Autowired
-	private EbeanServer ebeanServer;
-
-	/* (non-Javadoc)
-	 * @see org.spring.modules.ebean.UserService#save(org.spring.modules.ebean.User)
-	 */
-	@Transactional(readOnly = false, propagation = Propagation.REQUIRED, rollbackFor=Throwable.class)
-	public void save(User user) {
-		ebeanServer.save(user);
-	}
-
-	@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
-	public User find(long id) {
-		return ebeanServer.find(User.class, id);
-	}
-
-
-  @Transactional(readOnly = false, propagation = Propagation.REQUIRED)
-  public void batchInsert(){
-
-    List<User> users = new ArrayList<User>();
-    for(int i=0 ;i<5;i++){
-      User user = new User();
-      user.setName("user"+i);
-      users.add(user);
-    }
-
-    System.out.println("---------before batch-------");
-
-    Transaction tx = ebeanServer.beginTransaction();
-    tx.setBatch(PersistBatch.NONE);
-    tx.setBatchOnCascade(PersistBatch.ALL);
-    tx.setBatchSize(20);
-    ebeanServer.saveAll(users);//
-
-    System.out.println("---------after batch-------");
-  }
-
-
-	/**
-	 * Return the ebean server.
-	 */
-	public EbeanServer getEbeanServer() {
-		return ebeanServer;
-	}
-
-	/**
-	 * Sets the ebean server.
-	 */
-	public void setEbeanServer(EbeanServer ebeanServer) {
-		this.ebeanServer = ebeanServer;
-	}
-
-
-}

src/test/java/org/example/Account.java

@@ -0,0 +1,31 @@
+package org.example;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+public class Account {
+
+  @Id
+  private Long id;
+
+  @OneToOne
+  private User user;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public User getUser() {
+    return user;
+  }
+
+  public void setUser(User user) {
+    this.user = user;
+  }
+}

src/test/java/org/example/EbeanServerFactoryBean.java

@@ -1,30 +1,11 @@
-/**
- * Copyright (C) 2009 the original author or authors
- * <p>
- * This file is part of Ebean.
- * <p>
- * Ebean is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- * <p>
- * Ebean is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * <p>
- * You should have received a copy of the GNU Lesser General Public License
- * along with Ebean; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package com.avaje.ebean.springsupport.factory;
+package org.example;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.EbeanServerFactory;
-import com.avaje.ebean.config.ServerConfig;
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.config.ServerConfig;
 
 /**
  * A Spring FactoryBean for constructing EbeanServer instances.

src/test/java/org/example/EbeanSpringModuleTest.java

@@ -1,36 +1,18 @@
-/**
- * Copyright (C) 2009 the original author or authors
- * <p>
- * This file is part of Ebean.
- * <p>
- * Ebean is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- * <p>
- * Ebean is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * <p>
- * You should have received a copy of the GNU Lesser General Public License
- * along with Ebean; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package com.avaje.test.springsupport;
+package org.example;
+
+import io.ebean.Ebean;
+import io.ebean.Transaction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.util.logging.Logger;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
 /**
  * Unit test for Ebean Spring Module.
  * @since 18.05.2009
@@ -41,7 +23,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 public class EbeanSpringModuleTest {
 
   /** The Constant logger. */
-  private final static Logger logger = Logger.getLogger(EbeanSpringModuleTest.class.getName());
+  private final static Logger logger = LoggerFactory.getLogger(EbeanSpringModuleTest.class);
 
   /** The user service. */
   @Autowired
@@ -54,6 +36,27 @@ public class EbeanSpringModuleTest {
     super();
   }
 
+  /**
+   * Test app.
+   */
+  @Test
+  public void testInactiveTransaction() {
+
+    Transaction transaction = Ebean.beginTransaction();
+    long id;
+    try {
+      User user = new User();
+      user.setName("save with txn 1");
+      Ebean.save(user);
+      transaction.commit();
+      id = user.getOid();
+    } finally {
+      // don't end the transaction ...
+      //transaction.end();
+    }
+
+    Ebean.delete(User.class, id);
+  }
 
   @Test
   public void testBatchInsert() {
@@ -86,6 +89,20 @@ public class EbeanSpringModuleTest {
     logger.info("Found User with OID = 1");
   }
 
+  @Test
+  public void testNonTransactional() {
+    userService.nonTransactional();
+    logger.info("nonTransactional done");
+  }
+
+  @Test
+  public void testFindNonTransactional() {
+    logger.info("Finding User with OID = 1 ...");
+    User user = userService.find(1);
+    User user2 = userService.findNoCurrentTransaction(2);
+    logger.info("nonTransactional find user1:{} user2:{}", user, user2);
+  }
+
   /**
    * Return the user service.
    */

src/test/java/org/example/Role.java

@@ -0,0 +1,32 @@
+package org.example;
+
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+
+@Entity
+public class Role {
+
+  @Id
+  Long id;
+
+  @ManyToMany
+  private Set<User> users;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public Set<User> getUsers() {
+    return users;
+  }
+
+  public void setUsers(Set<User> users) {
+    this.users = users;
+  }
+}

src/test/java/org/example/User.java

@@ -0,0 +1,59 @@
+package org.example;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToOne;
+import java.util.Set;
+
+@Entity
+public class User {
+
+	@Id
+	long oid;
+
+	private String name;
+
+	@ManyToMany
+	private Set<Role> roles;
+
+	@OneToOne(mappedBy = "user")
+	private Account account;
+
+	public String toString() {
+		return "{user:" + oid + " name:" + name + "}";
+	}
+
+	public long getOid() {
+		return oid;
+	}
+
+	public void setOid(long oid) {
+		this.oid = oid;
+	}
+
+	public Set<Role> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(Set<Role> roles) {
+		this.roles = roles;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Account getAccount() {
+		return account;
+	}
+
+	public void setAccount(Account account) {
+		this.account = account;
+	}
+
+}

src/test/java/org/example/UserService.java

@@ -0,0 +1,17 @@
+package org.example;
+
+/**
+ * The Interface UserService.
+ */
+public interface UserService {
+
+	void save(User user);
+
+	User find(long id);
+
+	User findNoCurrentTransaction(long id);
+
+	void nonTransactional();
+
+	void batchInsert();
+}

src/test/java/org/example/UserServiceImpl.java

@@ -0,0 +1,78 @@
+package org.example;
+
+import io.ebean.Transaction;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import io.ebean.EbeanServer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The Class UserServiceImpl.
+ *
+ * @since 18.05.2009
+ * @author E Mc Greal
+ */
+public class UserServiceImpl implements UserService {
+
+	/** The ebean server. */
+	@Autowired
+	private EbeanServer ebeanServer;
+
+	@Transactional(propagation = Propagation.REQUIRED, rollbackFor=Throwable.class)
+	public void save(User user) {
+		ebeanServer.save(user);
+	}
+
+	@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
+	public User find(long id) {
+		return ebeanServer.find(User.class, id);
+	}
+
+	public void nonTransactional() {
+		ebeanServer.currentTransaction();
+	}
+
+	public User findNoCurrentTransaction(long id) {
+		return ebeanServer.find(User.class, id);
+	}
+
+  @Transactional(propagation = Propagation.REQUIRED)
+  public void batchInsert() {
+
+    List<User> users = new ArrayList<>();
+    for(int i=0 ;i<25;i++){
+      User user = new User();
+      user.setName("user"+i);
+      users.add(user);
+    }
+
+    System.out.println("---------before batch-------");
+
+    Transaction tx = ebeanServer.currentTransaction();
+    tx.setBatchSize(20);
+    ebeanServer.saveAll(users);
+
+    System.out.println("---------after batch-------");
+  }
+
+
+	/**
+	 * Return the ebean server.
+	 */
+	public EbeanServer getEbeanServer() {
+		return ebeanServer;
+	}
+
+	/**
+	 * Sets the ebean server.
+	 */
+	public void setEbeanServer(EbeanServer ebeanServer) {
+		this.ebeanServer = ebeanServer;
+	}
+
+
+}

src/test/resources/default-ebean-server.xml

@@ -4,19 +4,12 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
 
 	<!-- Default abstract Ebean Server configuration -->
-	<bean id="defaultEbeanServerConfig" class="com.avaje.ebean.config.ServerConfig" abstract="true">
-		<property name="autofetchConfig">
-			<bean class="com.avaje.ebean.config.AutofetchConfig">
-				<property name="logDirectory" value="logs"/>
-			</bean>
-		</property>
-
+	<bean id="defaultEbeanServerConfig" class="io.ebean.config.ServerConfig" abstract="true">
 		<property name="externalTransactionManager">
-			<bean class="com.avaje.ebean.springsupport.txn.SpringAwareJdbcTransactionManager"/>
+			<bean class="io.ebean.spring.txn.SpringJdbcTransactionManager"/>
 		</property>
-
 		<property name="namingConvention">
-			<bean class="com.avaje.ebean.config.UnderscoreNamingConvention"/>
+			<bean class="io.ebean.config.UnderscoreNamingConvention"/>
 		</property>
 	</bean>
 </beans>

src/test/resources/init-database.xml

@@ -19,7 +19,7 @@
       <bean class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
         <property name="driverClass" value="org.h2.Driver" />
         <property name="url"
-                  value="jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1" />
+                  value="jdbc:h2:mem:ebean-testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=false" />
       </bean>
     </constructor-arg>
   </bean>
@@ -33,9 +33,9 @@
 		<property name="name" value="test"/>
 		<property name="classes">
 			<list>
-				<value>com.avaje.test.springsupport.User</value>
-				<value>com.avaje.test.springsupport.Role</value>
-				<value>com.avaje.test.springsupport.Account</value>
+				<value>org.example.User</value>
+				<value>org.example.Role</value>
+				<value>org.example.Account</value>
 			</list>
 		</property>
 		<property name="dataSource" ref="dataSource"/>
@@ -45,11 +45,11 @@
 	</bean>
 
 	<!-- Ebean server -->
-	<bean id="ebeanServer" class="com.avaje.ebean.springsupport.factory.EbeanServerFactoryBean">
+	<bean id="ebeanServer" class="org.example.EbeanServerFactoryBean">
 		<property name="serverConfig" ref="serverConfig"/>
 	</bean>
 
-	<bean id="userService" class="com.avaje.test.springsupport.UserServiceImpl">
+	<bean id="userService" class="org.example.UserServiceImpl">
 		<property name="ebeanServer" ref="ebeanServer"/>
 	</bean>
 </beans>

src/test/resources/logback-test.xml

@@ -0,0 +1,32 @@
+<configuration scan="true" scanPeriod="10 seconds">
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>TRACE</level>
+    </filter>
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT"/>
+  </root>
+
+  <logger name="io.ebean" level="INFO"/>
+
+  <!-- sql and transaction logging -->
+  <logger name="io.ebean.SQL" level="TRACE"/>
+  <logger name="io.ebean.TXN" level="TRACE"/>
+  <logger name="io.ebean.SUM" level="TRACE"/>
+  <logger name="io.ebean.DDL" level="TRACE"/>
+
+  <!-- l2 cache logging -->
+  <logger name="io.ebean.cache.QUERY" level="TRACE"/>
+  <logger name="io.ebean.cache.BEAN" level="TRACE"/>
+  <logger name="io.ebean.cache.COLL" level="TRACE"/>
+  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>
+
+  <!-- elasticSearch query logging -->
+  <!--<logger name="io.ebean.ELA" level="TRACE"/>-->
+
+</configuration>