diff --git a/dist/pom.xml b/dist/pom.xml index ba97a19..0e987c3 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -5,7 +5,7 @@ org.jboss.seam.remoting seam-remoting-parent - 3.0.1-SNAPSHOT + 3.1.0-SNAPSHOT ../pom.xml diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml index baf678c..c4c352d 100644 --- 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"> + distribution + zip diff --git a/examples/helloworld/src/main/assembly/assembly.xml b/examples/helloworld/src/main/assembly/assembly.xml index 830f968..e56ef63 100644 --- 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"> + remoting-example-helloworld-distribution + zip diff --git a/examples/model/pom.xml b/examples/model/pom.xml index 5c86878..338aed1 100644 --- a/examples/model/pom.xml +++ b/examples/model/pom.xml @@ -40,7 +40,22 @@ org.jboss.seam.persistence - seam-persistence + seam-persistence-api + + + + org.jboss.seam.transaction + seam-transaction-api + + + + org.jboss.seam.solder + seam-solder-api + + + + org.jboss.seam.servlet + seam-servlet @@ -95,47 +110,23 @@ glassfish - - - javax - javaee-api - 6.0 - provided - - src/glassfish/resources - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - src/glassfish/java - - - - - - jboss6 - - true - + + + + src/jboss6/resources + + + org.jboss.seam.remoting @@ -152,6 +143,9 @@ jboss7 + + true + diff --git a/examples/model/src/main/resources/META-INF/persistence.xml b/examples/model/src/jboss6/resources/META-INF/persistence.xml similarity index 93% rename from examples/model/src/main/resources/META-INF/persistence.xml rename to examples/model/src/jboss6/resources/META-INF/persistence.xml index 2c90eab..9733cb2 100644 --- a/examples/model/src/main/resources/META-INF/persistence.xml +++ b/examples/model/src/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"> - modelDatasource + java:/DefaultDS org.jboss.seam.remoting.examples.model.Person org.jboss.seam.remoting.examples.model.Address diff --git a/examples/model/src/jboss7/resources/META-INF/persistence.xml b/examples/model/src/jboss7/resources/META-INF/persistence.xml index 95f22c4..2d20694 100644 --- a/examples/model/src/jboss7/resources/META-INF/persistence.xml +++ b/examples/model/src/jboss7/resources/META-INF/persistence.xml @@ -10,8 +10,6 @@ - diff --git a/examples/model/src/jboss7/resources/import.sql b/examples/model/src/jboss7/resources/import.sql deleted file mode 100644 index 53d4a18..0000000 --- a/examples/model/src/jboss7/resources/import.sql +++ /dev/null @@ -1,5 +0,0 @@ -insert into person (personid, firstname, lastname, dateofbirth) values (1, 'Shane', 'Bryzak', '1901-01-01'); -insert into address (addressid, person_id, streetno, streetname, suburb, postcode, country) values (1, 1, 100, 'Main', 'Pleasantville', '32123', 'Australia'); -insert into address (addressid, person_id, streetno, streetname, suburb, postcode, country) values (2, 1, 57, '1st Avenue', 'Pittsville', '32411', 'Australia'); -insert into person (personid, firstname, lastname, dateofbirth) values (2, 'Jozef', 'Hartinger', '1901-01-01'); -insert into address (addressid, person_id, streetno, streetname, suburb, postcode, country) values (3, 2, 99, 'Purkynova', 'Kralovo pole', '60200', 'Czech republic'); diff --git a/examples/model/src/main/assembly/assembly.xml b/examples/model/src/main/assembly/assembly.xml index 830f968..3759406 100644 --- 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"> + remoting-example-model-distribution + zip diff --git a/examples/model/src/glassfish/java/org/jboss/seam/remoting/examples/model/PopulateDatabase.java b/examples/model/src/main/java/org/jboss/seam/remoting/examples/model/PopulateDatabase.java similarity index 68% rename from examples/model/src/glassfish/java/org/jboss/seam/remoting/examples/model/PopulateDatabase.java rename to examples/model/src/main/java/org/jboss/seam/remoting/examples/model/PopulateDatabase.java index e5b4131..fe7fd93 100644 --- a/examples/model/src/glassfish/java/org/jboss/seam/remoting/examples/model/PopulateDatabase.java +++ b/examples/model/src/main/java/org/jboss/seam/remoting/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 deleted file mode 100644 index 36a0ecd..0000000 --- a/examples/model/src/main/resources/META-INF/seam-model-ds.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - modelDatasource - false - jdbc:hsqldb:. - org.hsqldb.jdbcDriver - sa - - - - diff --git a/examples/model/src/main/resources/import.sql b/examples/model/src/main/resources/import.sql deleted file mode 100644 index 53d4a18..0000000 --- a/examples/model/src/main/resources/import.sql +++ /dev/null @@ -1,5 +0,0 @@ -insert into person (personid, firstname, lastname, dateofbirth) values (1, 'Shane', 'Bryzak', '1901-01-01'); -insert into address (addressid, person_id, streetno, streetname, suburb, postcode, country) values (1, 1, 100, 'Main', 'Pleasantville', '32123', 'Australia'); -insert into address (addressid, person_id, streetno, streetname, suburb, postcode, country) values (2, 1, 57, '1st Avenue', 'Pittsville', '32411', 'Australia'); -insert into person (personid, firstname, lastname, dateofbirth) values (2, 'Jozef', 'Hartinger', '1901-01-01'); -insert into address (addressid, person_id, streetno, streetname, suburb, postcode, country) values (3, 2, 99, 'Purkynova', 'Kralovo pole', '60200', 'Czech republic'); diff --git a/examples/validation/pom.xml b/examples/validation/pom.xml index 2728d37..0a02514 100644 --- a/examples/validation/pom.xml +++ b/examples/validation/pom.xml @@ -33,6 +33,16 @@ seam-persistence + + org.jboss.seam.solder + seam-solder-api + + + + org.jboss.seam.solder + seam-solder + + org.hibernate.javax.persistence hibernate-jpa-2.0-api diff --git a/examples/validation/src/main/assembly/assembly.xml b/examples/validation/src/main/assembly/assembly.xml index 830f968..42aabe7 100644 --- 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"> + remoting-example-validation-distribution + zip diff --git a/impl/pom.xml b/impl/pom.xml index ae0cfc9..66b31da 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 diff --git a/impl/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java b/impl/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java index e7dd9d6..f8be809 100644 --- 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 index 08cb5b3..f0a32c5 100644 --- 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 index fb31b1e..5fd2f76 100644 --- 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 index 56a41e8..73bd817 100644 --- 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 index 15bfd85..0bdddda 100644 --- 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 index 62d0b86..16b4127 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ seam-parent org.jboss.seam - 12 + 14 org.jboss.seam.remoting @@ -20,7 +20,7 @@ - 3.1.0.Beta1 + 3.1.0.Beta2