[seam-commits] Seam SVN: r14424 - in branches/community/Seam_2_3/examples-ee6: drools/drools-ear and 1 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Fri Mar 16 18:51:39 EDT 2012
Author: dhinojosa
Date: 2012-03-16 18:51:38 -0400 (Fri, 16 Mar 2012)
New Revision: 14424
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
Log:
changed dependencies for drools tests
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml 2012-03-16 22:23:39 UTC (rev 14423)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml 2012-03-16 22:51:38 UTC (rev 14424)
@@ -87,16 +87,38 @@
</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>
+ <groupId>org.jboss.as.plugins</groupId>
+ <artifactId>jboss-as-maven-plugin</artifactId>
+ <version>7.1.1.Final</version>
+ <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>install</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml 2012-03-16 22:23:39 UTC (rev 14423)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml 2012-03-16 22:51:38 UTC (rev 14424)
@@ -85,15 +85,38 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
- <param>${project.build.directory}/${project.build.finalName}.${project.packaging}</param>
- </fileNames>
- </configuration>
+ <groupId>org.jboss.as.plugins</groupId>
+ <artifactId>jboss-as-maven-plugin</artifactId>
+ <version>7.1.1.Final</version>
+ <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>install</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-03-16 22:23:39 UTC (rev 14423)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-03-16 22:51:38 UTC (rev 14424)
@@ -15,31 +15,6 @@
<dependencies>
<dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP15</version>
- <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>
- <version>beta3.SP15</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.embedded</groupId>
- <artifactId>hibernate-all</artifactId>
- <version>beta3.SP15</version>
- </dependency>
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
@@ -57,19 +32,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
+ <groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
<groupId>org.seleniumhq.selenium.server</groupId>
<artifactId>selenium-server</artifactId>
<classifier>standalone</classifier>
@@ -83,6 +50,24 @@
<artifactId>functional-tests</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.protocol</groupId>
+ <artifactId>arquillian-protocol-servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -92,60 +77,59 @@
<filtering>true</filtering>
</testResource>
<testResource>
- <directory>src/test/bootstrap</directory>
- <filtering>false</filtering>
+ <directory>src/test/resources-integration</directory>
</testResource>
- <testResource>
- <directory>${basedir}/../drools-ear/src/main/application</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}/../drools-web/src/main/webapp</additionalClasspathElement>
- <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
- </additionalClasspathElements>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
+ <skip>true</skip>
</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>
</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-drools</example.context.path>
@@ -178,6 +162,27 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>ftest-tomcat</id>
+ <properties>
+ <example.context.path>jboss-seam-drools</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>
More information about the seam-commits
mailing list