Author: nbelaevski Date: 2009-05-12 21:03:19 -0400 (Tue, 12 May 2009) New Revision: 14147 Removed: trunk/examples/photoalbum/assembly/ear.xml Modified: trunk/examples/photoalbum/assembly/photoalbum.xml trunk/examples/photoalbum/assembly/pom.xml trunk/examples/photoalbum/pom.xml trunk/examples/photoalbum/source/pom.xml Log: https://jira.jboss.org/jira/browse/RF-7082 Deleted: trunk/examples/photoalbum/assembly/ear.xml =================================================================== --- trunk/examples/photoalbum/assembly/ear.xml 2009-05-13 00:46:30 UTC (rev 14146) +++ trunk/examples/photoalbum/assembly/ear.xml 2009-05-13 01:03:19 UTC (rev 14147) @@ -1,18 +0,0 @@ -<assembly> - <id>photoalbum-ear</id> - <formats> - <format>zip</format> - <format>tar.gz</format> - </formats> - <files> - <file> - <source>/../source/ear/target/photoalbum-ear-1.0-SNAPSHOT.ear</source> - </file> - <file> - <source>/../../JBossORG-EULA.txt</source> - </file> - <file> - <source>/../../lgpl.txt</source> - </file> - </files> -</assembly> \ No newline at end of file Modified: trunk/examples/photoalbum/assembly/photoalbum.xml =================================================================== --- trunk/examples/photoalbum/assembly/photoalbum.xml 2009-05-13 00:46:30 UTC (rev 14146) +++ trunk/examples/photoalbum/assembly/photoalbum.xml 2009-05-13 01:03:19 UTC (rev 14147) @@ -17,6 +17,10 @@ <fileSet> <directory>target/docs</directory> <outputDirectory>photoalbum/docs</outputDirectory> + <excludes> + <exclude>**/META-INF/*</exclude> + <exclude>**/META-INF</exclude> + </excludes> </fileSet> <fileSet> <directory>../source</directory> Modified: trunk/examples/photoalbum/assembly/pom.xml =================================================================== --- trunk/examples/photoalbum/assembly/pom.xml 2009-05-13 00:46:30 UTC (rev 14146) +++ trunk/examples/photoalbum/assembly/pom.xml 2009-05-13 01:03:19 UTC (rev 14147) @@ -12,10 +12,6 @@ <name>Examples assembly project</name> <packaging>pom</packaging> - <build> - <finalName>richfaces-examples-${project.version}</finalName> - </build> - <dependencies> <dependency> <groupId>org.richfaces.examples</groupId> @@ -25,69 +21,62 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>release</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.richfaces.docs.realworld</groupId> - <artifactId>en</artifactId> - <version>3.3.1-SNAPSHOT</version> - <type>jar</type> - <!--classifier>pdf</classifier--> - </artifactItem> - </artifactItems> - <outputDirectory> - ${project.build.directory}/docs - </outputDirectory> - <overWriteReleases> - false - </overWriteReleases> - <overWriteSnapshots> - true - </overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <build> + <finalName>richfaces-examples-${project.version}</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> <configuration> - <outputDirectory>${project.build.directory}/dist</outputDirectory> - <descriptors> - <descriptor>photoalbum.xml</descriptor> - <descriptor>ear.xml</descriptor> - </descriptors> + <artifactItems> + <artifactItem> + <groupId>org.richfaces.docs.realworld</groupId> + <artifactId>en</artifactId> + <version>3.3.1-SNAPSHOT</version> + <type>jar</type> + <!--classifier>pdf</classifier--> + </artifactItem> + </artifactItems> + <outputDirectory> + ${project.build.directory}/docs + </outputDirectory> + <overWriteReleases> + false + </overWriteReleases> + <overWriteSnapshots> + true + </overWriteSnapshots> </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </execution> + </executions> + </plugin> - </profiles> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}/dist</outputDirectory> + <descriptors> + <descriptor>photoalbum.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: trunk/examples/photoalbum/pom.xml =================================================================== --- trunk/examples/photoalbum/pom.xml 2009-05-13 00:46:30 UTC (rev 14146) +++ trunk/examples/photoalbum/pom.xml 2009-05-13 01:03:19 UTC (rev 14147) @@ -10,45 +10,4 @@ <module>source</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> - <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> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </project> \ No newline at end of file Modified: trunk/examples/photoalbum/source/pom.xml =================================================================== --- trunk/examples/photoalbum/source/pom.xml 2009-05-13 00:46:30 UTC (rev 14146) +++ trunk/examples/photoalbum/source/pom.xml 2009-05-13 01:03:19 UTC (rev 14147) @@ -2,18 +2,13 @@ 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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.richfaces.examples</groupId> - <artifactId>photoalbum</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum-source</artifactId> <packaging>pom</packaging> <name>${appName}</name> + <version>1.0-SNAPSHOT</version> <properties> <appName>Photoalbum Demo Application</appName>