Merge branch 'release/3.1.0.Beta3'

seam · Oct 2, 2011 · fdd0be9 · fdd0be9
2 parents 19eae8d + fba57de
commit fdd0be9
Show file tree

Hide file tree

Showing 28 changed files with 127 additions and 109 deletions.
diff --git a/building.txt b/building.txt
@@ -0,0 +1,14 @@
+Building this project
+=====================
+
+This project requires Apache Maven (available from http://maven.apache.org/) 
+Version 3.0.3 or later to build. It also requires that the JBoss Public Maven
+Repository is configured - this can be done in one of two ways:
+
+1) Configure your settings.xml (usually found in the .m2 directory within your
+home directory) to include the JBoss repository - see the instructions on the 
+following page to learn how to do this: http://community.jboss.org/wiki/MavenGettingStarted
+
+2) Use the provided settings.xml, by running "mvn <target> -s settings.xml".
+
+
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -40,13 +40,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.seam.solder</groupId>
-            <artifactId>seam-solder-api</artifactId>
+            <groupId>org.jboss.solder</groupId>
+            <artifactId>solder-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.seam.solder</groupId>
-            <artifactId>seam-solder</artifactId>
+            <groupId>org.jboss.solder</groupId>
+            <artifactId>solder-impl</artifactId>
             <scope>compile</scope>
         </dependency>
 

diff --git a/impl/src/main/java/org/jboss/seam/persistence/FlushModeManagerImpl.java b/impl/src/main/java/org/jboss/seam/persistence/FlushModeManagerImpl.java
@@ -20,7 +20,7 @@
 
 import javax.enterprise.context.ApplicationScoped;
 
-import org.jboss.seam.solder.bean.defaultbean.DefaultBean;
+import org.jboss.solder.bean.defaultbean.DefaultBean;
 
 /**
  * Provides for programmatic configuration of the default flush mode.

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,9 +28,9 @@
 import org.hibernate.Session;
 import org.hibernate.TransientObjectException;
 import org.hibernate.proxy.HibernateProxy;
-import org.jboss.seam.logging.Logger;
-import org.jboss.seam.solder.core.Veto;
-import org.jboss.seam.solder.reflection.Reflections;
+import org.jboss.solder.logging.Logger;
+import org.jboss.solder.core.Veto;
+import org.jboss.solder.reflection.Reflections;
 
 /**
  * Support for non-standardized features of Hibernate, when used as the JPA

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,10 +27,10 @@
 import javax.enterprise.inject.spi.InjectionTarget;
 import javax.inject.Inject;
 
-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;
+import org.jboss.solder.logging.Logger;
+import org.jboss.solder.beanManager.BeanManagerAware;
+import org.jboss.solder.reflection.Reflections;
+import org.jboss.solder.reflection.annotated.AnnotatedTypeBuilder;
 
 /**
  * Event listener that enables injection and initalizer methods for JPA entities

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,9 +33,9 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import org.jboss.seam.logging.Logger;
-import org.jboss.seam.solder.bean.ContextualLifecycle;
-import org.jboss.seam.solder.literal.DefaultLiteral;
+import org.jboss.solder.logging.Logger;
+import org.jboss.solder.bean.ContextualLifecycle;
+import org.jboss.solder.literal.DefaultLiteral;
 
 /**
  * SMPC lifecycle for SMPC's configured via @ExtensionManaged

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,19 +16,19 @@
  */
 package org.jboss.seam.persistence;
 
-import org.jboss.seam.logging.Logger;
+import org.jboss.solder.logging.Logger;
 import org.jboss.seam.persistence.util.EnvironmentUtils;
-import org.jboss.seam.solder.bean.BeanBuilder;
-import org.jboss.seam.solder.bean.Beans;
-import org.jboss.seam.solder.bean.ContextualLifecycle;
-import org.jboss.seam.solder.core.ExtensionManaged;
-import org.jboss.seam.solder.literal.AnyLiteral;
-import org.jboss.seam.solder.literal.ApplicationScopedLiteral;
-import org.jboss.seam.solder.literal.DefaultLiteral;
-import org.jboss.seam.solder.reflection.Reflections;
-import org.jboss.seam.solder.reflection.annotated.AnnotatedTypeBuilder;
-import org.jboss.seam.solder.reflection.annotated.Annotateds;
-import org.jboss.seam.solder.util.service.ServiceLoader;
+import org.jboss.solder.bean.BeanBuilder;
+import org.jboss.solder.bean.Beans;
+import org.jboss.solder.bean.ContextualLifecycle;
+import org.jboss.solder.core.ExtensionManaged;
+import org.jboss.solder.literal.AnyLiteral;
+import org.jboss.solder.literal.ApplicationScopedLiteral;
+import org.jboss.solder.literal.DefaultLiteral;
+import org.jboss.solder.reflection.Reflections;
+import org.jboss.solder.reflection.annotated.AnnotatedTypeBuilder;
+import org.jboss.solder.reflection.annotated.Annotateds;
+import org.jboss.solder.util.service.ServiceLoader;
 
 import javax.annotation.Resource;
 import javax.enterprise.context.Dependent;
