Merge branch 'release/3.1.0.Beta2'

seam · Aug 24, 2011 · 21c04c8 · 21c04c8
2 parents 4338ba3 + 8756663
commit 21c04c8
Show file tree

Hide file tree

Showing 20 changed files with 63 additions and 91 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.jboss.seam.remoting</groupId>
       <artifactId>seam-remoting-parent</artifactId>
-      <version>3.0.1-SNAPSHOT</version>
+      <version>3.1.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 

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>

diff --git a/examples/helloworld/src/main/assembly/assembly.xml b/examples/helloworld/src/main/assembly/assembly.xml
@@ -2,6 +2,8 @@
         xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
         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>remoting-example-helloworld-distribution</id>
+
     <formats>
         <format>zip</format>
     </formats>

diff --git a/examples/model/pom.xml b/examples/model/pom.xml
@@ -40,7 +40,22 @@
 
       <dependency>
          <groupId>org.jboss.seam.persistence</groupId>
-         <artifactId>seam-persistence</artifactId>
+         <artifactId>seam-persistence-api</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.transaction</groupId>
+         <artifactId>seam-transaction-api</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.solder</groupId>
+         <artifactId>seam-solder-api</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.servlet</groupId>
+         <artifactId>seam-servlet</artifactId>
       </dependency>
 
       <dependency>
@@ -95,47 +110,23 @@
    <profiles>
       <profile>
          <id>glassfish</id>
-         <dependencies>
-            <dependency>
-                <groupId>javax</groupId>
-                <artifactId>javaee-api</artifactId>
-                <version>6.0</version>
-                <scope>provided</scope>
-            </dependency>
-         </dependencies>
          <build>
             <resources>
                <resource>
                   <directory>src/glassfish/resources</directory>
                </resource>
             </resources>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>add-source</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                                <goal>add-source</goal>
-                            </goals>
-                            <configuration>
-                                <sources>
-                                    <source>src/glassfish/java</source>
-                                </sources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                  </plugin>
-            </plugins>
          </build>
       </profile>
       <profile>
          <id>jboss6</id>
-         <activation>
-            <activeByDefault>true</activeByDefault>
-         </activation>
+         <build>
+            <resources>
+               <resource>
+                  <directory>src/jboss6/resources</directory>
+               </resource>
+            </resources>
+         </build>
          <dependencies>
             <dependency>
                <groupId>org.jboss.seam.remoting</groupId>
@@ -152,6 +143,9 @@
       </profile>
       <profile>
          <id>jboss7</id>
+         <activation>
+            <activeByDefault>true</activeByDefault>
+         </activation>
          <build>
             <resources>
                <resource>

diff --git a/...c/main/resources/META-INF/persistence.xml → ...jboss6/resources/META-INF/persistence.xml b/...c/main/resources/META-INF/persistence.xml → ...jboss6/resources/META-INF/persistence.xml
@@ -4,7 +4,7 @@
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
              version="1.0">
     <persistence-unit name="model">
-        <jta-data-source>modelDatasource</jta-data-source>
+        <jta-data-source>java:/DefaultDS</jta-data-source>
         <class>org.jboss.seam.remoting.examples.model.Person</class>
         <class>org.jboss.seam.remoting.examples.model.Address</class>
         <properties>

diff --git a/examples/model/src/jboss7/resources/META-INF/persistence.xml b/examples/model/src/jboss7/resources/META-INF/persistence.xml
@@ -10,8 +10,6 @@
         <properties>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.show_sql" value="true"/>
-            <property name="hibernate.transaction.manager_lookup_class"
-                      value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/examples/model/src/jboss7/resources/import.sql b/examples/model/src/jboss7/resources/import.sql
diff --git a/examples/model/src/main/assembly/assembly.xml b/examples/model/src/main/assembly/assembly.xml
@@ -2,6 +2,8 @@
         xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
         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>remoting-example-model-distribution</id>
+
     <formats>
         <format>zip</format>
     </formats>

diff --git a/...ting/examples/model/PopulateDatabase.java → ...ting/examples/model/PopulateDatabase.java b/...ting/examples/model/PopulateDatabase.java → ...ting/examples/model/PopulateDatabase.java
@@ -1,25 +1,22 @@
 package org.jboss.seam.remoting.examples.model;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 
