Seam SVN: r15210 - branches/enterprise/WFK-2_1/distribution.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-10-08 08:30:26 -0400 (Mon, 08 Oct 2012)
New Revision: 15210
Modified:
branches/enterprise/WFK-2_1/distribution/pom.xml
Log:
moving functional-tests module from binary distribution
Modified: branches/enterprise/WFK-2_1/distribution/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/pom.xml 2012-10-08 12:30:20 UTC (rev 15209)
+++ branches/enterprise/WFK-2_1/distribution/pom.xml 2012-10-08 12:30:26 UTC (rev 15210)
@@ -160,11 +160,11 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>functional-tests</artifactId>
- <version>${project.version}</version>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.jboss.seam</groupId> -->
+<!-- <artifactId>functional-tests</artifactId> -->
+<!-- <version>${project.version}</version> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.jboss.seam</groupId>
13 years, 3 months
Seam SVN: r15209 - branches/enterprise/WFK-2_1/distribution/src/main/assembly.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-10-08 08:30:20 -0400 (Mon, 08 Oct 2012)
New Revision: 15209
Modified:
branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
branches/enterprise/WFK-2_1/distribution/src/main/assembly/src.xml
Log:
customized distribution assembly for WFK
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2012-10-08 12:30:12 UTC (rev 15208)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2012-10-08 12:30:20 UTC (rev 15209)
@@ -3,11 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2 http://maven.apache.org/xsd/assembly-2.2.xsd">
- <id>dist</id>
+ <id>bin</id>
<formats>
-<!-- <format>dir</format> -->
<format>zip</format>
- <format>tar.gz</format>
+<!-- <format>tar.gz</format> -->
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
@@ -36,11 +35,11 @@
<include>readme.txt</include>
<include>lgpl.txt</include>
<include>copyright.txt</include>
- <include>changelog.txt</include>
+<!-- <include>changelog.txt</include> -->
<include>seam21migration.txt</include>
<include>seam23migration.txt</include>
<include>seam2migration.txt</include>
- <include>clustering-howto.txt</include>
+<!-- <include>clustering-howto.txt</include> -->
<include>seam</include>
<include>seam.bat</include>
</includes>
@@ -54,20 +53,20 @@
<include>get-arquillian-libs.xml</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../jboss-seam/target</directory>
- <outputDirectory>lib/interop</outputDirectory>
- <includes>
- <include>jboss-seam-wls-compatible.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../jboss-seam/target</directory>
- <outputDirectory>lib/interop/src</outputDirectory>
- <includes>
- <include>jboss-seam-wls-compatible-sources.jar</include>
- </includes>
- </fileSet>
+<!-- <fileSet> -->
+<!-- <directory>../jboss-seam/target</directory> -->
+<!-- <outputDirectory>lib/interop</outputDirectory> -->
+<!-- <includes> -->
+<!-- <include>jboss-seam-wls-compatible.jar</include> -->
+<!-- </includes> -->
+<!-- </fileSet> -->
+<!-- <fileSet> -->
+<!-- <directory>../jboss-seam/target</directory> -->
+<!-- <outputDirectory>lib/interop/src</outputDirectory> -->
+<!-- <includes> -->
+<!-- <include>jboss-seam-wls-compatible-sources.jar</include> -->
+<!-- </includes> -->
+<!-- </fileSet> -->
<!-- all jars from jboss-seam module dependencies
(done this way due needs to have all scopes except test there) -->
<fileSet>
@@ -200,25 +199,6 @@
</includes>
</dependencySet>
- <!-- Pull in docbook artifacts
- <dependencySet>
- <outputDirectory>doc/reference/</outputDirectory>
- <unpack>true</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.jboss.seam:seam-reference-guide</include>
- </includes>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/</exclude>
- </excludes>
- </unpackOptions>
- <directoryMode>755</directoryMode>
- <fileMode>755</fileMode>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- -->
-
<!-- Add necessary javadoc jars -->
<dependencySet>
<outputDirectory>doc/api</outputDirectory>
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/src.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/src.xml 2012-10-08 12:30:12 UTC (rev 15208)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/src.xml 2012-10-08 12:30:20 UTC (rev 15209)
@@ -27,6 +27,7 @@
<exclude>**/*.iml</exclude>
<exclude>.gitignore</exclude>
<exclude>release-process.txt</exclude>
+ <exclude>seam-reference-guide/</exclude>
</excludes>
</fileSet>
13 years, 3 months
Seam SVN: r15208 - branches/enterprise/WFK-2_1/distribution/src/main/assembly.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-10-08 08:30:12 -0400 (Mon, 08 Oct 2012)
New Revision: 15208
Modified:
branches/enterprise/WFK-2_1/distribution/src/main/assembly/readme.txt
Log:
seam distribution readme.txt updated by instruction for EAP
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/readme.txt
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/readme.txt 2012-10-08 12:30:02 UTC (rev 15207)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/readme.txt 2012-10-08 12:30:12 UTC (rev 15208)
@@ -1,7 +1,7 @@
JBoss Seam - Contextual Component framework for Java EE
=========================================================
-version 2.3.0.Final, September 2012
+version 2.3.0.Final-redhat-1, October 2012
This software is distributed under the terms of the FSF Lesser Gnu
Public License (see lgpl.txt).
@@ -9,11 +9,11 @@
Get Up And Running Quick
------------------------
-1. Install JBoss AS 7.1.1.Final
+1. Install JBoss EAP 6.0.x
-2. Start JBoss AS by typing "bin/standalone.sh" in the JBoss home directory
+2. Start JBoss AS by typing "bin/standalone.sh" in the JBoss AS home directory
-3. In the "examples/booking" directory, type "mvn clean package" and check
+3. In the "examples/booking" directory, type "mvn clean install" and check
for any error messages.
4. In the booking-ear directory run:
13 years, 3 months
Seam SVN: r15207 - in branches/enterprise/WFK-2_1: bom and 3 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-10-08 08:30:02 -0400 (Mon, 08 Oct 2012)
New Revision: 15207
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
branches/enterprise/WFK-2_1/functional-tests/pom.xml
branches/enterprise/WFK-2_1/jboss-seam-remoting/pom.xml
branches/enterprise/WFK-2_1/jboss-seam/pom.xml
branches/enterprise/WFK-2_1/pom.xml
Log:
aligned to EAP 6 maven repository
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-08 12:29:52 UTC (rev 15206)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-08 12:30:02 UTC (rev 15207)
@@ -32,20 +32,19 @@
<properties>
<!-- Version string properties -->
<version.seam>2.3.0.Final-redhat-1</version.seam>
- <version.wicket>1.4.14</version.wicket>
<version.drools>5.3.3.Final</version.drools>
- <version.resteasy>2.0.1.GA</version.resteasy>
+ <version.resteasy>2.3.3.Final-redhat-1</version.resteasy>
<version.spring>3.1.1.RELEASE</version.spring>
- <version.jbossas7>7.1.1.Final</version.jbossas7>
- <version.jsf2>2.1.7</version.jsf2>
+ <version.jbossas7>7.1.2.Final-redhat-1</version.jbossas7>
+ <version.jsf2>2.1.7-redhat-1</version.jsf2>
<version.webdriver>0.9.7376</version.webdriver>
<version.infinispan>5.1.3.FINAL</version.infinispan>
<version.junit>4.8.2</version.junit>
<version.testng>5.14.10</version.testng>
- <version.richfaces>4.2.2.Final</version.richfaces>
+ <version.richfaces>4.2.3.Final-redhat-1</version.richfaces>
<version.arquillian_core>1.0.1.Final</version.arquillian_core>
-
-
+ <version.org.hibernate.search>4.1.1.Final-redhat-1</version.org.hibernate.search>
+ <version.org.jboss.bom>1.0.0.M12-redhat-1</version.org.jboss.bom>
<!-- ***************** -->
<!-- Repository Deployment URLs -->
<!-- ***************** -->
@@ -63,15 +62,15 @@
<dependency>
<groupId>org.jboss.bom</groupId>
<artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
- <version>1.0.0.Final</version>
+ <version>${version.org.jboss.bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-bom</artifactId>
- <version>${version.arquillian_core}</version>
+ <groupId>org.jboss.bom</groupId>
+ <artifactId>jboss-wfk-arquillian</artifactId>
+ <version>${version.org.jboss.bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -165,12 +164,6 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <version>1.4.1.SP9</version>
- </dependency>
-
- <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>1.2.3</version>
@@ -308,54 +301,6 @@
<version>3.1-jbossorg-1</version>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>1.0.0.CR8</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-slide</groupId>
- <artifactId>webdavlib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </exclusion>
- <exclusion>
- <groupId>wutka-dtdparser</groupId>
- <artifactId>dtdparser121</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- Excel export module dependency -->
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
@@ -396,7 +341,7 @@
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.15.0-GA</version>
+ <version>3.15.0.GA-redhat-1</version>
</dependency>
<dependency>
@@ -408,7 +353,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
@@ -709,7 +654,7 @@
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
- <version>2.1.2</version>
+ <version>2.1.7</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -730,7 +675,7 @@
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext-rtf</artifactId>
- <version>2.1.2</version>
+ <version>2.1.7</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -759,7 +704,12 @@
</exclusion>
</exclusions>
</dependency>
-
+ <!-- rewriting version in openid pom -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.0.2</version>
+ </dependency>
<dependency>
<groupId>org.openid4java</groupId>
<artifactId>openid4java-consumer</artifactId>
@@ -850,68 +800,6 @@
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>${version.wicket}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-ioc</artifactId>
- <version>${version.wicket}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${version.wicket}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-datetime</artifactId>
- <version>${version.wicket}</version>
- </dependency>
-
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${version.testng}</version>
Modified: branches/enterprise/WFK-2_1/functional-tests/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/functional-tests/pom.xml 2012-10-08 12:29:52 UTC (rev 15206)
+++ branches/enterprise/WFK-2_1/functional-tests/pom.xml 2012-10-08 12:30:02 UTC (rev 15207)
@@ -17,10 +17,36 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api-2.5</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Don't want to use version 2.9 -->
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>2.7.1-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.1.3-redhat-1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: branches/enterprise/WFK-2_1/jboss-seam/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/pom.xml 2012-10-08 12:29:52 UTC (rev 15206)
+++ branches/enterprise/WFK-2_1/jboss-seam/pom.xml 2012-10-08 12:30:02 UTC (rev 15207)
@@ -23,7 +23,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>antlr-maven-plugin</artifactId>
- <version>2.2</version>
+<!-- <version>2.2</version> -->
<configuration>
<grammars>org/jboss/seam/text/seam-text.g</grammars>
</configuration>
@@ -141,6 +141,12 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-orm</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>org.codehaus.jackson</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -149,11 +155,11 @@
<optional>true</optional>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.javassist</groupId> -->
-<!-- <artifactId>javassist</artifactId> -->
-<!-- <scope>provided</scope> -->
-<!-- </dependency> -->
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>dom4j</groupId>
@@ -261,38 +267,7 @@
<optional>true</optional>
</dependency>
- <!-- Order matters of jboss:jboss-cache and org.jboss.cache:jbosscache-core -->
-
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <optional>true</optional>
- </dependency>
-
-
-
- <!-- This is actually a dep of jboss-cache, but it doesn't declare it -->
-
- <!-- This is actually a dep of jboss-cache, but it doesn't declare it -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<optional>true</optional>
@@ -372,10 +347,16 @@
<artifactId>urlrewritefilter</artifactId>
<optional>true</optional>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>concurrent</groupId>
+ <groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
<optional>true</optional>
</dependency>
Modified: branches/enterprise/WFK-2_1/jboss-seam-remoting/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-remoting/pom.xml 2012-10-08 12:29:52 UTC (rev 15206)
+++ branches/enterprise/WFK-2_1/jboss-seam-remoting/pom.xml 2012-10-08 12:30:02 UTC (rev 15207)
@@ -30,6 +30,53 @@
<configuration>
<jsSrcDir>src/main/resources/org/jboss/seam/remoting/</jsSrcDir>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.8-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit-core-js</artifactId>
+ <version>2.8-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.1.3-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.cssparser</groupId>
+ <artifactId>cssparser</artifactId>
+ <version>0.9.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.1.3-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.14</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1-redhat-1</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: branches/enterprise/WFK-2_1/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/pom.xml 2012-10-08 12:29:52 UTC (rev 15206)
+++ branches/enterprise/WFK-2_1/pom.xml 2012-10-08 12:30:02 UTC (rev 15207)
@@ -243,7 +243,7 @@
</dependency>
<dependency>
- <groupId>concurrent</groupId>
+ <groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.4</version>
</dependency>
@@ -446,7 +446,7 @@
<profile>
<id>distribution</id>
<modules>
- <module>seam-reference-guide</module>
+<!-- <module>seam-reference-guide</module> -->
<module>distribution</module>
</modules>
</profile>
13 years, 3 months
Seam SVN: r15206 - branches/enterprise/WFK-2_1/jboss-seam-ioc/src/main/resources/org/jboss/seam/ioc/guice.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-10-08 08:29:52 -0400 (Mon, 08 Oct 2012)
New Revision: 15206
Removed:
branches/enterprise/WFK-2_1/jboss-seam-ioc/src/main/resources/org/jboss/seam/ioc/guice/guice-2.3.xsd
Log:
removed guice schema due not supported guice integration in seam-ioc
Deleted: branches/enterprise/WFK-2_1/jboss-seam-ioc/src/main/resources/org/jboss/seam/ioc/guice/guice-2.3.xsd
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-ioc/src/main/resources/org/jboss/seam/ioc/guice/guice-2.3.xsd 2012-10-08 12:26:54 UTC (rev 15205)
+++ branches/enterprise/WFK-2_1/jboss-seam-ioc/src/main/resources/org/jboss/seam/ioc/guice/guice-2.3.xsd 2012-10-08 12:29:52 UTC (rev 15206)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
- targetNamespace="http://jboss.org/schema/seam/guice" xmlns:guice="http://jboss.org/schema/seam/guice"
- xmlns:components="http://jboss.org/schema/seam/components" attributeFormDefault="unqualified">
-
- <xs:import namespace="http://jboss.org/schema/seam/components"
- schemaLocation="http://jboss.org/schema/seam/components-2.3.xsd"/>
-
- <xs:element name="init">
- <xs:annotation>
- <xs:documentation>Guice Support Configuration</xs:documentation>
- </xs:annotation>
- <xs:complexType mixed="true">
- <xs:attributeGroup ref="guice:attlist.guiceInit"/>
- </xs:complexType>
- </xs:element>
- <xs:attributeGroup name="attlist.guiceInit">
- <xs:attribute name="injector" type="components:string"/>
- </xs:attributeGroup>
-
- <xs:element name="injector">
- <xs:annotation>
- <xs:documentation>Guice Injector</xs:documentation>
- </xs:annotation>
- <xs:complexType mixed="true">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="modules" type="components:multiValuedProperty">
- <xs:annotation>
- <xs:documentation>A list of modules</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:choice>
- <xs:attributeGroup ref="components:attlist.component"/>
- <xs:attributeGroup ref="guice:attlist.guiceInjector"/>
- </xs:complexType>
- </xs:element>
- <xs:attributeGroup name="attlist.guiceInjector"/>
-
-</xs:schema>
13 years, 3 months
Seam SVN: r15205 - branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-web.
by seam-commits@lists.jboss.org
Author: maschmid
Date: 2012-10-08 08:26:54 -0400 (Mon, 08 Oct 2012)
New Revision: 15205
Modified:
branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-web/pom.xml
Log:
chatroom example add missing provided servlet and jsf apis
Modified: branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-web/pom.xml 2012-10-08 12:12:27 UTC (rev 15204)
+++ branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-web/pom.xml 2012-10-08 12:26:54 UTC (rev 15205)
@@ -47,6 +47,16 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
13 years, 3 months
Seam SVN: r15204 - branches/community/Seam_2_3/examples/registration/registration-web.
by seam-commits@lists.jboss.org
Author: maschmid
Date: 2012-10-08 08:12:27 -0400 (Mon, 08 Oct 2012)
New Revision: 15204
Modified:
branches/community/Seam_2_3/examples/registration/registration-web/pom.xml
Log:
registration, missing provided servlet and jsf dependencies (for web.xml validation)
Modified: branches/community/Seam_2_3/examples/registration/registration-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/registration/registration-web/pom.xml 2012-10-08 11:50:42 UTC (rev 15203)
+++ branches/community/Seam_2_3/examples/registration/registration-web/pom.xml 2012-10-08 12:12:27 UTC (rev 15204)
@@ -49,6 +49,16 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
13 years, 3 months
Seam SVN: r15203 - in branches/community/Seam_2_3/examples/quartz: quartz-web and 1 other directories.
by seam-commits@lists.jboss.org
Author: maschmid
Date: 2012-10-08 07:50:42 -0400 (Mon, 08 Oct 2012)
New Revision: 15203
Modified:
branches/community/Seam_2_3/examples/quartz/quartz-tests/src/test/java/org/jboss/seam/example/quartz/test/AccountTest.java
branches/community/Seam_2_3/examples/quartz/quartz-web/pom.xml
branches/community/Seam_2_3/examples/quartz/quartz-web/src/main/webapp/search.xhtml
Log:
quartz example cleanup
Modified: branches/community/Seam_2_3/examples/quartz/quartz-tests/src/test/java/org/jboss/seam/example/quartz/test/AccountTest.java
===================================================================
--- branches/community/Seam_2_3/examples/quartz/quartz-tests/src/test/java/org/jboss/seam/example/quartz/test/AccountTest.java 2012-10-08 11:40:16 UTC (rev 15202)
+++ branches/community/Seam_2_3/examples/quartz/quartz-tests/src/test/java/org/jboss/seam/example/quartz/test/AccountTest.java 2012-10-08 11:50:42 UTC (rev 15203)
@@ -11,8 +11,6 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
-import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: branches/community/Seam_2_3/examples/quartz/quartz-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/quartz/quartz-web/pom.xml 2012-10-08 11:40:16 UTC (rev 15202)
+++ branches/community/Seam_2_3/examples/quartz/quartz-web/pom.xml 2012-10-08 11:50:42 UTC (rev 15203)
@@ -55,6 +55,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples/quartz/quartz-web/src/main/webapp/search.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/quartz/quartz-web/src/main/webapp/search.xhtml 2012-10-08 11:40:16 UTC (rev 15202)
+++ branches/community/Seam_2_3/examples/quartz/quartz-web/src/main/webapp/search.xhtml 2012-10-08 11:50:42 UTC (rev 15203)
@@ -3,8 +3,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:s="http://jboss.org/schema/seam/taglib"
- template="template.xhtml">
+ xmlns:s="http://jboss.org/schema/seam/taglib">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Seam Pay</title>
13 years, 3 months
Seam SVN: r15202 - branches/community/Seam_2_3/examples/openid/openid-web.
by seam-commits@lists.jboss.org
Author: maschmid
Date: 2012-10-08 07:40:16 -0400 (Mon, 08 Oct 2012)
New Revision: 15202
Modified:
branches/community/Seam_2_3/examples/openid/openid-web/pom.xml
Log:
openid example, add missing servlet and jsf spec provided dependencies in openid-web
Modified: branches/community/Seam_2_3/examples/openid/openid-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/openid/openid-web/pom.xml 2012-10-08 11:30:43 UTC (rev 15201)
+++ branches/community/Seam_2_3/examples/openid/openid-web/pom.xml 2012-10-08 11:40:16 UTC (rev 15202)
@@ -61,6 +61,16 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
13 years, 3 months
Seam SVN: r15201 - in branches/community/Seam_2_3/examples/numberguess: numberguess-ejb and 2 other directories.
by seam-commits@lists.jboss.org
Author: maschmid
Date: 2012-10-08 07:30:43 -0400 (Mon, 08 Oct 2012)
New Revision: 15201
Modified:
branches/community/Seam_2_3/examples/numberguess/numberguess-ear/pom.xml
branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml
branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml
branches/community/Seam_2_3/examples/numberguess/numberguess-web/pom.xml
Log:
numberguess example cleanup
Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/numberguess/numberguess-ear/pom.xml 2012-10-08 10:52:13 UTC (rev 15200)
+++ branches/community/Seam_2_3/examples/numberguess/numberguess-ear/pom.xml 2012-10-08 11:30:43 UTC (rev 15201)
@@ -9,7 +9,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples</groupId>
<artifactId>numberguess-ear</artifactId>
<packaging>ear</packaging>
<name>Numberguess EAR Module (EE6)</name>
Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml 2012-10-08 10:52:13 UTC (rev 15200)
+++ branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml 2012-10-08 11:30:43 UTC (rev 15201)
@@ -9,7 +9,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples</groupId>
<artifactId>numberguess-ejb</artifactId>
<packaging>ejb</packaging>
<name>Numberguess EJB Module (EE6)</name>
Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml 2012-10-08 10:52:13 UTC (rev 15200)
+++ branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml 2012-10-08 11:30:43 UTC (rev 15201)
@@ -9,7 +9,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples</groupId>
<artifactId>numberguess-tests</artifactId>
<name>Numberguess Integration Tests Module (EE6)</name>
Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/numberguess/numberguess-web/pom.xml 2012-10-08 10:52:13 UTC (rev 15200)
+++ branches/community/Seam_2_3/examples/numberguess/numberguess-web/pom.xml 2012-10-08 11:30:43 UTC (rev 15201)
@@ -9,7 +9,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples</groupId>
<artifactId>numberguess-web</artifactId>
<packaging>war</packaging>
<name>Numberguess Web Module (EE6)</name>
@@ -25,17 +24,17 @@
<groupId>org.jboss.seam.examples</groupId>
<artifactId>numberguess-ejb</artifactId>
<type>ejb</type>
- <!--<scope>provided</scope>-->
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.el</groupId>
@@ -44,12 +43,6 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -61,6 +54,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
13 years, 3 months