@@ -100,7 +100,7 @@ public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event) {
 
     /**
      * loops through the fields on an AnnotatedType looking for a @PersistnceUnit
-     * producer field that is annotated {@link org.jboss.seam.solder.core.ExtensionManaged}. Then a corresponding
+     * producer field that is annotated {@link org.jboss.solder.core.ExtensionManaged}. Then a corresponding
      * smpc bean is created and registered. Any scope declaration on the producer
      * are removed as this is not supported by the spec
      * <p/>

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.logging.Logger;
+import org.jboss.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,9 +16,9 @@
  */
 package org.jboss.seam.persistence;
 
-import org.jboss.seam.logging.Logger;
+import org.jboss.solder.logging.Logger;
 import org.jboss.seam.persistence.util.InstanceResolver;
-import org.jboss.seam.solder.el.Expressions;
+import org.jboss.solder.el.Expressions;
 
 import javax.enterprise.inject.spi.BeanManager;
 import javax.persistence.EntityManager;

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.logging.Logger;
+import org.jboss.solder.logging.Logger;
 
 import javax.enterprise.context.ConversationScoped;
 import javax.enterprise.inject.Any;

diff --git a/impl/src/main/java/org/jboss/seam/persistence/QueryParser.java b/impl/src/main/java/org/jboss/seam/persistence/QueryParser.java
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.jboss.seam.solder.el.Expressions;
+import org.jboss.solder.el.Expressions;
 
 /**
  * Parses hql queries and replaces el with named parameters

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,10 +42,10 @@
 import javax.persistence.Persistence;
 import javax.persistence.PersistenceContext;
 
-import org.jboss.seam.logging.Logger;
+import org.jboss.solder.logging.Logger;
 import org.jboss.seam.persistence.util.EnvironmentUtils;
-import org.jboss.seam.solder.literal.AnyLiteral;
-import org.jboss.seam.solder.literal.DefaultLiteral;
+import org.jboss.solder.literal.AnyLiteral;
+import org.jboss.solder.literal.DefaultLiteral;
 
 /**
  * Support for managed persistence contexts in a Java SE environment or Servlet

diff --git a/.../main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionBeanLifecycle.java b/.../main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionBeanLifecycle.java
@@ -30,12 +30,12 @@
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.jboss.seam.logging.Logger;
+import org.jboss.solder.logging.Logger;
 import org.jboss.seam.persistence.HibernatePersistenceProvider;
 import org.jboss.seam.persistence.ManagedPersistenceContext;
 import org.jboss.seam.persistence.PersistenceContexts;
-import org.jboss.seam.solder.bean.ContextualLifecycle;
-import org.jboss.seam.solder.literal.DefaultLiteral;
+import org.jboss.solder.bean.ContextualLifecycle;
+import org.jboss.solder.literal.DefaultLiteral;
 
 /**
  * lifecycle for seam managed hibernate sessions

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,8 +22,8 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.enterprise.inject.spi.ProcessAnnotatedType;
 
-import org.jboss.seam.logging.Logger;
-import org.jboss.seam.solder.reflection.Reflections;
+import org.jboss.solder.logging.Logger;
+import org.jboss.solder.reflection.Reflections;
 
 /**
  * The portable extension for Seam Managed Hibernate Sessions. If hibernate is

diff --git a/.../main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionExtensionImpl.java b/.../main/java/org/jboss/seam/persistence/hibernate/HibernateManagedSessionExtensionImpl.java
@@ -35,17 +35,17 @@
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.jboss.seam.logging.Logger;
+import org.jboss.solder.logging.Logger;
 import org.jboss.seam.persistence.HibernatePersistenceProvider;
 import org.jboss.seam.persistence.ManagedPersistenceContext;
-import org.jboss.seam.solder.bean.BeanBuilder;
-import org.jboss.seam.solder.core.ExtensionManaged;
-import org.jboss.seam.solder.core.Veto;
-import org.jboss.seam.solder.literal.AnyLiteral;
-import org.jboss.seam.solder.literal.ApplicationScopedLiteral;
-import org.jboss.seam.solder.literal.DefaultLiteral;
-import org.jboss.seam.solder.reflection.annotated.AnnotatedTypeBuilder;
-import org.jboss.seam.solder.reflection.annotated.Annotateds;
+import org.jboss.solder.bean.BeanBuilder;
+import org.jboss.solder.core.ExtensionManaged;
+import org.jboss.solder.core.Veto;
+import org.jboss.solder.literal.AnyLiteral;
+import org.jboss.solder.literal.ApplicationScopedLiteral;
+import org.jboss.solder.literal.DefaultLiteral;
+import org.jboss.solder.reflection.annotated.AnnotatedTypeBuilder;
+import org.jboss.solder.reflection.annotated.Annotateds;
 
 /**
  * This class performs the actual work for the Hibernate managed session. As

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,16 +19,16 @@
 import org.hibernate.FlushMode;
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jboss.seam.logging.Logger;
+import org.jboss.solder.logging.Logger;
 import org.jboss.seam.persistence.FlushModeType;
 import org.jboss.seam.persistence.HibernatePersistenceProvider;
 import org.jboss.seam.persistence.ManagedPersistenceContext;
 import org.jboss.seam.persistence.PersistenceContexts;
 import org.jboss.seam.persistence.QueryParser;
 import org.jboss.seam.persistence.util.BeanManagerUtils;
 import org.jboss.seam.persistence.util.InstanceResolver;
-import org.jboss.seam.solder.el.Expressions;
-import org.jboss.seam.solder.literal.DefaultLiteral;
+import org.jboss.solder.el.Expressions;
+import org.jboss.solder.literal.DefaultLiteral;
 import org.jboss.seam.transaction.SeamTransaction;
 import org.jboss.seam.transaction.literal.DefaultTransactionLiteral;
 

diff --git a/impl/src/main/java/org/jboss/seam/persistence/util/EjbApi.java b/impl/src/main/java/org/jboss/seam/persistence/util/EjbApi.java
@@ -21,7 +21,7 @@
 
 import javax.enterprise.inject.spi.AnnotatedType;
 
-import org.jboss.seam.solder.reflection.Reflections;
+import org.jboss.solder.reflection.Reflections;
 
 /**
  * Utility class that provides access to some annotations from the Java

diff --git a/impl/src/main/java/org/jboss/seam/persistence/util/InstanceResolver.java b/impl/src/main/java/org/jboss/seam/persistence/util/InstanceResolver.java
@@ -30,7 +30,7 @@
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.jboss.seam.solder.literal.DefaultLiteral;
+import org.jboss.solder.literal.DefaultLiteral;
 
 
 /**

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

diff --git a/pom.xml b/pom.xml
@@ -24,15 +24,10 @@
         <module>api</module>
         <module>impl</module>
         <module>tests/base</module>
-
-        <!-- disabled until we upgrade to latest arquillian -->
-        <!--module>tests/jetty-hibernate</module-->
-        <!--module>tests/jetty-openjpa</module-->
-        <!--module>tests/jbossas-hibernate</module-->
     </modules>
 
     <properties>
-        <seam.version>3.1.0.Beta2</seam.version>
+        <seam.version>3.1.0.Beta3</seam.version>
         <emma.version>2.0.5312</emma.version>
     </properties>
 
@@ -87,66 +82,31 @@
                 <module>docs</module>
             </modules>
         </profile>
-        <profile>
-            <id>jboss-public-repository</id>
-            <activation>
-                <property>
-                    <name>jboss-public-repository</name>
-                    <value>!false</value>
-                </property>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>jboss-public-repository-group</id>
-                    <name>JBoss Public Maven Repository Group</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/public</url>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </snapshots>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>jboss-public-repository-group</id>
-                    <name>JBoss Public Maven Repository Group</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/public</url>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
+
         <profile>
             <!-- all tests using managed containers -->
             <id>all</id>
             <modules>
                 <module>tests/jbossas-hibernate</module>
             </modules>
         </profile>
+
         <profile>
             <!-- jboss remote profile-->
             <id>jbossas-remote-6</id>
             <modules>
                 <module>tests/jbossas-hibernate</module>
             </modules>
         </profile>
+
         <profile>
             <!-- jboss managed profile-->
             <id>jbossas-managed-6</id>
             <modules>
                 <module>tests/jbossas-hibernate</module>
             </modules>
         </profile>
+
         <profile>
             <id>code-coverage</id>
             <dependencies>