Merge branch 'release/3.1.0.Beta2'

seam · Aug 24, 2011 · 19eae8d · 19eae8d
2 parents db9a688 + 18c9cea
commit 19eae8d
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 35 deletions.
diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
@@ -3,6 +3,8 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
 
+    <id>distribution</id>
+
     <formats>
         <format>zip</format>
     </formats>
@@ -29,6 +31,7 @@
             <outputDirectory>artifacts</outputDirectory>
             <useProjectArtifact>false</useProjectArtifact>
             <includes>
+                <include>org.jboss.seam.persistence:seam-persistence-api</include>
                 <include>org.jboss.seam.persistence:seam-persistence</include>
             </includes>
             <excludes>

diff --git a/dist/src/main/assembly/readme.txt b/dist/src/main/assembly/readme.txt
@@ -14,10 +14,6 @@ Contents of distribution
 
    API Docs and reference guide.
 
- examples/
-
-   Seam Persistence Examples
-
  lib/
 
    Seam Persistence dependencies

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -15,10 +15,6 @@
     <!-- url required for JAR Manifest -->
     <url>${project.parent.url}</url>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <dependencies>
 
         <dependency>

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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.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.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 
 /**
  * this has been ported to seam and hacked to make it work

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jboss.seam</groupId>
         <artifactId>seam-parent</artifactId>
-        <version>12</version>
+        <version>14</version>
     </parent>
 
     <artifactId>seam-persistence-parent</artifactId>
@@ -32,7 +32,7 @@
     </modules>
 
     <properties>
-        <seam.version>3.1.0.Beta1</seam.version>
+        <seam.version>3.1.0.Beta2</seam.version>
         <emma.version>2.0.5312</emma.version>
     </properties>
 
@@ -70,18 +70,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <dependency>
-                <groupId>org.jboss.weld</groupId>
-                <artifactId>weld-core</artifactId>
-                <version>1.1.0.Final</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.weld.servlet</groupId>
-                <artifactId>weld-servlet</artifactId>
-                <version>1.1.0.Final</version>
-            </dependency>
-
         </dependencies>
 
     </dependencyManagement>