Author: maschmid
Date: 2012-04-05 08:12:01 -0400 (Thu, 05 Apr 2012)
New Revision: 14523
Modified:
branches/community/Seam_2_3/examples-ee6/seambay/seambay-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/seambay/seambay-ejb/src/main/java/org/jboss/seam/example/seambay/CategoryAction.java
branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/webdriver/WebServicesTest.java
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/pom.xml
Log:
clean seambay example and fix the ftests
Modified: branches/community/Seam_2_3/examples-ee6/seambay/seambay-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seambay/seambay-ear/pom.xml 2012-04-05
11:44:49 UTC (rev 14522)
+++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-ear/pom.xml 2012-04-05
12:12:01 UTC (rev 14523)
@@ -29,16 +29,6 @@
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
Modified:
branches/community/Seam_2_3/examples-ee6/seambay/seambay-ejb/src/main/java/org/jboss/seam/example/seambay/CategoryAction.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/seambay/seambay-ejb/src/main/java/org/jboss/seam/example/seambay/CategoryAction.java 2012-04-05
11:44:49 UTC (rev 14522)
+++
branches/community/Seam_2_3/examples-ee6/seambay/seambay-ejb/src/main/java/org/jboss/seam/example/seambay/CategoryAction.java 2012-04-05
12:12:01 UTC (rev 14523)
@@ -48,7 +48,7 @@
@WebRemote
public List<Category> getAllCategories()
{
- allCategories = entityManager.createQuery("from
Category").getResultList();
+ allCategories = entityManager.createQuery("from Category c order by
c.categoryId").getResultList();
return allCategories;
}
Modified:
branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/webdriver/WebServicesTest.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/webdriver/WebServicesTest.java 2012-04-05
11:44:49 UTC (rev 14522)
+++
branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/webdriver/WebServicesTest.java 2012-04-05
12:12:01 UTC (rev 14523)
@@ -61,7 +61,7 @@
protected static final String SET_DURATION_RESPONSE_JBOSS_4 =
"<setAuctionDurationResponse
xmlns=\"http://seambay.example.seam.jboss.org/";
protected static final String SET_STARTING_PRICE_RESPONSE_JBOSS_56 =
"<ns2:setAuctionPriceResponse
xmlns:ns2=\"http://seambay.example.seam.jboss.org/\"";
protected static final String SET_STARTING_PRICE_RESPONSE_JBOSS_4 =
"<setAuctionPriceResponse
xmlns=\"http://seambay.example.seam.jboss.org/";
- protected static final String AUCTION_DETAILS_PRICE_RESPONSE =
"<ns2:getNewAuctionDetailsResponse
xmlns:ns2=\"http://seambay.example.seam.jboss.org/\"><ret...,
NSW, Australia</location>";
+ protected static final String AUCTION_DETAILS_PRICE_RESPONSE =
"<ns2:getNewAuctionDetailsResponse
xmlns:ns2=\"http://seambay.example.seam.jboss.org/\"><ret...,
NSW, Australia</location>";
protected static final String LOGOUT_RESPONSE = "<ns2:logoutResponse
xmlns:ns2=\"http://seambay.example.seam.jboss.org/\"><ret...;
protected static final String CONFIRMATION_RESPONSE_JBOSS_56 =
"<ns2:confirmAuctionResponse
xmlns:ns2=\"http://seambay.example.seam.jboss.org/\"";
protected static final String CONFIRMATION_RESPONSE_JBOSS_4 =
"<confirmAuctionResponse
xmlns=\"http://seambay.example.seam.jboss.org/\"";
Modified: branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/pom.xml 2012-04-05
11:44:49 UTC (rev 14522)
+++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/pom.xml 2012-04-05
12:12:01 UTC (rev 14523)
@@ -29,6 +29,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>