Seam SVN: r12942 - build/tags.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-02 09:01:39 -0400 (Wed, 02 Jun 2010)
New Revision: 12942
Added:
build/tags/seam-parent-1/
Log:
[maven-scm] copy for tag seam-parent-1
Copied: build/tags/seam-parent-1 (from rev 12941, build/trunk/parent)
14 years, 9 months
Seam SVN: r12939 - build/trunk/parent.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-02 08:57:06 -0400 (Wed, 02 Jun 2010)
New Revision: 12939
Modified:
build/trunk/parent/pom.xml
Log:
use latest weld-parent
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2010-06-02 12:54:32 UTC (rev 12938)
+++ build/trunk/parent/pom.xml 2010-06-02 12:57:06 UTC (rev 12939)
@@ -5,17 +5,17 @@
<groupId>org.jboss.seam</groupId>
<artifactId…
[View More]>seam-parent</artifactId>
<packaging>pom</packaging>
- <version>3.0.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
<name>Seam Parent</name>
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>10</version>
+ <version>11</version>
</parent>
<description>
- The Parent for Seam modules
+ The parent for Seam modules, containing example and test dependencies
</description>
<url>http://www.seamframework.org</url>
@@ -34,66 +34,31 @@
</developer>
</developers>
- <!-- Dependency management, including extra repositories if needed -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Release Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>apache-incubating</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </pluginRepository>
- </pluginRepositories>
-
+ <!--
+ seam-parent declares versions that should NOT be exported to
+ consuming projects such as test dependencies and example
+ dependencies
+ -->
<properties>
- <seam.version>3.0.0-SNAPSHOT</seam.version>
<testng.version>5.10</testng.version>
- <slf4j.version>1.5.9.RC1</slf4j.version>
- <jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version>
- <weld.version>1.0.0</weld.version>
+ <junit.version>4.8.1</junit.version>
+ <arquillian.version>1.0.0.Alpha2</arquillian.version>
+ <slf4j.version>1.5.10</slf4j.version>
+ <weld.se.version>1.0.1-Final</weld.se.version>
+ <weld.servlet.version>1.0.1-Final</weld.servlet.version>
+ <glassfish.el.version>2.1.2-b04</glassfish.el.version>
+ <jsf.impl.version>2.0.2</jsf.impl.version>
+ <hibernate.validator.version>4.0.0.GA</hibernate.validator.version>
+ <hibernate.version>3.5.1-Final</hibernate.version>
+ <jsfmock.version>1.0.0</jsfmock.version>
+ <pretty.faces.version>2.0.4</pretty.faces.version>
+ <hsqldb.version>1.8.0.10</hsqldb.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-bom</artifactId>
- <version>${seam.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng.version}</version>
@@ -107,39 +72,108 @@
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-junit</artifactId>
+ <version>${arquillian.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-embedded</artifactId>
+ <version>${arquillian.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-jbossas-remote-60</artifactId>
+ <version>${arquillian.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-embedded-30</artifactId>
+ <version>${arquillian.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <version>${jboss.test.harness.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <version>${weld.version}</version>
+ <artifactId>weld-se</artifactId>
+ <version>${weld.se.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <version>${weld.servlet.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>${glassfish.el.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate.validator.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <version>${jsfmock.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.ocpsoft</groupId>
+ <artifactId>ocpsoft-pretty-faces</artifactId>
+ <version>${pretty.faces.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldb.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
- <dependencies>
- <!--
- The reason slf4j-jdk14 is included at runtime scope is because
- slf4j-api is compile scope and, without the JDK 1.4 bridge, JBoss AS
- will barf. This should be included by weld-extensions to make it easy
- to exclude if necessary.
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
</project>
[View Less]
14 years, 9 months
Seam SVN: r12936 - in modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test: timezone and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-02 08:49:18 -0400 (Wed, 02 Jun 2010)
New Revision: 12936
Modified:
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-available.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-fail.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country-variant.xml
modules/international/…
[View More]trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override-fail.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override.xml
Log:
lax xsd
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-available.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-available.xml 2010-06-02 12:46:44 UTC (rev 12935)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-available.xml 2010-06-02 12:49:18 UTC (rev 12936)
@@ -25,7 +25,7 @@
xmlns:lc="urn:java:org.jboss.seam.international.locale"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+ http://docs.jboss.org/cdi/beans_1_0.xsd">
<lc:AvailableLocales>
<s:specializes/>
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-fail.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-fail.xml 2010-06-02 12:46:44 UTC (rev 12935)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-fail.xml 2010-06-02 12:49:18 UTC (rev 12936)
@@ -25,7 +25,7 @@
xmlns:lc="urn:java:org.jboss.seam.international.locale"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+ http://docs.jboss.org/cdi/beans_1_0.xsd">
<lc:DefaultLocaleProducer>
<s:specializes/>
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country-variant.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country-variant.xml 2010-06-02 12:46:44 UTC (rev 12935)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country-variant.xml 2010-06-02 12:49:18 UTC (rev 12936)
@@ -25,7 +25,7 @@
xmlns:lc="urn:java:org.jboss.seam.international.locale"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+ http://docs.jboss.org/cdi/beans_1_0.xsd">
<lc:DefaultLocaleProducer>
<s:specializes/>
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country.xml 2010-06-02 12:46:44 UTC (rev 12935)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country.xml 2010-06-02 12:49:18 UTC (rev 12936)
@@ -25,7 +25,7 @@
xmlns:lc="urn:java:org.jboss.seam.international.locale"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+ http://docs.jboss.org/cdi/beans_1_0.xsd">
<lc:DefaultLocaleProducer>
<s:specializes/>
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang.xml 2010-06-02 12:46:44 UTC (rev 12935)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang.xml 2010-06-02 12:49:18 UTC (rev 12936)
@@ -25,7 +25,7 @@
xmlns:lc="urn:java:org.jboss.seam.international.locale"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+ http://docs.jboss.org/cdi/beans_1_0.xsd">
<lc:DefaultLocaleProducer>
<s:specializes/>
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override-fail.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override-fail.xml 2010-06-02 12:46:44 UTC (rev 12935)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override-fail.xml 2010-06-02 12:49:18 UTC (rev 12936)
@@ -25,7 +25,7 @@
xmlns:tz="urn:java:org.jboss.seam.international.timezone"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+ http://docs.jboss.org/cdi/beans_1_0.xsd">
<tz:DefaultTimeZoneProducer>
<s:specializes/>
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override.xml 2010-06-02 12:46:44 UTC (rev 12935)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override.xml 2010-06-02 12:49:18 UTC (rev 12936)
@@ -25,7 +25,7 @@
xmlns:tz="urn:java:org.jboss.seam.international.timezone"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+ http://docs.jboss.org/cdi/beans_1_0.xsd">
<tz:DefaultTimeZoneProducer>
<s:specializes/>
[View Less]
14 years, 9 months
Seam SVN: r12935 - modules/faces/trunk/examples/short-ly/src/main/webapp/WEB-INF.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-02 08:46:44 -0400 (Wed, 02 Jun 2010)
New Revision: 12935
Modified:
modules/faces/trunk/examples/short-ly/src/main/webapp/WEB-INF/web.xml
Log:
make xml validate
Modified: modules/faces/trunk/examples/short-ly/src/main/webapp/WEB-INF/web.xml
===================================================================
--- modules/faces/trunk/examples/short-ly/src/main/webapp/WEB-INF/web.xml 2010-06-02 12:43:12 UTC (rev 12934)
+++ modules/faces/trunk/examples/…
[View More]short-ly/src/main/webapp/WEB-INF/web.xml 2010-06-02 12:46:44 UTC (rev 12935)
@@ -1,53 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
- <data-source>
- <name>java:app/Application_Level_DataSource</name>
- <class-name>org.hsqldb.jdbc.jdbcDataSource</class-name>
- <url>jdbc:hsqldb:file:aname</url>
- <user>sa</user>
- <password>sa</password>
- <property>
- <name>hibernate.dialect</name>
- <value>org.hibernate.dialect.HSQLDialect</value>
- </property>
- </data-source>
- <data-source>
- <name>java:app/mysql</name>
- <class-name>org.hsqldb.jdbc.jdbcDataSource</class-name>
- <url>jdbc:hsqldb:file:aname</url>
- <user>sa</user>
- <password>sa</password>
- <property>
- <name>hibernate.dialect</name>
- <value>org.hibernate.dialect.HSQLDialect</value>
- </property>
- </data-source>
-
-
- <context-param>
- <param-name>javax.faces.PROJECT_STAGE</param-name>
- <param-value>Development</param-value>
- </context-param>
- <context-param>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>client</param-value>
- </context-param>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
- <welcome-file-list>
- <welcome-file>faces/index.xhtml</welcome-file>
- </welcome-file-list>
-</web-app>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
+ <context-param>
+ <param-name>javax.faces.PROJECT_STAGE</param-name>
+ <param-value>Development</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>client</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>30</session-timeout>
+ </session-config>
+ <welcome-file-list>
+ <welcome-file>faces/index.xhtml</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
[View Less]
14 years, 9 months