Seam SVN: r11547 - in branches/community/Seam_2_2/src/test/ftest: examples and 1 other directories.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-06 04:39:38 -0400 (Tue, 06 Oct 2009)
New Revision: 11547
Removed:
branches/community/Seam_2_2/src/test/ftest/lib/
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/build.xml
branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml
Log:
Moved folder for functional test dependencies to ${seam.dir}/lib/ftest
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-06 07:23:25 UTC (rev 11546)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-06 08:39:38 UTC (rev 11547)
@@ -33,7 +33,7 @@
<property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
<!-- TODO : should the libs be in seam/lib and managed with mvn? -->
- <property name="lib.dir" value="${ftest.dir}/lib" />
+ <property name="lib.dir" value="${seam.dir}/lib/ftest" />
<property name="log.dir" value="${ftest.dir}/log" />
<!-- Build resources -->
Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-06 07:23:25 UTC (rev 11546)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-06 08:39:38 UTC (rev 11547)
@@ -34,7 +34,7 @@
<property name="local.build.dir" value="build" />
<property name="classes.dir" value="${local.build.dir}/classes" />
<property name="test.output.dir" value="${seam.dir}/test-output" />
- <property name="ftest.lib.dir" value="${ftest.dir}/lib" />
+ <property name="ftest.lib.dir" value="${seam.dir}/lib/ftest" />
<property name="log.dir" value="log" />
<property name="test.report.dir" value="test-report" />
@@ -258,7 +258,7 @@
</target>
<!-- Target for obtaining htmlunit -->
- <target name="copy.htmlunit" if="depends.htmlunit">
+ <target name="copy.htmlunit" if="depends.htmlunit" unless="copy.htmlunit.done">
<copyInlineDependencies id="allexamples" scope="compile" todir="${ftest.lib.dir}">
<dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit" version="2.3"/>
<dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.1"/>
@@ -277,9 +277,10 @@
<dependency groupId="apache-xalan" artifactId="serializer" version="j_2.7.0"/>
<dependency groupId="xml-apis" artifactId="xml-apis" version="1.3.03"/>
</copyInlineDependencies>
+ <property name="copy.htmlunit.done" value="true" />
</target>
- <target name="copy.selenium">
+ <target name="copy.selenium" unless="copy.selenium.done">
<copyInlineDependencies id="selenium.server" scope="compile" todir="${ftest.lib.dir}">
<dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0.1" classifier="standalone">
<exclusion groupId="org.seleniumhq.selenium.core" artifactId="selenium-core" />
@@ -291,6 +292,7 @@
<exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default" />
</dependency>
</copyInlineDependencies>
+ <property name="copy.selenium.done" value="true" />
</target>
</project>
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml 2009-10-06 07:23:25 UTC (rev 11546)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml 2009-10-06 08:39:38 UTC (rev 11547)
@@ -35,7 +35,7 @@
<property name="seamgen.build.dir" value="${ftest.dir}/seamgen/build" />
<property name="classes.dir" value="${seamgen.build.dir}/classes" />
<property name="test.output.dir" value="${seam.dir}/test-output" />
- <property name="ftest.lib.dir" value="${ftest.dir}/lib" />
+ <property name="ftest.lib.dir" value="${seam.dir}/lib/ftest" />
<property name="root.lib.dir" value="${seam.dir}/lib" />
<property name="ftest.config.location" value="src/test/ftest/ftest.properties"/>
@@ -66,6 +66,7 @@
<delete dir="${test.output.dir}" />
<delete dir="${report.dir}" />
<delete dir="${log.dir}" />
+ <delete dir="${ftest.lib.dir}" />
</target>
<target name="copy.selenium">
15 years, 2 months
Seam SVN: r11546 - in branches/community/Seam_2_2/examples/wiki/src: main/org/jboss/seam/wiki/core/dao and 3 other directories.
by seam-commits@lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2009-10-06 03:23:25 -0400 (Tue, 06 Oct 2009)
New Revision: 11546
Added:
branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentCountComment.java
Modified:
branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java
branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java
branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml
branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/NativeQueries.hbm.xml
branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java
branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumQueries.hbm.xml
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java
Log:
Minor forum query performance optimization
Modified: branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java 2009-10-05 12:38:07 UTC (rev 11545)
+++ branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java 2009-10-06 07:23:25 UTC (rev 11546)
@@ -145,7 +145,7 @@
}
getLog().debug("updating last comment aggregation for: " + documentHome.getInstance());
- getWikiNodeDAO().updateWikiDocumentLastComment(documentHome.getInstance());
+ getWikiNodeDAO().updateWikiDocumentComments(documentHome.getInstance());
getEntityManager().flush();
Events.instance().raiseEvent("Comment.persisted");
@@ -180,7 +180,7 @@
getEntityManager().clear();
getLog().debug("updating last comment aggregation for: " + documentHome.getInstance());
- getWikiNodeDAO().updateWikiDocumentLastComment(documentHome.getInstance());
+ getWikiNodeDAO().updateWikiDocumentComments(documentHome.getInstance());
getEntityManager().flush();
getEntityManager().clear();
Modified: branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java 2009-10-05 12:38:07 UTC (rev 11545)
+++ branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java 2009-10-06 07:23:25 UTC (rev 11546)
@@ -670,7 +670,11 @@
nestedSetQuery.list(); // Append all children hierarchically to the transformers rootWrapper
}
- public void updateWikiDocumentLastComment(WikiDocument document) {
+ // TODO: This is not great
+ public void updateWikiDocumentComments(WikiDocument document) {
+
+ // First, the denormalized "last comment" data duplication
+
// TODO: This probably is vulnerable to a race condition if we don't lock the whole WIKI_DOCUMENT_LAST_COMMENT table
Long lastCommentId = (Long)
@@ -699,6 +703,24 @@
existingLastCommentEntry.setLastCommentCreatedOn(lastComment.getCreatedOn());
restrictedEntityManager.persist(existingLastCommentEntry);
}
+
+ // Next, the denormalized "total comment count" data duplication
+
+ Long commentCount = (Long)
+ getSession(true).getNamedQuery("countCommentOfDocument")
+ .setParameter("documentId", document.getId())
+ .setComment("Counting comments of document: " + document.getId())
+ .uniqueResult();
+
+ WikiDocumentCountComment existingCommentCount =
+ restrictedEntityManager.find(WikiDocumentCountComment.class, document.getId());
+ if (existingCommentCount != null) {
+ existingCommentCount.setCommentCount(commentCount);
+ } else {
+ existingCommentCount = new WikiDocumentCountComment();
+ existingCommentCount.setDocumentId(document.getId());
+ restrictedEntityManager.persist(existingCommentCount);
+ }
}
private Session getSession(boolean restricted) {
Modified: branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml 2009-10-05 12:38:07 UTC (rev 11545)
+++ branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml 2009-10-06 07:23:25 UTC (rev 11546)
@@ -54,6 +54,14 @@
<dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
</database-object>
+ <database-object>
+ <create>
+ alter table WIKI_DOCUMENT_COUNT_COMMENT add constraint FK_WIKI_DOCUMENT_COUNT_COMMENT_DOCUMENT_ID foreign key (WIKI_DOCUMENT_ID) references WIKI_DOCUMENT (NODE_ID) on delete cascade;
+ </create>
+ <drop/>
+ <dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
+ </database-object>
+
<!-- ############################### MySQL ############################### -->
@@ -112,6 +120,14 @@
<database-object>
<create>
+ alter table WIKI_DOCUMENT_COUNT_COMMENT add index FK_WIKI_DOCUMENT_COUNT_COMMENT_DOCUMENT_ID (WIKI_DOCUMENT_ID), add constraint FK_WIKI_DOCUMENT_COUNT_COMMENT_DOCUMENT_ID foreign key (WIKI_DOCUMENT_ID) references WIKI_DOCUMENT (NODE_ID) on delete cascade;
+ </create>
+ <drop/>
+ <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/>
+ </database-object>
+
+ <database-object>
+ <create>
create index IDX_PREFERENCE_ENTITY_NAME on PREFERENCE (ENTITY_NAME)
</create>
<drop>
Modified: branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/NativeQueries.hbm.xml
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/NativeQueries.hbm.xml 2009-10-05 12:38:07 UTC (rev 11545)
+++ branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/NativeQueries.hbm.xml 2009-10-06 07:23:25 UTC (rev 11546)
@@ -21,4 +21,16 @@
limit 1
</sql-query>
+ <sql-query name="countCommentOfDocument">
+ <return-scalar column="COMMENT_COUNT" type="long"/>
+ select
+ count(distinct c0.NODE_ID) as COMMENT_COUNT
+ from
+ WIKI_NODE ct0
+ inner join WIKI_COMMENT ct1 on ct0.NODE_ID = ct1.NODE_ID
+ inner join WIKI_COMMENT c0 on c0.NS_THREAD in (ct1.NS_THREAD)
+ where
+ ct0.PARENT_NODE_ID = :documentId
+ </sql-query>
+
</hibernate-mapping>
\ No newline at end of file
Copied: branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentCountComment.java (from rev 11534, branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentLastComment.java)
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentCountComment.java (rev 0)
+++ branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentCountComment.java 2009-10-06 07:23:25 UTC (rev 11546)
@@ -0,0 +1,42 @@
+package org.jboss.seam.wiki.core.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * An ugly denormalization and duplication of data, so aggregation queries
+ * can execute faster on nested set trees.
+ *
+ * @author Christian Bauer
+ */
+@Entity
+@Table(name = "WIKI_DOCUMENT_COUNT_COMMENT")
+public class WikiDocumentCountComment {
+
+ @Id
+ @Column(name = "WIKI_DOCUMENT_ID", nullable = false)
+ private Long documentId;
+
+ @Column(name = "COMMENT_COUNT")
+ protected Long commentCount;
+
+ public WikiDocumentCountComment() {}
+
+ public Long getDocumentId() {
+ return documentId;
+ }
+
+ public void setDocumentId(Long documentId) {
+ this.documentId = documentId;
+ }
+
+ public Long getCommentCount() {
+ return commentCount;
+ }
+
+ public void setCommentCount(Long commentCount) {
+ this.commentCount = commentCount;
+ }
+}
\ No newline at end of file
Modified: branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java 2009-10-05 12:38:07 UTC (rev 11545)
+++ branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java 2009-10-06 07:23:25 UTC (rev 11546)
@@ -135,38 +135,18 @@
)
.list();
- // Find topic count (topics are just wiki documents in the forum directories)
- getSession(true).getNamedQuery("forumTopicCount")
- .setParameter("parentDir", forumsDirectory)
- .setComment("Finding topic count for all forums")
- .setResultTransformer(
- new ResultTransformer() {
- public Object transformTuple(Object[] result, String[] strings) {
- if (forumInfoMap.containsKey((Long)result[0])) {
- ForumInfo info = forumInfoMap.get( (Long)result[0] );
- info.setTotalNumOfTopics((Long)result[1]);
- info.setTotalNumOfPosts(info.getTotalNumOfTopics());
- }
- return null;
- }
- public List transformList(List list) { return list; }
- }
- )
- .list();
-
- // Add reply count to topic count to get total num of posts
- getSession(true).getNamedQuery("forumReplyCount")
+ // Find topic and replies count (topics are just wiki documents in the forum directories)
+ getSession(true).getNamedQuery("forumTopicReplyCount")
.setParameter("parentDirId", forumsDirectory.getId())
.setParameter("readAccessLevel", currentAccessLevel)
- .setComment("Finding reply count for all forums")
+ .setComment("Finding topic and replies count for all forums")
.setResultTransformer(
new ResultTransformer() {
public Object transformTuple(Object[] result, String[] strings) {
if (forumInfoMap.containsKey((Long)result[0])) {
ForumInfo info = forumInfoMap.get( (Long)result[0] );
- info.setTotalNumOfPosts(
- info.getTotalNumOfPosts() + (Long)result[1]
- );
+ info.setTotalNumOfTopics((Long)result[1]);
+ info.setTotalNumOfPosts(info.getTotalNumOfTopics() + (Long)result[2]);
}
return null;
}
Modified: branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumQueries.hbm.xml
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumQueries.hbm.xml 2009-10-05 12:38:07 UTC (rev 11545)
+++ branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumQueries.hbm.xml 2009-10-06 07:23:25 UTC (rev 11546)
@@ -76,36 +76,25 @@
order by m.displayPosition asc
</query>
- <query name="forumTopicCount">
- select
- f.id, count(distinct t)
- from
- WikiDirectory f, WikiDocument t
- where
- f.parent = :parentDir
- and t.parent = f
- and (t.headerMacrosString like '%forumPosting%' or t.headerMacrosString like '%forumStickyPosting%')
- group
- by f.id
- </query>
-
- <sql-query name="forumReplyCount">
+ <sql-query name="forumTopicReplyCount">
<return-scalar column="FORUM_ID" type="long"/>
+ <return-scalar column="TOPIC_COUNT" type="long"/>
<return-scalar column="REPLY_COUNT" type="long"/>
select
- dir0.NODE_ID as FORUM_ID, count(distinct c0.NODE_ID) as REPLY_COUNT
+ dir0.NODE_ID as FORUM_ID,
+ count(doc0.NODE_ID) as TOPIC_COUNT,
+ sum(dc.COMMENT_COUNT) as REPLY_COUNT
from
- WIKI_DIRECTORY dir0
- inner join WIKI_NODE dir1 on dir0.NODE_ID=dir1.NODE_ID
- and dir1.READ_ACCESS_LEVEL <= :readAccessLevel and dir1.PARENT_NODE_ID = :parentDirId
- inner join WIKI_NODE doc1 on doc1.PARENT_NODE_ID = dir0.NODE_ID
- and doc1.READ_ACCESS_LEVEL <= :readAccessLevel
- inner join WIKI_DOCUMENT doc0 on doc0.NODE_ID=doc1.NODE_ID
- and (doc0.HEADER_MACROS like '%forumPosting%' or doc0.HEADER_MACROS like '%forumStickyPosting%')
- inner join WIKI_NODE ct0 on ct0.PARENT_NODE_ID = doc0.NODE_ID
- inner join WIKI_COMMENT ct1 on ct0.NODE_ID = ct1.NODE_ID
- inner join WIKI_COMMENT c0 on c0.NS_THREAD in (ct1.NS_THREAD)
- group by dir0.NODE_ID
+ WIKI_NODE dir0
+ inner join WIKI_NODE doc1 on doc1.PARENT_NODE_ID = dir0.NODE_ID
+ and doc1.READ_ACCESS_LEVEL <= :readAccessLevel
+ inner join WIKI_DOCUMENT doc0 on doc0.NODE_ID=doc1.NODE_ID
+ and (doc0.HEADER_MACROS like '%forumPosting%' or doc0.HEADER_MACROS like '%forumStickyPosting%')
+ left outer join WIKI_DOCUMENT_COUNT_COMMENT dc on dc.WIKI_DOCUMENT_ID = doc0.NODE_ID
+ where
+ dir0.READ_ACCESS_LEVEL <= :readAccessLevel and dir0.PARENT_NODE_ID = :parentDirId
+ group by
+ dir0.NODE_ID
</sql-query>
<sql-query name="forumLastTopic">
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-10-05 12:38:07 UTC (rev 11545)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java 2009-10-06 07:23:25 UTC (rev 11546)
@@ -7,12 +7,13 @@
package org.jboss.seam.wiki.test.editing;
import org.dbunit.operation.DatabaseOperation;
+import org.jboss.seam.mock.DBUnitSeamTest;
import org.jboss.seam.wiki.core.action.CommentHome;
import org.jboss.seam.wiki.core.action.CommentQuery;
-import org.jboss.seam.wiki.core.model.*;
import org.jboss.seam.wiki.core.dao.WikiNodeDAO;
-import org.jboss.seam.mock.DBUnitSeamTest;
-import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.wiki.core.model.User;
+import org.jboss.seam.wiki.core.model.WikiDocumentCountComment;
+import org.jboss.seam.wiki.core.model.WikiDocumentLastComment;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
@@ -78,6 +79,10 @@
WikiDocumentLastComment lastComment = em.find(WikiDocumentLastComment.class, 6l);
assert lastComment != null;
assert lastComment.getLastCommentId().equals(commentQuery.getComments().get(6).getId());
+
+ WikiDocumentCountComment countComment = em.find(WikiDocumentCountComment.class, 6l);
+ assert countComment != null;
+ assert countComment.getCommentCount() == 8;
}
}.run();
@@ -138,6 +143,10 @@
WikiDocumentLastComment lastComment = em.find(WikiDocumentLastComment.class, 6l);
assert lastComment != null;
assert lastComment.getLastCommentId().equals(commentQuery.getComments().get(6).getId());
+
+ WikiDocumentCountComment countComment = em.find(WikiDocumentCountComment.class, 6l);
+ assert countComment != null;
+ assert countComment.getCommentCount() == 7;
}
}.run();
@@ -179,6 +188,9 @@
assert lastComment != null;
assert lastComment.getLastCommentId().equals(13l);
+ WikiDocumentCountComment countComment = em.find(WikiDocumentCountComment.class, 6l);
+ assert countComment != null;
+ assert countComment.getCommentCount() == 4;
}
}.run();
15 years, 2 months
Seam SVN: r11545 - in branches/community/Seam_2_2/src/test/ftest: seamgen and 1 other directory.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-05 08:38:07 -0400 (Mon, 05 Oct 2009)
New Revision: 11545
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml
Log:
minor
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 12:05:35 UTC (rev 11544)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 12:38:07 UTC (rev 11545)
@@ -235,6 +235,7 @@
<cleanexample name="ui" />
<cleanexample name="wicket" />
<cleanexample name="wicket-runtime" />
+ <ant antfile="${ftest.dir}/seamgen/build.xml" target="clean" />
</target>
<target name="undeployall">
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml 2009-10-05 12:05:35 UTC (rev 11544)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml 2009-10-05 12:38:07 UTC (rev 11545)
@@ -32,11 +32,12 @@
<property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
<property name="common.src.dir" value="${ftest.dir}/src/main" />
<property name="src.dir" value="src/main" />
- <property name="seamgen.build.dir" value="build" />
+ <property name="seamgen.build.dir" value="${ftest.dir}/seamgen/build" />
<property name="classes.dir" value="${seamgen.build.dir}/classes" />
<property name="test.output.dir" value="${seam.dir}/test-output" />
<property name="ftest.lib.dir" value="${ftest.dir}/lib" />
<property name="root.lib.dir" value="${seam.dir}/lib" />
+ <property name="ftest.config.location" value="src/test/ftest/ftest.properties"/>
<property file="${seam.dir}/${ftest.config.location}" />
15 years, 2 months
Seam SVN: r11544 - in branches/community/Seam_2_2/src/test/ftest: examples and 2 other directories.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-05 08:05:35 -0400 (Mon, 05 Oct 2009)
New Revision: 11544
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/build.xml
branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml
branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java
Log:
Upgraded to selenium 1.0.1
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 10:10:27 UTC (rev 11543)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 12:05:35 UTC (rev 11544)
@@ -35,18 +35,18 @@
<!-- TODO : should the libs be in seam/lib and managed with mvn? -->
<property name="lib.dir" value="${ftest.dir}/lib" />
<property name="log.dir" value="${ftest.dir}/log" />
-
- <!-- Build resources -->
+
+ <!-- Build resources -->
<import file="${seam.dir}/build/common.build.xml" />
-
+
<path id="selenium.server.classpath">
<fileset dir="${lib.dir}">
<include name="selenium-server-standalone.jar" />
</fileset>
</path>
-
+
<!-- TODO : should the libs be in seam/lib and managed with mvn? -->
- <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="../../../lib/groovy-all.jar"/>
+ <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="../../../lib/groovy-all.jar"/>
<target name="testall" description="Run functional testsuite based on container property">
<fail unless="container">Please set container property.</fail>
@@ -90,7 +90,7 @@
<antcall target="stop.selenium.server" />
<antcall target="stop.container" />
</target>
-
+
<target name="testall.jboss5" description="Run functional testsuite for JBoss 5">
<property name="container" value="jboss5" />
<antcall target="start.container" />
@@ -276,20 +276,11 @@
<undeployexample name="wicket" />
</target>
- <!-- Target for declaring needed libraries for tests to run -->
- <target name="import.libraries">
- <copyInlineDependencies id="selenium.server" scope="compile" todir="${lib.dir}">
- <dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0-beta-2" classifier="standalone"/>
- <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0-beta-2">
- <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default"/>
- </dependency>
- </copyInlineDependencies>
+ <target name="copy.selenium">
+ <ant antfile="${ftest.dir}/examples/build.xml" target="copy.selenium" />
</target>
-
- <target name="start.selenium.server">
- <!-- Added for downloading libraries -->
- <antcall target="import.libraries"> </antcall>
-
+
+ <target name="start.selenium.server" depends="copy.selenium">
<java classpathref="selenium.server.classpath" classname="org.openqa.selenium.server.SeleniumServer" fork="true" spawn="true">
<arg line="-port ${selenium.server.port}" />
<arg line="${selenium.server.cmd.args}" />
@@ -298,14 +289,14 @@
<waitfor maxwait="30" maxwaitunit="second">
<and>
<socket server="${selenium.host}" port="${selenium.server.port}" />
- <!-- this url will 403, so we say that it should start counting errors at 404 to skip -->
- <http url="http://${selenium.host}:${selenium.server.port}/selenium-server/core/index.html" errorsBeginAt="404" />
+ <!-- this url will start returning 404 once the server is up, we set errorsBeginAt to 405 for the 404 response to be considered correct -->
+ <http url="http://${selenium.host}:${selenium.server.port}/selenium-server/core/index.html" errorsBeginAt="405" />
</and>
</waitfor>
</target>
<target name="stop.selenium.server">
- <get taskname="selenium-shutdown" src="http://${selenium.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDown" dest="${log.dir}/server.shutdown.dest.log" ignoreerrors="true" />
+ <get taskname="selenium-shutdown" src="http://${selenium.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" dest="${log.dir}/server.shutdown.dest.log" ignoreerrors="true" />
<echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
</target>
@@ -350,7 +341,7 @@
<callExample path="@{path}" target="undeploy.example" />
</sequential>
</macrodef>
-
+
<macrodef name="callExample">
<attribute name="path" />
<attribute name="target" />
@@ -369,19 +360,19 @@
<antcall target="start.container" >
</antcall>
</target>
-
+
<target name="stop.container" if="run.container.per.suite">
<echo>Stopping container</echo>
<ant antfile="examples/build.xml" target="stop.container.jboss" inheritall="false">
<property name="container" value="${container}" />
- </ant>
+ </ant>
</target>
<target name="start.container" if="run.container.per.suite">
<echo>Starting container</echo>
<ant antfile="examples/build.xml" target="start.container.jboss" inheritall="false">
<property name="container" value="${container}" />
- </ant>
+ </ant>
</target>
-
+
</project>
Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 10:10:27 UTC (rev 11543)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 12:05:35 UTC (rev 11544)
@@ -86,7 +86,7 @@
<target name="build.extras" description="Build example specific files before build">
</target>
- <target name="build" depends="build.common, build.extras, copy.htmlunit" description="Compiles the Test">
+ <target name="build" depends="build.common, build.extras, copy.htmlunit, copy.selenium" description="Compiles the Test">
<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
<copy todir="${classes.dir}">
<fileset dir="${src.dir}">
@@ -234,7 +234,7 @@
</waitfor>
</target>
- <target name="stop.container.jboss" depends="container.properties" >
+ <target name="stop.container.jboss" depends="container.properties" >
<sequential>
<echo message="Shutting down JBoss server"/>
<java classname="org.jboss.Shutdown" fork="false" dir="${container.home}/bin">
@@ -278,5 +278,19 @@
<dependency groupId="xml-apis" artifactId="xml-apis" version="1.3.03"/>
</copyInlineDependencies>
</target>
+
+ <target name="copy.selenium">
+ <copyInlineDependencies id="selenium.server" scope="compile" todir="${ftest.lib.dir}">
+ <dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0.1" classifier="standalone">
+ <exclusion groupId="org.seleniumhq.selenium.core" artifactId="selenium-core" />
+ <exclusion groupId="org.seleniumhq.selenium.server" artifactId="selenium-server-coreless" />
+ <exclusion groupId="org.apache.ant" artifactId="ant-trax" />
+ <exclusion groupId="org.apache.ant" artifactId="ant-nodeps" />
+ </dependency>
+ <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0.1">
+ <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default" />
+ </dependency>
+ </copyInlineDependencies>
+ </target>
</project>
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml 2009-10-05 10:10:27 UTC (rev 11543)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml 2009-10-05 12:05:35 UTC (rev 11544)
@@ -43,6 +43,10 @@
<!-- common path setup -->
<path id="classpath.build">
+ <fileset dir="${root.lib.dir}">
+ <include name="testng.jar"/>
+ <include name="gen/ant.jar"/>
+ </fileset>
<fileset dir="${ftest.lib.dir}" includes="**/*.jar" />
</path>
@@ -63,19 +67,10 @@
<delete dir="${log.dir}" />
</target>
- <!-- Target for declaring needed libraries for tests runs -->
- <target name="import.libraries">
- <copyInlineDependencies id="selenium.server" scope="compile" todir="${ftest.lib.dir}">
- <dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0-beta-2" classifier="standalone"/>
- <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0-beta-2">
- <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default"/>
- </dependency>
- <dependency groupId="org.apache.ant" artifactId="ant" version="1.7.0"/>
- <dependency groupId="org.apache.ant" artifactId="ant-launcher" version="1.7.0"/>
- <dependency groupId="org.testng" artifactId="testng" version="5.9"/>
- </copyInlineDependencies>
+ <target name="copy.selenium">
+ <ant antfile="${ftest.dir}/examples/build.xml" target="copy.selenium" />
</target>
-
+
<target name="build" depends="build.common" description="Compiles the Test">
<mkdir dir="${classes.dir}" />
<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
@@ -86,10 +81,7 @@
</copy>
</target>
- <target name="build.common" description="Compiles the common selenium test code">
- <!-- Added for downloading libraries -->
- <antcall target="import.libraries"> </antcall>
-
+ <target name="build.common" depends="copy.selenium" description="Compiles the common selenium test code">
<mkdir dir="${classes.dir}" />
<javac srcdir="${common.src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
<copy todir="${classes.dir}">
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java 2009-10-05 10:10:27 UTC (rev 11543)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java 2009-10-05 12:05:35 UTC (rev 11544)
@@ -245,9 +245,9 @@
else if("-log".equals(cmd)) {
rcc.setLogOutFileName(parameters.nextToken());
}
- else if("-singleWindow".equals(cmd)) {
+ /*else if("-singleWindow".equals(cmd)) {
rcc.setMultiWindow(false);
- }
+ }*/
else if("-avoidProxy".equals(cmd)) {
rcc.setHonorSystemProxy(false);
}
15 years, 2 months
Seam SVN: r11543 - branches/community/Seam_2_2/src/test/ftest.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-05 06:10:27 -0400 (Mon, 05 Oct 2009)
New Revision: 11543
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
Log:
rollback of r11537
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 10:06:00 UTC (rev 11542)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 10:10:27 UTC (rev 11543)
@@ -377,9 +377,6 @@
</ant>
</target>
<target name="start.container" if="run.container.per.suite">
- <!-- Added for downloading libraries -->
- <antcall target="import.libraries"> </antcall>
-
<echo>Starting container</echo>
<ant antfile="examples/build.xml" target="start.container.jboss" inheritall="false">
<property name="container" value="${container}" />
15 years, 2 months
Seam SVN: r11542 - branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-05 06:06:00 -0400 (Mon, 05 Oct 2009)
New Revision: 11542
Modified:
branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
Log:
minor
Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2009-10-05 10:04:20 UTC (rev 11541)
+++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2009-10-05 10:06:00 UTC (rev 11542)
@@ -97,7 +97,10 @@
}
public void stopBrowser() {
- browser.stop();
+ if (browser != null)
+ {
+ browser.stop();
+ }
}
public String getProperty(String key) {
15 years, 2 months
Seam SVN: r11541 - in branches/community/Seam_2_2/src/test/ftest: examples and 1 other directory.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-05 06:04:20 -0400 (Mon, 05 Oct 2009)
New Revision: 11541
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/build.xml
Log:
minor
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 09:59:48 UTC (rev 11540)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 10:04:20 UTC (rev 11541)
@@ -283,7 +283,6 @@
<dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0-beta-2">
<exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default"/>
</dependency>
- <dependency groupId="org.testng" artifactId="testng" version="5.9"/>
</copyInlineDependencies>
</target>
Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 09:59:48 UTC (rev 11540)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 10:04:20 UTC (rev 11541)
@@ -62,7 +62,9 @@
<!-- common path setup -->
<path id="classpath.build">
- <fileset dir="${root.lib.dir}" includes="**/*.jar" />
+ <fileset dir="${root.lib.dir}">
+ <include name="testng.jar"/>
+ </fileset>
<fileset dir="${ftest.lib.dir}" includes="**/*.jar" />
</path>
15 years, 2 months
Seam SVN: r11540 - in branches/community/Seam_2_2/src/test/ftest: examples and 1 other directories.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-05 05:59:48 -0400 (Mon, 05 Oct 2009)
New Revision: 11540
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/ui/build.xml
Log:
JBSEAM-4430 fixed htmlunit dependency
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 09:36:31 UTC (rev 11539)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 09:59:48 UTC (rev 11540)
@@ -352,38 +352,10 @@
</sequential>
</macrodef>
- <!-- Target for declaring needed libraries for ftest tests -->
- <target name="importlibraries">
- <copyInlineDependencies id="allexamples" scope="compile" todir="${lib.dir}">
- <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit" version="2.3"/>
- <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.1"/>
- <dependency groupId="org.w3c" artifactId="sac" version="1.3"/>
- <dependency groupId="commons-io" artifactId="commons-io" version="1.3.1"/>
- <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/>
- <dependency groupId="apache-xerces" artifactId="xercesImpl" version="2.9.0"/>
- <dependency groupId="commons-collections" artifactId="commons-collections" version="3.1"/>
- <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/>
- <dependency groupId="apache-xalan" artifactId="xalan" version="j_2.7.0"/>
- <dependency groupId="commons-codec" artifactId="commons-codec" version="1.3"/>
- <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
- <dependency groupId="net.sourceforge.cssparser" artifactId="cssparser" version="0.9.5"/>
- <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit-core-js" version="2.4"/>
- <dependency groupId="net.sourceforge.nekohtml" artifactId="nekohtml" version="1.9.9"/>
- <dependency groupId="apache-xalan" artifactId="serializer" version="j_2.7.0"/>
- <dependency groupId="xml-apis" artifactId="xml-apis" version="1.3.03"/>
- </copyInlineDependencies>
- </target>
-
-
-
<macrodef name="callExample">
<attribute name="path" />
<attribute name="target" />
<sequential>
-
- <!-- Added for downloading libraries -->
- <antcall target="importlibraries"> </antcall>
-
<ant dir="@{path}" target="@{target}" inheritall="false">
<property name="container" value="${container}">
</property>
Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 09:36:31 UTC (rev 11539)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 09:59:48 UTC (rev 11540)
@@ -31,8 +31,8 @@
<property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
<property name="src.dir" value="src" />
<property name="common.src.dir" value="${ftest.dir}/src/main" />
- <property name="build.dir" value="build" />
- <property name="classes.dir" value="${build.dir}/classes" />
+ <property name="local.build.dir" value="build" />
+ <property name="classes.dir" value="${local.build.dir}/classes" />
<property name="test.output.dir" value="${seam.dir}/test-output" />
<property name="ftest.lib.dir" value="${ftest.dir}/lib" />
<property name="log.dir" value="log" />
@@ -56,6 +56,8 @@
<property name="functional.listener" value="org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener"/>
<property name="root.lib.dir" value="${seam.dir}/lib" />
+ <!-- Build resources -->
+ <import file="${seam.dir}/build/common.build.xml" />
<!-- common path setup -->
@@ -72,7 +74,7 @@
<!-- common target definitions -->
<target name="clean" description="Delete all generated files">
- <delete dir="${build.dir}" />
+ <delete dir="${local.build.dir}" />
<delete dir="${test.output.dir}" />
<delete dir="${report.dir}" />
<delete dir="${log.dir}" />
@@ -82,7 +84,7 @@
<target name="build.extras" description="Build example specific files before build">
</target>
- <target name="build" depends="build.common, build.extras" description="Compiles the Test">
+ <target name="build" depends="build.common, build.extras, copy.htmlunit" description="Compiles the Test">
<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
<copy todir="${classes.dir}">
<fileset dir="${src.dir}">
@@ -252,5 +254,27 @@
<sleep seconds="3"/>
</sequential>
</target>
+
+ <!-- Target for obtaining htmlunit -->
+ <target name="copy.htmlunit" if="depends.htmlunit">
+ <copyInlineDependencies id="allexamples" scope="compile" todir="${ftest.lib.dir}">
+ <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit" version="2.3"/>
+ <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.1"/>
+ <dependency groupId="org.w3c" artifactId="sac" version="1.3"/>
+ <dependency groupId="commons-io" artifactId="commons-io" version="1.3.1"/>
+ <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/>
+ <dependency groupId="apache-xerces" artifactId="xercesImpl" version="2.9.0"/>
+ <dependency groupId="commons-collections" artifactId="commons-collections" version="3.1"/>
+ <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/>
+ <dependency groupId="apache-xalan" artifactId="xalan" version="j_2.7.0"/>
+ <dependency groupId="commons-codec" artifactId="commons-codec" version="1.3"/>
+ <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
+ <dependency groupId="net.sourceforge.cssparser" artifactId="cssparser" version="0.9.5"/>
+ <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit-core-js" version="2.4"/>
+ <dependency groupId="net.sourceforge.nekohtml" artifactId="nekohtml" version="1.9.9"/>
+ <dependency groupId="apache-xalan" artifactId="serializer" version="j_2.7.0"/>
+ <dependency groupId="xml-apis" artifactId="xml-apis" version="1.3.03"/>
+ </copyInlineDependencies>
+ </target>
</project>
Modified: branches/community/Seam_2_2/src/test/ftest/examples/ui/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/ui/build.xml 2009-10-05 09:36:31 UTC (rev 11539)
+++ branches/community/Seam_2_2/src/test/ftest/examples/ui/build.xml 2009-10-05 09:59:48 UTC (rev 11540)
@@ -23,6 +23,8 @@
<project name="ui.ftest.build" basedir="." default="build">
<property name="example.name" value="ui" />
+ <property name="depends.htmlunit" value="true"/>
+
<import file="../build.xml" />
<!-- Location of Seam -->
15 years, 2 months
Seam SVN: r11539 - in branches/community/Seam_2_2/src/test/ftest: examples and 1 other directory.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-05 05:36:31 -0400 (Mon, 05 Oct 2009)
New Revision: 11539
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/build.xml
branches/community/Seam_2_2/src/test/ftest/ftest.properties
Log:
JBSEAM-4430 removed jboss-test dependency
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 09:23:24 UTC (rev 11538)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 09:36:31 UTC (rev 11539)
@@ -283,7 +283,6 @@
<dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0-beta-2">
<exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default"/>
</dependency>
- <dependency groupId="org.jboss.test" artifactId="jboss-test" version="1.1.0.GA"/>
<dependency groupId="org.testng" artifactId="testng" version="5.9"/>
</copyInlineDependencies>
</target>
Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 09:23:24 UTC (rev 11538)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 09:36:31 UTC (rev 11539)
@@ -69,10 +69,6 @@
<path location="${classes.dir}" />
</path>
- <taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader" classpathref="classpath.build" />
- <taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader" classpathref="classpath.build" />
- <taskdef name="stop" classname="org.jboss.ant.taskdefs.server.StopServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader" classpathref="classpath.build" />
-
<!-- common target definitions -->
<target name="clean" description="Delete all generated files">
@@ -221,13 +217,17 @@
</target>
<target name="start.container.jboss" depends="container.properties">
- <server:config javaHome="${java.home}" jbossHome="${container.home}">
- <server name="${container.profile}">
- <jvmarg value="${container.jvm.arguments}" />
- <sysproperty key="java.endorsed.dirs" value="${container.home}/lib/endorsed" />
- </server>
- </server:config>
- <server:start name="${container.profile}" />
+ <echo message="Starting JBoss server" />
+ <java classname="org.jboss.Main" fork="true" spawn="true" dir="${container.home}/bin">
+ <classpath>
+ <pathelement location="${container.home}/bin/run.jar" />
+ </classpath>
+ <jvmarg line="${container.jvm.arguments}" />
+ <arg line="-c ${jboss.domain} -b ${jboss.host}" />
+ </java>
+ <waitfor maxwait="2" maxwaitunit="minute">
+ <socket server="localhost" port="8080" />
+ </waitfor>
</target>
<target name="stop.container.jboss" depends="container.properties" >
Modified: branches/community/Seam_2_2/src/test/ftest/ftest.properties
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/ftest.properties 2009-10-05 09:23:24 UTC (rev 11538)
+++ branches/community/Seam_2_2/src/test/ftest/ftest.properties 2009-10-05 09:36:31 UTC (rev 11539)
@@ -67,6 +67,8 @@
run.container.per.suite=false
jboss.deployments.restart=10
+jboss.domain=default
+jboss.host=localhost
# These credentials are needed for JBoss restart. See ${JBOSS_HOME}/server/${jboss.profile}/conf/props/jmx-console-users.properties
jboss.jmx.username=admin
@@ -98,4 +100,3 @@
test.package=com.example.test
richfaces.skin=classic
icefaces.home=
-jboss.domain=default
15 years, 2 months
Seam SVN: r11538 - branches/community/Seam_2_2/src/test/ftest.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-05 05:23:24 -0400 (Mon, 05 Oct 2009)
New Revision: 11538
Modified:
branches/community/Seam_2_2/src/test/ftest/ftest.properties
Log:
minor
Modified: branches/community/Seam_2_2/src/test/ftest/ftest.properties
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/ftest.properties 2009-10-05 06:58:56 UTC (rev 11537)
+++ branches/community/Seam_2_2/src/test/ftest/ftest.properties 2009-10-05 09:23:24 UTC (rev 11538)
@@ -75,10 +75,6 @@
# seam-gen specific properties
#seamgen.delete.project=true
-# If set to true, the container is launched automatically prior to testsuite execution and shut down after it finishes
-# The container has to be run manually otherwise
-seamgen.control.container=false
-
# workspace for new projects
workspace.home=
15 years, 2 months