[seam-commits] Seam SVN: r14620 - in branches/community/Seam_2_3/examples-ee6/icefaces: icefaces-ear and 3 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Fri Apr 20 05:29:32 EDT 2012
Author: maschmid
Date: 2012-04-20 05:29:30 -0400 (Fri, 20 Apr 2012)
New Revision: 14620
Modified:
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml
branches/community/Seam_2_3/examples-ee6/icefaces/pom.xml
Log:
icefaces example cleanup
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/pom.xml 2012-04-20 09:12:07 UTC (rev 14619)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/pom.xml 2012-04-20 09:29:30 UTC (rev 14620)
@@ -8,33 +8,24 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-ear</artifactId>
<packaging>ear</packaging>
<name>Icefaces EAR Module (EE6)</name>
- <properties>
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
- <jboss.domain>default</jboss.domain>
- </properties>
-
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-web</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
</dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- </dependency>
</dependencies>
<build>
@@ -43,7 +34,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.3.2</version>
<configuration>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build -->
@@ -53,13 +43,13 @@
<filtering>true</filtering>
<modules>
<webModule>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-web</artifactId>
<contextRoot>/seam-icefaces</contextRoot>
<bundleFileName>icefaces-web.war</bundleFileName>
</webModule>
<ejbModule>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-ejb</artifactId>
<bundleFileName>icefaces-ejb.jar</bundleFileName>
</ejbModule>
@@ -74,63 +64,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>exploded</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>icefaces-ear</artifactId>
- <type>ear</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>icefaces-web</artifactId>
- <type>war</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>icefaces-ejb</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-ejb.jar</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
- <param>${basedir}/src/main/resources/seam-icefaces-ds.xml</param>
- <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</directory>
- </fileNames>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml 2012-04-20 09:12:07 UTC (rev 14619)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml 2012-04-20 09:29:30 UTC (rev 14620)
@@ -8,7 +8,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-ejb</artifactId>
<packaging>ejb</packaging>
<name>Icefaces EJB Module (EE6)</name>
@@ -18,7 +18,6 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/pom.xml 2012-04-20 09:12:07 UTC (rev 14619)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/pom.xml 2012-04-20 09:29:30 UTC (rev 14620)
@@ -8,13 +8,13 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-tests</artifactId>
<name>Icefaces Integration Tests Module (EE6)</name>
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
@@ -58,11 +58,6 @@
<groupId>org.seleniumhq.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.jboss.seam</groupId>-->
- <!--<artifactId>functional-tests</artifactId>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
<dependency>
<groupId>junit</groupId>
@@ -213,27 +208,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>ftest-tomcat</id>
- <properties>
- <example.context.path>jboss-seam-booking</example.context.path>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml 2012-04-20 09:12:07 UTC (rev 14619)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml 2012-04-20 09:29:30 UTC (rev 14620)
@@ -9,10 +9,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-web</artifactId>
<packaging>war</packaging>
- <name>Icefaces Web Module</name>
+ <name>Icefaces Web Module (EE6)</name>
<properties>
<!-- filtering property for components.xml -->
@@ -29,18 +29,12 @@
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
<scope>provided</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.jboss.seam</groupId>-->
- <!--<artifactId>jboss-seam</artifactId>-->
- <!--<type>ejb</type>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -97,95 +91,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>tomcat</id>
- <properties>
- <!-- filtering property for components.xml -->
- <jndiPattern>#{ejbName}/local</jndiPattern>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples</groupId>
- <artifactId>icefaces-ejb</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </dependency>
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>icefaces-rtf</artifactId>
- </dependency>
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>icefaces</artifactId>
- </dependency>
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <finalName>jboss-seam-icefaces</finalName>
- </build>
- </profile>
- </profiles>
-
</project>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/pom.xml 2012-04-20 09:12:07 UTC (rev 14619)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/pom.xml 2012-04-20 09:29:30 UTC (rev 14620)
@@ -26,19 +26,19 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-web</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.icefaces</groupId>
<artifactId>icefaces-ear</artifactId>
<version>${project.version}</version>
</dependency>
More information about the seam-commits
mailing list