[seam-commits] Seam SVN: r14495 - in branches/community/Seam_2_3/examples-ee6: guice and 30 other directories.

Author: dhinojosa Date: 2012-04-03 12:37:44 -0400 (Tue, 03 Apr 2012) New Revision: 14495 Added: branches/community/Seam_2_3/examples-ee6/guice/ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/guice/guice-tests/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/ 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/JuiceTestBar.java branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/ 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/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/guice/guice-web/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.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/guice-web/src/main/webapp/bar.xhtml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/guice/pom.xml branches/community/Seam_2_3/examples-ee6/guice/readme.txt Removed: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/guice/guice-tests/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/ 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/JuiceTestBar.java branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/ 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/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/guice/guice-web/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.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/guice-web/src/main/webapp/bar.xhtml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/guice/pom.xml branches/community/Seam_2_3/examples-ee6/guice/readme.txt Log: guice migrated in, still not functional, does compile, test, not integration-test Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ear/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,161 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>guice</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</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> - <artifactId>guice-web</artifactId> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <type>ejb</type> - </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> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ioc</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <finalName>seam-guice</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <version>5</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> - <artifactId>guice-web</artifactId> - <contextRoot>/seam-guice</contextRoot> - <bundleFileName>guice-web.war</bundleFileName> - </webModule> - <ejbModule> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <bundleFileName>guice-ejb.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> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ear/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>guice</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</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> + <artifactId>guice-web</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <type>ejb</type> + </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> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ioc</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <finalName>seam-guice</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <version>5</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> + <artifactId>guice-web</artifactId> + <contextRoot>/seam-guice</contextRoot> + <bundleFileName>guice-web.war</bundleFileName> + </webModule> + <ejbModule> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <bundleFileName>guice-ejb.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> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>guice</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <packaging>ejb</packaging> - <name>Guice EJB Module (EE6)</name> - - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ioc</artifactId> - </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - </dependency> - <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - </dependency> - <!-- Don&apos;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> - </dependencies> -</project> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>guice</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <packaging>ejb</packaging> + <name>Guice EJB Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ioc</artifactId> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + </dependency> + <!-- Don&apos;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> + </dependencies> +</project> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,28 +0,0 @@ -package org.jboss.seam.example.guice; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -public class AppleJuice implements Juice -{ - private static final String name = "Apple Juice"; - private static final int price = 10; - - public AppleJuice() {} - - public String getName() - { - return name; - } - - public int getPrice() - { - return price; - } - - @Override - public String toString() - { - return name; - } -} \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,28 @@ +package org.jboss.seam.example.guice; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +public class AppleJuice implements Juice +{ + private static final String name = "Apple Juice"; + private static final int price = 10; + + public AppleJuice() {} + + public String getName() + { + return name; + } + + public int getPrice() + { + return price; + } + + @Override + public String toString() + { + return name; + } +} \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,11 +0,0 @@ -package org.jboss.seam.example.guice; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -public interface Juice -{ - public String getName(); - - public int getPrice(); -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,11 @@ +package org.jboss.seam.example.guice; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +public interface Juice +{ + public String getName(); + + public int getPrice(); +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,26 +0,0 @@ -package org.jboss.seam.example.guice; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.ioc.guice.Guice; -import com.google.inject.Inject; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -@Name("juiceBar") -@Guice // Activates @Inject on a Seam component -public class JuiceBar -{ - @Inject protected Juice juiceOfTheDay; // Guice looks at the variable type, not name - @Inject @Orange protected Juice anotherJuice; - - public Juice getJuiceOfTheDay() - { - return juiceOfTheDay; - } - - public Juice getAnotherJuice() - { - return anotherJuice; - } -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,26 @@ +package org.jboss.seam.example.guice; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.ioc.guice.Guice; +import com.google.inject.Inject; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +@Name("juiceBar") +@Guice // Activates @Inject on a Seam component +public class JuiceBar +{ + @Inject protected Juice juiceOfTheDay; // Guice looks at the variable type, not name + @Inject @Orange protected Juice anotherJuice; + + public Juice getJuiceOfTheDay() + { + return juiceOfTheDay; + } + + public Juice getAnotherJuice() + { + return anotherJuice; + } +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,18 +0,0 @@ -package org.jboss.seam.example.guice; - -import com.google.inject.Module; -import com.google.inject.Binder; -import com.google.inject.Scopes; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -public class JuiceBarModule implements Module -{ - public void configure(Binder binder) - { - binder.bind(Juice.class).to(AppleJuice.class); // Create a new instance every time. - - binder.bind(Juice.class).annotatedWith(Orange.class).to(OrangeJuice.class).in(Scopes.SINGLETON); - } -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,18 @@ +package org.jboss.seam.example.guice; + +import com.google.inject.Module; +import com.google.inject.Binder; +import com.google.inject.Scopes; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +public class JuiceBarModule implements Module +{ + public void configure(Binder binder) + { + binder.bind(Juice.class).to(AppleJuice.class); // Create a new instance every time. + + binder.bind(Juice.class).annotatedWith(Orange.class).to(OrangeJuice.class).in(Scopes.SINGLETON); + } +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,20 +0,0 @@ -package org.jboss.seam.example.guice; - -import com.google.inject.BindingAnnotation; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.ElementType; - -/** - * Indicates we want the orange version of a binding. - * - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -(a)Retention(RetentionPolicy.RUNTIME) -(a)Target({ElementType.FIELD, ElementType.PARAMETER}) -@BindingAnnotation -public @interface Orange -{ -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,20 @@ +package org.jboss.seam.example.guice; + +import com.google.inject.BindingAnnotation; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.ElementType; + +/** + * Indicates we want the orange version of a binding. + * + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target({ElementType.FIELD, ElementType.PARAMETER}) +@BindingAnnotation +public @interface Orange +{ +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,28 +0,0 @@ -package org.jboss.seam.example.guice; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -public class OrangeJuice implements Juice -{ - private static final String name = "Orange Juice"; - private static final int price = 12; - - public OrangeJuice() {} - - public String getName() - { - return name; - } - - public int getPrice() - { - return price; - } - - @Override - public String toString() - { - return name + " (" + price + " cents)"; - } -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,28 @@ +package org.jboss.seam.example.guice; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +public class OrangeJuice implements Juice +{ + private static final String name = "Orange Juice"; + private static final int price = 12; + + public OrangeJuice() {} + + public String getName() + { + return name; + } + + public int getPrice() + { + return price; + } + + @Override + public String toString() + { + return name + " (" + price + " cents)"; + } +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/seam.properties =================================================================== Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/seam.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/resources/seam.properties) =================================================================== Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>guice</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-tests</artifactId> - <name>Guice Integration Tests Module (EE6)</name> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium.server</groupId> - <artifactId>selenium-server</artifactId> - <classifier>standalone</classifier> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>functional-tests</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.protocol</groupId> - <artifactId>arquillian-protocol-servlet</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> - <directory>src/test/resources-integration</directory> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>integration-tests</id> - <activation> - <property> - <name>arquillian</name> - </property> - </activation> - </profile> - - <profile> - <id>arq-jbossas-7-managed</id> - <activation> - <property> - <name>arquillian</name> - <value>jbossas-managed-7</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>arq-jbossas-7-remote</id> - <activation> - <property> - <name>arquillian</name> - <value>jbossas-remote-7</value> - </property> - </activation> - </profile> - - <profile> - <id>ftest-jbossas</id> - <properties> - <example.context.path>seam-guice</example.context.path> - </properties> - <build> - <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> - <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> - <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> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,190 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>guice</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-tests</artifactId> + <name>Guice Integration Tests Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.server</groupId> + <artifactId>selenium-server</artifactId> + <classifier>standalone</classifier> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>functional-tests</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/test/resources-integration</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + </profile> + + <profile> + <id>ftest-jbossas</id> + <properties> + <example.context.path>seam-guice</example.context.path> + </properties> + <build> + <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> + <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> + <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> Deleted: 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_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,83 +0,0 @@ -package org.jboss.seam.example.guice.test; - -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 com.google.inject.Injector; -import com.google.inject.Key; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -public class GuiceTest extends SeamTest -{ - @Test - public void testGuiceInjector() throws Exception - { - new ComponentTest() - { - @Override - protected void testComponents() throws Exception - { - Injector injector = (Injector) getInstance("guiceExampleInjector"); - - Object juiceInstance = injector.getInstance(Juice.class); - assert juiceInstance instanceof AppleJuice : juiceInstance; - - Object orangeInstance = injector.getInstance(Key.get(Juice.class, Orange.class)); - assert orangeInstance instanceof OrangeJuice : orangeInstance; - } - }.run(); - } - - @Test - public void testGuiceIntegration() throws Exception - { - new ComponentTest() - { - @Override - protected void testComponents() throws Exception - { - JuiceBar juiceBar = (JuiceBar) getInstance("juiceBar"); - - Juice juiceOfTheDay = juiceBar.getJuiceOfTheDay(); - assert "Apple Juice".equals(juiceOfTheDay.getName()) : juiceOfTheDay.getName(); - Juice anotherJuice = juiceBar.getAnotherJuice(); - assert "Orange Juice".equals(anotherJuice.getName()) : anotherJuice.getName(); - - Juice juiceOfTheDay2 = juiceBar.getJuiceOfTheDay(); - assert juiceOfTheDay != juiceOfTheDay2 : "A new instance should be created by Guice."; - Juice anotherJuice2 = juiceBar.getAnotherJuice(); - assert anotherJuice == anotherJuice2 : "Different instances returned for the singleton object."; - } - }.run(); - } - - @Test - public void testGuiceDisinjection() throws Exception - { - new ComponentTest() - { - @Override - protected void testComponents() throws Exception - { - JuiceTestBar juiceBar = (JuiceTestBar) getInstance("juiceTestBar"); - juiceBar.getJuiceOfTheDay(); // Call a method to trigger Guice injection - - assert juiceBar.getJuiceOfTheDay() != null; - assert juiceBar.getAnotherJuice() != null; - - // Reflection to obtain the field value would not work here due to the proxy - assert juiceBar.getJuiceOfTheDayBypassInterceptors() == null - : "Value injected by Guice was not cleared after the call"; - assert juiceBar.getAnotherJuiceBypassInterceptors() == null - : "Value injected by Guice was not cleared after the call"; - } - }.run(); - } -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java (from rev 14479, branches/community/Seam_2_3Beta2/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 (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,83 @@ +package org.jboss.seam.example.guice.test; + +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 com.google.inject.Injector; +import com.google.inject.Key; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +public class GuiceTest extends SeamTest +{ + @Test + public void testGuiceInjector() throws Exception + { + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + Injector injector = (Injector) getInstance("guiceExampleInjector"); + + Object juiceInstance = injector.getInstance(Juice.class); + assert juiceInstance instanceof AppleJuice : juiceInstance; + + Object orangeInstance = injector.getInstance(Key.get(Juice.class, Orange.class)); + assert orangeInstance instanceof OrangeJuice : orangeInstance; + } + }.run(); + } + + @Test + public void testGuiceIntegration() throws Exception + { + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + JuiceBar juiceBar = (JuiceBar) getInstance("juiceBar"); + + Juice juiceOfTheDay = juiceBar.getJuiceOfTheDay(); + assert "Apple Juice".equals(juiceOfTheDay.getName()) : juiceOfTheDay.getName(); + Juice anotherJuice = juiceBar.getAnotherJuice(); + assert "Orange Juice".equals(anotherJuice.getName()) : anotherJuice.getName(); + + Juice juiceOfTheDay2 = juiceBar.getJuiceOfTheDay(); + assert juiceOfTheDay != juiceOfTheDay2 : "A new instance should be created by Guice."; + Juice anotherJuice2 = juiceBar.getAnotherJuice(); + assert anotherJuice == anotherJuice2 : "Different instances returned for the singleton object."; + } + }.run(); + } + + @Test + public void testGuiceDisinjection() throws Exception + { + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + JuiceTestBar juiceBar = (JuiceTestBar) getInstance("juiceTestBar"); + juiceBar.getJuiceOfTheDay(); // Call a method to trigger Guice injection + + assert juiceBar.getJuiceOfTheDay() != null; + assert juiceBar.getAnotherJuice() != null; + + // Reflection to obtain the field value would not work here due to the proxy + assert juiceBar.getJuiceOfTheDayBypassInterceptors() == null + : "Value injected by Guice was not cleared after the call"; + assert juiceBar.getAnotherJuiceBypassInterceptors() == null + : "Value injected by Guice was not cleared after the call"; + } + }.run(); + } +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,29 +0,0 @@ -package org.jboss.seam.example.guice.test; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.example.guice.JuiceBar; -import org.jboss.seam.example.guice.Juice; -import org.jboss.seam.ioc.guice.Guice; - -/** - * A component used by the disinjection test to obtain the values of the fields after the proxied call. - * - * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] gmail . com) - */ -@Name("juiceTestBar") -@Guice -public class JuiceTestBar extends JuiceBar -{ - @BypassInterceptors - public Juice getJuiceOfTheDayBypassInterceptors() - { - return juiceOfTheDay; - } - - @BypassInterceptors - public Juice getAnotherJuiceBypassInterceptors() - { - return anotherJuice; - } -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,29 @@ +package org.jboss.seam.example.guice.test; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.example.guice.JuiceBar; +import org.jboss.seam.example.guice.Juice; +import org.jboss.seam.ioc.guice.Guice; + +/** + * A component used by the disinjection test to obtain the values of the fields after the proxied call. + * + * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] gmail . com) + */ +@Name("juiceTestBar") +@Guice +public class JuiceTestBar extends JuiceBar +{ + @BypassInterceptors + public Juice getJuiceOfTheDayBypassInterceptors() + { + return juiceOfTheDay; + } + + @BypassInterceptors + public Juice getAnotherJuiceBypassInterceptors() + { + return anotherJuice; + } +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,58 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.seam.example.guice.test.selenium; - -import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; -import static org.testng.AssertJUnit.assertTrue; - - /* - * @author Martin Gencur - * - */ -public class GuiceTest extends SeamSeleniumTest -{ - protected static final String BAR_URL = "/bar.seam"; - protected static final String JUICE_OF_THE_DAY = "Apple Juice* - 10 cents"; - protected static final String ANOTHER_JUICE = "Orange Juice - 12 cents"; - protected static final String GUICE_TITLE = "Juice Bar"; - - @Override - @BeforeMethod - public void setUp() - { - super.setUp(); - browser.open(CONTEXT_PATH + BAR_URL); - } - - @Test - public void simplePageContentTest() - { - assertTrue("Home page of Guice Example expected", browser.getLocation().contains(BAR_URL)); - assertTrue("Different page title expected",browser.getTitle().contains(GUICE_TITLE)); - assertTrue("Juice of the day should contain its name and price", browser.isTextPresent(JUICE_OF_THE_DAY)); - assertTrue("Another juice should contain its name and price", browser.isTextPresent(ANOTHER_JUICE)); - } - -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.seam.example.guice.test.selenium; + +import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import static org.testng.AssertJUnit.assertTrue; + + /* + * @author Martin Gencur + * + */ +public class GuiceTest extends SeamSeleniumTest +{ + protected static final String BAR_URL = "/bar.seam"; + protected static final String JUICE_OF_THE_DAY = "Apple Juice* - 10 cents"; + protected static final String ANOTHER_JUICE = "Orange Juice - 12 cents"; + protected static final String GUICE_TITLE = "Juice Bar"; + + @Override + @BeforeMethod + public void setUp() + { + super.setUp(); + browser.open(CONTEXT_PATH + BAR_URL); + } + + @Test + public void simplePageContentTest() + { + assertTrue("Home page of Guice Example expected", browser.getLocation().contains(BAR_URL)); + assertTrue("Different page title expected",browser.getTitle().contains(GUICE_TITLE)); + assertTrue("Juice of the day should contain its name and price", browser.isTextPresent(JUICE_OF_THE_DAY)); + assertTrue("Another juice should contain its name and price", browser.isTextPresent(ANOTHER_JUICE)); + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources/seam.properties =================================================================== Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources/seam.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/resources/seam.properties) =================================================================== Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,27 +0,0 @@ - - <!-- - JBoss, Home of Professional Open Source Copyright 2008, Red Hat - Middleware LLC, and individual contributors by the @authors tag. See - the copyright.txt in the distribution for a full listing of individual - contributors. This is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. This software is - distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. You should have received a copy of the GNU - Lesser General Public License along with this software; if not, write - to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Guice example" verbose="2" parallel="false"> - <test name="guice_jboss5"> - <parameter name="PROPERTY_FILE" value="" /> - <classes> - <class - name="org.jboss.seam.example.guice.test.selenium.GuiceTest" /> - </classes> - </test> -</suite> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,27 @@ + + <!-- + JBoss, Home of Professional Open Source Copyright 2008, Red Hat + Middleware LLC, and individual contributors by the @authors tag. See + the copyright.txt in the distribution for a full listing of individual + contributors. This is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. This software is + distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, write + to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Guice example" verbose="2" parallel="false"> + <test name="guice_jboss5"> + <parameter name="PROPERTY_FILE" value="" /> + <classes> + <class + name="org.jboss.seam.example.guice.test.selenium.GuiceTest" /> + </classes> + </test> +</suite> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -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 Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml (from rev 14479, branches/community/Seam_2_3Beta2/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 (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,11 @@ +<!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 Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>guice</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-web</artifactId> - <packaging>war</packaging> - <name>Guice Web Module (EE6)</name> - - <properties> - <!-- filtering property for components.xml --> - <jndiPattern>java:app/guice-ejb/#{ejbName}</jndiPattern> - </properties> - - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <type>ejb</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </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> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jul</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/main/webapp</directory> - <filtering>true</filtering> - </resource> - </webResources> - </configuration> - </plugin> - </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> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,131 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>guice</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-web</artifactId> + <packaging>war</packaging> + <name>Guice Web Module (EE6)</name> + + <properties> + <!-- filtering property for components.xml --> + <jndiPattern>java:app/guice-ejb/#{ejbName}</jndiPattern> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </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> + <exclusions> + <exclusion> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-jul</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp</directory> + <filtering>true</filtering> + </resource> + </webResources> + </configuration> + </plugin> + </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> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.com/products/seam/components" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:core="http://jboss.com/products/seam/core" - xmlns:guice="http://jboss.com/products/seam/guice" - xsi:schemaLocation=" - http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd - http://jboss.com/products/seam/guice http://jboss.com/products/seam/guice-2.3.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> - - <core:init debug="true"/> - - <guice:injector name="guiceExampleInjector"> - <guice:modules> - <value>org.jboss.seam.example.guice.JuiceBarModule</value> - </guice:modules> - </guice:injector> - - <guice:init injector="#{guiceExampleInjector}"/> - -</components> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:guice="http://jboss.com/products/seam/guice" + xsi:schemaLocation=" + http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd + http://jboss.com/products/seam/guice http://jboss.com/products/seam/guice-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> + + <core:init debug="true"/> + + <guice:injector name="guiceExampleInjector"> + <guice:modules> + <value>org.jboss.seam.example.guice.JuiceBarModule</value> + </guice:modules> + </guice:injector> + + <guice:init injector="#{guiceExampleInjector}"/> + +</components> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<faces-config version="1.2" - 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_1_2.xsd"> - - <application> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> - -</faces-config> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml (from rev 14479, branches/community/Seam_2_3Beta2/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 (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,11 @@ +<?xml version='1.0' encoding='UTF-8'?> +<faces-config version="1.2" + 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_1_2.xsd"> + + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" - 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"> - - <display-name>Seam Guice Example</display-name> - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</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>*.seam</url-pattern> - </servlet-mapping> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -</web-app> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml (from rev 14479, branches/community/Seam_2_3Beta2/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 (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + 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"> + + <display-name>Seam Guice Example</display-name> + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</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>*.seam</url-pattern> + </servlet-mapping> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +</web-app> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,23 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core"> - <head> - <title>Juice Bar</title> - </head> - <body> - <h1>Juice Bar</h1> - <h:form id="main"> - <div> - Which juice do you prefer? - <ul> - <li>#{juiceBar.juiceOfTheDay.name}* - #{juiceBar.juiceOfTheDay.price} cents</li> - <li>#{juiceBar.anotherJuice.name} - #{juiceBar.anotherJuice.price} cents</li> - </ul> - <p><em>* Juice of the day</em></p> - </div> - <p><small>This page is intentionally static (no form action).</small></p> - </h:form> - </body> -</html> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,23 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + <head> + <title>Juice Bar</title> + </head> + <body> + <h1>Juice Bar</h1> + <h:form id="main"> + <div> + Which juice do you prefer? + <ul> + <li>#{juiceBar.juiceOfTheDay.name}* - #{juiceBar.juiceOfTheDay.price} cents</li> + <li>#{juiceBar.anotherJuice.name} - #{juiceBar.anotherJuice.price} cents</li> + </ul> + <p><em>* Juice of the day</em></p> + </div> + <p><small>This page is intentionally static (no form action).</small></p> + </h:form> + </body> +</html> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/index.html 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,5 +0,0 @@ -<html> -<head> - <meta http-equiv="Refresh" content="0; URL=bar.seam"> -</head> -</html> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/index.html) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=bar.seam"> +</head> +</html> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/guice/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>examples-ee6</artifactId> - <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice</artifactId> - <packaging>pom</packaging> - <name>Guice Example (EE6)</name> - - <modules> - <module>guice-ejb</module> - <module>guice-web</module> - <module>guice-ear</module> - <module>guice-tests</module> - </modules> - - <properties> - <example.name>guice</example.name> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <version>${project.version}</version> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-web</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ear</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - -</project> Copied: branches/community/Seam_2_3/examples-ee6/guice/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>examples-ee6</artifactId> + <groupId>org.jboss.seam</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice</artifactId> + <packaging>pom</packaging> + <name>Guice Example (EE6)</name> + + <modules> + <module>guice-ejb</module> + <module>guice-web</module> + <module>guice-ear</module> + <module>guice-tests</module> + </modules> + + <properties> + <example.name>guice</example.name> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ear</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> +</project> Deleted: branches/community/Seam_2_3/examples-ee6/guice/readme.txt =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/readme.txt 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/readme.txt 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,25 +0,0 @@ -Seam Guice Example -====================== -This is a simple example demonstrating the use of Google Guice with Seam. - -example.name=guice - -To deploy the example to JBossAS, follow these steps: - -* In the example root directory run: - - mvn clean package - -* Set JBOSS_HOME environment property. - -* In the guice-ear directory run: - - mvn jboss:hard-deploy - -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting WAR from guice-web/target directory to Tomcat manually. Copied: branches/community/Seam_2_3/examples-ee6/guice/readme.txt (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/readme.txt) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/readme.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/readme.txt 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,25 @@ +Seam Guice Example +====================== +This is a simple example demonstrating the use of Google Guice with Seam. + +example.name=guice + +To deploy the example to JBossAS, follow these steps: + +* In the example root directory run: + + mvn clean package + +* Set JBOSS_HOME environment property. + +* In the guice-ear directory run: + + mvn jboss:hard-deploy + +To deploy the example to Tomcat with Embedded JBoss, follow these steps: + +* In the example root directory run: + + mvn clean package -Ptomcat + +* Deploy the resulting WAR from guice-web/target directory to Tomcat manually.