diff --git a/pom.xml b/pom.xml index 280c82902..611442188 100644 --- a/pom.xml +++ b/pom.xml @@ -4,31 +4,22 @@ org.avaje - avaje-javaparent - 1.2 + java8-parent + 1.3 - org.avaje.ebean - ebean-spring - ebean-spring - 7.2.2-SNAPSHOT + io.ebean + ebean-springtxn + ebean-springtxn + 10.1.1-SNAPSHOT jar - Support for Spring transactions and IOC setup of Ebean server config + Support for Spring transaction use with Ebean - UTF-8 - 4.1.7.RELEASE + 4.3.4.RELEASE - http://www.avaje.org - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - + http://ebean-orm.github.io/ scm:git:git@github.com:ebean-orm/avaje-ebeanorm-spring.git @@ -39,31 +30,32 @@ org.slf4j slf4j-api [1.7,) + provided - org.avaje.ebean + io.ebean ebean - 8.1.1 + 10.1.1 provided - org.avaje.ebean + io.ebean ebean-agent - 8.1.1 + 10.1.1 provided - - org.avaje - avaje-agentloader - 2.1.2 - provided - + + + + + + @@ -124,17 +116,17 @@ - org.avaje.ebean + io.ebean ebean-maven-plugin - 8.1.1 + 10.1.1 main process-test-classes target/test-classes - com.avaje.** - debug=9 + org.example.** + debug=1 enhance @@ -165,15 +157,9 @@ - - org.avaje.ebean - - - ebean-maven-plugin - - - [3,4) - + io.ebean + ebean-maven-plugin + [10,11) enhance @@ -187,34 +173,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - 1.8 - org.avaje.doclet.PygmentsDoclet - - org.avaje - pygments-doclet - 1.0.0 - - - -Xdoclint:none - - true - - - - - attach-javadocs - - jar - - - - - diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e1c..000000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java b/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java deleted file mode 100644 index 11bd6a0c2..000000000 --- a/src/main/java/com/avaje/ebean/springsupport/AgentLoaderSupport.java +++ /dev/null @@ -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 - * - * - * - * - * 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"); - } - } -} diff --git a/src/main/java/com/avaje/ebean/springsupport/txn/SpringAwareJdbcTransactionManager.java b/src/main/java/io/ebean/springtxn/SpringAwareJdbcTransactionManager.java similarity index 96% rename from src/main/java/com/avaje/ebean/springsupport/txn/SpringAwareJdbcTransactionManager.java rename to src/main/java/io/ebean/springtxn/SpringAwareJdbcTransactionManager.java index e6402b3b5..38e64c476 100644 --- a/src/main/java/com/avaje/ebean/springsupport/txn/SpringAwareJdbcTransactionManager.java +++ b/src/main/java/io/ebean/springtxn/SpringAwareJdbcTransactionManager.java @@ -17,15 +17,12 @@ * 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; +package io.ebean.springtxn; -import java.util.List; -import javax.persistence.PersistenceException; -import javax.sql.DataSource; -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 io.ebean.config.ExternalTransactionManager; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.transaction.DefaultTransactionThreadLocal; +import io.ebeaninternal.server.transaction.TransactionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.datasource.ConnectionHolder; @@ -33,6 +30,10 @@ import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationAdapter; import org.springframework.transaction.support.TransactionSynchronizationManager; +import javax.persistence.PersistenceException; +import javax.sql.DataSource; +import java.util.List; + /** * A Spring-aware {@link ExternalTransactionManager}. *

