[seam-commits] Seam SVN: r11163 - in branches/community/Seam_2_2: build and 4 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Tue Jun 16 12:18:30 EDT 2009
Author: manaRH
Date: 2009-06-16 12:18:30 -0400 (Tue, 16 Jun 2009)
New Revision: 11163
Modified:
branches/community/Seam_2_2/build.xml
branches/community/Seam_2_2/build/build.properties
branches/community/Seam_2_2/build/common.build.xml
branches/community/Seam_2_2/build/embedded/build.xml
branches/community/Seam_2_2/build/embedded/hibernate-all.pom.xml
branches/community/Seam_2_2/build/embedded/jboss-embedded-all.pom.xml
branches/community/Seam_2_2/build/embedded/jboss-embedded.pom.xml
branches/community/Seam_2_2/build/embedded/shaded/hibernate-all.pom.xml
branches/community/Seam_2_2/build/embedded/shaded/jboss-embedded-all.pom.xml
branches/community/Seam_2_2/build/embedded/shaded/jboss-embedded.pom.xml
branches/community/Seam_2_2/build/embedded/shaded/thirdparty-all.pom.xml
branches/community/Seam_2_2/build/embedded/thirdparty-all.pom.xml
branches/community/Seam_2_2/build/root.pom.xml
branches/community/Seam_2_2/src/test/integration/resources/test-destinations-service.xml
branches/community/Seam_2_2/src/test/integration/src/org/jboss/seam/test/integration/testng.xml
Log:
JBSEAM-4201
Modified: branches/community/Seam_2_2/build/build.properties
===================================================================
--- branches/community/Seam_2_2/build/build.properties 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/build.properties 2009-06-16 16:18:30 UTC (rev 11163)
@@ -1,6 +1,6 @@
-offline.repository.jboss.org /Users/pmuir/workspace/repository.jboss.org/maven2
-embedded.poms.dir /Users/pmuir/workspace/seam/build/embedded
-embedded.dir /Users/pmuir/workspace/jbossas/embedded
+offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repo
+embedded.poms.dir /home/mnovotny/workspaces/jboss/jboss-seam_2_2/build/embedded
+embedded.dir /home/mnovotny/projects/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded
#embedded.jars.dir /Users/pmuir/tmp/embedded-jboss-beta3/lib
#ßembedded.dist.zip /Users/pmuir/Desktop/downloads/embedded-jboss-beta3.zip
-embedded.version beta3
\ No newline at end of file
+embedded.version beta3.SP7
\ No newline at end of file
Modified: branches/community/Seam_2_2/build/common.build.xml
===================================================================
--- branches/community/Seam_2_2/build/common.build.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/common.build.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -23,7 +23,7 @@
<property name="maven.settings.xml" location="${build.dir}/settings.xml" />
- <property name="embedded.version" value="beta3" />
+ <property name="embedded.version" value="beta3.SP7" />
<import file="${build.dir}/utilities.build.xml" />
Modified: branches/community/Seam_2_2/build/embedded/build.xml
===================================================================
--- branches/community/Seam_2_2/build/embedded/build.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/embedded/build.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -13,7 +13,7 @@
<path id="maven-ant-tasks.classpath" path="${build.dir}/lib/maven-ant-tasks.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-
+
<property name="shaded.embedded.jars.dir" value="${tmp.dir}/embedded"/>
<property name="embedded.jars.dir" value="${embedded.dir}/output/lib/embedded-jboss/lib" />
<property name="embedded.dist.zip" value="${embedded.dir}/embedded-jboss-${embedded.version}.zip" />
@@ -35,6 +35,7 @@
<jar destfile="${shaded.embedded.jars.dir}/thirdparty-all.jar">
<zipfileset src="${embedded.jars.dir}/thirdparty-all.jar" />
<zipfileset src="${lib.dir}/lucene-core.jar"/>
+ <zipfileset src="${lib.dir}/slf4j-log4j12.jar"/>
</jar>
<copy file="${embedded.jars.dir}/jboss-embedded.jar" todir="${shaded.embedded.jars.dir}" />
<copy file="${embedded.jars.dir}/jboss-embedded-all.jar" todir="${shaded.embedded.jars.dir}" />
Modified: branches/community/Seam_2_2/build/embedded/hibernate-all.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/embedded/hibernate-all.pom.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/embedded/hibernate-all.pom.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3</version>
+ <version>beta3.SP7</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/community/Seam_2_2/build/embedded/jboss-embedded-all.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/embedded/jboss-embedded-all.pom.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/embedded/jboss-embedded-all.pom.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3</version>
+ <version>beta3.SP7</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-SNAPSHOT</version>
+ <version>beta3.SP7</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/community/Seam_2_2/build/embedded/jboss-embedded.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/embedded/jboss-embedded.pom.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/embedded/jboss-embedded.pom.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
- <version>beta3</version>
+ <version>beta3.SP7</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all.</description>
<dependencies>
Modified: branches/community/Seam_2_2/build/embedded/shaded/hibernate-all.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/embedded/shaded/hibernate-all.pom.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/embedded/shaded/hibernate-all.pom.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3</version>
+ <version>beta3.SP7</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/community/Seam_2_2/build/embedded/shaded/jboss-embedded-all.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/embedded/shaded/jboss-embedded-all.pom.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/embedded/shaded/jboss-embedded-all.pom.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3</version>
+ <version>beta3.SP7</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-SNAPSHOT</version>
+ <version>beta3.SP7</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/community/Seam_2_2/build/embedded/shaded/jboss-embedded.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/embedded/shaded/jboss-embedded.pom.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/embedded/shaded/jboss-embedded.pom.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3</version>
+ <version>beta3.SP7</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/community/Seam_2_2/build/embedded/shaded/thirdparty-all.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/embedded/shaded/thirdparty-all.pom.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/embedded/shaded/thirdparty-all.pom.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3</version>
+ <version>beta3.SP7</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/community/Seam_2_2/build/embedded/thirdparty-all.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/embedded/thirdparty-all.pom.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/embedded/thirdparty-all.pom.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3</version>
+ <version>beta3.SP7</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS.</description>
</project>
Modified: branches/community/Seam_2_2/build/root.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/root.pom.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build/root.pom.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -375,11 +375,11 @@
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -839,7 +839,7 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3</version>
+ <version>beta3.SP7</version>
</dependency>
<dependency>
@@ -1218,6 +1218,12 @@
<version>${version.wicket}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Modified: branches/community/Seam_2_2/build.xml
===================================================================
--- branches/community/Seam_2_2/build.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/build.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -837,6 +837,8 @@
<path refid="runtime.emma.path" />
<path refid="test.core.path" />
<pathelement location="${lib.dir}/jboss-seam-remoting.jar" />
+ <!-- this is added because of conflicts with commons-logging which comes with richfaces-->
+ <pathelement location="${lib.dir}/test/thirdparty-all.jar" />
</classpath>
<xmlfileset dir="${classes.test.dir}" includes="**/testng.xml" />
</testng>
Modified: branches/community/Seam_2_2/src/test/integration/resources/test-destinations-service.xml
===================================================================
--- branches/community/Seam_2_2/src/test/integration/resources/test-destinations-service.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/src/test/integration/resources/test-destinations-service.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -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/community/Seam_2_2/src/test/integration/src/org/jboss/seam/test/integration/testng.xml
===================================================================
--- branches/community/Seam_2_2/src/test/integration/src/org/jboss/seam/test/integration/testng.xml 2009-06-16 04:41:23 UTC (rev 11162)
+++ branches/community/Seam_2_2/src/test/integration/src/org/jboss/seam/test/integration/testng.xml 2009-06-16 16:18:30 UTC (rev 11163)
@@ -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>
More information about the seam-commits
mailing list