JBoss Rich Faces SVN: r14174 - in trunk/examples/photoalbum: source/ejb/src/main and 4 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-05-13 12:26:09 -0400 (Wed, 13 May 2009)
New Revision: 14174
Added:
trunk/examples/photoalbum/source/ejb/src/main/resources-filtered/
trunk/examples/photoalbum/source/ejb/src/main/resources-filtered/components.properties
Removed:
trunk/examples/photoalbum/source/ejb/src/main/resources/components.properties
Modified:
trunk/examples/photoalbum/source/ejb/pom.xml
trunk/examples/photoalbum/source/web/pom.xml
trunk/examples/photoalbum/tests/pom.xml
Log:
commons-beanutils duplicated .jar files removed
components.properties updated to
Modified: trunk/examples/photoalbum/source/ejb/pom.xml
===================================================================
--- trunk/examples/photoalbum/source/ejb/pom.xml 2009-05-13 16:07:57 UTC (rev 14173)
+++ trunk/examples/photoalbum/source/ejb/pom.xml 2009-05-13 16:26:09 UTC (rev 14174)
@@ -87,6 +87,10 @@
<build>
<resources>
<resource>
+ <directory>src/main/resources-filtered</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
<directory>src/main/resources</directory>
</resource>
<resource>
Deleted: trunk/examples/photoalbum/source/ejb/src/main/resources/components.properties
===================================================================
--- trunk/examples/photoalbum/source/ejb/src/main/resources/components.properties 2009-05-13 16:07:57 UTC (rev 14173)
+++ trunk/examples/photoalbum/source/ejb/src/main/resources/components.properties 2009-05-13 16:26:09 UTC (rev 14174)
@@ -1,4 +0,0 @@
-#
-#Mon Sep 15 14:29:32 EEST 2008
-jndiPattern=photoalbum-ear-1.0-SNAPSHOT/#{ejbName}/local
-embeddedEjb=false
Copied: trunk/examples/photoalbum/source/ejb/src/main/resources-filtered/components.properties (from rev 14155, trunk/examples/photoalbum/source/ejb/src/main/resources/components.properties)
===================================================================
--- trunk/examples/photoalbum/source/ejb/src/main/resources-filtered/components.properties (rev 0)
+++ trunk/examples/photoalbum/source/ejb/src/main/resources-filtered/components.properties 2009-05-13 16:26:09 UTC (rev 14174)
@@ -0,0 +1,4 @@
+#
+#Mon Sep 15 14:29:32 EEST 2008
+jndiPattern=photoalbum-ear-${project.version}/#{ejbName}/local
+embeddedEjb=false
Modified: trunk/examples/photoalbum/source/web/pom.xml
===================================================================
--- trunk/examples/photoalbum/source/web/pom.xml 2009-05-13 16:07:57 UTC (rev 14173)
+++ trunk/examples/photoalbum/source/web/pom.xml 2009-05-13 16:26:09 UTC (rev 14174)
@@ -195,9 +195,28 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
<version>${richfacesVersion}</version>
Modified: trunk/examples/photoalbum/tests/pom.xml
===================================================================
--- trunk/examples/photoalbum/tests/pom.xml 2009-05-13 16:07:57 UTC (rev 14173)
+++ trunk/examples/photoalbum/tests/pom.xml 2009-05-13 16:26:09 UTC (rev 14174)
@@ -12,8 +12,9 @@
<packaging>jar</packaging>
<properties>
- <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome>
- <jboss.installer.url>file:F:\Distribs\jboss-4.2.3.GA.zip</jboss.installer.url>
+ <jboss.version>4.2.3.GA</jboss.version>
+ <jbosshome>${project.basedir}/target/installs/jboss-${jboss.version}/jboss-${jboss.version}</jbosshome>
+ <jboss.installer.url>file:F:\Distribs\jboss-${jboss.version}.zip</jboss.installer.url>
<jbosscontext>default</jbosscontext>
</properties>