Author: rsmeral Date: 2013-06-03 12:29:26 -0400 (Mon, 03 Jun 2013) New Revision: 15524 Modified: branches/enterprise/WFK-2_1/examples/blog/blog-ear/pom.xml branches/enterprise/WFK-2_1/examples/blog/blog-ejb/pom.xml branches/enterprise/WFK-2_1/examples/blog/blog-web/pom.xml branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/pages.xml branches/enterprise/WFK-2_1/examples/blog/pom.xml branches/enterprise/WFK-2_1/examples/booking/booking-ear/pom.xml branches/enterprise/WFK-2_1/examples/booking/booking-ejb/pom.xml branches/enterprise/WFK-2_1/examples/booking/booking-web/pom.xml branches/enterprise/WFK-2_1/examples/booking/build.xml branches/enterprise/WFK-2_1/examples/booking/pom.xml branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml branches/enterprise/WFK-2_1/examples/hibernate/pom.xml branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml branches/enterprise/WFK-2_1/examples/jee6/pom.xml Log: blog, booking, groovybooking, hibernate, jee6 converted Modified: branches/enterprise/WFK-2_1/examples/blog/blog-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/blog/blog-ear/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/blog/blog-ear/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -1,129 +1,139 @@ <?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.1.Final-redhat-2</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>blog</artifactId> + <groupId>org.jboss.seam.examples</groupId> + <version>2.3.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <groupId>org.jboss.seam.examples.blog</groupId> - <artifactId>blog-ear</artifactId> - <packaging>ear</packaging> - <name>Blog EAR Module (EE6)</name> + <groupId>org.jboss.seam.examples.blog</groupId> + <artifactId>blog-ear</artifactId> + <packaging>ear</packaging> + <name>Blog EAR Module (EE6)</name> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.blog</groupId> - <artifactId>blog-web</artifactId> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.blog</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> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples.blog</groupId> + <artifactId>blog-web</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples.blog</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> + </dependency> + </dependencies> - <build> - <finalName>seam-blog</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <version>6</version> - <defaultLibBundleDir>lib</defaultLibBundleDir> - <filtering>true</filtering> - <!-- Required as indexerService cannot be initialized before the blogEntityManagerFactory is available --> - <initializeInOrder>true</initializeInOrder> - <modules> + <build> + <finalName>seam-blog</finalName> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.as.plugins</groupId> + <artifactId>jboss-as-maven-plugin</artifactId> + <version>${version.jboss.maven.plugin}</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <version>${version.ear.plugin}</version> + <configuration> + <version>6</version> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <filtering>true</filtering> + <!-- Required as indexerService cannot be initialized before the blogEntityManagerFactory is available --> + <initializeInOrder>true</initializeInOrder> + <modules> - <ejbModule> - <groupId>org.jboss.seam.examples.blog</groupId> - <artifactId>blog-ejb</artifactId> - <bundleFileName>blog-ejb.jar</bundleFileName> - </ejbModule> + <ejbModule> + <groupId>org.jboss.seam.examples.blog</groupId> + <artifactId>blog-ejb</artifactId> + <bundleFileName>blog-ejb.jar</bundleFileName> + </ejbModule> - <webModule> - <groupId>org.jboss.seam.examples.blog</groupId> - <artifactId>blog-web</artifactId> - <contextRoot>/seam-blog</contextRoot> - <bundleFileName>blog-web.war</bundleFileName> - </webModule> + <webModule> + <groupId>org.jboss.seam.examples.blog</groupId> + <artifactId>blog-web</artifactId> + <contextRoot>/seam-blog</contextRoot> + <bundleFileName>blog-web.war</bundleFileName> + </webModule> - <ejbModule> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <bundleFileName>jboss-seam.jar</bundleFileName> - </ejbModule> - </modules> - </configuration> - </plugin> - </plugins> - </build> + <ejbModule> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <bundleFileName>jboss-seam.jar</bundleFileName> + </ejbModule> + </modules> + </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> - <artifactItems> - <artifactItem> - <groupId>org.jboss.seam.examples.blog</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.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.blog</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> - </plugins> - </build> - </profile> - </profiles> + <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.blog</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.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.blog</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> + </plugins> + </build> + </profile> + </profiles> </project> Modified: branches/enterprise/WFK-2_1/examples/blog/blog-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/blog/blog-ejb/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/blog/blog-ejb/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -1,108 +1,222 @@ <?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> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog</artifactId> - <version>2.3.1.Final-redhat-2</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>blog</artifactId> + <version>2.3.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <groupId>org.jboss.seam.examples.blog</groupId> - <artifactId>blog-ejb</artifactId> - <packaging>ejb</packaging> - <name>Blog EJB Module (EE6)</name> + <groupId>org.jboss.seam.examples.blog</groupId> + <artifactId>blog-ejb</artifactId> + <packaging>ejb</packaging> + <name>Blog EJB Module (EE6)</name> - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.servlet</groupId> - <artifactId>jboss-servlet-api_3.0_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>provided</scope> - </dependency> - <!--<dependency>--> - <!--<groupId>org.hibernate</groupId>--> - <!--<artifactId>hibernate-annotations</artifactId>--> - <!--</dependency>--> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>provided</scope> - </dependency> + <dependencies> + <!-- Seam is provided-scoped, because it is bundled as an EJB module in the EAR --> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <scope>provided</scope> + </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>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>org.infinispan</groupId> - <artifactId>infinispan-core</artifactId> - </dependency> - <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-tree</artifactId> - </dependency> + <dependency> + <groupId>org.infinispan</groupId> + <artifactId>infinispan-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.infinispan</groupId> + <artifactId>infinispan-tree</artifactId> + </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> - </dependencies> + <!-- Test dependencies --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-depchain</artifactId> + <type>pom</type> + <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> + + <profiles> + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + <properties> + <jndiPattern>java:app/seam-blog/#{ejbName}</jndiPattern> + <distributable>false</distributable> + </properties> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-remote</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + <build> + <plugins> + + <plugin> + <artifactId>maven-ejb-plugin</artifactId> + <version>${version.ejb.plugin}</version> + <configuration> + <ejbVersion>3.1</ejbVersion> + </configuration> + </plugin> + <!-- Skip tests by default, since they require a container --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: branches/enterprise/WFK-2_1/examples/blog/blog-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/blog/blog-web/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/blog/blog-web/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -6,7 +6,7 @@ <parent> <artifactId>blog</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> + <version>2.3.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -80,6 +80,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> + <version>${version.war.plugin}</version> <configuration> <webResources> <resource> Modified: branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/pages.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/pages.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -58,9 +58,10 @@ <action execute="#{blog.hitCount.hit}"/> </page> - <exception class="org.hibernate.search.errors.EmptyQueryException"> + <exception class="org.hibernate.search.errors.EmptyQueryException"> <redirect view-id="/search.xhtml"> <message severity="warn">Given query is too simple. Try again.</message> </redirect> </exception> + </pages> Modified: branches/enterprise/WFK-2_1/examples/blog/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/blog/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/blog/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -1,49 +1,167 @@ <?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> - <groupId>org.jboss.seam</groupId> - <artifactId>examples</artifactId> - <version>2.3.1.Final-redhat-2</version> - </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>blog</artifactId> + <version>2.3.1.Final-redhat-2</version> + <packaging>pom</packaging> + <name>Blog Example (EE6)</name> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>blog</artifactId> - <packaging>pom</packaging> - <name>Blog Example (EE6)</name> + <modules> + <module>blog-ejb</module> + <module>blog-web</module> + <module>blog-ear</module> + </modules> - <modules> - <module>blog-ejb</module> - <module>blog-web</module> - <module>blog-ear</module> - <module>blog-tests</module> - </modules> + <properties> + <example.name>blog</example.name> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.source>1.6</maven.compiler.source> + + <!-- To use jacoco, set jacoco.agent system property to something like + -javaagent:/path/to/jacocoagent.jar=append=true,destfile=/path/to/output/jacoco.exec --> + <jacoco.agent /> + + <!-- To use custom Maven settings with ShrinkWrap Resolver, uncomment + and customize the following property. --> + <!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>--> + + <version.commons.logging>1.1.1</version.commons.logging> + <version.slf4j>1.6.1</version.slf4j> + <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver> + + <!-- Plugin versions --> + <version.clean.plugin>2.5</version.clean.plugin> + <version.resources.plugin>2.6</version.resources.plugin> + <version.dependency.plugin>2.5.1</version.dependency.plugin> + <version.compiler.plugin>2.3.1</version.compiler.plugin> + <version.surefire.plugin>2.10</version.surefire.plugin> + <version.ear.plugin>2.6</version.ear.plugin> + <version.war.plugin>2.1.1</version.war.plugin> + <version.ejb.plugin>2.3</version.ejb.plugin> + <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin> + </properties> - <properties> - <example.name>blog</example.name> - </properties> + <dependencyManagement> + <dependencies> + <!-- Modules --> + <dependency> + <groupId>org.jboss.seam.examples.blog</groupId> + <artifactId>blog-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples.blog</groupId> + <artifactId>blog-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples.blog</groupId> + <artifactId>blog-ear</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- BOMs --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-bom</artifactId> + <version>${version.shrinkwrap.resolver}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>bom</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Common dependencies --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons.logging}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${version.slf4j}</version> + </dependency> + + <!-- TestNG is not necessary --> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.blog</groupId> - <artifactId>blog-ejb</artifactId> - <version>${project.version}</version> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.blog</groupId> - <artifactId>blog-web</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.blog</groupId> - <artifactId>blog-ear</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <!-- Manage plugin versions for build stability --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.surefire.plugin}</version> + <configuration> + <systemPropertyVariables> + <org.apache.maven.user-settings>${maven.user.settings}</org.apache.maven.user-settings> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${version.dependency.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>${version.resources.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>${version.compiler.plugin}</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>${version.clean.plugin}</version> + <!-- Delete lucene indexes on clean --> + <configuration> + <filesets> + <fileset> + <directory>blogindexes</directory> + </fileset> + </filesets> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-ear/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/booking/booking-ear/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -2,16 +2,16 @@ <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>booking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> + <artifactId>booking</artifactId> + <version>2.3.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.jboss.seam.examples.booking</groupId> <artifactId>booking-ear</artifactId> <packaging>ear</packaging> - <name>Booking EAR Module</name> + <name>Booking EAR Module (EE6)</name> <dependencies> <dependency> @@ -53,10 +53,20 @@ <build> <finalName>seam-booking</finalName> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.as.plugins</groupId> + <artifactId>jboss-as-maven-plugin</artifactId> + <version>${version.jboss.maven.plugin}</version> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> + <version>${version.ear.plugin}</version> <configuration> <defaultLibBundleDir>lib</defaultLibBundleDir> <filtering>true</filtering> @@ -80,39 +90,6 @@ </modules> </configuration> </plugin> - <plugin> - <groupId>org.jboss.as.plugins</groupId> - <artifactId>jboss-as-maven-plugin</artifactId> - <executions> - <!-- This requires to be enabled manually as <enabled>true</enabled> doesn't - work --> - <!-- <execution> --> - <!-- <id>add-datasource</id> --> - <!-- <phase>package</phase> --> - <!-- <configuration> --> - <!-- <address>subsystem=datasources,data-source=java:/bookingDatasource</address> --> - <!-- <properties> --> - <!-- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> --> - <!-- <jndi-name>java:/bookingDatasource</jndi-name> --> - <!-- <enabled>true</enabled> --> - <!-- <pool-name>bookingDSPool</pool-name> --> - <!-- <user-name>sa</user-name> --> - <!-- <driver-name>h2</driver-name> --> - <!-- </properties> --> - <!-- </configuration> --> - <!-- <goals> --> - <!-- <goal>add-resource</goal> --> - <!-- </goals> --> - <!-- </execution> --> - <!-- Datasource has to be created before running deploy --> - <execution> - <phase></phase> - <goals> - <goal>deploy</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> @@ -162,8 +139,8 @@ </execution> </executions> </plugin> - </plugins> - </build> + </plugins> + </build> </profile> </profiles> </project> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -2,19 +2,18 @@ <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</groupId> <artifactId>booking</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> + <version>2.3.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.jboss.seam.examples.booking</groupId> <artifactId>booking-ejb</artifactId> <packaging>ejb</packaging> - <name>Booking EJB Module</name> - + <name>Booking EJB Module (EE6)</name> + <dependencies> - <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> @@ -51,6 +50,32 @@ <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-depchain</artifactId> + <type>pom</type> + <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> <profiles> @@ -60,6 +85,7 @@ <plugins> <plugin> <artifactId>maven-resources-plugin</artifactId> + <version>${version.resources.plugin}</version> <executions> <execution> <id>copy-cluster-resources</id> @@ -76,7 +102,7 @@ <include>**/*</include> </includes> </resource> - </resources> + </resources> </configuration> </execution> </executions> @@ -84,6 +110,83 @@ </plugins> </build> </profile> + + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + <properties> + <jndiPattern>java:app/seam-booking/#{ejbName}</jndiPattern> + <distributable>false</distributable> + </properties> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-remote</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> </profiles> - + + <build> + <plugins> + <!-- Skip tests by default --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -2,16 +2,16 @@ <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</groupId> <artifactId>booking</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> + <version>2.3.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.jboss.seam.examples.booking</groupId> <artifactId>booking-web</artifactId> <packaging>war</packaging> - <name>Booking Web Module</name> + <name>Booking Web Module (EE6)</name> <properties> <!-- filtering property for components.xml --> @@ -84,6 +84,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> + <version>${version.war.plugin}</version> <configuration> <webResources> <resource> Modified: branches/enterprise/WFK-2_1/examples/booking/build.xml =================================================================== (Binary files differ) Modified: branches/enterprise/WFK-2_1/examples/booking/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/booking/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -1,30 +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> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>booking</artifactId> - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>examples</artifactId> - <version>2.3.1.Final-redhat-2</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>booking</artifactId> + <version>2.3.1.Final-redhat-2</version> <packaging>pom</packaging> <name>Booking Example (EE6)</name> <properties> <example.name>booking</example.name> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.source>1.6</maven.compiler.source> + + <!-- To use jacoco, set jacoco.agent system property to something like + -javaagent:/path/to/jacocoagent.jar=append=true,destfile=/path/to/output/jacoco.exec --> + <jacoco.agent /> + + <!-- To use custom Maven settings with ShrinkWrap Resolver, uncomment + and customize the following property. --> + <!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>--> + + <version.commons.logging>1.1.1</version.commons.logging> + <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver> + + <!-- Plugin versions --> + <version.dependency.plugin>2.5.1</version.dependency.plugin> + <version.surefire.plugin>2.10</version.surefire.plugin> + <version.resources.plugin>2.6</version.resources.plugin> + <version.compiler.plugin>2.3.1</version.compiler.plugin> + <version.ear.plugin>2.6</version.ear.plugin> + <version.war.plugin>2.1.1</version.war.plugin> + <version.ejb.plugin>2.3</version.ejb.plugin> + <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin> </properties> <modules> - <module>booking-ear</module> - <module>booking-ejb</module> - <module>booking-web</module> - <module>booking-tests</module> + <module>booking-ear</module> + <module>booking-ejb</module> + <module>booking-web</module> </modules> <dependencyManagement> <dependencies> + <!-- Modules --> <dependency> <groupId>org.jboss.seam.examples.booking</groupId> <artifactId>booking-ejb</artifactId> @@ -43,6 +62,82 @@ <version>${project.version}</version> <type>ear</type> </dependency> + + <!-- BOMs --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-bom</artifactId> + <version>${version.shrinkwrap.resolver}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>bom</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Common provided dependencies --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons.logging}</version> + <scope>provided</scope> + </dependency> + + <!-- TestNG is not necessary --> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <!-- Manage plugin versions for build stability --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.surefire.plugin}</version> + <configuration> + <systemPropertyVariables> + <org.apache.maven.user-settings>${maven.user.settings}</org.apache.maven.user-settings> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${version.dependency.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>${version.resources.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>${version.compiler.plugin}</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> Modified: branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -1,282 +1,234 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>groovybooking</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <artifactId>groovybooking</artifactId> + <groupId>org.jboss.seam.examples</groupId> + <version>2.3.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <groupId>org.jboss.seam.examples.groovybooking</groupId> - <artifactId>groovybooking-web</artifactId> - <packaging>war</packaging> - <name>Groovy Booking Web Module (EE6)</name> + <groupId>org.jboss.seam.examples.groovybooking</groupId> + <artifactId>groovybooking-web</artifactId> + <packaging>war</packaging> + <name>Groovy Booking Web Module (EE6)</name> - <properties> - <!-- filtering property for components.xml --> - <jndiPattern>java:app/groovybooking-ejb/#{ejbName}</jndiPattern> - <debug>true</debug> - <loadPersistenceUnits>false</loadPersistenceUnits> - <gmaven.runtime>1.5</gmaven.runtime> - </properties> + <properties> + <!-- filtering property for components.xml --> + <jndiPattern>java:app/groovybooking-web/#{ejbName}</jndiPattern> + <debug>true</debug> + <loadPersistenceUnits>false</loadPersistenceUnits> + <gmaven.runtime>1.5</gmaven.runtime> + </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - </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>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - </dependency> - <!-- <dependency> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - </dependency>--> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-core</artifactId> - <exclusions> - <exclusion> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-decisiontables</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-compiler</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-templates</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>knowledge-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.el</groupId> - <artifactId>jboss-el</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.servlet</groupId> - <artifactId>jboss-servlet-api_3.0_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + </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>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jdt</groupId> + <artifactId>core</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-core</artifactId> + <exclusions> + <exclusion> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-decisiontables</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-compiler</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-templates</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>knowledge-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> - <build> - <finalName>groovybooking-web</finalName> - <plugins> - <!-- Can't use gmaven-plugin because hot deployment won't work otherwise --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>compile-groovy-files</id> - <phase>generate-resources</phase> - <configuration> - <tasks> - <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc"> - <classpath refid="maven.compile.classpath"/> - </taskdef> - <mkdir dir="${project.build.outputDirectory}"/> - <groovyc destdir="${project.build.outputDirectory}" + <build> + <finalName>groovybooking-web</finalName> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.as.plugins</groupId> + <artifactId>jboss-as-maven-plugin</artifactId> + <version>${version.jboss.maven.plugin}</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <!-- Can't use gmaven-plugin because hot deployment won't work otherwise --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>${version.antrun.plugin}</version> + <executions> + <execution> + <id>compile-groovy-files</id> + <phase>generate-resources</phase> + <configuration> + <tasks> + <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc"> + <classpath refid="maven.compile.classpath"/> + </taskdef> + <mkdir dir="${project.build.outputDirectory}"/> + <groovyc destdir="${project.build.outputDirectory}" srcdir="${basedir}/src/main/groovy/" listfiles="true"> - <classpath refid="maven.compile.classpath"/> - <include name="**/model/**"/> - </groovyc> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>copy-class-files</id> - <phase>prepare-package</phase> - <configuration> - <tasks> - <property name="dev.dir" + <classpath refid="maven.compile.classpath"/> + <include name="**/model/**"/> + </groovyc> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>copy-class-files</id> + <phase>prepare-package</phase> + <configuration> + <tasks> + <property name="dev.dir" value="${project.build.directory}/${project.build.finalName}/WEB-INF/dev"/> - <mkdir dir="${dev.dir}"/> - <copy todir="${dev.dir}"> - <fileset dir="${basedir}/src/main/groovy/"> - <include name="**/action/**"/> - </fileset> - </copy> - <move todir="${dev.dir}"> - <fileset dir="${project.build.outputDirectory}"> - <include name="**/AuthenticatorAction.class"/> - <include name="**/ChangePasswordAction.class"/> - </fileset> - </move> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> + <mkdir dir="${dev.dir}"/> + <copy todir="${dev.dir}"> + <fileset dir="${basedir}/src/main/groovy/"> + <include name="**/action/**"/> + </fileset> + </copy> + <move todir="${dev.dir}"> + <fileset dir="${project.build.outputDirectory}"> + <include name="**/AuthenticatorAction.class"/> + <include name="**/ChangePasswordAction.class"/> + </fileset> + </move> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> - <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>${basedir}/src/main/groovy/action</source> - </sources> - <resources> - <!-- setup classpath with files previously compiled with groovyc --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>${version.build.helper.plugin}</version> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>${basedir}/src/main/groovy/action</source> + </sources> + <resources> + <!-- setup classpath with files previously compiled with groovyc --> + <resource> + <directory>${project.build.outputDirectory}</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>${version.war.plugin}</version> + <configuration> + <webResources> <resource> - <directory>${project.build.outputDirectory}</directory> + <directory>src/main/webapp</directory> + <filtering>true</filtering> </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <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> - <attachClasses>true</attachClasses> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.apache.maven.plugins - </groupId> - <artifactId> - maven-antrun-plugin - </artifactId> - <versionRange> - [1.3,) - </versionRange> - <goals> - <goal>run</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <profiles> - <profile> - <id>ftest-jbossas</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>wait-for-application</id> - <phase>none</phase> - </execution> - <execution> - <id>stop-selenium</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </webResources> + <attachClasses>true</attachClasses> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -3,25 +3,41 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.examples</groupId> <artifactId>groovybooking</artifactId> - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>examples</artifactId> - <version>2.3.1.Final-redhat-2</version> - </parent> + <version>2.3.1.Final-redhat-2</version> <packaging>pom</packaging> <name>Groovy Booking Example (EE6)</name> <properties> <example.name>groovybooking</example.name> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.source>1.6</maven.compiler.source> + + <!-- To use custom Maven settings with ShrinkWrap Resolver, uncomment + and customize the following property. --> + <!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>--> + + <version.commons.logging>1.1.1</version.commons.logging> + <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver> + + <!-- Plugin versions --> + <version.dependency.plugin>2.5.1</version.dependency.plugin> + <version.resources.plugin>2.6</version.resources.plugin> + <version.antrun.plugin>1.7</version.antrun.plugin> + <version.build.helper.plugin>1.7</version.build.helper.plugin> + <version.surefire.plugin>2.10</version.surefire.plugin> + <version.compiler.plugin>2.3.1</version.compiler.plugin> + <version.war.plugin>2.1.1</version.war.plugin> + <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin> </properties> <modules> <module>groovybooking-web</module> - <module>groovybooking-tests</module> </modules> <dependencyManagement> <dependencies> + <!-- Modules --> <dependency> <groupId>org.jboss.seam.examples.groovybooking</groupId> <artifactId>groovybooking-web</artifactId> @@ -34,6 +50,82 @@ <version>${project.version}</version> <classifier>classes</classifier> </dependency> + + <!-- BOMs --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-bom</artifactId> + <version>${version.shrinkwrap.resolver}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>bom</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Common provided dependencies --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons.logging}</version> + <scope>provided</scope> + </dependency> + + <!-- TestNG is not necessary --> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <!-- Manage plugin versions for build stability --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.surefire.plugin}</version> + <configuration> + <systemPropertyVariables> + <org.apache.maven.user-settings>${maven.user.settings}</org.apache.maven.user-settings> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${version.dependency.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>${version.resources.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>${version.compiler.plugin}</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + + </build> </project> Modified: branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -1,106 +1,211 @@ <?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> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>hibernate</artifactId> + <version>2.3.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <parent> - <artifactId>hibernate</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> - <relativePath>../pom.xml</relativePath> - </parent> + <groupId>org.jboss.seam.examples.hibernate</groupId> + <artifactId>hibernate-web</artifactId> + <packaging>war</packaging> + <name>Hibernate Web Module (EE6)</name> - <groupId>org.jboss.seam.examples.hibernate</groupId> - <artifactId>hibernate-web</artifactId> - <packaging>war</packaging> - <name>Hibernate Web Module (EE6)</name> + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + </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>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-depchain</artifactId> + <type>pom</type> + <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> + + <profiles> + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + <properties> + <jndiPattern>java:app/hibernate-web/#{ejbName}</jndiPattern> + <distributable>false</distributable> + </properties> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> - <build> - <finalName>hibernate-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> - <attachClasses>true</attachClasses> - </configuration> - </plugin> - </plugins> - </build> + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-remote</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - </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>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.el</groupId> - <artifactId>jboss-el</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.servlet</groupId> - <artifactId>jboss-servlet-api_3.0_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - - </dependencies> + <build> + <finalName>hibernate-web</finalName> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.as.plugins</groupId> + <artifactId>jboss-as-maven-plugin</artifactId> + <version>${version.jboss.maven.plugin}</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <!-- Skip tests by default --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>${version.war.plugin}</version> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp</directory> + <filtering>true</filtering> + </resource> + </webResources> + <attachClasses>true</attachClasses> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: branches/enterprise/WFK-2_1/examples/hibernate/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/hibernate/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -1,44 +1,134 @@ <?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> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>hibernate</artifactId> + <version>2.3.1.Final-redhat-2</version> + <packaging>pom</packaging> + <name>Hibernate Example (EE6)</name> - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>examples</artifactId> - <version>2.3.1.Final-redhat-2</version> - </parent> + <properties> + <example.name>hibernate</example.name> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.source>1.6</maven.compiler.source> + + <!-- To use jacoco, set jacoco.agent system property to something like + -javaagent:/path/to/jacocoagent.jar=append=true,destfile=/path/to/output/jacoco.exec --> + <jacoco.agent /> + + <!-- To use custom Maven settings with ShrinkWrap Resolver, uncomment + and customize the following property. --> + <!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>--> + + <version.commons.logging>1.1.1</version.commons.logging> + <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver> + + <!-- Plugin versions --> + <version.dependency.plugin>2.5.1</version.dependency.plugin> + <version.resources.plugin>2.6</version.resources.plugin> + <version.surefire.plugin>2.10</version.surefire.plugin> + <version.compiler.plugin>2.3.1</version.compiler.plugin> + <version.war.plugin>2.1.1</version.war.plugin> + <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin> + </properties> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>hibernate</artifactId> - <packaging>pom</packaging> + <modules> + <module>hibernate-web</module> + </modules> - <name>Hibernate Example (EE6)</name> - - <properties> - <example.name>hibernate</example.name> - </properties> - - <modules> - <module>hibernate-web</module> - <module>hibernate-tests</module> - </modules> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.hibernate</groupId> - <artifactId>hibernate-web</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.hibernate</groupId> - <artifactId>hibernate-web</artifactId> - <version>${project.version}</version> - <classifier>classes</classifier> - </dependency> - </dependencies> - </dependencyManagement> - + <dependencyManagement> + <dependencies> + <!-- Modules --> + <dependency> + <groupId>org.jboss.seam.examples.hibernate</groupId> + <artifactId>hibernate-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples.hibernate</groupId> + <artifactId>hibernate-web</artifactId> + <version>${project.version}</version> + <classifier>classes</classifier> + </dependency> + + <!-- BOMs --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-bom</artifactId> + <version>${version.shrinkwrap.resolver}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>bom</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Common provided dependencies --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons.logging}</version> + <scope>provided</scope> + </dependency> + + <!-- TestNG is not necessary --> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <!-- Manage plugin versions for build stability --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.surefire.plugin}</version> + <configuration> + <systemPropertyVariables> + <org.apache.maven.user-settings>${maven.user.settings}</org.apache.maven.user-settings> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${version.dependency.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>${version.resources.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>${version.compiler.plugin}</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + + </build> </project> Modified: branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -1,26 +1,32 @@ <?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"> +<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</groupId> <artifactId>jee6</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> + <version>2.3.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - - <groupId>org.jboss.seam.examples</groupId> + + <groupId>org.jboss.seam.examples.jee6</groupId> <artifactId>jee6-web</artifactId> <packaging>war</packaging> - <name>Booking Web Module</name> - + <name>Booking EE6 Web Module</name> + <properties> - <!-- filtering property for components.xml --> <jndiPattern>java:app/jee6-web/#{ejbName}</jndiPattern> <distributable>false</distributable> </properties> - + <dependencies> <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> <scope>provided</scope> @@ -52,25 +58,6 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <exclusions> - <exclusion> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> </dependency> <dependency> @@ -102,30 +89,94 @@ <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-api</artifactId> - </dependency> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-depchain</artifactId> + <type>pom</type> + <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> - <finalName>jee6-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> - <attachClasses>true</attachClasses> - </configuration> - </plugin> - </plugins> - </build> - + <profiles> <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-remote</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> <id>cluster</id> <properties> <distributable>true</distributable> @@ -156,4 +207,42 @@ </build> </profile> </profiles> + + <build> + <finalName>jee6-web</finalName> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.as.plugins</groupId> + <artifactId>jboss-as-maven-plugin</artifactId> + <version>${version.jboss.maven.plugin}</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <!-- Skip tests by default --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>${version.war.plugin}</version> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp</directory> + <filtering>true</filtering> + </resource> + </webResources> + <attachClasses>true</attachClasses> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: branches/enterprise/WFK-2_1/examples/jee6/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/pom.xml 2013-06-03 15:13:18 UTC (rev 15523) +++ branches/enterprise/WFK-2_1/examples/jee6/pom.xml 2013-06-03 16:29:26 UTC (rev 15524) @@ -1,34 +1,128 @@ <?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"> +<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> <groupId>org.jboss.seam.examples</groupId> <artifactId>jee6</artifactId> - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>examples</artifactId> - <version>2.3.1.Final-redhat-2</version> - <relativePath>../pom.xml</relativePath> - </parent> + <version>2.3.1.Final-redhat-2</version> <packaging>pom</packaging> <name>Booking Example EE6</name> <properties> <example.name>jee6</example.name> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.source>1.6</maven.compiler.source> + + <!-- To use jacoco, set jacoco.agent system property to something like + -javaagent:/path/to/jacocoagent.jar=append=true,destfile=/path/to/output/jacoco.exec --> + <jacoco.agent /> + + <!-- To use custom Maven settings with ShrinkWrap Resolver, uncomment + and customize the following property. --> + <!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>--> + + <version.commons.logging>1.1.1</version.commons.logging> + <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver> + + <!-- Plugin versions --> + <version.dependency.plugin>2.5.1</version.dependency.plugin> + <version.resources.plugin>2.6</version.resources.plugin> + <version.surefire.plugin>2.10</version.surefire.plugin> + <version.compiler.plugin>2.3.1</version.compiler.plugin> + <version.war.plugin>2.1.1</version.war.plugin> + <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin> </properties> - + <modules> <module>jee6-web</module> - <module>jee6-tests</module> </modules> <dependencyManagement> <dependencies> + <!-- Modules --> <dependency> <groupId>org.jboss.seam.examples</groupId> <artifactId>jee6-web</artifactId> <version>${project.version}</version> <classifier>classes</classifier> </dependency> + + <!-- BOMs --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-bom</artifactId> + <version>${version.shrinkwrap.resolver}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>bom</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Common provided dependencies --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons.logging}</version> + <scope>provided</scope> + </dependency> + + <!-- TestNG is not necessary --> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <!-- Manage plugin versions for build stability --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.surefire.plugin}</version> + <configuration> + <systemPropertyVariables> + <org.apache.maven.user-settings>${maven.user.settings}</org.apache.maven.user-settings> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${version.dependency.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>${version.resources.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>${version.compiler.plugin}</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + + </build> </project>