[seam-commits] Seam SVN: r11800 - in branches/community/Seam_2_2/examples/wiki: lib and 6 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Dec 9 03:55:45 EST 2009
Author: christian.bauer at jboss.com
Date: 2009-12-09 03:55:44 -0500 (Wed, 09 Dec 2009)
New Revision: 11800
Removed:
branches/community/Seam_2_2/examples/wiki/lib/jboss-archive-browsing.jar
branches/community/Seam_2_2/examples/wiki/src/test/AllTests-jdk6.tng.xml
Modified:
branches/community/Seam_2_2/examples/wiki/README.txt
branches/community/Seam_2_2/examples/wiki/build.xml
branches/community/Seam_2_2/examples/wiki/lib/hibernate-annotations.jar
branches/community/Seam_2_2/examples/wiki/lib/hibernate-commons-annotations.jar
branches/community/Seam_2_2/examples/wiki/lib/hibernate-entitymanager.jar
branches/community/Seam_2_2/examples/wiki/lib/hibernate-search.jar
branches/community/Seam_2_2/examples/wiki/lib/hibernate-validator.jar
branches/community/Seam_2_2/examples/wiki/lib/hibernate3.jar
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/BasicNodeOperations.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/ClipboardTests.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/DocumentHistoryTests.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Uploading.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/feeds/DocumentFeedTests.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/CommentTests.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/DirectoryTests.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/DocumentTests.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumHomeTests.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/TopicHomeTests.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/preferences/UserPreferencesTests.java
Log:
JBSEAM-4498, wiki upgrades: Hibernate 3.3, JDK6 compatibility for tests
Modified: branches/community/Seam_2_2/examples/wiki/README.txt
===================================================================
--- branches/community/Seam_2_2/examples/wiki/README.txt 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/README.txt 2009-12-09 08:55:44 UTC (rev 11800)
@@ -14,19 +14,15 @@
- Install JBoss Application Server 4.2.3 GA
-- Edit build.properties
+- Edit build.properties and configure the path to your jboss-4.2.3-GA installation directory
-- Upgrade/downgrade the Hibernate libraries to the ones bundled with this application:
- 'ant upgradehibernate' will replace the libraries in server/default/lib of JBoss AS 4.2.3
- and also copy the required ehcache.jar.
- (Sorry, but no other version works currently and the 4.2.3 bundled libraries are too old.)
-
- Install MySQL 5.x and start it
- Obtain the correct JDBC driver for your MySQL version and copy it into server/default/lib/ of JBoss AS
- The 'dev' default deployment profile will use the default MySQL 'test' database with user 'test' and
- no password, a fresh database schema will be exported to the database on each redeploy
+ no password, a fresh database schema will be exported to the database on each redeploy, you do not
+ have to do anything if these defaults are acceptable
- Call 'ant deploy'
@@ -52,10 +48,6 @@
- Install JBoss Application Server 4.2.3 GA
-- Upgrade/downgrade the Hibernate libraries bundled with JBoss AS to the libraries bundled
- with this application. Follow the steps outlined above (edit build.properties, call
- 'ant upgradehibernate') or copy them manually.
-
- Install MySQL 5.x and start it
- Obtain the correct JDBC driver for your MySQL version and copy it into server/default/lib/ of JBoss AS
Modified: branches/community/Seam_2_2/examples/wiki/build.xml
===================================================================
--- branches/community/Seam_2_2/examples/wiki/build.xml 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/build.xml 2009-12-09 08:55:44 UTC (rev 11800)
@@ -165,8 +165,7 @@
destdir="${classes.dir}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
- nowarn="${javac.nowarn}"
- target="1.5">
+ nowarn="${javac.nowarn}">
<src path="${src.java.dir}"/>
<src path="${src.plugin.dir}"/>
</javac>
@@ -227,40 +226,21 @@
<include name="jsf-facelets.jar" />
<include name="commons-digester.jar"/>
<include name="commons-beanutils.jar"/>
- <include name="jbpm-jpdl.jar" />
<include name="jboss-el.jar" />
<include name="urlrewritefilter.jar" />
- <include name="itext.jar" />
<include name="lucene-core.jar" />
<include name="antlr-runtime.jar" />
- <include name="core.jar" />
- <include name="janino.jar" />
- <include name="mvel2.jar" />
- <include name="drools-decisiontables.jar"/>
- <include name="jxl.jar"/>
- <include name="drools-api.jar" />
- <include name="drools-core.jar" />
- <include name="drools-compiler.jar" />
<include name="jboss-seam.jar" />
<include name="jboss-seam-debug.jar" />
- <include name="jboss-seam-ioc.jar" />
<include name="jboss-seam-mail.jar" />
- <include name="jboss-seam-pdf.jar" />
<include name="jboss-seam-remoting.jar" />
<include name="jboss-seam-ui.jar" />
+ <include name="slf4j*.jar" />
</fileset>
</copy>
<copy todir="${exploded.war.dir}/WEB-INF/lib">
<fileset dir="${local.lib.dir}">
- <exclude name="ejb3-persistence*"/>
- <exclude name="hibernate3*"/>
<exclude name="hibernate-tools*"/>
- <exclude name="hibernate-commons*"/>
- <exclude name="hibernate-annotations*"/>
- <exclude name="hibernate-entitymanager*"/>
- <exclude name="hibernate-validator*"/>
- <exclude name="jboss-archive-browsing*"/>
- <exclude name="ehcache*"/>
</fileset>
</copy>
@@ -400,8 +380,7 @@
destdir="${testclasses.dir}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
- nowarn="${javac.nowarn}"
- target="1.5">
+ nowarn="${javac.nowarn}">
<classpath>
<path refid="test.classpath" />
<path refid="runtime.emma.path" />
@@ -467,16 +446,13 @@
<target name="test" depends="configuretests,getemma"
description="Run tests defined in *.tng.xml">
- <condition property="testng.file" value="AllTests-jdk6.tng.xml" else="AllTests.tng.xml">
- <equals arg1="${ant.java.version}" arg2="1.6"/>
- </condition>
<taskdef resource="testngtasks" classpathref="test.classpath"/>
<testng outputdir="${test.output.dir}">
<classpath>
<path refid="test.classpath" />
<path refid="runtime.emma.path" />
</classpath>
- <xmlfileset dir="${src.test.dir}" includes="${testng.file}" />
+ <xmlfileset dir="${src.test.dir}" includes="AllTests.tng.xml" />
<jvmarg line="${testng.jvmargs}"/>
<jvmarg line="-Demma.coverage.out.file=${coverage.ec}" />
<!-- Needed for running Embedded JBoss under JDK 6 -->
Modified: branches/community/Seam_2_2/examples/wiki/lib/hibernate-annotations.jar
===================================================================
(Binary files differ)
Modified: branches/community/Seam_2_2/examples/wiki/lib/hibernate-commons-annotations.jar
===================================================================
(Binary files differ)
Modified: branches/community/Seam_2_2/examples/wiki/lib/hibernate-entitymanager.jar
===================================================================
(Binary files differ)
Modified: branches/community/Seam_2_2/examples/wiki/lib/hibernate-search.jar
===================================================================
(Binary files differ)
Modified: branches/community/Seam_2_2/examples/wiki/lib/hibernate-validator.jar
===================================================================
(Binary files differ)
Modified: branches/community/Seam_2_2/examples/wiki/lib/hibernate3.jar
===================================================================
(Binary files differ)
Deleted: branches/community/Seam_2_2/examples/wiki/lib/jboss-archive-browsing.jar
===================================================================
(Binary files differ)
Deleted: branches/community/Seam_2_2/examples/wiki/src/test/AllTests-jdk6.tng.xml
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/AllTests-jdk6.tng.xml 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/AllTests-jdk6.tng.xml 2009-12-09 08:55:44 UTC (rev 11800)
@@ -1,93 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="Lacewiki - All" verbose="1" parallel="false">
-
- <parameter name="database" value="hsql"/>
-
- <!-- MySQL also requires changes to persistence-test.xml and wiki-test-ds.xml
- <parameter name="database" value="mysql"/>
- -->
-
- <parameter name="datasourceJndiName" value="java:/wikiTestDatasource"/>
- <parameter name="binaryDir" value="META-INF/testbinaries"/>
-
- <test name="Model">
- <groups>
- <run>
- <exclude name="jdk6-expected-failures" />
- </run>
- </groups>
- <packages>
- <package name="org.jboss.seam.wiki.test.model"/>
- </packages>
- </test>
-
- <test name="DAO">
- <packages>
- <package name="org.jboss.seam.wiki.test.dao"/>
- </packages>
- </test>
-
- <test name="Preferences">
- <groups>
- <run>
- <exclude name="jdk6-expected-failures" />
- </run>
- </groups>
- <packages>
- <package name="org.jboss.seam.wiki.test.preferences"/>
- </packages>
- </test>
-
- <test name="Browsing">
- <packages>
- <package name="org.jboss.seam.wiki.test.browse"/>
- </packages>
- </test>
-
- <test name="Feeds">
- <groups>
- <run>
- <exclude name="jdk6-expected-failures" />
- </run>
- </groups>
- <packages>
- <package name="org.jboss.seam.wiki.test.feeds"/>
- </packages>
- </test>
-
- <test name="Editing">
- <groups>
- <run>
- <exclude name="jdk6-expected-failures" />
- </run>
- </groups>
- <packages>
- <package name="org.jboss.seam.wiki.test.editing"/>
- </packages>
- </test>
-
- <test name="NestedSet">
- <packages>
- <package name="org.jboss.seam.wiki.test.nestedset"/>
- </packages>
- </test>
-
- <test name="User">
- <packages>
- <package name="org.jboss.seam.wiki.test.user"/>
- </packages>
- </test>
-
- <test name="Plugins">
- <groups>
- <run>
- <exclude name="jdk6-expected-failures" />
- </run>
- </groups>
- <packages>
- <package name="org.jboss.seam.wiki.test.plugin"/>
- </packages>
- </test>
-
-</suite>
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/BasicNodeOperations.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/BasicNodeOperations.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/BasicNodeOperations.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -91,7 +91,7 @@
}.run();
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void createDocument() throws Exception {
final String conversationId = new NonFacesRequest("/docEdit_d.xhtml") {
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/ClipboardTests.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/ClipboardTests.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/ClipboardTests.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -26,7 +26,7 @@
);
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void copyPasteDocument() throws Exception {
new FacesRequest("/dirDisplay_d.xhtml") {
@@ -108,7 +108,7 @@
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void copyPasteUploadImage() throws Exception {
new FacesRequest("/dirDisplay_d.xhtml") {
@@ -190,7 +190,7 @@
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void copyPasteMultiple() throws Exception {
new FacesRequest("/dirDisplay_d.xhtml") {
@@ -608,7 +608,7 @@
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void copyPasteSameArea() throws Exception {
new FacesRequest("/dirDisplay_d.xhtml") {
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -26,7 +26,7 @@
);
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void postComment() throws Exception {
new FacesRequest("/docDisplay_d.xhtml") {
@@ -88,7 +88,7 @@
}.run();
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void replyToComment() throws Exception {
new FacesRequest("/docDisplay_d.xhtml") {
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/DocumentHistoryTests.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/DocumentHistoryTests.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/DocumentHistoryTests.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -67,7 +67,7 @@
}.run();
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void createDocumentCheckRevision() throws Exception {
final String conversationId = new NonFacesRequest("/docEdit_d.xhtml") {
@@ -103,7 +103,7 @@
}.run();
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void updateDocumentCheckRevisions() throws Exception {
loginAdmin();
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Uploading.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Uploading.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Uploading.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -22,7 +22,7 @@
);
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void createUpload() throws Exception {
final String conversationId = new NonFacesRequest("/uploadCreate_d.xhtml") {
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/feeds/DocumentFeedTests.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/feeds/DocumentFeedTests.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/feeds/DocumentFeedTests.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -27,7 +27,7 @@
);
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void createDocumentPushOnSiteFeed() throws Exception {
final String conversationId = new NonFacesRequest("/docEdit_d.xhtml") {
@@ -65,7 +65,7 @@
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void updateDocumentPushOnSiteFeed() throws Exception {
final String conversationId = new NonFacesRequest("/docEdit_d.xhtml") {
@@ -104,7 +104,7 @@
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void createDocumentPushOnParentDirectoryFeedOnly() throws Exception {
final String conversationId = new NonFacesRequest("/docEdit_d.xhtml") {
@@ -181,7 +181,7 @@
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void createDocumentPushOnAllFeeds() throws Exception {
final String conversationId = new NonFacesRequest("/docEdit_d.xhtml") {
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/CommentTests.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/CommentTests.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/CommentTests.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -113,7 +113,7 @@
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void insertCommentNewThread() throws Exception {
new FacesRequest() {
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/DirectoryTests.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/DirectoryTests.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/DirectoryTests.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -195,7 +195,7 @@
}
*/
- @Test(groups="jdk6-expected-failures")
+ @Test
public void insertDirectoryById() throws Exception {
new FacesRequest() {
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/DocumentTests.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/DocumentTests.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/model/DocumentTests.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -126,7 +126,7 @@
}.run();
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void insertDocumentById() throws Exception {
new FacesRequest() {
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumHomeTests.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumHomeTests.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumHomeTests.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -27,7 +27,7 @@
);
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void addForum() throws Exception {
loginAdmin();
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/TopicHomeTests.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/TopicHomeTests.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/TopicHomeTests.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -29,7 +29,7 @@
);
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void newTopic() throws Exception {
final String conversationId = new FacesRequest() {
@@ -94,7 +94,7 @@
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void newStickyTopic() throws Exception {
loginAdmin();
@@ -160,7 +160,7 @@
}.run();
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void newClosedTopic() throws Exception {
loginAdmin();
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/preferences/UserPreferencesTests.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/preferences/UserPreferencesTests.java 2009-12-08 16:18:28 UTC (rev 11799)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/preferences/UserPreferencesTests.java 2009-12-09 08:55:44 UTC (rev 11800)
@@ -29,7 +29,7 @@
);
}
- @Test(groups="jdk6-expected-failures")
+ @Test
public void createUserPreferences() throws Exception {
loginMember();
More information about the seam-commits
mailing list