1:34 p.m.
Author: pete.muir(a)jboss.org
Date: 2010-06-01 14:34:25 -0400 (Tue, 01 Jun 2010)
New Revision: 12926
Added:
modules/faces/trunk/examples/short-ly/src/main/assembly/
modules/faces/trunk/examples/short-ly/src/main/assembly/assembly.xml
Modified:
modules/faces/trunk/dist/
modules/faces/trunk/dist/pom.xml
modules/faces/trunk/dist/src/main/assembly/assembly.xml
modules/faces/trunk/examples/short-ly/pom.xml
modules/faces/trunk/examples/short-ly/readme.txt
modules/faces/trunk/pom.xml
Log:
add examples to dist
Property changes on: modules/faces/trunk/dist
___________________________________________________________________
Name: svn:ignore
- .settings
.project
+ .settings
.project
target
Modified: modules/faces/trunk/dist/pom.xml
===================================================================
--- modules/faces/trunk/dist/pom.xml 2010-06-01 18:29:39 UTC (rev 12925)
+++ modules/faces/trunk/dist/pom.xml 2010-06-01 18:34:25 UTC (rev 12926)
@@ -14,7 +14,7 @@
<name>Seam Faces Distribution</name>
<description>Builds a Seam Faces release distribution</description>
<packaging>pom</packaging>
-
+
<!-- TODO Remove -->
<!-- Snapshots repo to get parent -->
<repositories>
@@ -43,14 +43,14 @@
<artifactId>seam-faces-api</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces-api</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces-api</artifactId>
@@ -63,14 +63,14 @@
<artifactId>seam-faces</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces</artifactId>
@@ -85,6 +85,13 @@
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces-examples-short-ly</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+
</dependencies>
<build>
Modified: modules/faces/trunk/dist/src/main/assembly/assembly.xml
===================================================================
--- modules/faces/trunk/dist/src/main/assembly/assembly.xml 2010-06-01 18:29:39 UTC (rev
12925)
+++ modules/faces/trunk/dist/src/main/assembly/assembly.xml 2010-06-01 18:34:25 UTC (rev
12926)
@@ -2,7 +2,6 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl...
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <!--<id>distribution</id>-->
<formats>
<format>zip</format>
@@ -52,6 +51,15 @@
<include>org.jboss.seam.faces:seam-faces-api:jar:javadoc</include>
</includes>
</dependencySet>
+ <!-- Pull in the example projects -->
+ <dependencySet>
+ <outputDirectory>examples</outputDirectory>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+
<include>org.jboss.seam.faces:seam-faces-examples-short-ly</include>
+ </includes>
+ </dependencySet>
<!-- Pull in docbook artifacts -->
<dependencySet>
<outputDirectory>doc/reference</outputDirectory>
Modified: modules/faces/trunk/examples/short-ly/pom.xml
===================================================================
--- modules/faces/trunk/examples/short-ly/pom.xml 2010-06-01 18:29:39 UTC (rev 12925)
+++ modules/faces/trunk/examples/short-ly/pom.xml 2010-06-01 18:34:25 UTC (rev 12926)
@@ -96,10 +96,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.glassfish</groupId>
- <artifactId>maven-embedded-glassfish-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -107,8 +103,27 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
</plugins>
<finalName>short.ly</finalName>
</build>
+ <profiles>
+ <profile>
+ <id>glassfish</id>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.glassfish</groupId>
+ <artifactId>maven-embedded-glassfish-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: modules/faces/trunk/examples/short-ly/readme.txt
===================================================================
--- modules/faces/trunk/examples/short-ly/readme.txt 2010-06-01 18:29:39 UTC (rev 12925)
+++ modules/faces/trunk/examples/short-ly/readme.txt 2010-06-01 18:34:25 UTC (rev 12926)
@@ -3,4 +3,8 @@
- Step by Step setup for the example -
- Step by Step execution of the example - "ant deploy" or "mvn clean
install" or "run -c server1" + "run -c server2" or "using
your browser hit: http://localhost:8080/MyNewApp"
- Expected results - you should see "Hello World" on the console or you can
now navigate the web-based application
- - the readme.txt should include the maintainer of the example (along with contact
info). This may simply point to the examples' POM.
\ No newline at end of file
+ - the readme.txt should include the maintainer of the example (along with contact
info). This may simply point to the examples' POM.
+
+ ----
+
+ To run the example on GlassFish Embedded, type mvn -Pglassfish
\ No newline at end of file
Added: modules/faces/trunk/examples/short-ly/src/main/assembly/assembly.xml
===================================================================
--- modules/faces/trunk/examples/short-ly/src/main/assembly/assembly.xml
(rev 0)
+++ modules/faces/trunk/examples/short-ly/src/main/assembly/assembly.xml 2010-06-01
18:34:25 UTC (rev 12926)
@@ -0,0 +1,22 @@
+<assembly
+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl...
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <formats>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${project.build.finalName}</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>${project.build.directory}/**</exclude>
+ <exclude>.classpath</exclude>
+ <exclude>.project</exclude>
+ <exclude>.settings/**</exclude>
+ <exclude>gfembed*/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: modules/faces/trunk/examples/short-ly/src/main/assembly/assembly.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-06-01 18:29:39 UTC (rev 12925)
+++ modules/faces/trunk/pom.xml 2010-06-01 18:34:25 UTC (rev 12926)
@@ -21,6 +21,24 @@
<url>http://www.seamframework.org</url>
+ <!-- TODO Remove -->
+ <!-- Snapshots repo to get parent -->
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
+ </url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
<modules>
<module>api</module>
<module>impl</module>
@@ -53,24 +71,6 @@
</dependencies>
</dependencyManagement>
- <!-- TODO Remove -->
- <!-- Snapshots repo to get parent -->
- <repositories>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam.international</groupId>
@@ -169,6 +169,7 @@
<modules>
<module>dist</module>
<module>docs/reference</module>
+ <module>examples/short-ly</module>
</modules>
</profile>
<profile>