[seam-commits] Seam SVN: r14707 - in branches/community/Seam_2_3: examples/remoting/chatroom/chatroom-ejb and 2 other directories.

Author: dhinojosa Date: 2012-05-19 18:56:44 -0400 (Sat, 19 May 2012) New Revision: 14707 Modified: branches/community/Seam_2_3/ branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/chatroom-ejb.iml branches/community/Seam_2_3/jboss-seam-ui/pom.xml branches/community/Seam_2_3/jboss-seam/ branches/community/Seam_2_3/jboss-seam/pom.xml Log: added jar-dependencies to ignore list Property changes on: branches/community/Seam_2_3 ___________________________________________________________________ Modified: svn:ignore - *.ipr *.iws *.iml jboss-seam.jar jboss-seam-ui.jar jboss-seam-debug.jar jboss-seam-gen.jar jboss-seam-pdf.jar jboss-seam-mail.jar jboss-seam-remoting.jar jboss-seam-ioc.jar jboss-seam-trinidad.jar test-output test-report testng-failures.xml report output classes .classpath .project .settings build.properties coverage.ec dvdindexes coverage-output blogindexes .ant-targets-build.xml dependency-report.txt lacewikiIndex jmimemagic.log dist bin target .idea + *.ipr *.iws *.iml jboss-seam.jar jboss-seam-ui.jar jboss-seam-debug.jar jboss-seam-gen.jar jboss-seam-pdf.jar jboss-seam-mail.jar jboss-seam-remoting.jar jboss-seam-ioc.jar jboss-seam-trinidad.jar test-output test-report testng-failures.xml report output classes .classpath .project .settings build.properties coverage.ec dvdindexes coverage-output blogindexes .ant-targets-build.xml dependency-report.txt lacewikiIndex jmimemagic.log dist bin target .idea jar-dependencies Modified: branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/chatroom-ejb.iml =================================================================== --- branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/chatroom-ejb.iml 2012-05-19 22:55:21 UTC (rev 14706) +++ branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/chatroom-ejb.iml 2012-05-19 22:56:44 UTC (rev 14707) @@ -24,11 +24,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="jboss-seam" scope="PROVIDED" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.seam:jboss-seam:ejb:2.3.0-SNAPSHOT" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: com.thoughtworks.xstream:xstream:1.3.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:jdk15:5.10" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.el:jboss-el:1.0_02.CR6" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: javax.el:el-api:1.0" level="project" /> <orderEntry type="library" name="Maven: jboss:jboss-cache:1.4.1.SP9" level="project" /> @@ -36,7 +36,7 @@ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: javax.ejb:ejb-api:3.0" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: javax.faces:jsf-api:1.2_12" level="project" /> - <orderEntry type="module" module-name="jboss-seam-remoting" /> + <orderEntry type="library" name="Maven: org.jboss.seam:jboss-seam-remoting:2.3.0-SNAPSHOT" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: javax.jms:jms:1.1" level="project" /> </component> </module> Property changes on: branches/community/Seam_2_3/jboss-seam ___________________________________________________________________ Modified: svn:ignore - .classpath .settings .project target + .classpath .settings .project target *.iml Modified: branches/community/Seam_2_3/jboss-seam/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-05-19 22:55:21 UTC (rev 14706) +++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-05-19 22:56:44 UTC (rev 14707) @@ -370,8 +370,6 @@ <optional>true</optional> </dependency> - - <dependency> <groupId>org.openid4java</groupId> <artifactId>openid4java-consumer</artifactId> Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-05-19 22:55:21 UTC (rev 14706) +++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-05-19 22:56:44 UTC (rev 14707) @@ -1,163 +1,166 @@ -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>jboss-seam-parent</artifactId> - <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>jboss-seam-ui</artifactId> - <name>Seam UI JSF2 support</name> - +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>jboss-seam-parent</artifactId> + <groupId>org.jboss.seam</groupId> + <version>2.3.0.Beta2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>jboss-seam-ui</artifactId> + <name>Seam UI JSF2 support</name> + <properties> <version.richfaces>4.2.2.Final</version.richfaces> </properties> - - <build> -<!-- <finalName>jboss-seam-ui</finalName> --> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>${version.richfaces}</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.jboss.seam.ui</prefix> - <description>JSF controls for JBoss Seam</description> -<!-- <taglib> --> -<!-- <displayName>JBoss Seam UI</displayName> --> -<!-- <shortName>s</shortName> --> -<!-- <uri>http://jboss.com/products/seam/taglib</uri> --> -<!-- <tlibVersion>2.0</tlibVersion> --> -<!-- <jspVersion>2.1</jspVersion> --> -<!-- </taglib> --> - </library> - </configuration> - </plugin> - - </plugins> - </build> + <build> + <!-- <finalName>jboss-seam-ui</finalName> --> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>${version.richfaces}</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.jboss.seam.ui</prefix> + <description>JSF controls for JBoss Seam</description> + <!-- <taglib> --> + <!-- <displayName>JBoss Seam UI</displayName> --> + <!-- <shortName>s</shortName> --> + <!-- <uri>http://jboss.com/products/seam/taglib</uri> --> + <!-- <tlibVersion>2.0</tlibVersion> --> + <!-- <jspVersion>2.1</jspVersion> --> + <!-- </taglib> --> + </library> + </configuration> + </plugin> - <!-- See parent pom for notes on how to declare dependencies --> - <dependencies> - <dependency> - <groupId>org.jboss.spec.javax.servlet</groupId> - <artifactId>jboss-servlet-api_3.0_spec</artifactId> - <optional>true</optional> - <scope>provided</scope> - </dependency> + </plugins> + </build> - <dependency> - <groupId>org.jboss.spec.javax.servlet.jsp</groupId> - <artifactId>jboss-jsp-api_2.2_spec</artifactId> - <optional>true</optional> - <scope>provided</scope> - </dependency> + <!-- See parent pom for notes on how to declare dependencies --> + <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <optional>true</optional> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jul</artifactId> - </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet.jsp</groupId> + <artifactId>jboss-jsp-api_2.2_spec</artifactId> + <optional>true</optional> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-api</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${version.richfaces}</version> - <optional>true</optional> - </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-jul</artifactId> + </dependency> <dependency> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <scope>provided</scope> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <optional>true</optional> </dependency> - - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + <!--<version>${version.richfaces}</version>--> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + <!--<version>${version.richfaces}</version>--> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>${version.richfaces}</version> + <optional>true</optional> + </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.jboss.spec.javax.el</groupId> - <artifactId>jboss-el-api_2.2_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - </dependencies> - <profiles> + <dependency> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_2.2_spec</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + </dependencies> + <profiles> <profile> <id>code-coverage</id> <build> @@ -167,8 +170,8 @@ <artifactId>emma-maven-plugin</artifactId> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -181,13 +184,13 @@ </plugins> </build> </profile> - <profile> + <profile> <id>distribution</id> <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> <execution> <id>copy-dependencies</id> <goals> @@ -203,33 +206,35 @@ <transitive>true</transitive> </configuration> </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.7</version> - <configuration> - <links> - <link>http://docs.oracle.com/javase/6/docs/api/</link> - </links> - <keywords>true</keywords> - <author>true</author> - <stylesheetfile>jdstyle.css</stylesheetfile> - <doctitle>JBoss Seam ${project.name} API ${project.version}</doctitle> <!-- Used by javadoc:javadoc goal --> - <detectOfflineLinks>false</detectOfflineLinks> - </configuration> - <executions> - <execution> - <id>attach-javadocs</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin></plugins> + </executions> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.7</version> + <configuration> + <links> + <link>http://docs.oracle.com/javase/6/docs/api/</link> + </links> + <keywords>true</keywords> + <author>true</author> + <stylesheetfile>jdstyle.css</stylesheetfile> + <doctitle>JBoss Seam ${project.name} API ${project.version}</doctitle> + <!-- Used by javadoc:javadoc goal --> + <detectOfflineLinks>false</detectOfflineLinks> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </profile> </profiles> - + </project>