[seam-commits] Seam SVN: r14414 - in branches/community/Seam_2_3/examples-ee6: blog and 7 other directories.

Author: dhinojosa Date: 2012-03-15 17:27:20 -0400 (Thu, 15 Mar 2012) New Revision: 14414 Added: branches/community/Seam_2_3/examples-ee6/blog/ Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/jboss5/java/actions/SearchService.java branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/actions/PostAction.java branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml branches/community/Seam_2_3/examples-ee6/blog/pom.xml Log: added svn:ignore for blog dir Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-ear/pom.xml 2012-03-09 09:49:42 UTC (rev 14383) +++ branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml 2012-03-15 21:27:20 UTC (rev 14414) @@ -1,304 +1,312 @@ <?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>blog</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-ear</artifactId> - <packaging>ear</packaging> - <name>Blog EAR Module</name> - - <properties> - <jboss.home>${env.JBOSS_HOME}</jboss.home> - <jboss.domain>default</jboss.domain> - <jboss-cache.lib>jboss-cache-1.4.1.SP9.jar</jboss-cache.lib> - <jgroups.lib>jgroups-2.4.1.jar</jgroups.lib> - </properties> - - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-web</artifactId> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-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> - </dependencies> +<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>blog</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <build> - <finalName>seam-blog</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> - <filtering>true</filtering> - <jboss> - <version>4.2</version> - <loader-repository>seam.jboss.org:loader=seam-blog</loader-repository> - </jboss> - <modules> - <webModule> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-web</artifactId> - <contextRoot>/seam-blog</contextRoot> - <bundleFileName>blog-web.war</bundleFileName> - </webModule> - <ejbModule> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-ejb</artifactId> - <bundleFileName>blog-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>src/main/resources/blog-ds.xml</param> - <param>${project.build.directory}/${project.build.finalName}.${project.packaging}</param> - </fileNames> - </configuration> - </plugin> - </plugins> - </build> + <groupId>org.jboss.seam.examples-ee6.blog</groupId> + <artifactId>blog-ear</artifactId> + <packaging>ear</packaging> + <name>Blog EAR Module (EE6)</name> - <profiles> - <profile> - <id>exploded</id> - <properties> - <example.name>blog</example.name> - </properties> - <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</groupId> - <artifactId>blog-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</groupId> - <artifactId>blog-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</groupId> - <artifactId>blog-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> + <properties> + <jboss.home>${env.JBOSS_HOME}</jboss.home> + <jboss.domain>default</jboss.domain> + <jboss-cache.lib>jboss-cache-1.4.1.SP9.jar</jboss-cache.lib> + <jgroups.lib>jgroups-2.4.1.jar</jgroups.lib> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.blog</groupId> + <artifactId>blog-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6.blog</groupId> + <artifactId>blog-ejb</artifactId> + <version>${project.version}</version> + <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> + </dependencies> + + <build> + <finalName>seam-blog</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> + <filtering>true</filtering> + <jboss> + <version>4.2</version> + <loader-repository>seam.jboss.org:loader=seam-blog</loader-repository> + </jboss> + <modules> + <webModule> + <groupId>org.jboss.seam.examples-ee6.blog</groupId> + <artifactId>blog-web</artifactId> + <contextRoot>/seam-blog</contextRoot> + <bundleFileName>blog-web.war</bundleFileName> + </webModule> + <ejbModule> + <groupId>org.jboss.seam.examples-ee6.blog</groupId> + <artifactId>blog-ejb</artifactId> + <bundleFileName>blog-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>src/main/resources/blog-ds.xml</param> + <param>${project.build.directory}/${project.build.finalName}.${project.packaging}</param> + </fileNames> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>exploded</id> + <properties> + <example.name>blog</example.name> + </properties> + <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> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>src/main/resources/blog-ds.xml</param> - <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</directory> - </fileNames> + <artifactItems> + <artifactItem> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>blog-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.blog</groupId> + <artifactId>blog-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</groupId> + <artifactId>blog-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> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jbossas6</id> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <version>${hibernate.search.version}</version> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-analyzers</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-snowball</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-snowball</artifactId> - <version>${org.apache.lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>${org.apache.lucene.version}</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jbossas42</id> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - <exclusion> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - </profile> - </profiles> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <param>src/main/resources/blog-ds.xml</param> + <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</directory> + </fileNames> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jbossas6</id> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search</artifactId> + <version>${hibernate.search.version}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-lucene-analyzers</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-lucene-snowball</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-snowball</artifactId> + <version>${org.apache.lucene.version}</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>${org.apache.lucene.version}</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jbossas42</id> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search</artifactId> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> + </profile> + </profiles> </project> Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-ejb/pom.xml 2012-03-09 09:49:42 UTC (rev 14383) +++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml 2012-03-15 21:27:20 UTC (rev 14414) @@ -1,380 +1,179 @@ <?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>blog</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-ejb</artifactId> - <packaging>ejb</packaging> - <name>Blog EJB Module</name> +<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>blog</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-cache</artifactId> - </dependency> - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <exclusions> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </exclusion> - <exclusion> - <groupId>woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.solr</groupId> - <artifactId>solr-commons-csv</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.solr</groupId> - <artifactId>solr-solrj</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-highlighter</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-queries</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-spellchecker</artifactId> - </exclusion> - <exclusion> - <groupId>net.java.dev.stax-utils</groupId> - <artifactId>stax-utils</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-analyzers</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-snowball</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>jbossas51</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/jboss5/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jbossas6</id> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <version>${hibernate.search.version}</version> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-analyzers</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-snowball</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-snowball</artifactId> - <version>${org.apache.lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>${org.apache.lucene.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/jboss6/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jbossas42</id> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/jboss5/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>tomcat</id> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/jboss5/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - + <groupId>org.jboss.seam.examples-ee6.blog</groupId> + <artifactId>blog-ejb</artifactId> + <packaging>ejb</packaging> + <name>Blog EJB Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-jsf2</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + + <!--<dependency>--> + <!--<groupId>org.hibernate</groupId>--> + <!--<artifactId>hibernate-annotations</artifactId>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.hibernate</groupId>--> + <!--<artifactId>hibernate-entitymanager</artifactId>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.hibernate</groupId>--> + <!--<artifactId>hibernate-search</artifactId>--> + <!--<exclusions>--> + <!--<exclusion>--> + <!--<groupId>org.hibernate</groupId>--> + <!--<artifactId>hibernate-core</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.hibernate</groupId>--> + <!--<artifactId>ejb3-persistence</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>javax.transaction</groupId>--> + <!--<artifactId>jta</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>hsqldb</groupId>--> + <!--<artifactId>hsqldb</artifactId>--> + <!--</exclusion>--> + <!--</exclusions>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss</groupId>--> + <!--<artifactId>jboss-cache</artifactId>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jgroups</groupId>--> + <!--<artifactId>jgroups</artifactId>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.apache.lucene</groupId>--> + <!--<artifactId>lucene-core</artifactId>--> + <!--<version>2.9.4</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.apache.solr</groupId>--> + <!--<artifactId>solr-core</artifactId>--> + <!--<version>3.5.0</version>--> + <!--<exclusions>--> + <!--<exclusion>--> + <!--<groupId>commons-httpclient</groupId>--> + <!--<artifactId>commons-httpclient</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>commons-fileupload</groupId>--> + <!--<artifactId>commons-fileupload</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>woodstox</groupId>--> + <!--<artifactId>wstx-asl</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.apache.solr</groupId>--> + <!--<artifactId>solr-commons-csv</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.apache.geronimo.specs</groupId>--> + <!--<artifactId>geronimo-stax-api_1.0_spec</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.apache.solr</groupId>--> + <!--<artifactId>solr-solrj</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.codehaus.woodstox</groupId>--> + <!--<artifactId>wstx-asl</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.apache.solr</groupId>--> + <!--<artifactId>solr-lucene-highlighter</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.apache.solr</groupId>--> + <!--<artifactId>solr-lucene-queries</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.apache.solr</groupId>--> + <!--<artifactId>solr-lucene-spellchecker</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>net.java.dev.stax-utils</groupId>--> + <!--<artifactId>stax-utils</artifactId>--> + <!--</exclusion>--> + <!--</exclusions>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.apache.solr</groupId>--> + <!--<artifactId>solr-lucene-analyzers</artifactId>--> + <!--<version>1.3.0</version>--> + <!--<exclusions>--> + <!--<exclusion>--> + <!--<groupId>org.apache.solr</groupId>--> + <!--<artifactId>solr-lucene-core</artifactId>--> + <!--</exclusion>--> + <!--</exclusions>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.apache.solr</groupId>--> + <!--<artifactId>solr-lucene-snowball</artifactId>--> + <!--<version>1.3.0</version>--> + <!--<exclusions>--> + <!--<exclusion>--> + <!--<groupId>org.apache.solr</groupId>--> + <!--<artifactId>solr-lucene-core</artifactId>--> + <!--</exclusion>--> + <!--</exclusions>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>javax.servlet</groupId>--> + <!--<artifactId>servlet-api</artifactId>--> + <!--<scope>provided</scope>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>javax.ejb</groupId>--> + <!--<artifactId>ejb-api</artifactId>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>javax.faces</groupId>--> + <!--<artifactId>jsf-api</artifactId>--> + <!--</dependency>--> + </dependencies> </project> Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/jboss5/java/actions/SearchService.java =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-ejb/src/jboss5/java/actions/SearchService.java 2012-03-09 09:49:42 UTC (rev 14383) +++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/jboss5/java/actions/SearchService.java 2012-03-15 21:27:20 UTC (rev 14414) @@ -21,14 +21,14 @@ * @author Gavin King */ @Name("searchService") -public class SearchService +public class SearchService { - + @In private FullTextEntityManager entityManager; - + private String searchPattern; - + @Factory("searchResults") public List<BlogEntry> getSearchResults() { Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/actions/PostAction.java =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-ejb/src/main/java/actions/PostAction.java 2012-03-09 09:49:42 UTC (rev 14383) +++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/actions/PostAction.java 2012-03-15 21:27:20 UTC (rev 14414) @@ -31,7 +31,9 @@ @In(required=false) BlogEntry blogEntry; @In CacheProvider cacheProvider; - + + @In FacesMessages facesMessages; + public void post() throws IOException { blogEntry.setDate( new Date() ); @@ -42,7 +44,7 @@ public void invalid() { - FacesMessages.instance().add("You are missing some information, please try again"); + facesMessages.add("You are missing some information, please try again"); } } Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-ejb/src/main/java/domain/Blog.java 2012-03-09 09:49:42 UTC (rev 14383) +++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java 2012-03-15 21:27:20 UTC (rev 14414) @@ -10,12 +10,13 @@ import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.OrderBy; +import javax.validation.constraints.NotNull; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.validator.Length; -import org.hibernate.validator.NotNull; +import org.hibernate.validator.constraints.Length; + /** * Represents a blog, containing zero or more blog entries. * Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-ejb/src/main/java/domain/BlogEntry.java 2012-03-09 09:49:42 UTC (rev 14383) +++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java 2012-03-15 21:27:20 UTC (rev 14414) @@ -1,31 +1,21 @@ //$Id: BlogEntry.java 13984 2011-01-11 12:45:45Z sannegrinovero $ package domain; -import java.util.Date; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; - import org.apache.solr.analysis.LowerCaseFilterFactory; import org.apache.solr.analysis.NGramFilterFactory; import org.apache.solr.analysis.SnowballPorterFilterFactory; import org.apache.solr.analysis.StandardTokenizerFactory; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.validator.Length; -import org.hibernate.validator.NotNull; -import org.hibernate.search.annotations.Analyzer; -import org.hibernate.search.annotations.AnalyzerDef; -import org.hibernate.search.annotations.AnalyzerDefs; -import org.hibernate.search.annotations.Fields; -import org.hibernate.search.annotations.Indexed; -import org.hibernate.search.annotations.DocumentId; -import org.hibernate.search.annotations.Field; -import org.hibernate.search.annotations.Parameter; -import org.hibernate.search.annotations.TokenFilterDef; -import org.hibernate.search.annotations.TokenizerDef; +import org.hibernate.search.annotations.*; +import org.hibernate.validator.constraints.Length; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.validation.constraints.NotNull; +import java.util.Date; + /** * Represents a blog entry. * @@ -33,100 +23,100 @@ * @author Sanne Grinovero */ @Entity -(a)Cache(usage=CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) @Indexed @AnalyzerDefs({ - @AnalyzerDef(name = "en", - tokenizer = @TokenizerDef(factory = StandardTokenizerFactory.class), - filters = { - @TokenFilterDef(factory = LowerCaseFilterFactory.class), - @TokenFilterDef(factory = SnowballPorterFilterFactory.class, params = { - @Parameter(name = "language", value = "English") - }) - }), - @AnalyzerDef(name="ngrams", tokenizer=(a)TokenizerDef(factory=StandardTokenizerFactory.class), - filters={ - @TokenFilterDef(factory = LowerCaseFilterFactory.class), - @TokenFilterDef(factory = NGramFilterFactory.class, - params = { @Parameter(name = "minGramSize", value = "3"), @Parameter(name = "maxGramSize", value = "3") }) - })} - ) + @AnalyzerDef(name = "en", + tokenizer = @TokenizerDef(factory = StandardTokenizerFactory.class), + filters = { + @TokenFilterDef(factory = LowerCaseFilterFactory.class), + @TokenFilterDef(factory = SnowballPorterFilterFactory.class, params = { + @Parameter(name = "language", value = "English") + }) + }), + @AnalyzerDef(name = "ngrams", tokenizer = @TokenizerDef(factory = StandardTokenizerFactory.class), + filters = { + @TokenFilterDef(factory = LowerCaseFilterFactory.class), + @TokenFilterDef(factory = NGramFilterFactory.class, + params = {@Parameter(name = "minGramSize", value = "3"), @Parameter(name = "maxGramSize", value = "3")}) + })} +) public class BlogEntry { - @Id @Length(min=1, max=20) - @DocumentId - private String id; - - @NotNull @Length(max=70) - @Fields({ - @Field(name="title:en", analyzer=@Analyzer(definition="en")), - @Field(name="title:ngrams", analyzer=@Analyzer(definition="ngrams"))}) - private String title; - - @Length(max=200) - private String excerpt; - - @NotNull @Length(max=1400) - @Fields({ - @Field(name="body:en", analyzer=@Analyzer(definition="en")), - @Field(name="body:ngrams", analyzer=@Analyzer(definition="ngrams"))}) - private String body; - - @NotNull - private Date date = new Date(); - - @ManyToOne @NotNull - private Blog blog; + @Id + @Length(min = 1, max = 20) + @DocumentId + private String id; - public BlogEntry(Blog blog) { - this.blog = blog; - } - - BlogEntry() {} + @NotNull + @Length(max = 70) + @Fields({ + @Field(name = "title:en", analyzer = @Analyzer(definition = "en")), + @Field(name = "title:ngrams", analyzer = @Analyzer(definition = "ngrams"))}) + private String title; - public String getId() { - return id; - } + @Length(max = 200) + private String excerpt; - public String getTitle() { - return title; - } + @NotNull + @Length(max = 1400) + @Fields({ + @Field(name = "body:en", analyzer = @Analyzer(definition = "en")), + @Field(name = "body:ngrams", analyzer = @Analyzer(definition = "ngrams"))}) + private String body; - public String getExcerpt() { - return excerpt; - } + @NotNull + private Date date = new Date(); - public String getBody() { - return body; - } + @ManyToOne + @NotNull + private Blog blog; - public Date getDate() { - return date; - } + public BlogEntry(Blog blog) { + this.blog = blog; + } - public void setBody(String body) - { + BlogEntry() { + } + + public String getId() { + return id; + } + + public String getTitle() { + return title; + } + + public String getExcerpt() { + return excerpt; + } + + public String getBody() { + return body; + } + + public Date getDate() { + return date; + } + + public void setBody(String body) { this.body = body; } - - public void setDate(Date date) - { + + public void setDate(Date date) { this.date = date; } - - public void setExcerpt(String excerpt) - { - if ( "".equals(excerpt) ) excerpt=null; + + public void setExcerpt(String excerpt) { + if ("".equals(excerpt)) excerpt = null; this.excerpt = excerpt; } - - public void setId(String id) - { + + public void setId(String id) { this.id = id; } - - public void setTitle(String title) - { + + public void setTitle(String title) { this.title = title; } Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml 2012-03-09 09:49:42 UTC (rev 14383) +++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml 2012-03-15 21:27:20 UTC (rev 14414) @@ -1,216 +1,229 @@ <?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>blog</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-tests</artifactId> - <name>Blog Integration Tests Module</name> - - <dependencies> - <dependency> - <groupId>org.jboss.embedded</groupId> - <artifactId>jboss-embedded-all</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.seam.embedded</groupId> - <artifactId>thirdparty-all</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.seam.embedded</groupId> - <artifactId>hibernate-all</artifactId> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-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>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </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> - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> <!-- this takes datasource blog-ds.xml --> - <directory>${basedir}/../blog-ear/src/main/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> <!-- this takes treecache.xml --> - <directory>${basedir}/../blog-ear/src/main/application</directory> - <filtering>true</filtering> - </testResource> - <testResource> <!-- this takes themes aka *.properties --> - <directory>${basedir}/../blog-web/src/main/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>false</skipTests> - <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> - <additionalClasspathElements> - <additionalClasspathElement>${basedir}/../blog-web/src/main/webapp</additionalClasspathElement> - <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> - </additionalClasspathElements> - <suiteXmlFiles> - <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> - </suiteXmlFiles> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-seam-bootstrap</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <includes>bootstrap/**</includes> - <artifactItems> - <artifactItem> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-embedded-bootstrap</artifactId> - <version>${project.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/blogindexes</directory> - </fileset> - </filesets> - </configuration> - </plugin> - </plugins> - </build> +<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> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>blog</artifactId> + <version>2.3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <profiles> - <profile> - <id>ftest-jbossas</id> - <properties> - <example.context.path>seam-blog</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}/../blog-ear/src/main/resources/blog-ds.xml</param> - <param>${basedir}/../blog-ear/target/seam-blog.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-blog</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> - + <groupId>org.jboss.seam.examples-ee6.blog</groupId> + <artifactId>blog-tests</artifactId> + <name>Blog Integration Tests Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.blog</groupId> + <artifactId>blog-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-jsf2</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </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>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <type>pom</type> + <scope>provided</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> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-api-maven</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-impl-maven</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> <!-- this takes datasource blog-ds.xml --> + <directory>${basedir}/src/main/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> <!-- this takes themes aka *.properties --> + <directory>${basedir}/../blog-web/src/main/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-blog</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> + <profile> + <id>ftest-jbossas-cluster</id> + <properties> + <example.context.path>seam-blog</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> + <profile> + <id>ftest-tomcat</id> + <properties> + <example.context.path>jboss-seam-blog</example.context.path> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-web/pom.xml 2012-03-09 09:49:42 UTC (rev 14383) +++ branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml 2012-03-15 21:27:20 UTC (rev 14414) @@ -1,194 +1,89 @@ <?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>blog</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-web</artifactId> - <packaging>war</packaging> - <name>Blog Web Module</name> - - <properties> - <!-- filtering property for components.xml --> - <jndiPattern>seam-blog/#{ejbName}/local</jndiPattern> - </properties> - - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-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-ui</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jul</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug</artifactId> - </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>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</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>jbossas6</id> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <version>${hibernate.search.version}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - <profile> - <id>tomcat</id> - <properties> - <!-- filtering property for components.xml --> - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-ejb</artifactId> - <type>ejb</type> - <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> - <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> - </dependencies> - <build> - <finalName>jboss-seam-blog</finalName> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-resources</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/classes</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../blog-ear/src/main/application</directory> - <includes> - <include>treecache.xml</include> - </includes> - </resource> - <resource> - <directory>${basedir}/../blog-ear/src/main/resources</directory> - <includes> - <include>blog-ds.xml</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> +<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>blog</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6.blog</groupId> + <artifactId>blog-web</artifactId> + <packaging>war</packaging> + <name>Blog Web Module (EE6)</name> + + <properties> + <!-- filtering property for components.xml --> + <jndiPattern>java:app/blog-ejb/#{ejbName}</jndiPattern> + <distributable>false</distributable> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.blog</groupId> + <artifactId>blog-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui-jsf2</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-jul</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug-jsf2</artifactId> + </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>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + <version>4.1.0.Final</version> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + <version>4.1.0.Final</version> + </dependency> + </dependencies> + + <build> + <finalName>blog-web</finalName> + <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> </project> Modified: branches/community/Seam_2_3/examples-ee6/blog/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/pom.xml 2012-03-09 09:49:42 UTC (rev 14383) +++ branches/community/Seam_2_3/examples-ee6/blog/pom.xml 2012-03-15 21:27:20 UTC (rev 14414) @@ -1,58 +1,58 @@ <?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</artifactId> - <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog</artifactId> - <packaging>pom</packaging> - <name>Blog Example</name> - - <modules> - <module>blog-ejb</module> - <module>blog-web</module> - <module>blog-ear</module> - <module>blog-tests</module> - </modules> +<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> + <groupId>org.jboss.seam</groupId> + <artifactId>examples-ee6</artifactId> + <version>2.3.0-SNAPSHOT</version> + </parent> - <properties> - <example.name>blog</example.name> - </properties> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>blog</artifactId> + <packaging>pom</packaging> + <name>Blog Example (EE6)</name> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-ejb</artifactId> - <version>${project.version}</version> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-web</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog-ear</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <profiles> - <profile> - <id>jbossas6</id> - <properties> - <hibernate.search.version>3.3.0.Final</hibernate.search.version> - <org.apache.lucene.version>3.0.3</org.apache.lucene.version> - </properties> - </profile> - </profiles> + <modules> + <module>blog-ejb</module> + <module>blog-web</module> + <module>blog-ear</module> + <module>blog-tests</module> + </modules> + <properties> + <example.name>blog</example.name> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>blog-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>blog-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>blog-ear</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <profiles> + <profile> + <id>jbossas6</id> + <properties> + <hibernate.search.version>3.3.0.Final</hibernate.search.version> + <org.apache.lucene.version>3.0.3</org.apache.lucene.version> + </properties> + </profile> + </profiles> </project>