Merge branch 'release/3.1.0.Beta1' into develop

seam · Aug 14, 2011 · cd88918 · cd88918
2 parents 4ade1e2 + c39b28c
commit cd88918
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 33 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -1,5 +1,4 @@
-<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">
+<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>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -1,6 +1,5 @@
 <?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">
+<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>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -1,5 +1,4 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -1,5 +1,4 @@
-<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">
+<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>
@@ -42,12 +41,17 @@
         <dependency>
             <groupId>org.jboss.seam.transaction</groupId>
             <artifactId>seam-transaction-api</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.seam.solder</groupId>
+            <artifactId>seam-solder-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.jboss.seam.solder</groupId>
             <artifactId>seam-solder</artifactId>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -99,11 +103,11 @@
                                 </goals>
                                 <configuration>
                                     <tasks>
-                                        <delete dir="${project.build.directory}/classes"/>
-                                        <mkdir dir="${project.build.directory}/classes"/>
+                                        <delete dir="${project.build.directory}/classes" />
+                                        <mkdir dir="${project.build.directory}/classes" />
                                         <copy todir="${project.build.directory}/classes" overwrite="true">
                                             <fileset dir="${project.build.directory}/generated-classes/emma/classes">
-                                                <include name="**/*"/>
+                                                <include name="**/*" />
                                             </fileset>
                                         </copy>
                                     </tasks>

diff --git a/impl/src/main/java/org/jboss/seam/persistence/HibernatePersistenceProvider.java b/impl/src/main/java/org/jboss/seam/persistence/HibernatePersistenceProvider.java
@@ -28,7 +28,7 @@
 import org.hibernate.Session;
 import org.hibernate.TransientObjectException;
 import org.hibernate.proxy.HibernateProxy;
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.solder.core.Veto;
 import org.jboss.seam.solder.reflection.Reflections;
 

diff --git a/impl/src/main/java/org/jboss/seam/persistence/InjectionEventListener.java b/impl/src/main/java/org/jboss/seam/persistence/InjectionEventListener.java
@@ -27,7 +27,7 @@
 import javax.enterprise.inject.spi.InjectionTarget;
 import javax.inject.Inject;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.solder.beanManager.BeanManagerAware;
 import org.jboss.seam.solder.reflection.Reflections;
 import org.jboss.seam.solder.reflection.annotated.AnnotatedTypeBuilder;

diff --git a/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextBeanLifecycle.java b/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextBeanLifecycle.java
@@ -33,7 +33,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.solder.bean.ContextualLifecycle;
 import org.jboss.seam.solder.literal.DefaultLiteral;
 

diff --git a/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextExtension.java b/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextExtension.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.seam.persistence;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.persistence.util.EnvironmentUtils;
 import org.jboss.seam.solder.bean.BeanBuilder;
 import org.jboss.seam.solder.bean.Beans;

diff --git a/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextProxyHandler.java b/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextProxyHandler.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.seam.persistence;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.persistence.util.BeanManagerUtils;
 import org.jboss.seam.transaction.SeamTransaction;
 import org.jboss.seam.transaction.literal.DefaultTransactionLiteral;

diff --git a/impl/src/main/java/org/jboss/seam/persistence/PersistenceContextProxyHandler.java b/impl/src/main/java/org/jboss/seam/persistence/PersistenceContextProxyHandler.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.seam.persistence;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.persistence.util.InstanceResolver;
 import org.jboss.seam.solder.el.Expressions;
 

diff --git a/impl/src/main/java/org/jboss/seam/persistence/PersistenceContextsImpl.java b/impl/src/main/java/org/jboss/seam/persistence/PersistenceContextsImpl.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.seam.persistence;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 
 import javax.enterprise.context.ConversationScoped;
 import javax.enterprise.inject.Any;

diff --git a/impl/src/main/java/org/jboss/seam/persistence/SePersistenceContextExtension.java b/impl/src/main/java/org/jboss/seam/persistence/SePersistenceContextExtension.java
@@ -42,7 +42,7 @@
 import javax.persistence.Persistence;
 import javax.persistence.PersistenceContext;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.persistence.util.EnvironmentUtils;
 import org.jboss.seam.solder.literal.AnyLiteral;
 import org.jboss.seam.solder.literal.DefaultLiteral;

diff --git a/.../main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionBeanLifecycle.java b/.../main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionBeanLifecycle.java
@@ -30,7 +30,7 @@
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.persistence.HibernatePersistenceProvider;
 import org.jboss.seam.persistence.ManagedPersistenceContext;
 import org.jboss.seam.persistence.PersistenceContexts;

diff --git a/.../src/main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionExtension.java b/.../src/main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionExtension.java
@@ -22,7 +22,7 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.enterprise.inject.spi.ProcessAnnotatedType;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.solder.reflection.Reflections;
 
 /**

diff --git a/.../main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionExtensionImpl.java b/.../main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionExtensionImpl.java
@@ -35,7 +35,7 @@
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.persistence.HibernatePersistenceProvider;
 import org.jboss.seam.persistence.ManagedPersistenceContext;
 import org.jboss.seam.solder.bean.BeanBuilder;

diff --git a/...c/main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionProxyHandler.java b/...c/main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionProxyHandler.java
@@ -19,7 +19,7 @@
 import org.hibernate.FlushMode;
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.persistence.FlushModeType;
 import org.jboss.seam.persistence.HibernatePersistenceProvider;
 import org.jboss.seam.persistence.ManagedPersistenceContext;

diff --git a/impl/src/main/java/org/jboss/seam/persistence/util/NamingUtils.java b/impl/src/main/java/org/jboss/seam/persistence/util/NamingUtils.java
@@ -21,7 +21,7 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.solder.logging.Logger;
 
 /**
  * this has been ported to seam and hacked to make it work

diff --git a/pom.xml b/pom.xml
@@ -1,11 +1,10 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.jboss.seam</groupId>
         <artifactId>seam-parent</artifactId>
-        <version>12-SNAPSHOT</version>
+        <version>12</version>
     </parent>
 
     <artifactId>seam-persistence-parent</artifactId>
@@ -33,7 +32,7 @@
     </modules>
 
     <properties>
-        <seam.version>3.0.0.Final</seam.version>
+        <seam.version>3.1.0.Beta1</seam.version>
         <emma.version>2.0.5312</emma.version>
     </properties>
 
@@ -205,8 +204,7 @@
                                     </goals>
                                     <configuration>
                                         <tasks>
-                                            <copy file="${project.parent.build.directory}/../impl/target/coverage.em"
-                                                  todir="${basedir}"/>
+                                            <copy file="${project.parent.build.directory}/../impl/target/coverage.em" todir="${basedir}" />
                                         </tasks>
                                     </configuration>
                                 </execution>

diff --git a/tests/base/pom.xml b/tests/base/pom.xml
@@ -1,5 +1,4 @@
-<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">
+<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>