#11 - Repackage to io.ebean.springtxn ... remove factory bean support (move it to src/test as example)

pom.xml

@@ -4,31 +4,22 @@
 
   <parent>
     <groupId>org.avaje</groupId>
-    <artifactId>avaje-javaparent</artifactId>
-    <version>1.2</version>
+    <artifactId>java8-parent</artifactId>
+    <version>1.3</version>
   </parent>
 
-  <groupId>org.avaje.ebean</groupId>
-  <artifactId>ebean-spring</artifactId>
-  <name>ebean-spring</name>
-  <version>7.2.2-SNAPSHOT</version>
+  <groupId>io.ebean</groupId>
+  <artifactId>ebean-springtxn</artifactId>
+  <name>ebean-springtxn</name>
+  <version>10.1.1-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <description>Support for Spring transactions and IOC setup of Ebean server config</description>
+  <description>Support for Spring transaction use with Ebean</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>
   </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>
     <developerConnection>scm:git:git@github.com:ebean-orm/avaje-ebeanorm-spring.git</developerConnection>
@@ -39,31 +30,32 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>[1.7,)</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- Provided: Bring in explicitly -->
     <dependency>
-      <groupId>org.avaje.ebean</groupId>
+      <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>8.1.1</version>
+      <version>10.1.1</version>
       <scope>provided</scope>
     </dependency>
 
     <!-- Optional: Add to use AgentLoaderSupport -->
     <dependency>
-      <groupId>org.avaje.ebean</groupId>
+      <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>8.1.1</version>
+      <version>10.1.1</version>
       <scope>provided</scope>
     </dependency>
 
     <!-- Optional: Add to use AgentLoaderSupport -->
-    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-agentloader</artifactId>
-      <version>2.1.2</version>
-      <scope>provided</scope>
-    </dependency>
+    <!--<dependency>-->
+      <!--<groupId>org.avaje</groupId>-->
+      <!--<artifactId>avaje-agentloader</artifactId>-->
+      <!--<version>2.1.2</version>-->
+      <!--<scope>provided</scope>-->
+    <!--</dependency>-->
 
     <!-- Provided: Spring, bring in explicitly -->
     <dependency>
@@ -124,17 +116,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.avaje.ebean</groupId>
+        <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>8.1.1</version>
+        <version>10.1.1</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>
+              <packages>org.example.**</packages>
+              <transformArgs>debug=1</transformArgs>
             </configuration>
             <goals>
               <goal>enhance</goal>
@@ -165,15 +157,9 @@
               <pluginExecutions>
                 <pluginExecution>
                   <pluginExecutionFilter>
-                    <groupId>
-                      org.avaje.ebean
-                    </groupId>
-                    <artifactId>
-                      ebean-maven-plugin
-                    </artifactId>
-                    <versionRange>
-                      [3,4)
-                    </versionRange>
+                    <groupId>io.ebean</groupId>
+                    <artifactId>ebean-maven-plugin</artifactId>
+                    <versionRange>[10,11)</versionRange>
                     <goals>
                       <goal>enhance</goal>
                     </goals>
@@ -187,34 +173,6 @@
           </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>

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="com.avaje.ebean.springsupport.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/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}.
  * <p>

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 {
 

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/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;

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.

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;

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;

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;

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.

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;

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">
 
 	<!-- Default abstract Ebean Server configuration -->
-	<bean id="defaultEbeanServerConfig" class="com.avaje.ebean.config.ServerConfig" abstract="true">
+	<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.springtxn.SpringAwareJdbcTransactionManager"/>
 		</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

@@ -8,10 +8,10 @@
 	                    http://www.springframework.org/schema/context
            				http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-  <bean class="com.avaje.ebean.springsupport.AgentLoaderSupport">
-    <property name="debug" value="1" />
-    <property name="packages" value="com.avaje.test.springsupport.**" />
-  </bean>
+  <!--<bean class="com.avaje.ebean.springsupport.AgentLoaderSupport">-->
+    <!--<property name="debug" value="1" />-->
+    <!--<property name="packages" value="com.avaje.test.springsupport.**" />-->
+  <!--</bean>-->
 
 	<import resource="classpath:default-ebean-server.xml"/>
 
@@ -38,9 +38,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"/>
@@ -50,11 +50,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>