[richfaces-svn-commits] JBoss Rich Faces SVN: r14077 - in trunk/examples/photoalbum: source and 7 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri May 8 07:51:32 EDT 2009
Author: Alex.Kolonitsky
Date: 2009-05-08 07:51:31 -0400 (Fri, 08 May 2009)
New Revision: 14077
Added:
trunk/examples/photoalbum/source/web/environment/
trunk/examples/photoalbum/source/web/environment/dev/
trunk/examples/photoalbum/source/web/environment/dev/environment.properties
trunk/examples/photoalbum/source/web/environment/prod/
trunk/examples/photoalbum/source/web/environment/prod/environment.properties
Removed:
trunk/examples/photoalbum/source/web/src/main/resources/environment.properties
Modified:
trunk/examples/photoalbum/pom.xml
trunk/examples/photoalbum/source/ear/pom.xml
trunk/examples/photoalbum/source/ejb/pom.xml
trunk/examples/photoalbum/source/pom.xml
trunk/examples/photoalbum/source/web/pom.xml
Log:
change pom files
Modified: trunk/examples/photoalbum/pom.xml
===================================================================
--- trunk/examples/photoalbum/pom.xml 2009-05-08 10:01:48 UTC (rev 14076)
+++ trunk/examples/photoalbum/pom.xml 2009-05-08 11:51:31 UTC (rev 14077)
@@ -19,7 +19,9 @@
<faceletsVersion>1.1.15.B1</faceletsVersion>
<jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome>
<jbosscontext>default</jbosscontext>
- <jboss.installer.url>file:E:\apps\jboss\jboss-4.2.3.GA.zip</jboss.installer.url>
+ <jboss.installer.url>file:E:\install\Develop\java\JBoss\jboss-4.2.3.GA.zip</jboss.installer.url>
+ <imageset>full</imageset>
+ <environment.properties>environment/prod</environment.properties>
</properties>
<repositories>
<repository>
@@ -34,55 +36,96 @@
</repository>
</repositories>
<modules>
- <module>ear</module>
- <module>ejb</module>
- <module>web</module>
+ <module>source/ear</module>
+ <module>source/ejb</module>
+ <module>source/web</module>
<!--module>tests</module-->
</modules>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- </configuration>
- </plugin>
- </plugins>
-
- <pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5</version>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ <projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
+ <wtpmanifest>true</wtpmanifest>
+ <wtpapplicationxml>true</wtpapplicationxml>
+ <wtpversion>2.0</wtpversion>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JDK_CONTAINER</classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>false</downloadJavadocs>
- <projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
- <wtpmanifest>true</wtpmanifest>
- <wtpapplicationxml>true</wtpapplicationxml>
- <wtpversion>2.0</wtpversion>
- <classpathContainers>
- <classpathContainer>org.eclipse.jdt.launching.JDK_CONTAINER</classpathContainer>
- </classpathContainers>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
<profile>
+ <id>richfaces</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <properties>
+ <imageset>full</imageset>
+ <imagespath>Upload/full/images</imagespath>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <connectionType>developerConnection</connectionType>
+ </configuration>
+ <executions>
+ <execution>
+ <id>fetch-feature</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>export</goal>
+ </goals>
+
+ <configuration>
+ <connectionType>developerConnection</connectionType>
+ <developerConnectionUrl>scm:svn:https://svn.jboss.org/repos/richfaces/branches/examples-data/photoapp/images/</developerConnectionUrl>
+ <skipExportIfExists>true</skipExportIfExists>
+ <exportDirectory>source/web/Upload/full</exportDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>hudson</id>
<properties>
<jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.3.GA.zip</jboss.installer.url>
Modified: trunk/examples/photoalbum/source/ear/pom.xml
===================================================================
--- trunk/examples/photoalbum/source/ear/pom.xml 2009-05-08 10:01:48 UTC (rev 14076)
+++ trunk/examples/photoalbum/source/ear/pom.xml 2009-05-08 11:51:31 UTC (rev 14077)
@@ -60,8 +60,20 @@
<build>
<finalName>${projectName}-ear-1.0-SNAPSHOT</finalName>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>fetch-feature</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>2.3.1</version>
<configuration>
@@ -91,15 +103,36 @@
</build>
<profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
-
<profile>
<id>richfaces</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>copy-prod-resources</id>
+ <phase>install</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>dist</outputDirectory>
+ <resources>
+ <resource>
+ <directory>target/*.ear</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
Modified: trunk/examples/photoalbum/source/ejb/pom.xml
===================================================================
--- trunk/examples/photoalbum/source/ejb/pom.xml 2009-05-08 10:01:48 UTC (rev 14076)
+++ trunk/examples/photoalbum/source/ejb/pom.xml 2009-05-08 11:51:31 UTC (rev 14077)
@@ -1,119 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.richfaces</groupId>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.richfaces</groupId>
<artifactId>photoalbum</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>${projectName}-ejb</artifactId>
- <name>EJB module</name>
- <version>1.0-SNAPSHOT</version>
- <packaging>ejb</packaging>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>${projectName}-ejb</artifactId>
+ <name>EJB module</name>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>ejb</packaging>
- <dependencies>
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
<!--<dependency>-->
- <!-- runtime requirement hibernate needs -->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-log4j12</artifactId>-->
- <!--<version>1.5.2</version>-->
+ <!-- runtime requirement hibernate needs -->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-log4j12</artifactId>-->
+ <!--<version>1.5.2</version>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <version>${seamVersion}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-pdf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </exclusion>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>${seamVersion}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-pdf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </exclusion>
</exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>3.0.0.ga</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.3.0.ga</version>
- <!--<version>3.4.0.GA</version>-->
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ </dependency>
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <build>
- <resources>
- <resource>
- <directory>sql/short</directory>
- </resource>
- </resources>
- </build>
- </profile>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.0.0.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.3.0.ga</version>
+ <!--<version>3.4.0.GA</version>-->
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
<profile>
<id>richfaces</id>
- <build>
- <resources>
- <resource>
- <directory>sql/full</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <imageset>full</imageset>
+ </properties>
</profile>
</profiles>
@@ -123,77 +88,41 @@
<resource>
<directory>src/main/resources</directory>
</resource>
+ <resource>
+ <directory>sql/${imageset}</directory>
+ </resource>
</resources>
+
+
<plugins>
-<!--
<plugin>
- -->
-<!-- HIBERNATE 3 PLUGIN - this can output the DDL to a file -->
-<!--
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>hibernate3-maven-plugin</artifactId>
- <version>2.0-alpha-2</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
<executions>
<execution>
- <phase>process-classes</phase>
- <goals>
- <goal>hbm2ddl</goal>
- </goals>
+ <id>fetch-feature</id>
+ <phase>none</phase>
</execution>
</executions>
- <configuration>
- <components>
- <component>
- <name>hbm2ddl</name>
- <implementation>annotationconfiguration</implementation>
- </component>
- </components>
- <componentProperties>
- <implementation>jpaconfiguration</implementation>
- <persistenceunit>entityManager</persistenceunit>
- <outputfilename>myschema.ddl</outputfilename>
- <propertyfile>${basedir}/src/main/resources/database.properties</propertyfile>
- <drop>false</drop>
- <create>true</create>
- <export>false</export>
- <format>true</format>
- </componentProperties>
- </configuration>
</plugin>
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
+ <artifactId>maven-ejb-plugin</artifactId>
<configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
+ <ejbVersion>3.0</ejbVersion>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
</configuration>
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
</plugin>
-
--->
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
</project>
Modified: trunk/examples/photoalbum/source/pom.xml
===================================================================
--- trunk/examples/photoalbum/source/pom.xml 2009-05-08 10:01:48 UTC (rev 14076)
+++ trunk/examples/photoalbum/source/pom.xml 2009-05-08 11:51:31 UTC (rev 14077)
@@ -1,91 +1,103 @@
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces</groupId>
- <artifactId>photoalbum</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>sample application</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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces</groupId>
+ <artifactId>photoalbum</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>sample application</name>
<parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>root</artifactId>
- <version>2.1.1.GA</version>
- </parent>
-
- <properties>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>root</artifactId>
+ <version>2.1.1.GA</version>
+ </parent>
+
+ <properties>
<projectName>photoalbum</projectName>
<richfacesVersion>3.3.1-SNAPSHOT</richfacesVersion>
<seamVersion>2.1.1.GA</seamVersion>
<faceletsVersion>1.1.15.B1</faceletsVersion>
- <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome>
+ <jbosshome>
+ ${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA
+ </jbosshome>
<jbosscontext>default</jbosscontext>
<jboss.installer.url>file:E:\apps\jboss\jboss-4.2.3.GA.zip</jboss.installer.url>
+ <!--<imageset>short</imageset>-->
+ <imageset>short</imageset>
+ <imagespath>Upload/short</imagespath>
+ <environment.properties>environment/dev</environment.properties>
</properties>
- <repositories>
- <repository>
- <id>repository.jboss.com</id>
- <name>Jboss Repository for Maven</name>
- <url>http://repository.jboss.com/maven2/</url>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <name>Jboss Repository for Maven</name>
- <url>http://repository.jboss.org/maven2/</url>
- </repository>
- </repositories>
- <modules>
- <module>ear</module>
- <module>ejb</module>
- <module>web</module>
- <!--module>tests</module-->
- </modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- </configuration>
- </plugin>
- </plugins>
-
- <pluginManagement>
+ <repositories>
+ <repository>
+ <id>repository.jboss.com</id>
+ <name>Jboss Repository for Maven</name>
+ <url>http://repository.jboss.com/maven2/</url>
+ </repository>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>Jboss Repository for Maven</name>
+ <url>http://repository.jboss.org/maven2/</url>
+ </repository>
+ </repositories>
+ <modules>
+ <module>ear</module>
+ <module>ejb</module>
+ <module>web</module>
+ <!--module>tests</module-->
+ </modules>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5</version>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>false</downloadJavadocs>
- <projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
+ <projectNameTemplate>[artifactId]-[version]
+ </projectNameTemplate>
<wtpmanifest>true</wtpmanifest>
<wtpapplicationxml>true</wtpapplicationxml>
<wtpversion>2.0</wtpversion>
<classpathContainers>
- <classpathContainer>org.eclipse.jdt.launching.JDK_CONTAINER</classpathContainer>
+ <classpathContainer>
+ org.eclipse.jdt.launching.JDK_CONTAINER
+ </classpathContainer>
</classpathContainers>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
- </build>
+ </build>
<profiles>
<profile>
<id>hudson</id>
<properties>
- <jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.3.GA.zip</jboss.installer.url>
+ <jboss.installer.url>
+ http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.3.GA.zip
+ </jboss.installer.url>
</properties>
</profile>
</profiles>
Added: trunk/examples/photoalbum/source/web/environment/dev/environment.properties
===================================================================
--- trunk/examples/photoalbum/source/web/environment/dev/environment.properties (rev 0)
+++ trunk/examples/photoalbum/source/web/environment/dev/environment.properties 2009-05-08 11:51:31 UTC (rev 14077)
@@ -0,0 +1 @@
+environment=development
\ No newline at end of file
Added: trunk/examples/photoalbum/source/web/environment/prod/environment.properties
===================================================================
--- trunk/examples/photoalbum/source/web/environment/prod/environment.properties (rev 0)
+++ trunk/examples/photoalbum/source/web/environment/prod/environment.properties 2009-05-08 11:51:31 UTC (rev 14077)
@@ -0,0 +1 @@
+environment=production
\ No newline at end of file
Modified: trunk/examples/photoalbum/source/web/pom.xml
===================================================================
--- trunk/examples/photoalbum/source/web/pom.xml 2009-05-08 10:01:48 UTC (rev 14076)
+++ trunk/examples/photoalbum/source/web/pom.xml 2009-05-08 11:51:31 UTC (rev 14077)
@@ -12,7 +12,6 @@
<name>WAR module</name>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
-
<dependencies>
<dependency>
@@ -208,31 +207,13 @@
</dependencies>
<profiles>
<profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <build>
- <resources>
- <resource>
- <directory>Upload/short</directory>
- <targetPath>Upload</targetPath>
- </resource>
- </resources>
- </build>
- </profile>
-
- <profile>
<id>richfaces</id>
- <build>
- <resources>
- <resource>
- <directory>Upload/full/images</directory>
- <targetPath>Upload</targetPath>
- </resource>
- </resources>
+ <properties>
+ <imagespath>Upload/full/images</imagespath>
+ <environment.properties>environment/prod</environment.properties>
+ </properties>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -268,10 +249,28 @@
<resource>
<directory>src/main/resources</directory>
</resource>
+ <resource>
+ <directory>${environment.properties}</directory>
+ </resource>
+ <resource>
+ <directory>${imagespath}</directory>
+ <targetPath>Upload</targetPath>
+ </resource>
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>fetch-feature</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-war-plugin</artifactId>
</plugin>
</plugins>
Deleted: trunk/examples/photoalbum/source/web/src/main/resources/environment.properties
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/resources/environment.properties 2009-05-08 10:01:48 UTC (rev 14076)
+++ trunk/examples/photoalbum/source/web/src/main/resources/environment.properties 2009-05-08 11:51:31 UTC (rev 14077)
@@ -1 +0,0 @@
-environment=development
\ No newline at end of file
More information about the richfaces-svn-commits
mailing list