[seam-commits] Seam SVN: r14491 - in branches/community/Seam_2_3/examples-ee6: drools and 8 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Tue Apr 3 12:01:05 EDT 2012
Author: manaRH
Date: 2012-04-03 12:01:03 -0400 (Tue, 03 Apr 2012)
New Revision: 14491
Added:
branches/community/Seam_2_3/examples-ee6/drools/drools-ear/src/main/application/META-INF/
branches/community/Seam_2_3/examples-ee6/drools/drools-ear/src/main/application/META-INF/jboss-deployment-structure.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/arquillian.xml
Modified:
branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java
branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/pom.xml
branches/community/Seam_2_3/examples-ee6/pom.xml
Log:
fixed Drools example and added it to global examples-ee6 pom.xml file
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-04-03 15:32:11 UTC (rev 14490)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml 2012-04-03 16:01:03 UTC (rev 14491)
@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-ear</artifactId>
<packaging>ear</packaging>
<name>Drools EAR Module (EE6)</name>
@@ -21,33 +21,42 @@
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-web</artifactId>
- <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-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>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackrabbit-core</artifactId>
+ <groupId>org.apache.jackrabbit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>cglib</artifactId>
+ <groupId>cglib</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hibernate-ehcache</artifactId>
+ <groupId>org.hibernate</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
@@ -56,62 +65,39 @@
<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-drools</loader-repository>
- </jboss>
<modules>
<webModule>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-web</artifactId>
<contextRoot>/seam-drools</contextRoot>
<bundleFileName>drools-web.war</bundleFileName>
</webModule>
<ejbModule>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-ejb</artifactId>
<bundleFileName>drools-ejb.jar</bundleFileName>
</ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
</modules>
</configuration>
</plugin>
<plugin>
<groupId>org.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>
+ <phase></phase>
<goals>
<goal>deploy</goal>
</goals>
@@ -139,7 +125,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-ear</artifactId>
<type>ear</type>
<overWrite>true</overWrite>
@@ -147,7 +133,7 @@
</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-web</artifactId>
<type>war</type>
<overWrite>true</overWrite>
@@ -156,7 +142,7 @@
</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-ejb</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
Added: branches/community/Seam_2_3/examples-ee6/drools/drools-ear/src/main/application/META-INF/jboss-deployment-structure.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-ear/src/main/application/META-INF/jboss-deployment-structure.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-03 16:01:03 UTC (rev 14491)
@@ -0,0 +1,14 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
+ <deployment>
+ <dependencies>
+ <module name="org.apache.log4j" export="true"/>
+ <module name="org.javassist" export="true"/>
+ <module name="org.hibernate" export="true"/>
+ <module name="org.dom4j" export="true"/>
+ <module name="org.apache.commons.logging" export="true"/>
+ <module name="org.apache.commons.collections" export="true"/>
+ <module name="javax.faces.api" export="true"/>
+ <module name="com.sun.jsf-impl" export="true"/>
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml 2012-04-03 15:32:11 UTC (rev 14490)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml 2012-04-03 16:01:03 UTC (rev 14491)
@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-ejb</artifactId>
<packaging>ejb</packaging>
<name>Drools EJB Module (EE6)</name>
@@ -48,10 +48,12 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.drools</groupId>
@@ -76,24 +78,20 @@
<artifactId>drools-templates</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.1</version>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jbpm</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <version>3.2.3</version>
- </dependency>
</dependencies>
</project>
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-04-03 15:32:11 UTC (rev 14490)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-04-03 16:01:03 UTC (rev 14491)
@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-tests</artifactId>
<name>Drools Integration Tests Module (EE6)</name>
@@ -20,7 +20,7 @@
<classifier>jdk15</classifier>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-ejb</artifactId>
<type>ejb</type>
<scope>test</scope>
@@ -32,11 +32,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.seleniumhq.selenium.server</groupId>
<artifactId>selenium-server</artifactId>
<classifier>standalone</classifier>
@@ -68,6 +71,10 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java 2012-04-03 15:32:11 UTC (rev 14490)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java 2012-04-03 16:01:03 UTC (rev 14491)
@@ -1,19 +1,46 @@
//$Id: DroolsNumberGuessTest.java 6415 2007-10-07 22:27:57Z pmuir $
package org.jboss.seam.example.numberguess.test;
+import java.io.File;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.pageflow.Pageflow;
import org.jboss.seam.example.numberguess.Game;
import org.jboss.seam.example.numberguess.Guess;
import org.jboss.seam.example.numberguess.RandomNumber;
-import org.jboss.seam.mock.SeamTest;
-import org.testng.annotations.Test;
+import org.jboss.seam.mock.JUnitSeamTest;
+import org.jboss.seam.pageflow.Pageflow;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
-public class DroolsNumberGuessTest extends SeamTest
+ at RunWith(Arquillian.class)
+public class DroolsNumberGuessTest extends JUnitSeamTest
{
private int guessedValue;
+
+ @Deployment(name="RenderTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-drools.ear").importFrom(new File("../drools-ear/target/seam-drools.ear"))
+ .as(EnterpriseArchive.class);
+ WebArchive web = er.getAsType(WebArchive.class, "drools-web.war");
+ web.addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockFacesContextFactory"), "classes/META-INF/services/javax.faces.context.FacesContextFactory");
+ web.addClasses(DroolsNumberGuessTest.class);
+
+ return er;
+ }
+
@Test
public void testNumberGuessWin() throws Exception
{
Added: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/arquillian.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/arquillian.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/arquillian.xml 2012-04-03 16:01:03 UTC (rev 14491)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://jboss.org/schema/arquillian"
+ xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+ <engine>
+ <property name="deploymentExportPath">target/</property>
+ </engine>
+
+ <container qualifier="jboss" default="true">
+ <configuration>
+ <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property>
+ <property name="jbossHome">target/jboss-as-${version.jbossas7}</property>
+ </configuration>
+ </container>
+
+</arquillian>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml 2012-04-03 15:32:11 UTC (rev 14490)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml 2012-04-03 16:01:03 UTC (rev 14491)
@@ -8,14 +8,14 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-web</artifactId>
<packaging>war</packaging>
<name>Drools Web Module (EE6)</name>
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-ejb</artifactId>
<type>ejb</type>
<scope>provided</scope>
@@ -24,6 +24,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/drools/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/pom.xml 2012-04-03 15:32:11 UTC (rev 14490)
+++ branches/community/Seam_2_3/examples-ee6/drools/pom.xml 2012-04-03 16:01:03 UTC (rev 14491)
@@ -27,19 +27,19 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-web</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.drools</groupId>
<artifactId>drools-ear</artifactId>
<version>${project.version}</version>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-03 15:32:11 UTC (rev 14490)
+++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-03 16:01:03 UTC (rev 14491)
@@ -18,7 +18,7 @@
<!--<module>blog</module>-->
<module>booking</module>
<!--<module>contactlist</module>-->
- <!--<module>drools</module>-->
+ <module>drools</module>
<!-- <module>dvdstore</module> -->
<module>excel</module>
<module>mail</module>
More information about the seam-commits
mailing list