Seam SVN: r14669 - branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-05-11 10:05:05 -0400 (Fri, 11 May 2012)
New Revision: 14669
Removed:
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties
Log:
cleanup
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml 2012-05-11 13:41:31 UTC (rev 14668)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml 2012-05-11 14:05:05 UTC (rev 14669)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE datasources
- PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
-
-<datasources>
- <local-tx-datasource>
- <jndi-name>bookingDatasource</jndi-name>
- <connection-url>jdbc:hsqldb:.</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>sa</user-name>
- <password></password>
- </local-tx-datasource>
-</datasources>
-
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties 2012-05-11 13:41:31 UTC (rev 14668)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties 2012-05-11 14:05:05 UTC (rev 14669)
@@ -1,3 +0,0 @@
-#debug is explicitly disabled in test to avoid JBIDE-3623
-#Thu Dec 31 16:24:37 CET 2009
-org.jboss.seam.core.init.debug=false
\ No newline at end of file
11 years, 12 months
Seam SVN: r14668 - branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-05-11 09:41:31 -0400 (Fri, 11 May 2012)
New Revision: 14668
Removed:
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources/seam.properties
Log:
cleanup
Deleted: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources/seam.properties
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources/seam.properties 2012-05-11 13:37:25 UTC (rev 14667)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources/seam.properties 2012-05-11 13:41:31 UTC (rev 14668)
@@ -1,3 +0,0 @@
-#debug is explicitly disabled in test to avoid JBIDE-3623
-#Thu Dec 31 16:24:37 CET 2009
-org.jboss.seam.core.init.debug=false
11 years, 12 months
Seam SVN: r14667 - branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-05-11 09:37:25 -0400 (Fri, 11 May 2012)
New Revision: 14667
Modified:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/SynchronizationInterceptor.java
Log:
JBSEAM-4943 disabled synchronization for SFSB due new impl in AS7 and Java EE6
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/SynchronizationInterceptor.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/SynchronizationInterceptor.java 2012-05-11 12:19:09 UTC (rev 14666)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/SynchronizationInterceptor.java 2012-05-11 13:37:25 UTC (rev 14667)
@@ -4,6 +4,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
+import javax.ejb.Stateful;
+
import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.annotations.intercept.InterceptorType;
@@ -45,7 +47,8 @@
public boolean isInterceptorEnabled()
{
- return getComponent().isSynchronize();
+ // JBSEAM-4943
+ return getComponent().isSynchronize() && !getComponent().businessInterfaceHasAnnotation(Stateful.class);
}
}
11 years, 12 months
Seam SVN: r14666 - in branches/community/Seam_2_3/seam-integration-tests/src/test: resources/WEB-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-05-11 08:19:09 -0400 (Fri, 11 May 2012)
New Revision: 14666
Added:
branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml
Modified:
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java
branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml
branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml
Log:
MessagingTest fix, deploy test jms destinations
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-05-11 08:13:32 UTC (rev 14665)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-05-11 12:19:09 UTC (rev 14666)
@@ -28,7 +28,8 @@
.addAsWebInfResource("WEB-INF/components.xml", "components.xml")
.addAsWebInfResource("WEB-INF/pages.xml", "pages.xml")
.addAsWebInfResource("WEB-INF/web.xml", "web.xml")
- .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml");
+ .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml")
+ .addAsWebInfResource("WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml", "jboss-seam-integration-tests-hornetq-jms.xml");
}
public static WebArchive jbpmSeamDeployment() {
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java 2012-05-11 08:13:32 UTC (rev 14665)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java 2012-05-11 12:19:09 UTC (rev 14666)
@@ -112,7 +112,7 @@
@MessageDriven(activationConfig={
@ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
- @ActivationConfigProperty(propertyName="destination", propertyValue="topic/test")
+ @ActivationConfigProperty(propertyName="destination", propertyValue="topic/seamTest")
})
@Name("testTopicListener")
static public class TestTopicListener
@@ -133,7 +133,7 @@
@MessageDriven(activationConfig={
@ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
- @ActivationConfigProperty(propertyName="destination", propertyValue="queue/test")
+ @ActivationConfigProperty(propertyName="destination", propertyValue="queue/seamTest")
})
@Name("testQueueListener")
static public class TestQueueListener
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml 2012-05-11 08:13:32 UTC (rev 14665)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml 2012-05-11 12:19:09 UTC (rev 14666)
@@ -41,18 +41,5 @@
<value>testProcess4.jpdl.xml</value>
</bpm:process-definitions>
</bpm:jbpm>
-
- <jms:topic-connection topic-connection-factory-jndi-name="/ConnectionFactory" />
- <jms:queue-connection queue-connection-factory-jndi-name="/ConnectionFactory" />
-
- <jms:managed-topic-publisher name="testPublisher"
- auto-create="true"
- topic-jndi-name="/topic/testTopic" />
-
- <jms:managed-queue-sender name="testSender"
- auto-create="true"
- queue-jndi-name="/queue/testQueue" />
-
-
</components>
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml 2012-05-11 08:13:32 UTC (rev 14665)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml 2012-05-11 12:19:09 UTC (rev 14666)
@@ -37,11 +37,11 @@
<jms:managed-topic-publisher name="testPublisher"
auto-create="true"
- topic-jndi-name="topic/test" />
+ topic-jndi-name="topic/seamTest" />
<jms:managed-queue-sender name="testSender"
auto-create="true"
- queue-jndi-name="queue/test" />
+ queue-jndi-name="queue/seamTest" />
</components>
Added: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml (rev 0)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml 2012-05-11 12:19:09 UTC (rev 14666)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<messaging-deployment xmlns="urn:jboss:messaging-deployment:1.0">
+ <hornetq-server>
+ <jms-destinations>
+ <jms-topic name="seamTestTopic">
+ <entry name="/topic/seamTest"/>
+ </jms-topic>
+ <jms-queue name="seamTestQueue">
+ <entry name="/queue/seamTest"/>
+ </jms-queue>
+ </jms-destinations>
+ </hornetq-server>
+</messaging-deployment>
11 years, 12 months
Seam SVN: r14665 - branches/community/Seam_2_3.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-05-11 04:13:32 -0400 (Fri, 11 May 2012)
New Revision: 14665
Modified:
branches/community/Seam_2_3/pom.xml
Log:
remove arquillian-seam2 extension from parent
Modified: branches/community/Seam_2_3/pom.xml
===================================================================
--- branches/community/Seam_2_3/pom.xml 2012-05-11 08:04:15 UTC (rev 14664)
+++ branches/community/Seam_2_3/pom.xml 2012-05-11 08:13:32 UTC (rev 14665)
@@ -45,7 +45,6 @@
<!-- Version string properties -->
<version.arquillian_core>1.0.0.Final</version.arquillian_core>
- <version.arquillian_seam2>1.0.0.Alpha2</version.arquillian_seam2>
<version.wicket>1.4.14</version.wicket>
<version.drools>5.1.1</version.drools>
<version.testng>5.10</version.testng>
@@ -79,13 +78,6 @@
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.arquillian.extension</groupId>
- <artifactId>arquillian-seam2</artifactId>
- <version>${version.arquillian_seam2}</version>
- <scope>test</scope>
- </dependency>
-
<!-- All Seam modules -->
<dependency>
<groupId>org.jboss.seam</groupId>
11 years, 12 months
Seam SVN: r14664 - in branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests: src/test/java/org/jboss/seam/example/contactlist/test and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-05-11 04:04:15 -0400 (Fri, 11 May 2012)
New Revision: 14664
Removed:
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/testng.xml
Modified:
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java
Log:
remove arq-seam extension from contactlist
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-05-11 07:56:31 UTC (rev 14663)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-05-11 08:04:15 UTC (rev 14664)
@@ -76,12 +76,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.extension</groupId>
- <artifactId>arquillian-seam2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_2.2_spec</artifactId>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java 2012-05-11 07:56:31 UTC (rev 14663)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java 2012-05-11 08:04:15 UTC (rev 14664)
@@ -1,5 +1,7 @@
package org.jboss.seam.example.contactlist.test;
+import static org.junit.Assert.*;
+
import java.util.List;
import org.jboss.arquillian.container.test.api.Deployment;
@@ -13,7 +15,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import static org.junit.Assert.*;
+
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,14 +38,20 @@
@Test
public void testList() throws Exception
{
+ Lifecycle.beginCall();
+
EntityQuery<Contact> contacts = (EntityQuery<Contact>)Component.getInstance("contacts");
List<Contact> contactsList = (List<Contact>) (contacts.getResultList());
assertEquals(5, contactsList.size());
+
+ Lifecycle.endCall();
}
@Test
public void testSearch() throws Exception
{
+ Lifecycle.beginCall();
+
Contact exampleContact = (Contact)Component.getInstance("exampleContact");
exampleContact.setFirstName("Norman");
@@ -64,17 +72,19 @@
Lifecycle.endCall();
}
-
+
Long contactId;
-
+
@Test
public void testCreateDeleteContact() throws Exception
{
+ Lifecycle.beginCall();
+
Contact contact = (Contact) Component.getInstance("contact");
contact.setFirstName("Emmanuel");
contact.setLastName("Bernard");
contact.setCity("Paris");
-
+
EntityHome<Contact> contactHome = (EntityHome<Contact>)Component.getInstance("contactHome");
assertEquals("persisted", contactHome.persist());
contactId = (Long)contactHome.getId();
@@ -91,9 +101,11 @@
Lifecycle.endCall();
Lifecycle.beginCall();
-
+
contactHome = (EntityHome<Contact>)Component.getInstance("contactHome");
contactHome.setId(contactId);
assertEquals("removed", contactHome.remove());
+
+ Lifecycle.endCall();
}
}
Deleted: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/testng.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/testng.xml 2012-05-11 07:56:31 UTC (rev 14663)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/testng.xml 2012-05-11 08:04:15 UTC (rev 14664)
@@ -1,11 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-
-<suite name="Contact List" verbose="2" parallel="false">
-
- <test name="Contact List">
- <classes>
- <class name="org.jboss.seam.example.contactlist.test.ContactListTest"/>
- </classes>
- </test>
-
-</suite>
\ No newline at end of file
11 years, 12 months
Seam SVN: r14663 - in branches/community/Seam_2_3/examples-ee6/booking/booking-tests: src/test/java/org/jboss/seam/example/booking/test and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-05-11 03:56:31 -0400 (Fri, 11 May 2012)
New Revision: 14663
Removed:
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml
Modified:
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java
Log:
remove arq-seam extension from the booking example test
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-05-11 01:25:17 UTC (rev 14662)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-05-11 07:56:31 UTC (rev 14663)
@@ -75,12 +75,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.extension</groupId>
- <artifactId>arquillian-seam2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_2.2_spec</artifactId>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java 2012-05-11 01:25:17 UTC (rev 14662)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java 2012-05-11 07:56:31 UTC (rev 14663)
@@ -16,6 +16,7 @@
import org.jboss.seam.Component;
import org.jboss.seam.annotations.In;
import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.Manager;
import org.jboss.seam.example.booking.Booking;
import org.jboss.seam.example.booking.BookingList;
@@ -26,6 +27,9 @@
import org.jboss.seam.security.Identity;
import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,24 +48,25 @@
return er;
}
- @In(value="org.jboss.seam.core.manager")
- private Manager manager;
+ @Before
+ public void before() {
+ Lifecycle.beginCall();
+ }
- @In(value="org.jboss.seam.security.identity")
- private Identity identity;
+ @After
+ public void after() {
+ Lifecycle.endCall();
+ }
- @In
- private HotelSearching hotelSearch;
-
- @In
- private HotelBooking hotelBooking;
-
- @In
- private BookingList bookingList;
-
@Test
public void testBookHotel() throws Exception
{
+ Manager manager = Manager.instance();
+ Identity identity = Identity.instance();
+ HotelSearching hotelSearch = (HotelSearching)Component.getInstance("hotelSearch");
+ HotelBooking hotelBooking = (HotelBooking)Component.getInstance("hotelBooking");
+ BookingList bookingList = (BookingList)Component.getInstance("bookingList");
+
manager.initializeTemporaryConversation();
Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java 2012-05-11 01:25:17 UTC (rev 14662)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java 2012-05-11 07:56:31 UTC (rev 14663)
@@ -8,14 +8,17 @@
import org.jboss.arquillian.container.test.api.OverProtocol;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.Component;
-import org.jboss.seam.annotations.In;
import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.Manager;
import org.jboss.seam.example.booking.ChangePassword;
import org.jboss.seam.example.booking.User;
import org.jboss.seam.security.Identity;
import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,12 +37,21 @@
return er;
}
- @In(value="org.jboss.seam.security.identity")
- private Identity identity;
+ @Before
+ public void before() {
+ Lifecycle.beginCall();
+ }
+ @After
+ public void after() {
+ Lifecycle.endCall();
+ }
+
@Test
public void testChangePassword() throws Exception
{
+ Identity identity = Identity.instance();
+
Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
identity.setUsername("gavin");
identity.setPassword("foobar");
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-05-11 01:25:17 UTC (rev 14662)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-05-11 07:56:31 UTC (rev 14663)
@@ -9,12 +9,16 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.Component;
import org.jboss.seam.annotations.In;
+import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.Manager;
import org.jboss.seam.example.booking.User;
import org.jboss.seam.security.Identity;
import org.jboss.seam.web.Session;
import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,13 +36,22 @@
return er;
}
-
- @In(value="org.jboss.seam.security.identity")
- private Identity identity;
+ @Before
+ public void before() {
+ Lifecycle.beginCall();
+ }
+
+ @After
+ public void after() {
+ Lifecycle.endCall();
+ }
+
@Test
public void testLoginComponent() throws Exception
{
+ Identity identity = Identity.instance();
+
assertFalse(identity.isLoggedIn());
identity.setUsername("gavin");
identity.setPassword("foobar");
@@ -60,6 +73,8 @@
@Test
public void testLogin() throws Exception
{
+ Identity identity = Identity.instance();
+
assertFalse(identity.isLoggedIn());
identity.setUsername("gavin");
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml 2012-05-11 01:25:17 UTC (rev 14662)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml 2012-05-11 07:56:31 UTC (rev 14663)
@@ -1,13 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-
-<suite name="Hotel Booking" verbose="2" parallel="false">
-
- <test name="Hotel Booking">
- <classes>
- <class name="org.jboss.seam.example.booking.test.LoginTest"/>
- <class name="org.jboss.seam.example.booking.test.BookingTest"/>
- <class name="org.jboss.seam.example.booking.test.ChangePasswordTest"/>
- </classes>
- </test>
-
-</suite>
\ No newline at end of file
11 years, 12 months
Seam SVN: r14662 - branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-05-10 21:25:17 -0400 (Thu, 10 May 2012)
New Revision: 14662
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list
branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list
branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list
Log:
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list 2012-05-10 15:42:08 UTC (rev 14661)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list 2012-05-11 01:25:17 UTC (rev 14662)
@@ -1,11 +1,29 @@
commons-digester.jar
jboss-seam-debug.jar
jboss-seam-excel.jar
+jxl.jar
+jfreechart.jar
+jcommon.jar
jboss-seam-ioc.jar
+spring-aop.jar:3.1.1.RELEASE:compile
+aopalliance.jar:1.0:compile
+spring-asm.jar
+spring-beans.jar
+spring-core.jar
+spring-orm.jar
+spring-jdbc.jar
+spring-tx.jar
+spring-web.jar
+spring-context.jar
+spring-expression.jar
+guice.jar
jboss-seam-mail.jar
jboss-seam-pdf.jar
+itext.jar
+itext-rtf.jar
jboss-seam-rss.jar
+yarfraw.jar
jboss-seam-ui.jar
-jxl.jar
+jboss-seam-jul.jar
richfaces-impl.jar
richfaces-ui.jar
\ No newline at end of file
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list 2012-05-10 15:42:08 UTC (rev 14661)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list 2012-05-11 01:25:17 UTC (rev 14662)
@@ -9,5 +9,18 @@
jboss-el.jar
jboss-seam-remoting.jar
jbpm-jpdl.jar
+hibernate-ehcache.jar
+ehcache-core.jar
+jackrabbit-spi-commons.jar
+jackrabbit-jcr-commons.jar
+jackrabbit-api.jar
+jackrabbit-spi.jar
+jackrabbit-text-extractors.jar
+poi.jar
+poi-scratchpad.jar
+pdfbox.jar
+fontbox.jar
+jempbox.jar
+derby.jar
mvel2.jar
richfaces-api.jar
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list 2012-05-10 15:42:08 UTC (rev 14661)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list 2012-05-11 01:25:17 UTC (rev 14662)
@@ -1,24 +1,67 @@
antlr-runtime.jar
commons-beanutils.jar
commons-digester.jar
+bsh.jar
drools-templates.jar
drools-decisiontables.jar
drools-api.jar
drools-compiler.jar
drools-core.jar
jboss-el.jar
+el-api.jar
jboss-seam.jar
+openid4java-consumer.jar
+guava.jar
+jcip-annotations.jar
+httpclient.jar
+httpcore.jar
+commons-codec.jar
+nekohtml.jar
+xercesImpl.jar
+xml-apis.jar
+concurrent.jar
+urlrewritefilter.jar
+quartz.jar
+groovy-all.jar
+jgroups.jar
jboss-seam-debug.jar
jboss-seam-excel.jar
+jxl.jar
+jfreechart.jar
+jcommon.jar
jboss-seam-ioc.jar
+spring-aop.jar:3.1.1.RELEASE:compile
+aopalliance.jar:1.0:compile
+spring-asm.jar
+spring-beans.jar
+spring-core.jar
+spring-orm.jar
+spring-jdbc.jar
+spring-tx.jar
+spring-web.jar
+spring-context.jar
+spring-expression.jar
+guice.jar
jboss-seam-mail.jar
+jboss-seam-ui.jar
+jboss-seam-jul.jar
jboss-seam-pdf.jar
-jboss-seam-remoting.jar
-jboss-seam-rss.jar
-jboss-seam-ui.jar
+itext.jar
+itext-rtf.jar
jbpm-jpdl.jar
-jxl.jar
-mvel2.jar
+hibernate-ehcache.jar
+ehcache-core.jar
+jackrabbit-spi-commons.jar
+jackrabbit-jcr-commons.jar
+jackrabbit-api.jar
+jackrabbit-spi.jar
+jackrabbit-text-extractors.jar
+poi.jar
+poi-scratchpad.jar
+pdfbox.jar
+fontbox.jar
+jempbox.jar
+derby.jar
richfaces-api.jar
richfaces-impl.jar
richfaces-ui.jar
\ No newline at end of file
11 years, 12 months
Seam SVN: r14661 - in branches/community/Seam_2_3/examples-ee6/blog/blog-tests: src/test/java/org/jboss/seam/example/blog/test and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-05-10 11:42:08 -0400 (Thu, 10 May 2012)
New Revision: 14661
Added:
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/web.xml
Removed:
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/Deployments.java
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/testng.xml
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java
Log:
convert blog example tests back to JUnitSeamTest
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml 2012-05-10 13:35:08 UTC (rev 14660)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml 2012-05-10 15:42:08 UTC (rev 14661)
@@ -79,12 +79,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.extension</groupId>
- <artifactId>arquillian-seam2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_2.2_spec</artifactId>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java 2012-05-10 13:35:08 UTC (rev 14660)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java 2012-05-10 15:42:08 UTC (rev 14661)
@@ -1,5 +1,6 @@
package org.jboss.seam.example.blog.test;
+import java.io.File;
import java.util.List;
import java.util.Map;
import java.util.MissingResourceException;
@@ -11,169 +12,305 @@
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.OverProtocol;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.seam.Component;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.contexts.Lifecycle;
+import org.jboss.seam.mock.JUnitSeamTest;
import org.jboss.seam.security.Identity;
import org.jboss.seam.theme.Theme;
import org.jboss.seam.theme.ThemeSelector;
-import org.jboss.seam.transaction.UserTransaction;
-
-import actions.BlogService;
-import actions.EntryAction;
-import actions.PostAction;
-import actions.SearchService;
-import domain.Blog;
-import domain.BlogEntry;
import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import static org.junit.Assert.*;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import actions.BlogService;
+import actions.SearchService;
+import domain.Blog;
+import domain.BlogEntry;
+
@RunWith(Arquillian.class)
-public class BlogTest
+public class BlogTest extends JUnitSeamTest
{
-
- @Deployment(name="BookingTest")
+ @Deployment(name = "BestSellersTest")
@OverProtocol("Servlet 3.0")
public static Archive<?> createDeployment()
{
- EnterpriseArchive er = Deployments.bookingDeployment();
+ EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-blog.ear").importFrom(new File("../blog-ear/target/seam-blog.ear")).as(EnterpriseArchive.class);
+
WebArchive web = er.getAsType(WebArchive.class, "blog-web.war");
-
web.addClasses(BlogTest.class);
+ // Install org.jboss.seam.mock.MockSeamListener
+ web.delete("/WEB-INF/web.xml");
+ web.addAsWebInfResource("web.xml");
+
return er;
}
-
+
@Test
public void testPost() throws Exception
{
- Lifecycle.beginCall();
- Identity identity = Identity.instance();
- identity.setPassword("tokyo");
- identity.authenticate();
-
- BlogEntry entry = (BlogEntry) Component.getInstance("blogEntry");
- entry.setId("testing");
- entry.setTitle("Integration testing Seam applications is easy!");
- entry.setBody("This post is about Arquillian...");
+ new FacesRequest()
+ {
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ Identity.instance().setPassword("tokyo");
+ }
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ Identity.instance().authenticate();
+ }
+ }.run();
- UserTransaction transaction = (UserTransaction)Component.getInstance("org.jboss.seam.transaction.transaction");
- transaction.begin();
- PostAction postAction = (PostAction)Component.getInstance("postAction");
- postAction.post();
- transaction.commit();
-
- Lifecycle.endCall();
+ new FacesRequest("/post.xhtml")
+ {
- Lifecycle.beginCall();
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ BlogEntry entry = (BlogEntry) getInstance("blogEntry");
+ entry.setId("testing");
+ entry.setTitle("Integration testing Seam applications is easy!");
+ entry.setBody("This post is about SeamTest...");
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ // post now returns void
+ // assert invokeMethod("#{postAction.post}").equals("/index.xhtml");
+ invokeMethod("#{postAction.post}");
+ setOutcome("/index.xhtml");
+ }
+
+ @Override
+ protected void afterRequest()
+ {
+ assert isInvokeApplicationComplete();
+ assert !isRenderResponseBegun();
+ }
+
+ }.run();
+
+ new NonFacesRequest("/index.xhtml")
+ {
+
+ @Override
+ protected void renderResponse() throws Exception
+ {
+ List<BlogEntry> blogEntries = ( (Blog) getInstance(BlogService.class) ).getBlogEntries();
+ assert blogEntries.size()==4;
+ BlogEntry blogEntry = blogEntries.get(0);
+ assert blogEntry.getId().equals("testing");
+ assert blogEntry.getBody().equals("This post is about SeamTest...");
+ assert blogEntry.getTitle().equals("Integration testing Seam applications is easy!");
+ }
+
+ }.run();
- List<BlogEntry> blogEntries = ( (Blog) Component.getInstance(BlogService.class) ).getBlogEntries();
- assertEquals(4, blogEntries.size());
-
- BlogEntry blogEntry = blogEntries.get(0);
- assertEquals("testing", blogEntry.getId());
- assertEquals("This post is about Arquillian...", blogEntry.getBody());
- assertEquals("Integration testing Seam applications is easy!", blogEntry.getTitle());
+ new FacesRequest()
+ {
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ ( (EntityManager) getInstance("entityManager") ).createQuery("delete from BlogEntry where id='testing'").executeUpdate();
+ }
+ }.run();
- transaction = (UserTransaction)Component.getInstance("org.jboss.seam.transaction.transaction");
- transaction.begin();
- ( (EntityManager) Component.getInstance("entityManager") ).createQuery("delete from BlogEntry where id='testing'").executeUpdate();
- transaction.commit();
-
- Lifecycle.endCall();
}
@Test
public void testLatest() throws Exception
{
- assertEquals(3, ( (Blog) Component.getInstance(BlogService.class) ).getBlogEntries().size());
+ new NonFacesRequest("/index.xhtml")
+ {
+
+ @Override
+ protected void renderResponse() throws Exception
+ {
+ assert ( (Blog) getInstance(BlogService.class) ).getBlogEntries().size()==3;
+ }
+
+ }.run();
}
@Test
public void testEntry() throws Exception
{
- EntryAction entryAction = (EntryAction)Component.getInstance("entryAction");
- entryAction.loadBlogEntry("seamtext");
-
- BlogEntry blogEntry = (BlogEntry) Contexts.getEventContext().get("blogEntry");
- assertNotNull(blogEntry);
- assertEquals("seamtext", blogEntry.getId());
+ new NonFacesRequest("/entry.xhtml")
+ {
+
+ @Override
+ protected void beforeRequest()
+ {
+ setParameter("blogEntryId", "seamtext");
+ }
+
+ @Override
+ protected void renderResponse() throws Exception
+ {
+ BlogEntry blogEntry = (BlogEntry) Contexts.getEventContext().get("blogEntry");
+ assert blogEntry!=null;
+ assert blogEntry.getId().equals("seamtext");
- // make sure the entry is really there
- assertTrue(blogEntry.getBody().length() > 0);
- assertEquals("Introducing Seam Text", blogEntry.getTitle());
+ // make sure the entry is really there
+ assert blogEntry.getBody().length() > 0;
+ assert blogEntry.getTitle().equals("Introducing Seam Text");
+ }
+
+ }.run();
}
@Test
public void testSearch() throws Exception
{
- SearchService searchService = (SearchService)Component.getInstance("searchService");
- searchService.setSearchPattern("seam text");
+ // Some time to allow indexing in the background
+ Thread.sleep(1000);
- List<BlogEntry> results = (List<BlogEntry>) Component.getInstance("searchResults");
- assertEquals("seamtext", results.get(0).getId());
+ String id = new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ ( (SearchService) getInstance(SearchService.class) ).setSearchPattern("seam");
+ }
+
+ @Override
+ protected String getInvokeApplicationOutcome()
+ {
+ return "/search.xhtml";
+ }
+
+ @Override
+ protected void afterRequest()
+ {
+ assert !isRenderResponseBegun();
+ }
+
+ }.run();
+
+ new NonFacesRequest("/search.xhtml", id)
+ {
+
+ @Override
+ protected void beforeRequest()
+ {
+ setParameter("searchPattern", "\"seam text\"");
+ }
+
+ @Override
+ protected void renderResponse() throws Exception
+ {
+ List<BlogEntry> results = (List<BlogEntry>) getInstance("searchResults");
+ // The hibernate search returns non-precise matches since version 4, so we only check that the expected result is first
+ assert "seamtext".equals(results.get(0).getId());
+ }
+
+ }.run();
}
@Test
- @Ignore // themeSelector.select uses FacesContext, which isn't available in a test
public void testSelectTheme() throws Exception
{
- ThemeSelector themeSelector = ThemeSelector.instance();
- List<SelectItem> themes = (List<SelectItem>) themeSelector.getThemes();
- assertEquals(3, themes.size());
- assertEquals("default", themes.get(0).getLabel());
- assertEquals("default", themeSelector.getTheme());
+ String id = new NonFacesRequest("/index.xhtml")
+ {
+
+ @Override
+ protected void renderResponse() throws Exception
+ {
+ List<SelectItem> themes = (List<SelectItem>) getValue("#{themeSelector.themes}");
+ assert themes.size() == 3;
+ assert themes.get(0).getLabel().equals("default");
+ assert themes.get(0).getLabel().equals("default");
+ assert "default".equals(getValue("#{themeSelector.theme}"));
- Map<String, String> theme = Theme.instance();
- assertEquals("template.xhtml", theme.get("template"));
- // we can't do interpolate the value correctly in these tests
- assertEquals("/screen.css", theme.get("css"));
- assertEquals("foo", theme.get("foo"));
-
- themeSelector.setTheme("accessible");
- themeSelector.select();
-
- assertEquals("accessible", themeSelector.getTheme());
-
- theme = Theme.instance();
- assertEquals("/accessible.css", theme.get("css"));
- assertEquals("template.xhtml", theme.get("template"));
+ assert "template.xhtml".equals(getValue("#{theme.template}"));
+ // we can't do interpolate the value correctly in these tests
+ // assert "/screen.css".equals(getValue("#{theme.css}"));
+ assert "foo".equals(getValue("#{theme.foo}"));
+ }
+
+ }.run();
-
- themeSelector.selectTheme("printable");
- assertEquals("printable", themeSelector.getTheme());
-
- theme = Theme.instance();
- assertEquals("/printable.css", theme.get("css"));
- assertEquals("print.xhtml", theme.get("template"));
-
- theme = Theme.instance();
- assertEquals(2, theme.entrySet().size());
-
- themeSelector.setTheme("foo");
- themeSelector.select();
- assertEquals("foo", themeSelector.getTheme());
- theme = Theme.instance();
- ResourceBundle themeResources = ThemeSelector.instance().getThemeResourceBundle();
- assertFalse(themeResources.getKeys().hasMoreElements());
- assertEquals(0, theme.entrySet().size());
- boolean exception = false;
- try
- {
- themeResources.getObject("bar");
- }
- catch (MissingResourceException e)
- {
- exception = true;
- }
- assertTrue(exception);
- assertEquals("bar", theme.get("bar"));
+ new FacesRequest("/index.xhtml", id)
+ {
+ @Override
+ protected void updateModelValues() throws Exception {
+ setValue("#{themeSelector.theme}", "accessible");
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception {
+ invokeAction("#{themeSelector.select}");
+ }
+
+ @Override
+ protected void renderResponse() throws Exception
+ {
+ assert "accessible".equals(getValue("#{themeSelector.theme}"));
+ //assert "/accessible.css".equals(getValue("#{theme.css}"));
+ assert "template.xhtml".equals(getValue("#{theme.template}"));
+ }
+ }.run();
+
+ new FacesRequest("/index.xhtml", id)
+ {
+
+ @Override
+ protected void invokeApplication() throws Exception {
+ invokeAction("#{themeSelector.selectTheme('printable')}");
+ }
+
+ @Override
+ protected void renderResponse() throws Exception
+ {
+ assert "printable".equals(getValue("#{themeSelector.theme}"));
+ //assert "/printable.css".equals(getValue("#{theme.css}"));
+ assert "print.xhtml".equals(getValue("#{theme.template}"));
+ Map<String, String> theme = Theme.instance();
+ assert theme.entrySet().size() == 2;
+ }
+ }.run();
+
+ new FacesRequest("/index.xhtml", id)
+ {
+ @Override
+ protected void updateModelValues() throws Exception {
+ setValue("#{themeSelector.theme}", "foo");
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception {
+ invokeAction("#{themeSelector.select}");
+ }
+
+ @Override
+ protected void renderResponse() throws Exception
+ {
+ assert "foo".equals(getValue("#{themeSelector.theme}"));
+ Map<String, String> theme = Theme.instance();
+ ResourceBundle themeResources = ThemeSelector.instance().getThemeResourceBundle();
+ assert !themeResources.getKeys().hasMoreElements();
+ assert theme.entrySet().size() == 0;
+ boolean exception = false;
+ try
+ {
+ themeResources.getObject("bar");
+ }
+ catch (MissingResourceException e)
+ {
+ exception = true;
+ }
+ assert exception;
+ assert theme.get("bar").equals("bar");
+ }
+ }.run();
}
}
Deleted: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/Deployments.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/Deployments.java 2012-05-10 13:35:08 UTC (rev 14660)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/Deployments.java 2012-05-10 15:42:08 UTC (rev 14661)
@@ -1,14 +0,0 @@
-package org.jboss.seam.example.blog.test;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.importer.ZipImporter;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-
-import java.io.File;
-
-public class Deployments {
- public static EnterpriseArchive bookingDeployment() {
- return ShrinkWrap.create(ZipImporter.class, "seam-blog.ear").importFrom(new File("../blog-ear/target/seam-blog.ear"))
- .as(EnterpriseArchive.class);
- }
-}
Deleted: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/testng.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/testng.xml 2012-05-10 13:35:08 UTC (rev 14660)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/testng.xml 2012-05-10 15:42:08 UTC (rev 14661)
@@ -1,11 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-
-<suite name="Blog" verbose="2" parallel="false">
-
- <test name="Blog">
- <classes>
- <class name="org.jboss.seam.example.blog.test.BlogTest"/>
- </classes>
- </test>
-
-</suite>
Added: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/web.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/web.xml 2012-05-10 15:42:08 UTC (rev 14661)
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+ <listener>
+ <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
+ </listener>
+
+</web-app>
11 years, 12 months
Seam SVN: r14660 - in branches/community/Seam_2_3/distribution: src/main/assembly and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-05-10 09:35:08 -0400 (Thu, 10 May 2012)
New Revision: 14660
Added:
branches/community/Seam_2_3/distribution/get-arquillian-libs.xml
Removed:
branches/community/Seam_2_3/distribution/arq-aether-task.xml
Modified:
branches/community/Seam_2_3/distribution/pom.xml
branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml
Log:
JBSEAM-4946
Deleted: branches/community/Seam_2_3/distribution/arq-aether-task.xml
===================================================================
--- branches/community/Seam_2_3/distribution/arq-aether-task.xml 2012-05-10 12:26:59 UTC (rev 14659)
+++ branches/community/Seam_2_3/distribution/arq-aether-task.xml 2012-05-10 13:35:08 UTC (rev 14660)
@@ -1,19 +0,0 @@
-<project xmlns:aether="antlib:org.sonatype.aether.ant" default="copyarq">
- <taskdef uri="antlib:org.sonatype.aether.ant" resource="org/sonatype/aether/ant/antlib.xml">
- <classpath>
- <fileset dir="../build/lib" includes="aether-ant-tasks-*.jar" />
- </classpath>
- </taskdef>
-
- <property name="test.lib.dir" location="test" />
- <property name="version.jboss-as7" value="7.1.1.Final"/>
- <target name="copyarq" >
- <mkdir dir="${test.lib.dir}"/>
- <aether:resolve>
- <aether:dependencies>
- <aether:dependency groupid="org.jboss.as" artifactid="jboss-as-arquillian-container-managed" version="${version.jboss-as7}" />
- </aether:dependencies>
- <files dir="${test.lib.dir}" layout="{artifactId}-{version}-{classifier}.{extension}" />
- </aether:resolve>
- </target>
-</project>
Copied: branches/community/Seam_2_3/distribution/get-arquillian-libs.xml (from rev 14659, branches/community/Seam_2_3/distribution/arq-aether-task.xml)
===================================================================
--- branches/community/Seam_2_3/distribution/get-arquillian-libs.xml (rev 0)
+++ branches/community/Seam_2_3/distribution/get-arquillian-libs.xml 2012-05-10 13:35:08 UTC (rev 14660)
@@ -0,0 +1,19 @@
+<project xmlns:aether="antlib:org.sonatype.aether.ant" default="copyarq">
+ <taskdef uri="antlib:org.sonatype.aether.ant" resource="org/sonatype/aether/ant/antlib.xml">
+ <classpath>
+ <fileset dir="../build/lib" includes="aether-ant-tasks-*.jar" />
+ </classpath>
+ </taskdef>
+
+ <property name="test.lib.dir" location="test" />
+ <property name="version.jboss-as7" value="7.1.1.Final"/>
+ <target name="copyarq" >
+ <mkdir dir="${test.lib.dir}"/>
+ <aether:resolve>
+ <aether:dependencies>
+ <aether:dependency groupid="org.jboss.as" artifactid="jboss-as-arquillian-container-managed" version="${version.jboss-as7}" />
+ </aether:dependencies>
+ <files dir="${test.lib.dir}" layout="{artifactId}-{version}-{classifier}.{extension}" />
+ </aether:resolve>
+ </target>
+</project>
Modified: branches/community/Seam_2_3/distribution/pom.xml
===================================================================
--- branches/community/Seam_2_3/distribution/pom.xml 2012-05-10 12:26:59 UTC (rev 14659)
+++ branches/community/Seam_2_3/distribution/pom.xml 2012-05-10 13:35:08 UTC (rev 14660)
@@ -16,16 +16,15 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
- <phase>validate</phase>
+ <phase>package</phase>
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
<property name="test.lib.dir" location="target/arquillian/" />
<property name="version.jboss-as7" value="${version.jbossas7}" />
- <ant antfile="arq-aether-task.xml" target="copyarq"/>
+ <ant antfile="get-arquillian-libs.xml" target="copyarq"/>
</target>
</configuration>
<goals>
Modified: branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml 2012-05-10 12:26:59 UTC (rev 14659)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml 2012-05-10 13:35:08 UTC (rev 14660)
@@ -43,7 +43,15 @@
</includes>
<fileMode>0744</fileMode>
</fileSet>
+
<fileSet>
+ <directory>.</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>get-arquillian-libs.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../extras</directory>
<outputDirectory>extras</outputDirectory>
<includes>
11 years, 12 months