Seam SVN: r11229 - in branches/enterprise/JBPAPP_5_0: seam-gen and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-01 11:04:10 -0400 (Wed, 01 Jul 2009)
New Revision: 11229
Modified:
branches/enterprise/JBPAPP_5_0/build/gen.pom.xml
branches/enterprise/JBPAPP_5_0/build/root.pom.xml
branches/enterprise/JBPAPP_5_0/seam-gen/build.xml
Log:
fixed classpath for seam-gen - it misses slf4j-log4j12
Modified: branches/enterprise/JBPAPP_5_0/build/gen.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/gen.pom.xml 2009-07-01 13:30:34 UTC (rev 11228)
+++ branches/enterprise/JBPAPP_5_0/build/gen.pom.xml 2009-07-01 15:04:10 UTC (rev 11229)
@@ -149,6 +149,18 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-07-01 13:30:34 UTC (rev 11228)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-07-01 15:04:10 UTC (rev 11229)
@@ -1088,7 +1088,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
Modified: branches/enterprise/JBPAPP_5_0/seam-gen/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/seam-gen/build.xml 2009-07-01 13:30:34 UTC (rev 11228)
+++ branches/enterprise/JBPAPP_5_0/seam-gen/build.xml 2009-07-01 15:04:10 UTC (rev 11229)
@@ -1350,8 +1350,8 @@
<pathelement path="${seam.dir}/lib/hibernate-annotations.jar"/>
<pathelement path="${seam.dir}/lib/hibernate-entitymanager.jar"/>
<pathelement path="${seam.dir}/lib/hibernate-validator.jar"/>
- <pathelement path="${seam.dir}/lib/slf4j-api.jar"/>
- <pathelement path="${seam.dir}/lib/slf4j-log4j12.jar"/>
+ <pathelement path="${seam.dir}/lib/gen/slf4j-api.jar"/>
+ <pathelement path="${seam.dir}/lib/gen/slf4j-log4j12.jar"/>
<pathelement path="${seam.dir}/lib/log4j.jar"/>
<pathelement path="${seam.dir}/lib/commons-collections.jar"/>
<pathelement path="${seam.dir}/lib/commons-logging.jar"/>
14 years, 10 months
- 1
- 0
Seam SVN: r11228 - in branches/enterprise/JBPAPP_5_0: seam-gen/ivy and 3 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-01 09:30:34 -0400 (Wed, 01 Jul 2009)
New Revision: 11228
Removed:
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/icefaces/
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/rss/
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/wicket-runtime/
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/wicket/
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/icefaces.xml
Modified:
branches/enterprise/JBPAPP_5_0/examples/readme.txt
branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/readme.txt
Log:
JBPAPP-2154
Modified: branches/enterprise/JBPAPP_5_0/examples/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/readme.txt 2009-07-01 13:07:29 UTC (rev 11227)
+++ branches/enterprise/JBPAPP_5_0/examples/readme.txt 2009-07-01 13:30:34 UTC (rev 11228)
@@ -32,9 +32,6 @@
hibernate/ The Seam Booking demo ported to Hibernate3.
-icefaces/ The Seam Booking demo with ICEfaces, instead of
- Ajax4JSF.
-
itext/ A demo of the Seam iText integration for generating PDFs.
jee5/booking The Seam Booking demo ported to the Java EE 5 platforms.
@@ -71,10 +68,6 @@
remoting/helloworld/ A trivial example using Ajax.
-remoting/progressbar/ An example of an Ajax progress bar.
-
-restbay/ An example of using Seam with JAX-RS plain HTTP Web Services.
-
seambay/ An example of using Seam with Web Services.
seamdiscs/ Demonstrates Seam, Trinidad, Ajax4jsf and Richfaces.
@@ -93,11 +86,7 @@
ui/ Demonstrates some Seam JSF controls.
-wiki/ A fully featured wiki system based on Seam which
- is used by seamframework.org. Please read
- wiki/README.txt for installation instructions.
-
Deploying and Testing an Example Application
============================================
Modified: branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml 2009-07-01 13:07:29 UTC (rev 11227)
+++ branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml 2009-07-01 13:30:34 UTC (rev 11228)
@@ -12,8 +12,7 @@
<property name="seam.version" value="2.1.2"/>
<property name="jsf.version" value="1.2_12"/>
<property name="richfaces.version" value="3.3.1.GA"/>
- <property name="icefaces.version" value="1.8.1"/>
- <property name="jboss-embedded.version" value="beta3"/>
+ <property name="jboss-embedded.version" value="beta3.SP8"/>
<target name="init-ivy">
<available property="ivy.installed" value="true" file="${ivy.jar.file}" type="file"/>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2009-07-01 13:07:29 UTC (rev 11227)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2009-07-01 13:30:34 UTC (rev 11228)
@@ -31,7 +31,6 @@
selenium.browser.url=http://127.0.0.1:8080
selenium.speed=0
selenium.timeout=120000
-selenium.icefaces.wait.time=2000
# enter any commands wanted for the testng run
selenium.testng.jvmargs=-Dfoo
@@ -90,5 +89,4 @@
action.package=com.example
test.package=com.example.test
richfaces.skin=classic
-icefaces.home=
jboss.domain=default
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2009-07-01 13:07:29 UTC (rev 11227)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2009-07-01 13:30:34 UTC (rev 11228)
@@ -83,10 +83,6 @@
<run.selenium.test suite="richfaces" />
</target>
- <target name="seam-gen.icefaces.testsuite" depends="build" description="Run Icefaces testsuite">
- <run.selenium.test suite="icefaces" />
- </target>
-
<target name="seam-gen.smoke.testsuite" depends="build" description="Run smoke testsuite">
<run.selenium.test suite="smoke" />
</target>
Deleted: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/icefaces.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/icefaces.xml 2009-07-01 13:07:29 UTC (rev 11227)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/icefaces.xml 2009-07-01 13:30:34 UTC (rev 11228)
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-<suite name="seam-gen ICEfaces suite" parallel="false" verbose="3">
- <listeners>
- <listener
- class-name="org.jboss.seam.test.functional.seamgen.utils.SeleniumTestListener" />
- </listeners>
- <parameter name="suffix" value="001" />
- <test name="ICEfaces exploded Ear Test">
- <parameter name="icefaces" value="true" />
- <parameter name="type" value="ear" />
- <classes>
- <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" />
- <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" />
- <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" />
- <class
- name="org.jboss.seam.test.functional.seamgen.HotDeploymentStaticTest" />
- <class name="org.jboss.seam.test.functional.seamgen.PersonTest" />
- <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" />
- <class name="org.jboss.seam.test.functional.seamgen.UserTest" />
- <class name="org.jboss.seam.test.functional.seamgen.UserTest" />
- <class name="org.jboss.seam.test.functional.seamgen.RoleTest" />
- </classes>
- </test>
- <test name="ICEfaces exploded War Test">
- <parameter name="icefaces" value="true" />
- <parameter name="type" value="war" />
- <classes>
- <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" />
- <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" />
- <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" />
- <class
- name="org.jboss.seam.test.functional.seamgen.HotDeploymentNewFormTest" />
- <class
- name="org.jboss.seam.test.functional.seamgen.HotDeploymentStaticTest" />
- <class name="org.jboss.seam.test.functional.seamgen.PersonTest" />
- <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" />
- <class name="org.jboss.seam.test.functional.seamgen.UserTest" />
- <class name="org.jboss.seam.test.functional.seamgen.RoleTest" />
- </classes>
- </test>
- <test name="ICEfaces Ear Test">
- <parameter name="icefaces" value="true" />
- <parameter name="type" value="ear" />
- <parameter name="explode" value="false" />
- <classes>
- <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" />
- <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" />
- <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" />
- <class name="org.jboss.seam.test.functional.seamgen.PersonTest" />
- <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" />
- <class name="org.jboss.seam.test.functional.seamgen.UserTest" />
- <class name="org.jboss.seam.test.functional.seamgen.RoleTest" />
- </classes>
- </test>
- <test name="ICEfaces War Test">
- <parameter name="icefaces" value="true" />
- <parameter name="type" value="war" />
- <parameter name="explode" value="false" />
- <classes>
- <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" />
- <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" />
- <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" />
- <class name="org.jboss.seam.test.functional.seamgen.PersonTest" />
- <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" />
- <class name="org.jboss.seam.test.functional.seamgen.UserTest" />
- <class name="org.jboss.seam.test.functional.seamgen.RoleTest" />
- </classes>
- </test>
-</suite>
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/readme.txt 2009-07-01 13:07:29 UTC (rev 11227)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/readme.txt 2009-07-01 13:30:34 UTC (rev 11228)
@@ -68,7 +68,6 @@
4.) Run tests.
a) run "ant seam-gen.richfaces.testsuite" to test seam-gen with RichFaces
- b) run "ant seam-gen.icefaces.testsuite" to test seam-gen with ICEfaces
The matrix describing these testsuites follows:
---------------------------------------------
@@ -103,7 +102,5 @@
1.) type - set to ear or war, ear is the default value
2.) explode - set to true or false, if set to false, application will be deployed and undeployed using (un)deploy target.
(un)explode target will be used otherwise. True is the default value.
-3.) icefaces - set to true to create an ICEfaces project. RichFaces project will be created otherwise.
- This parameter defaults to false.
-4.) suffix - value of this parameter will be appended to the application name.
+3.) suffix - value of this parameter will be appended to the application name.
14 years, 10 months
- 1
- 0
Seam SVN: r11227 - in branches/enterprise/JBPAPP_5_0: build/embedded/shaded and 2 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-01 09:07:29 -0400 (Wed, 01 Jul 2009)
New Revision: 11227
Modified:
branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml
branches/enterprise/JBPAPP_5_0/src/test/integration/resources/test-destinations-service.xml
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/testng.xml
Log:
back ported upgrade of jboss-embedded to beta3.SP8
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml 2009-07-01 13:07:29 UTC (rev 11227)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
<description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations)</description>
</project>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml 2009-07-01 13:07:29 UTC (rev 11227)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
<description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml 2009-07-01 13:07:29 UTC (rev 11227)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all.</description>
<dependencies>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml 2009-07-01 13:07:29 UTC (rev 11227)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
<description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations) and Hibernate Search (specific to this seam version of hibernate-all)</description>
</project>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml 2009-07-01 13:07:29 UTC (rev 11227)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
<description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml 2009-07-01 13:07:29 UTC (rev 11227)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all. This Seam specific version simply keeps the old jboss-embedded-api name for tooling compatibility</description>
<dependencies>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml 2009-07-01 13:07:29 UTC (rev 11227)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS. This Seam version also includes lucene, a dependency
of hibernate search</description>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml 2009-07-01 13:07:29 UTC (rev 11227)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS.</description>
</project>
Modified: branches/enterprise/JBPAPP_5_0/src/test/integration/resources/test-destinations-service.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/integration/resources/test-destinations-service.xml 2009-07-01 08:55:09 UTC (rev 11226)
+++ branches/enterprise/JBPAPP_5_0/src/test/integration/resources/test-destinations-service.xml 2009-07-01 13:07:29 UTC (rev 11227)
@@ -1,17 +1,17 @@
<server>
-<!-- <mbean code="org.jboss.mq.server.jmx.Topic"-->
-<!-- name="jboss.mq.destination:service=Topic,name=testTopic">-->
-<!-- <depends optional-attribute-name="ServerPeer">-->
-<!-- jboss.messaging:service=ServerPeer-->
-<!-- </depends>-->
-<!-- <depends>jboss.messaging:service=PostOffice</depends>-->
-<!-- </mbean>-->
-<!-- -->
-<!-- <mbean code="org.jboss.mq.server.jmx.Queue"-->
-<!-- name="jboss.mq.destination:service=Queue,name=testQueue">-->
-<!-- <depends optional-attribute-name="ServerPeer">-->
-<!-- jboss.messaging:service=ServerPeer-->
-<!-- </depends>-->
-<!-- <depends>jboss.messaging:service=PostOffice</depends>-->
-<!-- </mbean>-->
+ <mbean code="org.jboss.mq.server.jmx.Topic"
+ name="jboss.mq.destination:service=Topic,name=testTopic">
+ <depends optional-attribute-name="ServerPeer">
+ jboss.messaging:service=ServerPeer
+ </depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=testQueue">
+ <depends optional-attribute-name="ServerPeer">
+ jboss.messaging:service=ServerPeer
+ </depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
</server>
Modified: branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/testng.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/testng.xml 2009-07-01 08:55:09 UTC (rev 11226)
+++ branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/testng.xml 2009-07-01 13:07:29 UTC (rev 11227)
@@ -50,11 +50,11 @@
</classes>
</test>
-<!-- <test name="Seam Integration Tests: JMS">-->
-<!-- <classes>-->
-<!-- <class name="org.jboss.seam.test.integration.MessagingTest" />-->
-<!-- </classes>-->
-<!-- </test>-->
+ <test name="Seam Integration Tests: JMS">
+ <classes>
+ <class name="org.jboss.seam.test.integration.MessagingTest" />
+ </classes>
+ </test>
<test name="Seam Integration Tests: Mocks">
<classes>
14 years, 10 months
- 1
- 0
Seam SVN: r11226 - branches/enterprise/JBPAPP_5_0/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-01 04:55:09 -0400 (Wed, 01 Jul 2009)
New Revision: 11226
Modified:
branches/enterprise/JBPAPP_5_0/build/common.build.xml
branches/enterprise/JBPAPP_5_0/build/core.pom.xml
branches/enterprise/JBPAPP_5_0/build/root.pom.xml
branches/enterprise/JBPAPP_5_0/build/ui.pom.xml
Log:
JBPAPP-2154 - removed Meldware, upgraded jbpm3. embedded to beta3.SP8
Modified: branches/enterprise/JBPAPP_5_0/build/common.build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/common.build.xml 2009-07-01 08:52:26 UTC (rev 11225)
+++ branches/enterprise/JBPAPP_5_0/build/common.build.xml 2009-07-01 08:55:09 UTC (rev 11226)
@@ -23,7 +23,7 @@
<property name="maven.settings.xml" location="${build.dir}/settings.xml" />
- <property name="embedded.version" value="beta3.SP7" />
+ <property name="embedded.version" value="beta3.SP8" />
<import file="${build.dir}/utilities.build.xml" />
Modified: branches/enterprise/JBPAPP_5_0/build/core.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/core.pom.xml 2009-07-01 08:52:26 UTC (rev 11225)
+++ branches/enterprise/JBPAPP_5_0/build/core.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
@@ -229,18 +229,6 @@
</dependency>
<dependency>
- <groupId>org.buni.meldware</groupId>
- <artifactId>meldware-mailjmx</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.buni.meldware</groupId>
- <artifactId>meldware-mailapi</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<optional>true</optional>
@@ -292,7 +280,7 @@
</dependency>
<dependency>
- <groupId>org.jbpm</groupId>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
<optional>true</optional>
</dependency>
Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-07-01 08:52:26 UTC (rev 11225)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
@@ -240,15 +240,15 @@
</dependency>
<dependency>
- <groupId>org.jbpm</groupId>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5.SP5</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-cache</artifactId>
- <version>1.4.1.SP9</version>
+ <version>1.4.1.SP13</version>
</dependency>
<dependency>
@@ -271,7 +271,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>2.2.0.CR6</version>
+ <version>3.1.0.GA</version>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
@@ -287,7 +287,7 @@
<dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>2.4.1</version>
+ <version>2.6.10.GA</version>
</dependency>
<dependency>
@@ -523,7 +523,7 @@
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.8.0.GA</version>
+ <version>3.9.0.GA</version>
</dependency>
<dependency>
@@ -694,18 +694,6 @@
</dependency>
<dependency>
- <groupId>org.buni.meldware</groupId>
- <artifactId>meldware-mailjmx</artifactId>
- <version>1.0M8</version>
- </dependency>
-
- <dependency>
- <groupId>org.buni.meldware</groupId>
- <artifactId>meldware-mailapi</artifactId>
- <version>1.0M8</version>
- </dependency>
-
- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<version>${version.drools}</version>
@@ -774,13 +762,13 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP7</version>
+ <version>beta3.SP8</version>
</dependency>
<dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
- <version>1.6.0</version>
+ <version>1.5.2</version>
</dependency>
<dependency>
@@ -815,7 +803,7 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta9</version>
+ <version>2.0.7.GA</version>
<exclusions>
<exclusion>
<groupId>apache-httpclient</groupId>
@@ -855,13 +843,13 @@
<dependency>
<groupId>jboss.jboss-aop</groupId>
<artifactId>jboss-aop</artifactId>
- <version>1.5.0.GA</version>
+ <version>2.1.1.GA</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.0.0.Beta11</version>
+ <version>2.1.2.GA</version>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
@@ -873,13 +861,13 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
- <version>2.0.4.GA</version>
+ <version>2.1.0.GA</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.0.4.GA</version>
+ <version>2.2.0.GA</version>
<exclusions>
<exclusion>
<groupId>apache-xerces</groupId>
@@ -945,7 +933,7 @@
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
- <version>1.0.8a</version>
+ <version>1.0.9</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -1100,7 +1088,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
@@ -1124,7 +1112,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.8-brew</version>
+ <version>1.8.0.8patch02-brew</version>
</dependency>
<dependency>
Modified: branches/enterprise/JBPAPP_5_0/build/ui.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/ui.pom.xml 2009-07-01 08:52:26 UTC (rev 11225)
+++ branches/enterprise/JBPAPP_5_0/build/ui.pom.xml 2009-07-01 08:55:09 UTC (rev 11226)
@@ -116,7 +116,7 @@
</dependency>
<dependency>
- <groupId>org.jbpm</groupId>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
<optional>true</optional>
<exclusions>
14 years, 10 months
- 1
- 0
Seam SVN: r11225 - branches/enterprise/JBPAPP_5_0/src/test/unit/org/jboss/seam/test/unit.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-07-01 04:52:26 -0400 (Wed, 01 Jul 2009)
New Revision: 11225
Modified:
branches/enterprise/JBPAPP_5_0/src/test/unit/org/jboss/seam/test/unit/MailTest.java
Log:
JBPAPP-2154 - missed removed Meldware classes
Modified: branches/enterprise/JBPAPP_5_0/src/test/unit/org/jboss/seam/test/unit/MailTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/unit/org/jboss/seam/test/unit/MailTest.java 2009-06-30 14:07:07 UTC (rev 11224)
+++ branches/enterprise/JBPAPP_5_0/src/test/unit/org/jboss/seam/test/unit/MailTest.java 2009-07-01 08:52:26 UTC (rev 11225)
@@ -1,13 +1,12 @@
package org.jboss.seam.test.unit;
-import java.util.ArrayList;
+//import java.util.ArrayList;
import javax.mail.NoSuchProviderException;
import javax.mail.Session;
import javax.naming.NamingException;
import org.jboss.seam.mail.MailSession;
-import org.jboss.seam.mail.MeldwareUser;
import org.testng.annotations.Test;
import com.sun.mail.smtp.SMTPSSLTransport;
@@ -30,7 +29,7 @@
private static final String PASSWORD = "letmein";
- private static final String EMAIL = "pete.muir(a)jboss.org";
+// private static final String EMAIL = "pete.muir(a)jboss.org";
@Test
public void testBasicMailSession()
@@ -367,34 +366,34 @@
assert failure;
}
- @Test
- public void testMeldwareUser()
- {
- MeldwareUser meldwareUser = new MeldwareUser();
- meldwareUser.setUsername(USERNAME);
- meldwareUser.setPassword(PASSWORD);
- meldwareUser.getAliases().add(EMAIL);
-
- assert USERNAME.equals(meldwareUser.getUsername());
- assert PASSWORD.equals(meldwareUser.getPassword());
- assert meldwareUser.getAliases() != null;
- assert meldwareUser.getAliases().contains(EMAIL);
- assert meldwareUser.getRoles().contains("calendaruser");
- assert !meldwareUser.getRoles().contains("adminuser");
-
- meldwareUser.setAliases(new ArrayList<String>());
- assert meldwareUser.getAliases().isEmpty();
- }
+// @Test
+// public void testMeldwareUser()
+// {
+// MeldwareUser meldwareUser = new MeldwareUser();
+// meldwareUser.setUsername(USERNAME);
+// meldwareUser.setPassword(PASSWORD);
+// meldwareUser.getAliases().add(EMAIL);
+//
+// assert USERNAME.equals(meldwareUser.getUsername());
+// assert PASSWORD.equals(meldwareUser.getPassword());
+// assert meldwareUser.getAliases() != null;
+// assert meldwareUser.getAliases().contains(EMAIL);
+// assert meldwareUser.getRoles().contains("calendaruser");
+// assert !meldwareUser.getRoles().contains("adminuser");
+//
+// meldwareUser.setAliases(new ArrayList<String>());
+// assert meldwareUser.getAliases().isEmpty();
+// }
- @Test
- public void testAdminMeldwareUser()
- {
- MeldwareUser meldwareUser = new MeldwareUser();
- meldwareUser.setAdministrator(true);
-
- assert meldwareUser.getRoles().contains("calendaruser");
- assert meldwareUser.getRoles().contains("adminuser");
- }
+// @Test
+// public void testAdminMeldwareUser()
+// {
+// MeldwareUser meldwareUser = new MeldwareUser();
+// meldwareUser.setAdministrator(true);
+//
+// assert meldwareUser.getRoles().contains("calendaruser");
+// assert meldwareUser.getRoles().contains("adminuser");
+// }
// TODO Write tests for Meldware
14 years, 10 months
- 1
- 0