diff --git a/src/main/java/com/avaje/ebean/springsupport/txn/SpringJdbcTransaction.java b/src/main/java/io/ebean/springtxn/SpringJdbcTransaction.java similarity index 87% rename from src/main/java/com/avaje/ebean/springsupport/txn/SpringJdbcTransaction.java rename to src/main/java/io/ebean/springtxn/SpringJdbcTransaction.java index 6b38fa7af..ac420f9e0 100644 --- a/src/main/java/com/avaje/ebean/springsupport/txn/SpringJdbcTransaction.java +++ b/src/main/java/io/ebean/springtxn/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.springtxn; 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 { diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index e025373c1..000000000 --- a/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -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" - - diff --git a/src/test/java/com/avaje/test/springsupport/Account.java b/src/test/java/org/example/Account.java similarity index 97% rename from src/test/java/com/avaje/test/springsupport/Account.java rename to src/test/java/org/example/Account.java index 12043ed5d..944602524 100644 --- a/src/test/java/com/avaje/test/springsupport/Account.java +++ b/src/test/java/org/example/Account.java @@ -17,7 +17,7 @@ * 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 javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/main/java/com/avaje/ebean/springsupport/factory/EbeanServerFactoryBean.java b/src/test/java/org/example/EbeanServerFactoryBean.java similarity index 92% rename from src/main/java/com/avaje/ebean/springsupport/factory/EbeanServerFactoryBean.java rename to src/test/java/org/example/EbeanServerFactoryBean.java index 3b9475393..295e5e90b 100644 --- a/src/main/java/com/avaje/ebean/springsupport/factory/EbeanServerFactoryBean.java +++ b/src/test/java/org/example/EbeanServerFactoryBean.java @@ -17,14 +17,14 @@ * 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. diff --git a/src/test/java/com/avaje/test/springsupport/EbeanSpringModuleTest.java b/src/test/java/org/example/EbeanSpringModuleTest.java similarity index 98% rename from src/test/java/com/avaje/test/springsupport/EbeanSpringModuleTest.java rename to src/test/java/org/example/EbeanSpringModuleTest.java index 6d31d3e2d..a17452005 100644 --- a/src/test/java/com/avaje/test/springsupport/EbeanSpringModuleTest.java +++ b/src/test/java/org/example/EbeanSpringModuleTest.java @@ -17,7 +17,7 @@ * 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 java.util.logging.Logger; import org.junit.Test; diff --git a/src/test/java/com/avaje/test/springsupport/Role.java b/src/test/java/org/example/Role.java similarity index 97% rename from src/test/java/com/avaje/test/springsupport/Role.java rename to src/test/java/org/example/Role.java index 1ff6aa60e..41239de62 100644 --- a/src/test/java/com/avaje/test/springsupport/Role.java +++ b/src/test/java/org/example/Role.java @@ -18,7 +18,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.avaje.test.springsupport; +package org.example; import java.util.Set; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/test/springsupport/User.java b/src/test/java/org/example/User.java similarity index 97% rename from src/test/java/com/avaje/test/springsupport/User.java rename to src/test/java/org/example/User.java index eccf35e1a..ec7bc2a1b 100644 --- a/src/test/java/com/avaje/test/springsupport/User.java +++ b/src/test/java/org/example/User.java @@ -17,7 +17,7 @@ * 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 javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/test/springsupport/UserService.java b/src/test/java/org/example/UserService.java similarity index 96% rename from src/test/java/com/avaje/test/springsupport/UserService.java rename to src/test/java/org/example/UserService.java index 8da63c0ae..c4e7301c9 100644 --- a/src/test/java/com/avaje/test/springsupport/UserService.java +++ b/src/test/java/org/example/UserService.java @@ -18,7 +18,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.avaje.test.springsupport; +package org.example; /** * The Interface UserService. diff --git a/src/test/java/com/avaje/test/springsupport/UserServiceImpl.java b/src/test/java/org/example/UserServiceImpl.java similarity index 94% rename from src/test/java/com/avaje/test/springsupport/UserServiceImpl.java rename to src/test/java/org/example/UserServiceImpl.java index 8bb82c305..b828010a6 100644 --- a/src/test/java/com/avaje/test/springsupport/UserServiceImpl.java +++ b/src/test/java/org/example/UserServiceImpl.java @@ -18,15 +18,15 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.avaje.test.springsupport; +package org.example; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PersistBatch; +import io.ebean.Transaction; +import io.ebean.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 io.ebean.EbeanServer; import java.util.ArrayList; import java.util.List; diff --git a/src/main/resources/default-ebean-server.xml b/src/test/resources/default-ebean-server.xml similarity index 64% rename from src/main/resources/default-ebean-server.xml rename to src/test/resources/default-ebean-server.xml index f2831531f..a325cec3e 100644 --- a/src/main/resources/default-ebean-server.xml +++ b/src/test/resources/default-ebean-server.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"> - + - + - + diff --git a/src/test/resources/init-database.xml b/src/test/resources/init-database.xml index d0739c9c0..2273a21f3 100644 --- a/src/test/resources/init-database.xml +++ b/src/test/resources/init-database.xml @@ -8,10 +8,10 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> - - - - + + + + @@ -38,9 +38,9 @@ - com.avaje.test.springsupport.User - com.avaje.test.springsupport.Role - com.avaje.test.springsupport.Account + org.example.User + org.example.Role + org.example.Account @@ -50,11 +50,11 @@ - + - +