[seam-commits] Seam SVN: r13079 - in modules/faces/branches/exception_handling: docs/reference and 3 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Mon Jun 7 13:23:30 EDT 2010 

Author: lightguard
Date: 2010-06-07 13:23:29 -0400 (Mon, 07 Jun 2010)
New Revision: 13079

Added:
   modules/faces/branches/exception_handling/docs/reference/src/main/assembly/
   modules/faces/branches/exception_handling/docs/reference/src/main/assembly/assembly.xml
Removed:
   modules/faces/branches/exception_handling/docs/reference/src/main/assembly/assembly.xml
Modified:
   modules/faces/branches/exception_handling/
   modules/faces/branches/exception_handling/docs/reference/pom.xml
   modules/faces/branches/exception_handling/docs/reference/src/main/docbook/en-US/installation.xml
   modules/faces/branches/exception_handling/docs/reference/src/main/docbook/en-US/messages.xml
Log:
Merged revisions 13058-13059,13065 via svnmerge from 
https://svn.jboss.org/repos/seam/modules/faces/trunk

.......
  r13058 | pete.muir at jboss.org | 2010-06-04 15:22:58 -0600 (Fri, 04 Jun 2010) | 1 line
  
  create a source distro for the ref guide
.......
  r13059 | pete.muir at jboss.org | 2010-06-04 15:25:16 -0600 (Fri, 04 Jun 2010) | 1 line
  
  minor
.......
  r13065 | pete.muir at jboss.org | 2010-06-04 16:23:53 -0600 (Fri, 04 Jun 2010) | 1 line
  
  namespace conflicting ids
.......



Property changes on: modules/faces/branches/exception_handling
___________________________________________________________________
Name: svnmerge-integrated
   - /modules/faces/trunk:1-13056
   + /modules/faces/trunk:1-13078

Modified: modules/faces/branches/exception_handling/docs/reference/pom.xml
===================================================================
--- modules/faces/branches/exception_handling/docs/reference/pom.xml	2010-06-07 17:12:43 UTC (rev 13078)
+++ modules/faces/branches/exception_handling/docs/reference/pom.xml	2010-06-07 17:23:29 UTC (rev 13079)
@@ -51,4 +51,23 @@
       </plugins>
    </build>
 
+   <profiles>
+      <profile>
+         <id>distribution</id>
+         <activation>
+            <property>
+               <name>release</name>
+            </property>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-assembly-plugin</artifactId>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+
 </project>

Copied: modules/faces/branches/exception_handling/docs/reference/src/main/assembly (from rev 13065, modules/faces/trunk/docs/reference/src/main/assembly)

Deleted: modules/faces/branches/exception_handling/docs/reference/src/main/assembly/assembly.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/assembly/assembly.xml	2010-06-04 22:23:53 UTC (rev 13065)
+++ modules/faces/branches/exception_handling/docs/reference/src/main/assembly/assembly.xml	2010-06-07 17:23:29 UTC (rev 13079)
@@ -1,17 +0,0 @@
-<assembly
-   xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-   <id>sources</id>
-   <formats>
-      <format>zip</format>
-   </formats>
-   <baseDirectory>${project.artifactId}</baseDirectory>
-   <fileSets>
-      <fileSet>
-         <outputDirectory>.</outputDirectory>
-         <directory>${project.basedir}/src/main/docbook/en-US</directory>
-         <useDefaultExcludes>true</useDefaultExcludes>
-      </fileSet>
-   </fileSets>
-</assembly>

Copied: modules/faces/branches/exception_handling/docs/reference/src/main/assembly/assembly.xml (from rev 13065, modules/faces/trunk/docs/reference/src/main/assembly/assembly.xml)
===================================================================
--- modules/faces/branches/exception_handling/docs/reference/src/main/assembly/assembly.xml	                        (rev 0)
+++ modules/faces/branches/exception_handling/docs/reference/src/main/assembly/assembly.xml	2010-06-07 17:23:29 UTC (rev 13079)
@@ -0,0 +1,17 @@
+<assembly
+   xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+   <id>sources</id>
+   <formats>
+      <format>zip</format>
+   </formats>
+   <baseDirectory>${project.artifactId}</baseDirectory>
+   <fileSets>
+      <fileSet>
+         <outputDirectory>.</outputDirectory>
+         <directory>${project.basedir}/src/main/docbook/en-US</directory>
+         <useDefaultExcludes>true</useDefaultExcludes>
+      </fileSet>
+   </fileSets>
+</assembly>

Modified: modules/faces/branches/exception_handling/docs/reference/src/main/docbook/en-US/installation.xml
===================================================================
--- modules/faces/branches/exception_handling/docs/reference/src/main/docbook/en-US/installation.xml	2010-06-07 17:12:43 UTC (rev 13078)
+++ modules/faces/branches/exception_handling/docs/reference/src/main/docbook/en-US/installation.xml	2010-06-07 17:23:29 UTC (rev 13079)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
-<chapter id="installation">
+<chapter id="faces.installation">
 	<title>Installation</title>
 	<para>
 		Most features of Seam Faces are installed automatically by including the seam-faces.jar and seam-faces-api.jar

Modified: modules/faces/branches/exception_handling/docs/reference/src/main/docbook/en-US/messages.xml
===================================================================
--- modules/faces/branches/exception_handling/docs/reference/src/main/docbook/en-US/messages.xml	2010-06-07 17:12:43 UTC (rev 13078)
+++ modules/faces/branches/exception_handling/docs/reference/src/main/docbook/en-US/messages.xml	2010-06-07 17:23:29 UTC (rev 13079)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
-<chapter id="messages">
+<chapter id="faces.messages">
 	<title>Messages API</title>
 	<para>
 		While JSF already has the concept of adding <literal>FacesMessage</literal> objects to the FacesContext in order for those messages to be

More information about the seam-commits mailing list