10:03 a.m.
Author: maschmid
Date: 2012-04-20 04:03:10 -0400 (Fri, 20 Apr 2012)
New Revision: 14613
Added:
branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/
branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/
branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/
branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/META-INF/
branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/META-INF/jboss-deployment-structure.xml
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/arquillian.xml
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/web.xml
Removed:
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml
Modified:
branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java
branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml
branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml
branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml
branches/community/Seam_2_3/examples-ee6/guice/pom.xml
Log:
guice example fixes
Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml 2012-04-20 07:38:42
UTC (rev 14612)
+++ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml 2012-04-20 08:03:10
UTC (rev 14613)
@@ -4,28 +4,23 @@
<parent>
<artifactId>guice</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0.Beta1-SNAPSHOT</version>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-ear</artifactId>
<packaging>ear</packaging>
<name>Guice EAR Module (EE6)</name>
- <properties>
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
- <jboss.domain>default</jboss.domain>
- </properties>
-
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-web</artifactId>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-ejb</artifactId>
<type>ejb</type>
</dependency>
@@ -34,16 +29,6 @@
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -58,104 +43,34 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.3.2</version>
<configuration>
- <version>5</version>
+ <version>6</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<!-- Exclude eclipse generated application.xml and manually
modified jboss-app.xml during mvn build -->
<earSourceExcludes>**/application.xml,
**/jboss-app.xml</earSourceExcludes>
<!-- use maven generated application.xml instead -->
<generateApplicationXml>true</generateApplicationXml>
- <jboss>
- <version>5</version>
-
<loader-repository>seam.jboss.org:loader=seam-guice.ear</loader-repository>
- </jboss>
<modules>
<webModule>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+
<groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-web</artifactId>
<contextRoot>/seam-guice</contextRoot>
<bundleFileName>guice-web.war</bundleFileName>
</webModule>
<ejbModule>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+
<groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-ejb</artifactId>
<bundleFileName>guice-ejb.jar</bundleFileName>
</ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
</modules>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
-
<param>${project.build.directory}/${project.build.finalName}.${project.packaging}</param>
- </fileNames>
- </configuration>
- </plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>exploded</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
-
<groupId>org.jboss.seam.examples-ee6</groupId>
-
<artifactId>guice-ear</artifactId>
- <type>ear</type>
- <overWrite>true</overWrite>
-
<outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</outputDirectory>
- </artifactItem>
- <artifactItem>
-
<groupId>org.jboss.seam.examples-ee6</groupId>
-
<artifactId>guice-web</artifactId>
- <type>war</type>
- <overWrite>true</overWrite>
-
<outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war</outputDirectory>
- </artifactItem>
- <artifactItem>
-
<groupId>org.jboss.seam.examples-ee6</groupId>
-
<artifactId>guice-ejb</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
-
<outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-ejb.jar</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <version>1.5.0</version>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
-
<directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</directory>
- </fileNames>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Added:
branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/META-INF/jboss-deployment-structure.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/META-INF/jboss-deployment-structure.xml
(rev 0)
+++
branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-20
08:03:10 UTC (rev 14613)
@@ -0,0 +1,13 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
+ <deployment>
+ <dependencies>
+ <module name="org.javassist" export="true"/>
+ <module name="org.apache.log4j" export="true"/>
+ <module name="org.dom4j" export="true"/>
+ <module name="org.apache.commons.logging"
export="true"/>
+ <module name="org.apache.commons.collections"
export="true"/>
+ <module name="javax.faces.api" export="true"/>
+ <module name="com.sun.jsf-impl" export="true"/>
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml 2012-04-20 07:38:42
UTC (rev 14612)
+++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml 2012-04-20 08:03:10
UTC (rev 14613)
@@ -4,11 +4,11 @@
<parent>
<artifactId>guice</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0.Beta1-SNAPSHOT</version>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-ejb</artifactId>
<packaging>ejb</packaging>
<name>Guice EJB Module (EE6)</name>
@@ -24,24 +24,20 @@
<artifactId>jboss-seam-ioc</artifactId>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- </dependency>
- <!-- Don'know the reason for this dependency, needs to be cleared
-->
- <!--<dependency>-->
- <!--<groupId>javax.faces</groupId>-->
- <!--<artifactId>jsf-api</artifactId>-->
- <!--<version></version>-->
- <!--</dependency>-->
- <dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml 2012-04-20 07:38:42
UTC (rev 14612)
+++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml 2012-04-20 08:03:10
UTC (rev 14613)
@@ -7,17 +7,17 @@
<parent>
<artifactId>guice</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0.Beta1-SNAPSHOT</version>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-tests</artifactId>
<name>Guice Integration Tests Module (EE6)</name>
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-ejb</artifactId>
<type>ejb</type>
<scope>test</scope>
@@ -29,8 +29,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -65,6 +65,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ </dependency>
+
</dependencies>
<build>
@@ -135,17 +140,6 @@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
-
<param>${basedir}/../guice-ear/target/seam-guice.ear</param>
- </fileNames>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
</plugin>
<plugin>
@@ -159,27 +153,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>ftest-tomcat</id>
- <properties>
- <example.context.path>jboss-seam-guice</example.context.path>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified:
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java 2012-04-20
07:38:42 UTC (rev 14612)
+++
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java 2012-04-20
08:03:10 UTC (rev 14613)
@@ -1,12 +1,24 @@
package org.jboss.seam.example.guice.test;
+import java.io.File;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.example.guice.JuiceBar;
import org.jboss.seam.example.guice.Juice;
import org.jboss.seam.example.guice.AppleJuice;
import org.jboss.seam.example.guice.Orange;
import org.jboss.seam.example.guice.OrangeJuice;
-import org.jboss.seam.mock.SeamTest;
-import org.testng.annotations.Test;
+import org.jboss.seam.mock.JUnitSeamTest;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
import com.google.inject.Injector;
import com.google.inject.Key;
@@ -14,8 +26,29 @@
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
-public class GuiceTest extends SeamTest
+(a)RunWith(Arquillian.class)
+public class GuiceTest extends JUnitSeamTest
{
+ @Deployment(name="GuiceTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive ear = ShrinkWrap.create(ZipImporter.class,
"seam-guice.ear").importFrom(new
File("../guice-ear/target/seam-guice.ear"))
+ .as(EnterpriseArchive.class);
+
+ // Install org.jboss.seam.mock.MockSeamListener
+ WebArchive web = ear.getAsType(WebArchive.class, "guice-web.war");
+ web.delete("/WEB-INF/web.xml");
+ web.addAsWebInfResource("web.xml");
+
+ web.addClasses(GuiceTest.class);
+
+ JavaArchive ejb = ear.getAsType(JavaArchive.class, "guice-ejb.jar");
+ ejb.addClasses(JuiceTestBar.class);
+
+ return ear;
+ }
+
@Test
public void testGuiceInjector() throws Exception
{
Added:
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/arquillian.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/arquillian.xml
(rev 0)
+++
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/arquillian.xml 2012-04-20
08:03:10 UTC (rev 14613)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://jboss.org/schema/arquillian"
+ xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+ <engine>
+ <property name="deploymentExportPath">target/</property>
+ </engine>
+
+ <container qualifier="jboss" default="true">
+ <configuration>
+ <property name="javaVmArguments">-Xmx1024m
-XX:MaxPermSize=512m</property>
+ <property
name="jbossHome">target/jboss-as-${version.jbossas7}</property>
+ </configuration>
+ </container>
+
+</arquillian>
Deleted:
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml 2012-04-20
07:38:42 UTC (rev 14612)
+++
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml 2012-04-20
08:03:10 UTC (rev 14613)
@@ -1,11 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-
-<suite name="Guice" verbose="2" parallel="false">
-
- <test name="Guice">
- <classes>
- <class name="org.jboss.seam.example.guice.test.GuiceTest"/>
- </classes>
- </test>
-
-</suite>
\ No newline at end of file
Added:
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/web.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/web.xml
(rev 0)
+++
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/web.xml 2012-04-20
08:03:10 UTC (rev 14613)
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<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">
+
+ <listener>
+
<listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
+ </listener>
+
+</web-app>
Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml 2012-04-20 07:38:42
UTC (rev 14612)
+++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml 2012-04-20 08:03:10
UTC (rev 14613)
@@ -5,11 +5,11 @@
<parent>
<artifactId>guice</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0.Beta1-SNAPSHOT</version>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-web</artifactId>
<packaging>war</packaging>
<name>Guice Web Module (EE6)</name>
@@ -21,7 +21,7 @@
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-ejb</artifactId>
<type>ejb</type>
<scope>provided</scope>
@@ -30,15 +30,12 @@
<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-debug</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.sun.facelets</groupId>-->
- <!--<artifactId>jsf-facelets</artifactId>-->
- <!--</dependency>-->
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
@@ -59,10 +56,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
</dependencies>
<build>
@@ -82,50 +75,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>tomcat</id>
- <properties>
- <!-- filtering property for components.xml -->
- <jndiPattern>#{ejbName}/local</jndiPattern>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples</groupId>
- <artifactId>guice-ejb</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <finalName>jboss-seam-guice</finalName>
- </build>
- </profile>
- </profiles>
</project>
Modified:
branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-20
07:38:42 UTC (rev 14612)
+++
branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-20
08:03:10 UTC (rev 14613)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<faces-config version="1.2"
+<faces-config version="2.1"
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-facesconfig_2_1.xsd">
Modified:
branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml 2012-04-20
07:38:42 UTC (rev 14612)
+++
branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml 2012-04-20
08:03:10 UTC (rev 14613)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5"
+<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_2_5.xsd">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<display-name>Seam Guice Example</display-name>
Modified: branches/community/Seam_2_3/examples-ee6/guice/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/guice/pom.xml 2012-04-20 07:38:42 UTC (rev
14612)
+++ branches/community/Seam_2_3/examples-ee6/guice/pom.xml 2012-04-20 08:03:10 UTC (rev
14613)
@@ -3,7 +3,7 @@
<parent>
<artifactId>examples-ee6</artifactId>
<groupId>org.jboss.seam</groupId>
- <version>2.3.0.Beta1-SNAPSHOT</version>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -26,19 +26,19 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-web</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.guice</groupId>
<artifactId>guice-ear</artifactId>
<version>${project.version}</version>
</dependency>