-import javax.annotation.PostConstruct;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import javax.enterprise.event.Observes;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+
+import org.jboss.seam.servlet.WebApplication;
+import org.jboss.seam.servlet.event.Initialized;
+import org.jboss.seam.transaction.Transactional;
 
 /**
- * Populate a database for Glassfish with data. This class is not necessary
- * when using JBoss AS due to use of Hibernate JPA provider in conjunction
- * with import.sql file. Hibernate will then populate the database
- * automatically right after deploying the application.
+ * Populate a database with data. 
  *
  * @author Martin Gencur
  */
-@Singleton
-@Startup
 public class PopulateDatabase {
     @PersistenceContext
     private EntityManager entityManager;
@@ -28,14 +25,8 @@ public class PopulateDatabase {
     private Address a;
     private final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 
-    @PostConstruct
-    public void startup() throws Exception {
-        Query q = entityManager.createNativeQuery("DELETE from ADDRESS");
-        q.executeUpdate();
-        q = entityManager.createNativeQuery("DELETE from PERSON");
-        q.executeUpdate();
-        entityManager.flush();
-
+    @Transactional
+    public void loadData(@Observes @Initialized WebApplication webapp) throws ParseException { 
         p = new Person();
         p.setFirstName("Shane");
         p.setLastName("Bryzak");
@@ -60,7 +51,6 @@ public void startup() throws Exception {
         a.setCountry("Australia");
         p.getAddresses().add(a);
         entityManager.persist(p);
-        entityManager.flush();
 
         p = new Person();
         p.setFirstName("Jozef");
@@ -77,6 +67,5 @@ public void startup() throws Exception {
         a.setCountry("Czech republic");
         p.getAddresses().add(a);
         entityManager.persist(p);
-        entityManager.flush();
     }
 }
diff --git a/examples/model/src/main/resources/META-INF/seam-model-ds.xml b/examples/model/src/main/resources/META-INF/seam-model-ds.xml
diff --git a/examples/model/src/main/resources/import.sql b/examples/model/src/main/resources/import.sql
diff --git a/examples/validation/pom.xml b/examples/validation/pom.xml
@@ -33,6 +33,16 @@
          <artifactId>seam-persistence</artifactId>
       </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>
+      </dependency>
+
       <dependency>
          <groupId>org.hibernate.javax.persistence</groupId>
          <artifactId>hibernate-jpa-2.0-api</artifactId>

diff --git a/examples/validation/src/main/assembly/assembly.xml b/examples/validation/src/main/assembly/assembly.xml
@@ -2,6 +2,8 @@
         xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
         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>remoting-example-validation-distribution</id>
+
     <formats>
         <format>zip</format>
     </formats>

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>

diff --git a/impl/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java b/impl/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java
@@ -16,7 +16,7 @@
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.remoting.wrapper.Wrapper;
 
 /**

diff --git a/impl/src/main/java/org/jboss/seam/remoting/MetadataCache.java b/impl/src/main/java/org/jboss/seam/remoting/MetadataCache.java
@@ -20,7 +20,7 @@
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.remoting.BeanMetadata.BeanType;
 import org.jboss.seam.remoting.annotations.WebRemote;
 

diff --git a/impl/src/main/java/org/jboss/seam/remoting/Remoting.java b/impl/src/main/java/org/jboss/seam/remoting/Remoting.java
@@ -17,7 +17,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.remoting.model.ModelHandler;
 import org.jboss.seam.remoting.validation.ConstraintTranslator;
 

diff --git a/impl/src/main/java/org/jboss/seam/remoting/model/ModelHandler.java b/impl/src/main/java/org/jboss/seam/remoting/model/ModelHandler.java
@@ -20,7 +20,7 @@
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.remoting.AbstractRequestHandler;
 import org.jboss.seam.remoting.Call;
 import org.jboss.seam.remoting.MarshalUtils;

diff --git a/impl/src/main/java/org/jboss/seam/remoting/validation/ConstraintTranslator.java b/impl/src/main/java/org/jboss/seam/remoting/validation/ConstraintTranslator.java
@@ -32,7 +32,7 @@
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.remoting.AnnotationsParser;
 import org.jboss.seam.remoting.RequestHandler;
 import org.jboss.seam.remoting.util.JsConverter;

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <artifactId>seam-parent</artifactId>
       <groupId>org.jboss.seam</groupId>
-      <version>12</version>
+      <version>14</version>
    </parent>
 
    <groupId>org.jboss.seam.remoting</groupId>
@@ -20,7 +20,7 @@
    </modules>
 
    <properties>
-      <seam.version>3.1.0.Beta1</seam.version>
+      <seam.version>3.1.0.Beta2</seam.version>
    </properties>
 
    <dependencyManagement>