Seam SVN: r11407 - branches/enterprise/JBPAPP_5_0/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-08-20 08:06:00 -0400 (Thu, 20 Aug 2009)
New Revision: 11407
Modified:
branches/enterprise/JBPAPP_5_0/build/utilities.build.xml
Log:
added debug option for maven - commented
Modified: branches/enterprise/JBPAPP_5_0/build/utilities.build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/utilities.build.xml 2009-08-20 12:04:04 UTC (rev 11406)
+++ branches/enterprise/JBPAPP_5_0/build/utilities.build.xml 2009-08-20 12:06:00 UTC (rev 11407)
@@ -212,7 +212,7 @@
<sysproperty key="maven.home" value="${maven.dir}" />
<arg line="-Dseam.version=${complete.version}" />
<arg line="--settings ${maven.settings.xml}" />
- <!--<arg line="-q" />-->
+ <!--<arg line="-X" /> -->
<args />
<arg line="@{target}" />
</java>
14 years, 8 months
Seam SVN: r11406 - branches/enterprise/JBPAPP_5_0/src/test/ftest/lib.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-08-20 08:04:04 -0400 (Thu, 20 Aug 2009)
New Revision: 11406
Modified:
branches/enterprise/JBPAPP_5_0/src/test/ftest/lib/testng-5.8-jdk15.jar
Log:
aligned testng jar
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/lib/testng-5.8-jdk15.jar
===================================================================
(Binary files differ)
14 years, 8 months
Seam SVN: r11405 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/jmx.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-08-20 07:59:29 -0400 (Thu, 20 Aug 2009)
New Revision: 11405
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java
Log:
backport of JBSEAM-4029
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java 2009-08-20 07:39:30 UTC (rev 11404)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java 2009-08-20 11:59:29 UTC (rev 11405)
@@ -139,10 +139,10 @@
protected MBeanServer locateJBoss()
{
- for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext(); )
+ for (Object o : MBeanServerFactory.findMBeanServer(null))
{
- MBeanServer server = (MBeanServer) i.next();
- if (server.getDefaultDomain().equals("jboss"))
+ MBeanServer server = (MBeanServer) o;
+ if ("jboss".equals(server.getDefaultDomain()))
{
return server;
}
14 years, 8 months
Seam SVN: r11404 - in branches/community/Seam_2_2/src/test/ftest/examples/seambay: src/org/jboss/seam/example/seambay/test/selenium and 1 other directory.
by seam-commits＠lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2009-08-20 03:39:30 -0400 (Thu, 20 Aug 2009)
New Revision: 11404
Added:
branches/community/Seam_2_2/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/WebServiceTestPageTest.java
Modified:
branches/community/Seam_2_2/src/test/ftest/examples/seambay/jboss5.xml
branches/community/Seam_2_2/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/seambay.properties
Log:
JBSEAM-4366 Added testcase for web service test page of seambay example
Modified: branches/community/Seam_2_2/src/test/ftest/examples/seambay/jboss5.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/seambay/jboss5.xml 2009-08-18 17:36:33 UTC (rev 11403)
+++ branches/community/Seam_2_2/src/test/ftest/examples/seambay/jboss5.xml 2009-08-20 07:39:30 UTC (rev 11404)
@@ -26,6 +26,7 @@
<class name="org.jboss.seam.example.seambay.test.selenium.SellTest" />
<class name="org.jboss.seam.example.seambay.test.selenium.SearchTest" />
<class name="org.jboss.seam.example.seambay.test.selenium.BidTest" />
+ <class name="org.jboss.seam.example.seambay.test.selenium.WebServiceTestPageTest" />
</classes>
</test>
</suite>
Added: branches/community/Seam_2_2/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/WebServiceTestPageTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/WebServiceTestPageTest.java (rev 0)
+++ branches/community/Seam_2_2/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/WebServiceTestPageTest.java 2009-08-20 07:39:30 UTC (rev 11404)
@@ -0,0 +1,273 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.example.seambay.test.selenium;
+
+import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.thoughtworks.selenium.Wait;
+
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.AssertJUnit.fail;
+
+import com.thoughtworks.selenium.Wait;
+
+/**
+ * This class tests a functionality of web service test page available directly
+ * from SeamBay home page
+ *
+ * @author Martin Gencur
+ *
+ */
+public class WebServiceTestPageTest extends SeleniumSeamBayTest
+{
+
+ protected static final Long TIMEOUT = 3000L; //3 seconds
+ protected static final String HERE_LINK = "xpath=//a[contains(text(),\"here\")]";
+ protected static final String SERVICE_PAGE_HEADING= "seamBay Web Services - Test Page";
+
+ protected static final String INVOKE_SERVICE_BUTTON = "xpath=//button[contains(@onclick,\"sendRequest\")]";
+ protected static final String REQUEST_AREA = "id=serviceRequest";
+ protected static final String RESPONSE_AREA = "id=serviceResponse";
+
+ protected static final String LOGIN_LINK = "xpath=//a[contains(text(),\"Login\")]";
+ protected static final String LIST_CATEGORIES_LINK = "xpath=//a[contains(text(),\"List Categories\")]";
+ protected static final String CREATE_NEW_AUCTION_LINK = "xpath=//a[contains(text(),\"Create new auction\")]";
+ protected static final String UPDATE_AUCTION_DETAILS_LINK = "xpath=//a[contains(text(),\"Update auction details\")]";
+ protected static final String SET_AUCTION_DURATION_LINK = "xpath=//a[contains(text(),\"Set auction duration\")]";
+ protected static final String SET_STARTING_PRICE_LINK = "xpath=//a[contains(text(),\"Set starting price\")]";
+ protected static final String GET_AUCTION_DETAILS_LINK = "xpath=//a[contains(text(),\"Get the auction details\")]";
+ protected static final String CONFIRM_AUCTION_LINK = "xpath=//a[contains(text(),\"Confirm auction\")]";
+ protected static final String FIND_AUCTIONS_LINK = "xpath=//a[contains(text(),\"Find Auctions\")]";
+ protected static final String LOGOUT_LINK = "xpath=//a[contains(text(),\"Logout\")]";
+
+ /*login parameters*/
+ protected static final String LOGIN_INPUT_USERNAME = "id=username";
+ protected static final String LOGIN_INPUT_PASSWORD = "id=password";
+
+ /*create new auction parameters*/
+ protected static final String AUCTION_TITLE = "id=title";
+ protected static final String AUCTION_DESCRIPTION = "id=description";
+ protected static final String AUCTION_CATEGORY_ID = "id=categoryId";
+
+ /*parameters for other tests*/
+ protected static final String SEARCH_TERM = "id=searchTerm";
+ protected static final String AUCTION_DURATION = "id=duration";
+ protected static final String STARTING_PRICE = "id=price";
+
+ @Test
+ public void simplePageContentTest(){
+ browser.clickAndWait(HERE_LINK);
+ waitForElementPresent(RESPONSE_AREA, TIMEOUT);
+ assertTrue("Page should contain service page heading",browser.isTextPresent(SERVICE_PAGE_HEADING));
+ }
+
+ @Test(dependsOnMethods={"simplePageContentTest"})
+ public void loginTest(){
+ loginService();
+ String x = browser.getValue(RESPONSE_AREA);
+ assertTrue("Response area should contain \"true\"", x.contains(getProperty("LOGIN_RIGHT_RESPONSE")));
+ }
+
+ public void loginService(){
+ String username = "demo";
+ String password = "demo";
+ browser.clickAndWait(HERE_LINK);
+ waitForElementPresent(RESPONSE_AREA, TIMEOUT);
+ waitForElementPresent(LOGIN_LINK, TIMEOUT);
+ browser.click(LOGIN_LINK);
+ waitForElementPresent(LOGIN_INPUT_USERNAME, TIMEOUT);
+ waitForElementPresent(LOGIN_INPUT_PASSWORD, TIMEOUT);
+ browser.type(LOGIN_INPUT_USERNAME, username);
+ browser.type(LOGIN_INPUT_PASSWORD, password);
+ browser.click(INVOKE_SERVICE_BUTTON);
+ waitForElementContent(RESPONSE_AREA, TIMEOUT*5);
+ }
+
+ @Test(dependsOnMethods={"loginTest"})
+ public void listCategoriesTest(){
+ loginService();
+ waitForElementPresent(LIST_CATEGORIES_LINK, TIMEOUT);
+ browser.click(LIST_CATEGORIES_LINK);
+ waitForElementPresent(INVOKE_SERVICE_BUTTON, TIMEOUT);
+ browser.click(INVOKE_SERVICE_BUTTON);
+ waitForElementContent(RESPONSE_AREA, TIMEOUT*5);
+ String x = browser.getValue(RESPONSE_AREA);
+ assertTrue("Response area should contain a list of categories.", x.contains(getProperty("LIST_CATEGORIES_RESPONSE")));
+ }
+
+ @Test(dependsOnMethods={"loginTest"})
+ public void createNewAuctionTest(){
+ loginService();
+ createNewAuctionService();
+ String x = browser.getValue(RESPONSE_AREA);
+ assertTrue("Response area should contain information about creating the auction.", x.contains(getProperty("CREATE_NEW_AUCTION_RESPONSE")));
+ }
+
+ public void createNewAuctionService(){
+ String title = "Animals";
+ String description = "You can buy an animal here";
+ String categoryId = "6";
+ waitForElementPresent(CREATE_NEW_AUCTION_LINK, TIMEOUT);
+ browser.click(CREATE_NEW_AUCTION_LINK);
+ waitForElementPresent(AUCTION_TITLE, TIMEOUT);
+ waitForElementPresent(AUCTION_DESCRIPTION, TIMEOUT);
+ waitForElementPresent(AUCTION_CATEGORY_ID, TIMEOUT);
+ browser.type(AUCTION_TITLE, title);
+ browser.type(AUCTION_DESCRIPTION, description);
+ browser.type(AUCTION_CATEGORY_ID, categoryId);
+ waitForElementPresent(INVOKE_SERVICE_BUTTON, TIMEOUT);
+ browser.click(INVOKE_SERVICE_BUTTON);
+ waitForElementContent(RESPONSE_AREA, TIMEOUT*5);
+ }
+
+ @Test(dependsOnMethods={"loginTest","createNewAuctionTest"})
+ public void findAuctionsTest(){
+ String searchTerm = "Animals";
+ loginService();
+ createNewAuctionService();
+ waitForElementPresent(FIND_AUCTIONS_LINK, TIMEOUT);
+ browser.click(FIND_AUCTIONS_LINK);
+ waitForElementPresent(SEARCH_TERM, TIMEOUT);
+ browser.type(SEARCH_TERM, searchTerm);
+ waitForElementPresent(INVOKE_SERVICE_BUTTON, TIMEOUT);
+ browser.click(INVOKE_SERVICE_BUTTON);
+ waitForElementContent(RESPONSE_AREA, TIMEOUT*5);
+ String x = browser.getValue(RESPONSE_AREA);
+ assertTrue("Response area should contain information about finding auction.", x.contains(getProperty("FIND_AUCTIONS_RESPONSE")));
+ }
+
+ @Test(dependsOnMethods={"loginTest","createNewAuctionTest"})
+ public void updateAuctionTest(){
+ String title = "Animals";
+ String description = "Another description";
+ String categoryId = "5";
+ loginService();
+ createNewAuctionService();
+ waitForElementPresent(UPDATE_AUCTION_DETAILS_LINK, TIMEOUT);
+ browser.click(UPDATE_AUCTION_DETAILS_LINK);
+ waitForElementPresent(AUCTION_TITLE, TIMEOUT);
+ waitForElementPresent(AUCTION_DESCRIPTION, TIMEOUT);
+ waitForElementPresent(AUCTION_CATEGORY_ID, TIMEOUT);
+ browser.type(AUCTION_TITLE, title);
+ browser.type(AUCTION_DESCRIPTION, description);
+ browser.type(AUCTION_CATEGORY_ID, categoryId);
+ waitForElementPresent(INVOKE_SERVICE_BUTTON, TIMEOUT);
+ browser.click(INVOKE_SERVICE_BUTTON);
+ waitForElementContent(RESPONSE_AREA, TIMEOUT*5);
+ String x = browser.getValue(RESPONSE_AREA);
+ assertTrue("Response area should contain information about updating the auction.", x.contains(getProperty("UPDATE_AUCTION_RESPONSE")));
+ }
+
+ @Test(dependsOnMethods={"loginTest","createNewAuctionTest"})
+ public void setAuctionDurationTest(){
+ String duration = "20";
+ loginService();
+ createNewAuctionService();
+ waitForElementPresent(SET_AUCTION_DURATION_LINK, TIMEOUT);
+ browser.click(SET_AUCTION_DURATION_LINK);
+ waitForElementPresent(AUCTION_DURATION, TIMEOUT);
+ browser.type(AUCTION_DURATION, duration);
+ waitForElementPresent(INVOKE_SERVICE_BUTTON, TIMEOUT);
+ browser.click(INVOKE_SERVICE_BUTTON);
+ waitForElementContent(RESPONSE_AREA, TIMEOUT*5);
+ String x = browser.getValue(RESPONSE_AREA);
+ assertTrue("Response area should contain information about setting duration.", x.contains(getProperty("SET_DURATION_RESPONSE")));
+ }
+
+ @Test(dependsOnMethods={"loginTest","createNewAuctionTest"})
+ public void setStartingPriceTest(){
+ String price = "1000";
+ loginService();
+ createNewAuctionService();
+ waitForElementPresent(SET_STARTING_PRICE_LINK, TIMEOUT);
+ browser.click(SET_STARTING_PRICE_LINK);
+ waitForElementPresent(STARTING_PRICE, TIMEOUT);
+ browser.type(STARTING_PRICE, price);
+ waitForElementPresent(INVOKE_SERVICE_BUTTON, TIMEOUT);
+ browser.click(INVOKE_SERVICE_BUTTON);
+ waitForElementContent(RESPONSE_AREA, TIMEOUT*5);
+ String x = browser.getValue(RESPONSE_AREA);
+ assertTrue("Response area should contain information about setting starting price.", x.contains(getProperty("SET_STARTING_PRICE_RESPONSE")));
+ }
+
+ @Test(dependsOnMethods={"loginTest","createNewAuctionTest"})
+ public void getAuctionDetailsTest(){
+ loginService();
+ createNewAuctionService();
+ waitForElementPresent(GET_AUCTION_DETAILS_LINK, TIMEOUT);
+ browser.click(GET_AUCTION_DETAILS_LINK);
+ waitForElementPresent(INVOKE_SERVICE_BUTTON, TIMEOUT);
+ browser.click(INVOKE_SERVICE_BUTTON);
+ waitForElementContent(RESPONSE_AREA, TIMEOUT*5);
+ String x = browser.getValue(RESPONSE_AREA);
+ assertTrue("Response area should contain auction details.", x.contains(getProperty("AUCTION_DETAILS_PRICE_RESPONSE")));
+ }
+
+ @Test(dependsOnMethods={"loginTest"})
+ public void logOutTest(){
+ loginService();
+ waitForElementPresent(LOGOUT_LINK, TIMEOUT);
+ browser.click(LOGOUT_LINK);
+ waitForElementPresent(INVOKE_SERVICE_BUTTON, TIMEOUT);
+ browser.click(INVOKE_SERVICE_BUTTON);
+ waitForElementContent(RESPONSE_AREA, TIMEOUT*5);
+ String x = browser.getValue(RESPONSE_AREA);
+ assertTrue("Response area should contain logout confirmation.", x.contains(getProperty("LOGOUT_RESPONSE")));
+ }
+
+ @Test(dependsOnMethods={"loginTest","createNewAuctionTest"})
+ public void confirmAuctionTest(){
+ loginService();
+ createNewAuctionService();
+ waitForElementPresent(CONFIRM_AUCTION_LINK, TIMEOUT);
+ browser.click(CONFIRM_AUCTION_LINK);
+ waitForElementPresent(INVOKE_SERVICE_BUTTON, TIMEOUT);
+ browser.click(INVOKE_SERVICE_BUTTON);
+ waitForElementContent(RESPONSE_AREA, TIMEOUT*5);
+ String x = browser.getValue(RESPONSE_AREA);
+ assertTrue("Response area should contain information about confirmation.", x.contains(getProperty("CONFIRMATION_RESPONSE")));
+ }
+
+ public void waitForElementPresent(final String locator, Long timeout){
+ new Wait()
+ {
+ @Override
+ public boolean until()
+ {
+ return browser.isElementPresent(locator);
+ }
+ }.wait("Timeout while waiting for element "+ locator +" present.", timeout);
+ } //waitForElementPresent
+
+ public void waitForElementContent(final String locator, Long timeout){
+ new Wait()
+ {
+ @Override
+ public boolean until()
+ {
+ return (browser.getValue(locator).length() != 0);
+ }
+ }.wait("Timeout while waiting for element content."+browser.getValue(locator).length()+","+locator , timeout);
+ } //waitForElementContent
+}
Modified: branches/community/Seam_2_2/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/seambay.properties
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/seambay.properties 2009-08-18 17:36:33 UTC (rev 11403)
+++ branches/community/Seam_2_2/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/seambay.properties 2009-08-20 07:39:30 UTC (rev 11404)
@@ -34,7 +34,7 @@
SELL_NEXT id=sellForm:next
SELL_CONFIRM id=sellForm:confirm
SELL_CATEGORY_SELECT id=rootCategory
-SELL_CATEGORY_SELECT_SECOND_OPTION xpath=id(\"rootCategory\")/option[2] # availability of second option indicates that category list has been loaded
+SELL_CATEGORY_SELECT_SECOND_OPTION xpath\=id("rootCategory")/option[14] \# availability of second option indicates that category list has been loaded (2)
SELL_SUBCATEGORY_SELECT id\=tier2
SEARCH_FIELD id=search:searchTerm
@@ -53,4 +53,14 @@
BID_HISTORY_COUNT //table[@id='history']/tbody/tr
BID_OUTBID id=outbid
BID_HIGH_BIDDER id\=highBidder
-BID_HISTORY_BACK id\=back
\ No newline at end of file
+BID_HISTORY_BACK id\=back
+LIST_CATEGORIES_RESPONSE=<ns2\:listCategoriesResponse xmlns\:ns2\="http\://seambay.example.seam.jboss.org/"><return><categoryId>1</categoryId><name>Antiques</name></return><return><categoryId>2</categoryId><name>Art</name></return><return><categoryId>3</categoryId><name>Books</name></return><return><categoryId>4</categoryId><name>Cameras and Photography</name></return><return><categoryId>5</categoryId><name>Cars and Boats</name></return><return><categoryId>6</categoryId><name>Cell Phones</name></return><return><categoryId>7</categoryId><name>Clothing and Shoes</name></return><return><categoryId>8</categoryId><name>Computers</name></return><return><categoryId>9</categoryId><name>Music</name></return><return><categoryId>10</categoryId><name>Electronics</name></return><return><categoryId>11</categoryId><name>Home and Garden</name></return><return><categoryId>12</categoryId><name>Musical Instruments</name></return><return><categoryId>13</categoryId><name>Sporting goods</name></!
return><return><categoryId>14</categoryId><name>Toys</name></return><return><categoryId>15</categoryId><name>Video Games</name></return><return><categoryId>1001</categoryId><name>Furniture</name><parent><categoryId>1</categoryId><name>Antiques</name></parent></return><return><categoryId>1002</categoryId><name>Silverware</name><parent><categoryId>1</categoryId><name>Antiques</name></parent></return><return><categoryId>2001</categoryId><name>Paintings</name><parent><categoryId>2</categoryId><name>Art</name></parent></return><return><categoryId>2002</categoryId><name>Prints</name><parent><categoryId>2</categoryId><name>Art</name></parent></return><return><categoryId>2003</categoryId><name>Sculptures</name><parent><categoryId>2</categoryId><name>Art</name></parent></return><return><categoryId>3001</categoryId><name>Fiction</name><parent><categoryId>3</categoryId><name>Books</name></parent></return><return><categoryId>3002</categoryId><name>Non Fiction</name><parent><categoryId>!
3</categoryId><name>Books</name></parent></return><return><cat!
egoryId>
3003</categoryId><name>Comic Books</name><parent><categoryId>3</categoryId><name>Books</name></parent></return><return><categoryId>3004</categoryId><name>Children</name><parent><categoryId>3</categoryId><name>Books</name></parent></return><return><categoryId>4001</categoryId><name>Digital Cameras</name><parent><categoryId>4</categoryId><name>Cameras and Photography</name></parent></return><return><categoryId>4002</categoryId><name>Memory Cards</name><parent><categoryId>4</categoryId><name>Cameras and Photography</name></parent></return><return><categoryId>4003</categoryId><name>Film Cameras</name><parent><categoryId>4</categoryId><name>Cameras and Photography</name></parent></return><return><categoryId>4004</categoryId><name>Video Cameras</name><parent><categoryId>4</categoryId><name>Cameras and Photography</name></parent></return><return><categoryId>5001</categoryId><name>Cars</name><parent><categoryId>5</categoryId><name>Cars and Boats</name></parent></return><return><cate!
goryId>5002</categoryId><name>Motorcycles</name><parent><categoryId>5</categoryId><name>Cars and Boats</name></parent></return><return><categoryId>5003</categoryId><name>Car Parts</name><parent><categoryId>5</categoryId><name>Cars and Boats</name></parent></return><return><categoryId>6001</categoryId><name>Mobile Phones</name><parent><categoryId>6</categoryId><name>Cell Phones</name></parent></return><return><categoryId>6002</categoryId><name>Mobile Accessories</name><parent><categoryId>6</categoryId><name>Cell Phones</name></parent></return><return><categoryId>6003</categoryId><name>Prepaid cards</name><parent><categoryId>6</categoryId><name>Cell Phones</name></parent></return><return><categoryId>7001</categoryId><name>Women</name><parent><categoryId>7</categoryId><name>Clothing and Shoes</name></parent></return><return><categoryId>7002</categoryId><name>Men</name><parent><categoryId>7</categoryId><name>Clothing and Shoes</name></parent></return><return><categoryId>7003</c!
ategoryId><name>Girls</name><parent><categoryId>7</categoryId>!
<name>Cl
othing and Shoes</name></parent></return><return><categoryId>7004</categoryId><name>Boys</name><parent><categoryId>7</categoryId><name>Clothing and Shoes</name></parent></return><return><categoryId>7005</categoryId><name>Babies</name><parent><categoryId>7</categoryId><name>Clothing and Shoes</name></parent></return><return><categoryId>8001</categoryId><name>Notebooks</name><parent><categoryId>8</categoryId><name>Computers</name></parent></return><return><categoryId>8002</categoryId><name>Desktop PCs</name><parent><categoryId>8</categoryId><name>Computers</name></parent></return><return><categoryId>8003</categoryId><name>Servers</name><parent><categoryId>8</categoryId><name>Computers</name></parent></return><return><categoryId>8004</categoryId><name>Hardware</name><parent><categoryId>8</categoryId><name>Computers</name></parent></return><return><categoryId>8005</categoryId><name>Software</name><parent><categoryId>8</categoryId><name>Computers</name></parent></return><return><!
categoryId>9001</categoryId><name>CDs</name><parent><categoryId>9</categoryId><name>Music</name></parent></return><return><categoryId>9002</categoryId><name>Records</name><parent><categoryId>9</categoryId><name>Music</name></parent></return><return><categoryId>10001</categoryId><name>Home Audio</name><parent><categoryId>10</categoryId><name>Electronics</name></parent></return><return><categoryId>10002</categoryId><name>MP3 Players</name><parent><categoryId>10</categoryId><name>Electronics</name></parent></return><return><categoryId>10003</categoryId><name>Television</name><parent><categoryId>10</categoryId><name>Electronics</name></parent></return><return><categoryId>10004</categoryId><name>Home theatre</name><parent><categoryId>10</categoryId><name>Electronics</name></parent></return><return><categoryId>11001</categoryId><name>Kitchen</name><parent><categoryId>11</categoryId><name>Home and Garden</name></parent></return><return><categoryId>11002</categoryId><name>Real Esta!
te</name><parent><categoryId>11</categoryId><name>Home and Gar!
den</nam
e></parent></return><return><categoryId>11003</categoryId><name>Furniture</name><parent><categoryId>11</categoryId><name>Home and Garden</name></parent></return><return><categoryId>12001</categoryId><name>Guitars</name><parent><categoryId>12</categoryId><name>Musical Instruments</name></parent></return><return><categoryId>12002</categoryId><name>Pianos and Keyboards</name><parent><categoryId>12</categoryId><name>Musical Instruments</name></parent></return><return><categoryId>12003</categoryId><name>Percussion</name><parent><categoryId>12</categoryId><name>Musical Instruments</name></parent></return><return><categoryId>12004</categoryId><name>Orchestral</name><parent><categoryId>12</categoryId><name>Musical Instruments</name></parent></return><return><categoryId>13001</categoryId><name>Golf</name><parent><categoryId>13</categoryId><name>Sporting goods</name></parent></return><return><categoryId>13002</categoryId><name>Fishing</name><parent><categoryId>13</categoryId><name>Spo!
rting goods</name></parent></return><return><categoryId>13003</categoryId><name>Tennis</name><parent><categoryId>13</categoryId><name>Sporting goods</name></parent></return><return><categoryId>14001</categoryId><name>Remote control</name><parent><categoryId>14</categoryId><name>Toys</name></parent></return><return><categoryId>14002</categoryId><name>Cars and trucks</name><parent><categoryId>14</categoryId><name>Toys</name></parent></return><return><categoryId>14003</categoryId><name>Dolls</name><parent><categoryId>14</categoryId><name>Toys</name></parent></return><return><categoryId>14004</categoryId><name>Educational</name><parent><categoryId>14</categoryId><name>Toys</name></parent></return><return><categoryId>15001</categoryId><name>PC</name><parent><categoryId>15</categoryId><name>Video Games</name></parent></return><return><categoryId>15002</categoryId><name>Nintendo Wii</name><parent><categoryId>15</categoryId><name>Video Games</name></parent></return><return><categor!
yId>15003</categoryId><name>Sony Playstation 3</name><parent><!
category
Id>15</categoryId><name>Video Games</name></parent></return><return><categoryId>15004</categoryId><name>XBox 360</name><parent><categoryId>15</categoryId><name>Video Games</name></parent></return></ns2\:listCategoriesResponse>
+LOGIN_RIGHT_RESPONSE=<return>true</return>
+CREATE_NEW_AUCTION_RESPONSE=<ns2\:createAuctionResponse xmlns\:ns2\="http\://seambay.example.seam.jboss.org/"/>
+FIND_AUCTIONS_RESPONSE=<description>You can buy an animal here</description>
+UPDATE_AUCTION_RESPONSE=<ns2\:updateAuctionDetailsResponse xmlns\:ns2\="http\://seambay.example.seam.jboss.org/"/>
+SET_DURATION_RESPONSE=<ns2\:setAuctionDurationResponse xmlns\:ns2\="http\://seambay.example.seam.jboss.org/"/>
+SET_STARTING_PRICE_RESPONSE=<ns2\:setAuctionPriceResponse xmlns\:ns2\="http\://seambay.example.seam.jboss.org/"/>
+AUCTION_DETAILS_PRICE_RESPONSE=<ns2\:getNewAuctionDetailsResponse xmlns\:ns2\="http\://seambay.example.seam.jboss.org/"><return><account><accountId>1</accountId><feedbackPercent>0.0</feedbackPercent><feedbackScore>0</feedbackScore><location>Sydney, NSW, Australia</location>
+LOGOUT_RESPONSE=<ns2\:logoutResponse xmlns\:ns2\="http\://seambay.example.seam.jboss.org/"><return>true</return></ns2\:logoutResponse>
+CONFIRMATION_RESPONSE=<env\:Body><ns2\:confirmAuctionResponse xmlns\:ns2\="http\://seambay.example.seam.jboss.org/"/></env\:Body>
14 years, 8 months
Seam SVN: r11403 - branches/community/Seam_2_2/src/main/org/jboss/seam/jmx.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-08-18 13:36:33 -0400 (Tue, 18 Aug 2009)
New Revision: 11403
Modified:
branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java
Log:
JBSEAM-4029
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java 2009-08-18 17:18:28 UTC (rev 11402)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java 2009-08-18 17:36:33 UTC (rev 11403)
@@ -139,11 +139,9 @@
protected MBeanServer locateJBoss()
{
- for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext(); )
- {
- MBeanServer server = (MBeanServer) i.next();
- if (server.getDefaultDomain().equals("jboss"))
- {
+ for (Object o: MBeanServerFactory.findMBeanServer(null)) {
+ MBeanServer server = (MBeanServer) o;
+ if ("jboss".equals(server.getDefaultDomain())) {
return server;
}
}
14 years, 8 months
Seam SVN: r11402 - in branches/community/Seam_2_2_Drools5: src/main/org/jboss/seam and 1 other directories.
by seam-commits＠lists.jboss.org
Author: tsurdilovic
Date: 2009-08-18 13:18:28 -0400 (Tue, 18 Aug 2009)
New Revision: 11402
Modified:
branches/community/Seam_2_2_Drools5/examples/drools/resources/WEB-INF/components.xml
branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools-2.2.xsd
branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeBase.java
Log:
Drools5 Integration.
Modified: branches/community/Seam_2_2_Drools5/examples/drools/resources/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_2_Drools5/examples/drools/resources/WEB-INF/components.xml 2009-08-18 15:43:09 UTC (rev 11401)
+++ branches/community/Seam_2_2_Drools5/examples/drools/resources/WEB-INF/components.xml 2009-08-18 17:18:28 UTC (rev 11402)
@@ -13,6 +13,9 @@
<drools:rule-resources>
<value>classpath;numberguess.drl;DRL</value>
</drools:rule-resources>
+ <drools:event-listeners>
+ <value>org.drools.event.knowledgebase.DefaultKnowledgeBaseEventListener</value>
+ </drools:event-listeners>
</drools:knowledge-base>
<drools:knowledge-agent name="kagent" agent-name="myAgent" scan-resources="true" scan-directories="false"
Modified: branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeBase.java
===================================================================
--- branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeBase.java 2009-08-18 15:43:09 UTC (rev 11401)
+++ branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeBase.java 2009-08-18 17:18:28 UTC (rev 11402)
@@ -16,6 +16,10 @@
import org.drools.builder.KnowledgeBuilderErrors;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.builder.ResourceType;
+import org.drools.event.knowledgebase.KnowledgeBaseEventListener;
+import org.drools.event.process.ProcessEventListener;
+import org.drools.event.rule.AgendaEventListener;
+import org.drools.event.rule.WorkingMemoryEventListener;
import org.drools.io.ResourceFactory;
import org.drools.template.ObjectDataCompiler;
import org.jboss.seam.Component;
@@ -52,6 +56,7 @@
private String knowledgeBuilderConfig;
private String knowledgeBaseConfig;
private String[] ruleResources;
+ private String[] eventListeners;
private org.drools.KnowledgeBase kbase;
@Create
@@ -117,9 +122,29 @@
kbase = KnowledgeBaseFactory.newKnowledgeBase(kbaseconfig);
kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
+ if(eventListeners != null) {
+ for(String eventListener : eventListeners) {
+ setEventListener(kbase, eventListener);
+ }
+ }
}
+ protected void setEventListener(org.drools.KnowledgeBase kbase, String eventListener) {
+ try {
+ Class eventListenerClass = Class.forName(eventListener);
+ Object eventListenerObject = eventListenerClass.newInstance();
+
+ if(eventListenerObject instanceof KnowledgeBaseEventListener) {
+ kbase.addEventListener((KnowledgeBaseEventListener) eventListenerObject);
+ } else {
+ log.warn("event Listener " + eventListener + " is not of valid type");
+ }
+ } catch(Exception e) {
+ log.warn("error adding event listener " + eventListener);
+ }
+ }
+
@Unwrap
public org.drools.KnowledgeBase getKnowledgeBase()
{
Modified: branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools-2.2.xsd
===================================================================
--- branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools-2.2.xsd 2009-08-18 15:43:09 UTC (rev 11401)
+++ branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools-2.2.xsd 2009-08-18 17:18:28 UTC (rev 11402)
@@ -72,6 +72,8 @@
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element minOccurs="0" maxOccurs="1"
ref="drools:rule-resources" />
+ <xs:element minOccurs="0" maxOccurs="1"
+ ref="drools:event-listeners" />
</xs:choice>
<xs:attributeGroup ref="components:attlist.component" />
<xs:attributeGroup ref="drools:attlist.KnowledgeBase" />
14 years, 8 months
Seam SVN: r11401 - in branches/enterprise/JBPAPP_5_0/seam-gen/resources: WEB-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-08-18 11:43:09 -0400 (Tue, 18 Aug 2009)
New Revision: 11401
Modified:
branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-dev-war.xml
branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-prod-war.xml
branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-test-war.xml
branches/enterprise/JBPAPP_5_0/seam-gen/resources/WEB-INF/components-war.xml
Log:
JBPAPP-2493
Modified: branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-dev-war.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-dev-war.xml 2009-08-18 15:00:22 UTC (rev 11400)
+++ branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-dev-war.xml 2009-08-18 15:43:09 UTC (rev 11401)
@@ -13,8 +13,7 @@
<property name="hibernate.hbm2ddl.auto" value="@hbm2ddl@"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.format_sql" value="true"/>@catalogProperty@@schemaProperty@
- <!-- Only relevant if Seam is loading the persistence unit (Java SE bootstrap) -->
- <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+ <property name="jboss.entity.manager.factory.jndi.name" value="java:/@projectName@EntityManagerFactory"/>
</properties>
</persistence-unit>
Modified: branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-prod-war.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-prod-war.xml 2009-08-18 15:00:22 UTC (rev 11400)
+++ branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-prod-war.xml 2009-08-18 15:43:09 UTC (rev 11401)
@@ -12,8 +12,7 @@
<property name="hibernate.dialect" value="@hibernate.dialect@"/>
<property name="hibernate.hbm2ddl.auto" value="validate"/>
<property name="hibernate.jdbc.batch_size" value="20"/>@catalogProperty@@schemaProperty@
- <!-- Only relevant if Seam is loading the persistence unit (Java SE bootstrap) -->
- <property name="hibernate.transaction.manager_lookup_class" value="@transactionManagerLookupClass@"/>
+ <property name="jboss.entity.manager.factory.jndi.name" value="java:/@projectName@EntityManagerFactory"/>
</properties>
</persistence-unit>
Modified: branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-test-war.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-test-war.xml 2009-08-18 15:00:22 UTC (rev 11400)
+++ branches/enterprise/JBPAPP_5_0/seam-gen/resources/META-INF/persistence-test-war.xml 2009-08-18 15:43:09 UTC (rev 11401)
@@ -12,7 +12,7 @@
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.cache.use_second_level_cache" value="false"/>
- <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+ <property name="jboss.entity.manager.factory.jndi.name" value="java:/@projectName@EntityManagerFactory"/>
</properties>
</persistence-unit>
Modified: branches/enterprise/JBPAPP_5_0/seam-gen/resources/WEB-INF/components-war.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/seam-gen/resources/WEB-INF/components-war.xml 2009-08-18 15:00:22 UTC (rev 11400)
+++ branches/enterprise/JBPAPP_5_0/seam-gen/resources/WEB-INF/components-war.xml 2009-08-18 15:43:09 UTC (rev 11401)
@@ -28,12 +28,10 @@
<!-- Make sure this URL pattern is the same as that used by the Faces Servlet -->
<web:hot-deploy-filter url-pattern="*.seam"/>
- <persistence:entity-manager-factory name="entityManagerFactory"
- persistence-unit-name="@projectName@"/>
+ <persistence:managed-persistence-context
+ name="entityManager" auto-create="true"
+ persistence-unit-jndi-name="java:/@projectName@EntityManagerFactory"/>
- <persistence:managed-persistence-context name="entityManager" auto-create="true"
- entity-manager-factory="#{entityManagerFactory}"/>
-
<drools:rule-base name="securityRules">
<drools:rule-files><value>/security.drl</value></drools:rule-files>
</drools:rule-base>
14 years, 8 months
Seam SVN: r11400 - branches/community/Seam_2_2/seam-gen/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-18 11:00:22 -0400 (Tue, 18 Aug 2009)
New Revision: 11400
Modified:
branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml
Log:
JBDS-828, JBSEAM-4276
Modified: branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml 2009-08-18 13:55:31 UTC (rev 11399)
+++ branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml 2009-08-18 15:00:22 UTC (rev 11400)
@@ -36,7 +36,7 @@
<!-- entity-manager-factory="#{entityManagerFactory}"/>-->
<persistence:managed-persistence-context name="entityManager" auto-create="true"
- persistence-unit-jndi-name="@projectName@EntityManagerFactory"/>
+ persistence-unit-jndi-name="java:/@projectName@EntityManagerFactory"/>
<drools:rule-base name="securityRules">
<drools:rule-files><value>/security.drl</value></drools:rule-files>
14 years, 8 months
Seam SVN: r11399 - in branches/community/Seam_2_2_Drools5: src/main/org/jboss/seam/drools and 1 other directory.
by seam-commits＠lists.jboss.org
Author: tsurdilovic
Date: 2009-08-18 09:55:31 -0400 (Tue, 18 Aug 2009)
New Revision: 11399
Modified:
branches/community/Seam_2_2_Drools5/examples/drools/resources/WEB-INF/components.xml
branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeAgent.java
branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeBase.java
Log:
Drools5 Integration.
Modified: branches/community/Seam_2_2_Drools5/examples/drools/resources/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_2_Drools5/examples/drools/resources/WEB-INF/components.xml 2009-08-18 12:32:17 UTC (rev 11398)
+++ branches/community/Seam_2_2_Drools5/examples/drools/resources/WEB-INF/components.xml 2009-08-18 13:55:31 UTC (rev 11399)
@@ -11,14 +11,14 @@
<drools:knowledge-base name="kbase" knowledge-builder-config="kbuilderconfig.properties" knowledge-base-config="kbaseconfig.properties">
<drools:rule-resources>
- <value>classpath:numberguess.drl:DRL</value>
+ <value>classpath;numberguess.drl;DRL</value>
</drools:rule-resources>
</drools:knowledge-base>
<drools:knowledge-agent name="kagent" agent-name="myAgent" scan-resources="true" scan-directories="false"
monitor-change-set-events="true" scan-interval="30">
<drools:change-sets>
- <value>classpath:numberguesschangeset.xml</value>
+ <value>classpath;numberguesschangeset.xml</value>
</drools:change-sets>
</drools:knowledge-agent>
@@ -32,7 +32,7 @@
<drools:knowledge-base name="kbase2" knowledge-builder-config="kbuilderconfig.properties" knowledge-base-config="kbaseconfig.properties">
<drools:rule-resources>
- <value>classpath:test.drl:DRL</value>
+ <value>classpath;test.drl;DRL</value>
</drools:rule-resources>
</drools:knowledge-base>
@@ -50,7 +50,7 @@
<drools:knowledge-base name="kbase3" knowledge-builder-config="kbuilderconfig.properties" knowledge-base-config="kbaseconfig.properties">
<drools:rule-resources>
- <value>classpath:test2.drl:DRL</value>
+ <value>classpath;test2.drl;DRL</value>
</drools:rule-resources>
</drools:knowledge-base>
@@ -67,7 +67,7 @@
<drools:knowledge-base name="kbase4" knowledge-builder-config="kbuilderconfig.properties" knowledge-base-config="kbaseconfig.properties">
<drools:rule-resources>
- <value>classpath:testtemplate.drl:DRL:testTemplateDataProvider</value>
+ <value>classpath;testtemplate.drl;DRL;testTemplateDataProvider</value>
</drools:rule-resources>
</drools:knowledge-base>
Modified: branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeAgent.java
===================================================================
--- branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeAgent.java 2009-08-18 12:32:17 UTC (rev 11398)
+++ branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeAgent.java 2009-08-18 13:55:31 UTC (rev 11399)
@@ -32,7 +32,7 @@
public class KnowledgeAgent
{
private static final LogProvider log = Logging.getLogProvider(RuleAgent.class);
- private static final Pattern COLON = Pattern.compile(":");
+ private static final Pattern DIVIDER = Pattern.compile(";");
private static final int RESOURCE_PATH = 0;
private static final int RESOURCE = 1;
private static final String RESOURCE_TYPE_URL = "url";
@@ -115,7 +115,7 @@
}
private void applyChangeSet(org.drools.agent.KnowledgeAgent kagent, String changeSet) {
- String[] resourceParts = COLON.split(changeSet.trim());
+ String[] resourceParts = DIVIDER.split(changeSet.trim());
if(resourceParts.length != 2) {
log.error("Unable to use changeset: " + changeSet);
Modified: branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeBase.java
===================================================================
--- branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeBase.java 2009-08-18 12:32:17 UTC (rev 11398)
+++ branches/community/Seam_2_2_Drools5/src/main/org/jboss/seam/drools/KnowledgeBase.java 2009-08-18 13:55:31 UTC (rev 11399)
@@ -40,7 +40,7 @@
public class KnowledgeBase
{
private static final LogProvider log = Logging.getLogProvider(KnowledgeBase.class);
- private static final Pattern COLON = Pattern.compile(":");
+ private static final Pattern DIVIDER = Pattern.compile(";");
private static final int RESOURCE_PATH = 0;
private static final int RESOURCE = 1;
private static final int RESOURCE_TYPE = 2;
@@ -158,7 +158,7 @@
protected void addResource(KnowledgeBuilder kbuilder, String resource)
{
- String[] resourceParts = COLON.split(resource.trim());
+ String[] resourceParts = DIVIDER.split(resource.trim());
if (resourceParts.length < 3)
{
14 years, 8 months
Seam SVN: r11398 - in branches/community/Seam_2_2/seam-gen/resources: WEB-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-18 08:32:17 -0400 (Tue, 18 Aug 2009)
New Revision: 11398
Modified:
branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-dev-war.xml
branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-prod-war.xml
branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-test-war.xml
branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml
Log:
JBDS-828, JBSEAM-4276
Modified: branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-dev-war.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-dev-war.xml 2009-08-18 11:36:14 UTC (rev 11397)
+++ branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-dev-war.xml 2009-08-18 12:32:17 UTC (rev 11398)
@@ -13,8 +13,7 @@
<property name="hibernate.hbm2ddl.auto" value="@hbm2ddl@"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.format_sql" value="true"/>@catalogProperty@@schemaProperty@
- <!-- Only relevant if Seam is loading the persistence unit (Java SE bootstrap) -->
- <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+ <property name="jboss.entity.manager.factory.jndi.name" value="java:/@projectName@EntityManagerFactory"/>
</properties>
</persistence-unit>
Modified: branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-prod-war.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-prod-war.xml 2009-08-18 11:36:14 UTC (rev 11397)
+++ branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-prod-war.xml 2009-08-18 12:32:17 UTC (rev 11398)
@@ -12,8 +12,7 @@
<property name="hibernate.dialect" value="@hibernate.dialect@"/>
<property name="hibernate.hbm2ddl.auto" value="validate"/>
<property name="hibernate.jdbc.batch_size" value="20"/>@catalogProperty@@schemaProperty@
- <!-- Only relevant if Seam is loading the persistence unit (Java SE bootstrap) -->
- <property name="hibernate.transaction.manager_lookup_class" value="@transactionManagerLookupClass@"/>
+ <property name="jboss.entity.manager.factory.jndi.name" value="java:/@projectName@EntityManagerFactory"/>
</properties>
</persistence-unit>
Modified: branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-test-war.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-test-war.xml 2009-08-18 11:36:14 UTC (rev 11397)
+++ branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-test-war.xml 2009-08-18 12:32:17 UTC (rev 11398)
@@ -12,7 +12,7 @@
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.cache.use_second_level_cache" value="false"/>
- <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+ <property name="jboss.entity.manager.factory.jndi.name" value="java:/@projectName@EntityManagerFactory"/>
</properties>
</persistence-unit>
Modified: branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml 2009-08-18 11:36:14 UTC (rev 11397)
+++ branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml 2009-08-18 12:32:17 UTC (rev 11398)
@@ -36,7 +36,7 @@
<!-- entity-manager-factory="#{entityManagerFactory}"/>-->
<persistence:managed-persistence-context name="entityManager" auto-create="true"
- persistence-unit-jndi-name="@projectName@"/>
+ persistence-unit-jndi-name="@projectName@EntityManagerFactory"/>
<drools:rule-base name="securityRules">
<drools:rule-files><value>/security.drl</value></drools:rule-files>
14 years, 8 months