Seam SVN: r14049 - branches/enterprise/JBPAPP_5_0/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2011-02-16 06:44:05 -0500 (Wed, 16 Feb 2011)
New Revision: 14049
Modified:
branches/enterprise/JBPAPP_5_0/build/ci.settings.xml
Log:
fixing maven repositories list for hudson jobs
Modified: branches/enterprise/JBPAPP_5_0/build/ci.settings.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/ci.settings.xml 2011-02-16 10:09:15 UTC (rev 14048)
+++ branches/enterprise/JBPAPP_5_0/build/ci.settings.xml 2011-02-16 11:44:05 UTC (rev 14049)
@@ -264,15 +264,13 @@
</properties>
</profile>
-->
-
-
<profile>
<id>jboss-product-repository</id>
<repositories>
<repository>
<id>jboss-product-repository</id>
<name>JBoss Product Maven Repository</name>
- <url>http://download.devel.redhat.com/brewroot/repos/mead-shared-build/latest/...</url>
+ <url>http://repository.jboss.org/maven2-brew/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
@@ -288,6 +286,26 @@
<pluginRepository>
<id>jboss-product-repository</id>
<name>JBoss Product Maven Repository</name>
+ <url>http://repository.jboss.org/maven2-brew/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <profile>
+ <id>jboss-mead-repository</id>
+ <repositories>
+ <repository>
+ <id>jboss-mead-repository</id>
+ <name>JBoss Mead Maven Repository</name>
<url>http://download.devel.redhat.com/brewroot/repos/mead-shared-build/latest/...</url>
<layout>default</layout>
<releases>
@@ -295,8 +313,24 @@
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-mead-repository</id>
+ <name>JBoss Mead Maven Repository</name>
+ <url>http://download.devel.redhat.com/brewroot/repos/mead-shared-build/latest/...</url>
+ <layout>default</layout>
+ <releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
@@ -373,6 +407,7 @@
<activeProfiles>
<activeProfile>jboss-product-repository</activeProfile>
+ <activeProfile>jboss-mead-repository</activeProfile>
<activeProfile>jboss-public-repository</activeProfile>
<activeProfile>jboss-snapshot-repository</activeProfile>
</activeProfiles>
13 years, 10 months
Seam SVN: r14048 - branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2011-02-16 05:09:15 -0500 (Wed, 16 Feb 2011)
New Revision: 14048
Modified:
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/BidTest.java
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/SeleniumSeamBayTest.java
Log:
JBPAPP-5057
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/BidTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/BidTest.java 2011-02-15 23:17:51 UTC (rev 14047)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/BidTest.java 2011-02-16 10:09:15 UTC (rev 14048)
@@ -26,7 +26,6 @@
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.fail;
-import org.jboss.seam.example.common.test.selenium.SeamSelenium;
import org.testng.annotations.Test;
/**
@@ -60,46 +59,46 @@
{
String firstBidderName = "honestjoe";
String secondBidderName = "bidTester";
+ String secondBidderPassword = "password";
String title = "Nikon D80 Digital Camera";
- SeamSelenium firstBrowser = browser;
- SeamSelenium secondBrowser = startBrowser();
- try
+ /*
+ * Second user registers, logs in and places a bid
+ */
+ browser.clickAndWait(getProperty("REGISTRATION"));
+ submitRegistrationForm(secondBidderName, secondBidderPassword, secondBidderPassword, "Slovakia");
+ assertTrue("Creating new user failed.", isLoggedIn());
+ // place a bid for a camera
+ search(title);
+ browser.clickAndWait(getProperty("SEARCH_RESULTS_FIRST_ROW_LINK"));
+ placeBid("2000");
+ logout();
+ /*
+ * First user logs in and places several bids
+ */
+ browser.open(CONTEXT_PATH + getProperty("HOME_PAGE"));
+ login();
+ search(title);
+ browser.clickAndWait(getProperty("SEARCH_RESULTS_FIRST_ROW_LINK"));
+ for (int i = 1100; i < 2000; i += 200)
{
- // register new user in first browser
- browser.clickAndWait(getProperty("REGISTRATION"));
- submitRegistrationForm(secondBidderName, "password", "password", "Slovakia");
- assertTrue("Creating new user failed.", isLoggedIn());
- // place a bid for a camera
- search(title);
- browser.clickAndWait(getProperty("SEARCH_RESULTS_FIRST_ROW_LINK"));
- placeBid("2000");
- // switch to second browser and place several bids
- browser = secondBrowser;
- browser.open(CONTEXT_PATH + getProperty("HOME_PAGE"));
- login();
- search(title);
- browser.clickAndWait(getProperty("SEARCH_RESULTS_FIRST_ROW_LINK"));
- for (int i = 1100; i < 2000; i += 200)
- {
- placeBid(String.valueOf(i));
- assertTrue("'You have been outbid' page expected.", browser.isElementPresent(getProperty("BID_OUTBID")));
- }
- placeBid("2200");
- assertFalse("Outbid unexpectedly", browser.isElementPresent(getProperty("BID_OUTBID")));
- assertEquals("High bidder not recognized.", firstBidderName, browser.getText(getProperty("BID_HIGH_BIDDER")));
- // switch to first browser again and place the highest bid again
- browser = firstBrowser;
- placeBid("2100");
+ placeBid(String.valueOf(i));
assertTrue("'You have been outbid' page expected.", browser.isElementPresent(getProperty("BID_OUTBID")));
- placeBid("2500");
- assertEquals("High bidder not recognized.", secondBidderName, browser.getText(getProperty("BID_HIGH_BIDDER")));
}
- finally
- {
- browser = firstBrowser;
- secondBrowser.stop();
- }
+ placeBid("2200");
+ assertFalse("Outbid unexpectedly", browser.isElementPresent(getProperty("BID_OUTBID")));
+ assertEquals("High bidder not recognized.", firstBidderName, browser.getText(getProperty("BID_HIGH_BIDDER")));
+ logout();
+ /*
+ * Switch to the second user again and place the highest bid again
+ */
+ login(secondBidderName, secondBidderPassword);
+ search(title);
+ browser.clickAndWait(getProperty("SEARCH_RESULTS_FIRST_ROW_LINK"));
+ placeBid("2100");
+ assertTrue("'You have been outbid' page expected.", browser.isElementPresent(getProperty("BID_OUTBID")));
+ placeBid("2500");
+ assertEquals("High bidder not recognized.", secondBidderName, browser.getText(getProperty("BID_HIGH_BIDDER")));
}
public void placeBid(String price)
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/SeleniumSeamBayTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/SeleniumSeamBayTest.java 2011-02-15 23:17:51 UTC (rev 14047)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/seambay/src/org/jboss/seam/example/seambay/test/selenium/SeleniumSeamBayTest.java 2011-02-16 10:09:15 UTC (rev 14048)
@@ -67,6 +67,11 @@
{
return browser.isElementPresent(getProperty("LOGOUT"));
}
+
+ public void logout()
+ {
+ browser.clickAndWait(getProperty("LOGOUT"));
+ }
public void submitRegistrationForm(String username, String password, String verify, String location)
{
13 years, 10 months
[seam/persistence] d5c9de: SEAMPERSIST-14 Allow @Transactional on stereotypes
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/seam/persistence
Commit: d5c9de7f42df4d7e4d6c5cd29da9b3c30ecc1b80
https://github.com/seam/persistence/commit/d5c9de7f42df4d7e4d6c5cd29da9b3...
Author: Stuart Douglas <stuart.w.douglas(a)gmail.com>
Date: 2011-02-15 (Tue, 15 Feb 2011)
Changed paths:
M impl/src/main/java/org/jboss/seam/persistence/transaction/TransactionExtension.java
M impl/src/main/java/org/jboss/seam/persistence/transaction/TransactionInterceptor.java
A tests/base/src/main/java/org/jboss/seam/persistence/transactions/test/StereotypeTransactionManagedBean.java
A tests/base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionInterceptorStereotypeTestBase.java
A tests/base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionalStereotype.java
A tests/jbossas-hibernate/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionInterceptorStereotypeTest.java
Log Message:
-----------
SEAMPERSIST-14 Allow @Transactional on stereotypes
13 years, 10 months
Seam SVN: r14047 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2011-02-15 18:17:51 -0500 (Tue, 15 Feb 2011)
New Revision: 14047
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcess.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java
Log:
JBPAPP-5517 cleaning log messages while throwing exception
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcess.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcess.java 2011-02-15 13:40:09 UTC (rev 14046)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcess.java 2011-02-15 23:17:51 UTC (rev 14047)
@@ -220,7 +220,7 @@
}
}
catch (Exception e) {
- log.error("Exception while ending bussiness task!");
+ // log.error("Exception while ending bussiness task!");
processId = null;
taskId = null;
throw new RuntimeException(e);
@@ -250,7 +250,7 @@
}
catch (Exception e)
{
- log.error("Exception while transition is in process!");
+ //log.error("Exception while transition is in process!");
processId = null;
taskId = null;
throw new RuntimeException(e);
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java 2011-02-15 13:40:09 UTC (rev 14046)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java 2011-02-15 23:17:51 UTC (rev 14047)
@@ -17,14 +17,12 @@
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.BijectionInterceptor;
-import org.jboss.seam.core.EventInterceptor;
import org.jboss.seam.core.Expressions;
import org.jboss.seam.core.Init;
import org.jboss.seam.intercept.AbstractInterceptor;
import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
-import org.jboss.seam.transaction.TransactionInterceptor;
import org.jboss.seam.util.Strings;
import org.jboss.seam.web.Parameters;
@@ -68,7 +66,7 @@
return BusinessProcess.instance().resumeTask(taskId);
}
catch (Exception e) {
- log.error("BusinessProcess.resumeTask thrown exception!");
+ //log.warn("BusinessProcess.resumeTask thrown exception!");
return false;
}
}
@@ -82,7 +80,7 @@
return BusinessProcess.instance().resumeTask(taskId);
}
catch (Exception e) {
- log.error("BusinessProcess.resumeTask thrown exception!");
+ //log.warn("BusinessProcess.resumeTask thrown exception!");
return false;
}
}
@@ -97,7 +95,14 @@
}
else
{
- return BusinessProcess.instance().resumeProcess( tag.definition(), getProcessKey( tag.processKey() ) );
+ try
+ {
+ return BusinessProcess.instance().resumeProcess( tag.definition(), getProcessKey( tag.processKey() ) );
+ }
+ catch (Exception e) {
+ //log.warn("BusinessProcess.resumeTask thrown exception!");
+ return false;
+ }
}
}
if ( method.isAnnotationPresent(EndTask.class) )
@@ -142,7 +147,7 @@
BusinessProcess.instance().endTask( method.getAnnotation(EndTask.class).transition() );
}
catch (Exception e) {
- log.error("Closing JBPM context because exception(s) was thrown!", e);
+ //log.error("Closing JBPM context because exception(s) was thrown!", e);
throw new RuntimeException(e);
}
finally
@@ -161,7 +166,7 @@
BusinessProcess.instance().transition(transitionName);
}
catch (Exception e) {
- log.error("Closing JBPM context because exception(s) was thrown!", e);
+ //log.error("Closing JBPM context because exception(s) was thrown!", e);
throw new RuntimeException(e);
}
finally
13 years, 10 months
[seam/validation] 6da5c3: SEAMVALIDATE-2: Use HV 4.2.0.Beta1 instead of snap...
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/seam/validation
Commit: 6da5c351cc60345cd097b0711e4a5c32131728a6
https://github.com/seam/validation/commit/6da5c351cc60345cd097b0711e4a5c3...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-15 (Tue, 15 Feb 2011)
Changed paths:
M parent/pom.xml
Log Message:
-----------
SEAMVALIDATE-2: Use HV 4.2.0.Beta1 instead of snapshot dependency to ensure a stable build
Commit: 98b10fd3a5435a718389fc40e8e87b2d46e9362f
https://github.com/seam/validation/commit/98b10fd3a5435a718389fc40e8e87b2...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-15 (Tue, 15 Feb 2011)
Changed paths:
A impl/src/test/resources/META-INF/beans.xml
Log Message:
-----------
SEAMVALIDATE-2: provide beans.xml for unit tests
Commit: d4f12014820fadb36c7a56d5964725cefeb2db6b
https://github.com/seam/validation/commit/d4f12014820fadb36c7a56d5964725c...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-15 (Tue, 15 Feb 2011)
Changed paths:
R example/etc/license.txt
A example/helloworld/etc/license.txt
A example/helloworld/pom.xml
A example/helloworld/src/main/java/org/jboss/seam/validation/HelloWorldService.java
A example/helloworld/src/main/java/org/jboss/seam/validation/HelloWorldServlet.java
A example/helloworld/src/main/resources/META-INF/beans.xml
A example/helloworld/src/main/webapp-jee/WEB-INF/web.xml
A example/helloworld/src/main/webapp-jetty/WEB-INF/jetty-env.xml
A example/helloworld/src/main/webapp-jetty/WEB-INF/jetty-web.xml
A example/helloworld/src/main/webapp-jetty/WEB-INF/web.xml
A example/helloworld/src/main/webapp/WEB-INF/beans.xml
A example/helloworld/src/main/webapp/index.html
A example/helloworld/src/test/java/org/jboss/seam/validation/JettyRunner.java
R example/pom.xml
R example/src/main/java/org/jboss/seam/validation/HelloWorldService.java
R example/src/main/java/org/jboss/seam/validation/HelloWorldServlet.java
R example/src/main/resources/META-INF/beans.xml
R example/src/main/webapp-jee/WEB-INF/web.xml
R example/src/main/webapp-jetty/WEB-INF/jetty-env.xml
R example/src/main/webapp-jetty/WEB-INF/jetty-web.xml
R example/src/main/webapp-jetty/WEB-INF/web.xml
R example/src/main/webapp/WEB-INF/beans.xml
R example/src/main/webapp/index.html
R example/src/test/java/org/jboss/seam/validation/JettyRunner.java
M parent/pom.xml
M pom.xml
Log Message:
-----------
Merge branch 'master' of github.com:seam/validation
13 years, 10 months
[seam/forge] 471371: Prototyped signal handling (only works on OpenJDK/...
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/seam/forge
Commit: 4713718bb4a8f40b20ab438912c49253849a8dfa
https://github.com/seam/forge/commit/4713718bb4a8f40b20ab438912c49253849a...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2011-02-15 (Tue, 15 Feb 2011)
Changed paths:
M dev-plugins/src/main/java/org/jboss/seam/forge/dev/java/JavaPlugin.java
M dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/LsMavenPomPlugin.java
M j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/jpa/NewEntityPlugin.java
M j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/jpa/NewFieldPlugin.java
M j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/jsf/FacesFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/dependencies/DependencyImpl.java
M scaffold-plugin/src/main/java/org/jboss/seam/forge/scaffold/ScaffoldProviderCompleter.java
M scaffold-plugin/src/main/java/org/jboss/seam/forge/scaffold/plugins/ForgeDefaultScaffold.java
M scaffold-plugin/src/main/java/org/jboss/seam/forge/scaffold/plugins/GenPlugin.java
M scaffold-plugin/src/main/java/org/jboss/seam/forge/scaffold/plugins/ProfileCompleter.java
M scaffold-plugin/src/main/java/org/jboss/seam/forge/scaffold/plugins/ScaffoldPlugin.java
M shell-api/src/main/java/org/jboss/seam/forge/shell/plugins/Current.java
M shell-api/src/main/java/org/jboss/seam/forge/shell/project/ResourceScoped.java
M shell/src/main/java/org/jboss/seam/forge/shell/Bootstrap.java
M shell/src/main/java/org/jboss/seam/forge/shell/command/CommandLibraryExtension.java
M shell/src/main/java/org/jboss/seam/forge/shell/completer/AvailableFacetsCompleter.java
M shell/src/main/java/org/jboss/seam/forge/shell/completer/ShellEnvCompleter.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/ChangeDirectoryPlugin.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/InstallPluginPlugin.java
M shell/src/main/java/org/jboss/seam/forge/shell/project/CurrentProject.java
M shell/src/main/java/org/jboss/seam/forge/shell/project/ProjectInitializer.java
M shell/src/main/java/org/jboss/seam/forge/shell/project/resources/CurrentResource.java
M shell/src/main/java/org/jboss/seam/forge/shell/project/resources/ResourceProducer.java
M shell/src/main/java/org/jboss/seam/forge/shell/project/resources/ResourceScopedContext.java
M shell/src/main/java/org/jboss/seam/forge/shell/util/PluginUtil.java
Log Message:
-----------
Prototyped signal handling (only works on OpenJDK/Sun JVMs)
13 years, 10 months
Seam SVN: r14046 - branches/enterprise/JBPAPP_5_0/examples/tasks/view.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2011-02-15 08:40:09 -0500 (Tue, 15 Feb 2011)
New Revision: 14046
Modified:
branches/enterprise/JBPAPP_5_0/examples/tasks/view/tasks.js
Log:
JBPAPP-5039
Modified: branches/enterprise/JBPAPP_5_0/examples/tasks/view/tasks.js
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/tasks/view/tasks.js 2011-02-15 13:23:11 UTC (rev 14045)
+++ branches/enterprise/JBPAPP_5_0/examples/tasks/view/tasks.js 2011-02-15 13:40:09 UTC (rev 14046)
@@ -20,16 +20,17 @@
var update = $('<input/>').attr('type', 'button').attr('id', 'update').val('Update').click(function() {
var newCategoryName = $(categories).val();
+ var taskName = $(name).val();
var callback = function(data) {
removeTaskEditForm(taskId, taskName);
if (categoryName == newCategoryName) {
- updateTaskNameOnUI(taskId, data); // just update the name
+ updateTaskNameOnUI(taskId, taskName); // just update the name
} else {
$('#' + taskId).remove(); // add the task into new category
addTask(data, newCategoryName);
}
}
- putTask(newCategoryName, taskId, $(name).val(), false, callback);
+ putTask(newCategoryName, taskId, taskName, false, callback);
});
var form = $('<form/>').attr('id', 'updateTask').append(categories).append(name).append(update);
$('#' + taskId + ' .name').replaceWith(form);
@@ -91,7 +92,6 @@
$('<tr/>').attr('id', taskId).append(buttonCell).append(nameCell).insertAfter('[id=' + categoryName + ']');
}
-function updateTaskNameOnUI(taskId, task) {
- var taskName = $(task).find('name').text();
+function updateTaskNameOnUI(taskId, taskName) {
$('#' + taskId + " .name").text(taskName);
}
13 years, 10 months
Seam SVN: r14045 - in branches/enterprise/JBPAPP_5_0/src/test/integration: src/org/jboss/seam/test/integration and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2011-02-15 08:23:11 -0500 (Tue, 15 Feb 2011)
New Revision: 14045
Modified:
branches/enterprise/JBPAPP_5_0/src/test/integration/resources/jbpm.cfg.xml
branches/enterprise/JBPAPP_5_0/src/test/integration/resources/testProcess5.jpdl.xml
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/BusinessProcessTest.java
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java
Log:
JBPAPP-5517 - integration test for exception handling in jbpm EL expression
Modified: branches/enterprise/JBPAPP_5_0/src/test/integration/resources/jbpm.cfg.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/integration/resources/jbpm.cfg.xml 2011-02-15 12:10:45 UTC (rev 14044)
+++ branches/enterprise/JBPAPP_5_0/src/test/integration/resources/jbpm.cfg.xml 2011-02-15 13:23:11 UTC (rev 14045)
@@ -1,13 +1,15 @@
<jbpm-configuration>
<jbpm-context>
- <service name="persistence">
- <factory>
- <bean class="org.jbpm.persistence.db.DbPersistenceServiceFactory">
- <field name="isTransactionEnabled"><false/></field>
- </bean>
- </factory>
- </service>
+
+ <service name="persistence" factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
+<!-- <service name="persistence">-->
+<!-- <factory>-->
+<!-- <bean class="org.jbpm.persistence.db.DbPersistenceServiceFactory">-->
+<!-- <field name="isTransactionEnabled"><false/></field>-->
+<!-- </bean>-->
+<!-- </factory>-->
+<!-- </service>-->
<service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
<service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
<service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
Modified: branches/enterprise/JBPAPP_5_0/src/test/integration/resources/testProcess5.jpdl.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/integration/resources/testProcess5.jpdl.xml 2011-02-15 12:10:45 UTC (rev 14044)
+++ branches/enterprise/JBPAPP_5_0/src/test/integration/resources/testProcess5.jpdl.xml 2011-02-15 13:23:11 UTC (rev 14045)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<process-definition
- name="OrderManagement"
+ name="TestProcess5"
xmlns="urn:jbpm.org:jpdl-3.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd"
@@ -12,17 +12,14 @@
</start-state>
<task-node name="process" end-tasks="true">
- <task name="ship" description="Ship order">
- <assignment pooled-actors="#{shipperAssignment.pooledActors}"/>
- </task>
<transition name="shipped" to="problem">
- <action expression="#{afterShipping.log}"/>
+ <action expression="#{seamExpressionEvaluatorTestController.log}"/>
</transition>
<transition name="cancel" to="cancelled"/>
</task-node>
<node name="problem">
- <action expression="#{seamExpressionEvaluatorTestController.exceptionThrowing}"></action>
+ <action expression="#{seamExpressionEvaluatorTestController.exceptionThrowing}" />
<transition to="complete" />
</node>
Modified: branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/BusinessProcessTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/BusinessProcessTest.java 2011-02-15 12:10:45 UTC (rev 14044)
+++ branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/BusinessProcessTest.java 2011-02-15 13:23:11 UTC (rev 14045)
@@ -8,6 +8,9 @@
public class BusinessProcessTest
extends SeamTest
{
+
+ static final String EXCEPTION_MESSAGE = "org.jbpm.jpdl.el.ELException: Error evaluating ${seamExpressionEvaluatorTestController.exceptionThrowing}; possible causes are logged at debug level";
+
@Test
public void noProcessDefinition()
throws Exception
@@ -52,10 +55,12 @@
protected void invokeApplication() throws Exception
{
try {
- invokeAction("#{seamExpressionEvaluatorTestController.createProcess5}");
+ invokeAction("#{bpmTest.startExceptionPageflow}");
assert false;
- } catch (Exception e) {
-
+ } catch (Exception e) {
+// System.out.println(e.getMessage());
+// System.out.println(EXCEPTION_MESSAGE);
+ assert EXCEPTION_MESSAGE.equals(e.getMessage());
}
}
@@ -72,5 +77,10 @@
@CreateProcess(definition="TestProcess1")
public void startOne() {
}
+
+ @CreateProcess(definition="TestProcess5")
+ public void startExceptionPageflow()
+ {
+ }
}
}
Modified: branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java 2011-02-15 12:10:45 UTC (rev 14044)
+++ branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java 2011-02-15 13:23:11 UTC (rev 14045)
@@ -41,6 +41,11 @@
System.out.println("true");
}
+ public void log()
+ {
+ System.out.println("After Shipping");
+ }
+
public String getName()
{
return this.name;
13 years, 10 months
Seam SVN: r14044 - in branches/community/Seam_2_2: src/resteasy/org/jboss/seam/resteasy and 1 other directory.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2011-02-15 07:10:45 -0500 (Tue, 15 Feb 2011)
New Revision: 14044
Modified:
branches/community/Seam_2_2/examples/tasks/resources/WEB-INF/components.xml
branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyResourceAdapter.java
Log:
JBSEAM-4775
Modified: branches/community/Seam_2_2/examples/tasks/resources/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_2/examples/tasks/resources/WEB-INF/components.xml 2011-02-15 11:18:54 UTC (rev 14043)
+++ branches/community/Seam_2_2/examples/tasks/resources/WEB-INF/components.xml 2011-02-15 12:10:45 UTC (rev 14044)
@@ -43,7 +43,7 @@
entity-class="org.jboss.seam.example.tasks.entity.Category"
media-types="application/xml application/json application/fastinfoset"/>
- <resteasy:application resource-path-prefix="/v1" destroy-session-after-request="false">
+ <resteasy:application resource-path-prefix="/v1" destroy-session-after-request="true">
<resteasy:media-type-mappings>
<key>xml</key>
<value>application/xml</value>
Modified: branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyResourceAdapter.java
===================================================================
--- branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyResourceAdapter.java 2011-02-15 11:18:54 UTC (rev 14043)
+++ branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyResourceAdapter.java 2011-02-15 12:10:45 UTC (rev 14044)
@@ -146,8 +146,13 @@
}
finally
{
- // Prevent anemic sessions clog up the server
- if (application.isDestroySessionAfterRequest())
+ /*
+ * Prevent anemic sessions clog up the server
+ *
+ * session.isNew() check - do not close non-anemic sessions established by the view layer (JSF)
+ * which are reused by the JAX-RS requests (so that the requests do not have to be re-authorized)
+ */
+ if (application.isDestroySessionAfterRequest() && request.getSession().isNew())
{
log.debug("Destroying HttpSession after REST request");
Session.instance().invalidate();
13 years, 10 months