From 57323b633dff9ef32cc3e7fef836d27ee8d0d7d9 Mon Sep 17 00:00:00 2001 From: Remi Bantos Date: Mon, 31 Dec 2012 13:12:48 +0100 Subject: [PATCH 1/2] - Fix #960 defect - Also fix typo in appliedBy attribute description in AppendixC-OptionalTasks ("deltaset" was duplicated in the attribute name for "appliedBy") - Fix and complete phing-grammar for "appliedBy" and "checkall" attributes. --- .../en/source/appendixes/optionaltasks.xml | 14 +- .../appendixes/AppendixC-OptionalTasks.html | 156 ++++++++------- etc/phing-grammar.rng | 182 +++++++++--------- 3 files changed, 190 insertions(+), 162 deletions(-) diff --git a/docs/docbook5/en/source/appendixes/optionaltasks.xml b/docs/docbook5/en/source/appendixes/optionaltasks.xml index 371db2670a..c99d753552 100755 --- a/docs/docbook5/en/source/appendixes/optionaltasks.xml +++ b/docs/docbook5/en/source/appendixes/optionaltasks.xml @@ -663,13 +663,23 @@ No - deltaset + appliedBy String Value of the 'applied_by' column for each - entry in the changelog table + entry in the changelog table dbdeploy No + + checkall + Boolean + False means dbdeploy will only apply patches that have a higher number + than the last patchnumber that was applied + True means dbdeploy will apply all changes that aren't applied + already (in ascending order) + false + No + diff --git a/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html b/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html index ff0dffe8db..4e6904c93a 100755 --- a/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html +++ b/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html @@ -23,7 +23,7 @@

This reference lists the tasks alphabetically by the name of the classes that implement the tasks. So if you are searching for the reference to the <phplint> tag, for example, you will want to look at the reference of PhpLintTask.

- +

ApiGenTask

@@ -353,7 +353,7 @@

Attributes

no - +

Supported Nested Tags

@@ -721,6 +721,16 @@

Attributes

dbdeploy No + + checkall + Boolean + False means dbdeploy will only apply patches that have a higher number + than the last patchnumber that was applied + True means dbdeploy will apply all changes that aren't applied + already (in ascending order) + false + No +

@@ -868,7 +878,7 @@

Attributes

FileSyncTask

-

Syncs files or directories using the rsync command. Syncing can be done on the +

Syncs files or directories using the rsync command. Syncing can be done on the same server or from/to a remote server.

Example

@@ -1025,12 +1035,12 @@ 

 			FtpDeployTask 

 		
Deploys a set of files to a remote FTP server.

 		
Example

-		
<ftpdeploy 
-  host="${ftp.host}" 
-  port="${ftp.port}" 
-  username="${ftp.username}" 
+		
<ftpdeploy
+  host="${ftp.host}"
+  port="${ftp.port}"
+  username="${ftp.username}"
   password="${ftp.password}"
-  dir="${ftp.dir}" 
+  dir="${ftp.dir}"
   passive="false"
   mode="${ftp.mode}">
   <fileset dir=".">
@@ -1258,12 +1268,12 @@ 
Example

 <resolvepath propertyName="repo.dir.resolved" file="${repo.dir}" />
 
 <!-- Clone repository -->
-<gitclone 
+<gitclone
     repository="git://github.com/path/to/repo/repo.git"
     targetPath="${repo.dir.resolved}" />
 
 <!-- Clone bare repository -->
-<gitclone 
+<gitclone
     repository="git://github.com/path/to/repo/repo.git"
     targetPath="${repo.dir.resolved}"
     bare="true" />
@@ -1343,13 +1353,13 @@ 
Example

 <resolvepath propertyName="repo.dir.resolved" file="${repo.dir}" />
 
 <!-- Clone repository -->
-<gitclone 
+<gitclone
     repository="git://github.com/path/to/repo/repo.git"
     targetPath="${repo.dir.resolved}" />
 
 <!-- Cleanup repository-->
-<gitgc 
-    repository="${repo.dir.resolved}" 
+<gitgc
+    repository="${repo.dir.resolved}"
     aggressive="true"
     prune="1.week.ago" />
 

@@ -1489,35 +1499,35 @@ 
Example

 
 <!-- Create branch "sample-branch" tracking current HEAD -->
 <gitbranch
-    repository="${repo.dir.resolved}" 
+    repository="${repo.dir.resolved}"
     branchname="sample-branch" />
 
-<!-- 
-Create branch "sample-branch" tracking origin/master 
+<!--
+Create branch "sample-branch" tracking origin/master
 Note that you can omit both startpoint and track attributes in this case
 -->
 <gitbranch
-    repository="${repo.dir.resolved}" 
+    repository="${repo.dir.resolved}"
     branchname="sample-branch"
     startpoint="origin/master"
     track="true" />
 
 <!-- Delete fully merged branch "sample-branch" -->
-<gitbranch 
-    repository="${repo.dir.resolved}" 
-    branchname="sample-branch" 
+<gitbranch
+    repository="${repo.dir.resolved}"
+    branchname="sample-branch"
     delete="true" />
 
 <!-- Force delete even unmerged branch "sample-branch" -->
-<gitbranch 
-    repository="${repo.dir.resolved}" 
-    branchname="sample-branch" 
+<gitbranch
+    repository="${repo.dir.resolved}"
+    branchname="sample-branch"
     forcedelete="true" />
 
 <!-- Renabe "branch1" to "branch2" -->
-<gitbranch 
-    repository="${repo.dir.resolved}" 
-    branchname="branch1" 
+<gitbranch
+    repository="${repo.dir.resolved}"
+    branchname="branch1"
     newbranch="branch2"
     move="true" />
 
@@ -1665,10 +1675,10 @@ 
Example

     repository="${repo.dir.resolved}" all="true" />
 
 <!-- Fetch from origin/master to "refspec-branch" local branch -->
-<gitfetch 
-    repository="${repo.dir.resolved}" 
+<gitfetch
+    repository="${repo.dir.resolved}"
     source="origin"
-    refspec="master:refspec-branch" 
+    refspec="master:refspec-branch"
     quiet="true" />
 

 		

@@ -1793,24 +1803,24 @@ 
Example

 <resolvepath propertyName="repo.dir.resolved" file="${repo.dir}" />
 
 <!-- clone repository -->
-<gitclone 
+<gitclone
     repository="git://github.com/path/to/repo/repo.git"
     targetPath="${repo.dir.resolved}" />
 
 <!-- create and switch to "mybranch" branch -->
 <gitcheckout
-    repository="${repo.dir.resolved}" 
+    repository="${repo.dir.resolved}"
     branchname="mybranch" quiet="true" create="true" />
 
 <!-- get back to "master" branch -->
 <gitcheckout
-    repository="${repo.dir.resolved}" 
+    repository="${repo.dir.resolved}"
     branchname="master" quiet="true" />
 
 <!-- create (force) already created branch -->
 <gitcheckout
-    repository="${repo.dir.resolved}" 
-    branchname="mybranch" quiet="true" 
+    repository="${repo.dir.resolved}"
+    branchname="mybranch" quiet="true"
     forceCreate="true" />

@@ -1931,22 +1941,22 @@

Example

<resolvepath propertyName="repo.dir.resolved" file="${repo.dir}" /> <!-- clone repository --> -<gitclone +<gitclone repository="git://github.com/path/to/repo/repo.git" targetPath="${repo.dir.resolved}" /> <!-- create couple of test branches --> <gitbranch - repository="${repo.dir.resolved}" + repository="${repo.dir.resolved}" branchname="merge-test-1" startpoint="origin/master" /> <gitbranch - repository="${repo.dir.resolved}" + repository="${repo.dir.resolved}" branchname="merge-test-2" startpoint="origin/master" /> <!-- Merge those branches back into master --> <gitmerge - repository="${repo.dir.resolved}" - remote="merge-test-1 merge-test-2" + repository="${repo.dir.resolved}" + remote="merge-test-1 merge-test-2" message="merging repos" commit="true" />

@@ -2106,7 +2116,7 @@

Example

<resolvepath propertyName="repo.dir.resolved" file="${repo.dir}" /> <!-- clone repository --> -<gitclone +<gitclone repository="git://github.com/path/to/repo/repo.git" targetPath="${repo.dir.resolved}" /> @@ -2116,8 +2126,8 @@

Example

<!-- pull remote origin/foobranch and rebase when merging --> <gitpull - repository="${repo.dir.resolved}" - source="origin" refspec="foobranch" + repository="${repo.dir.resolved}" + source="origin" refspec="foobranch" strategy="recursive" keep="true" force="true" quiet="true" rebase="true" /> @@ -2232,23 +2242,23 @@

Example

<resolvepath propertyName="repo.dir.resolved" file="${repo.dir}" /> <!-- clone repository --> -<gitclone +<gitclone repository="git://github.com/path/to/repo/repo.git" targetPath="${repo.dir.resolved}" /> <!-- push branch "master" into "foobranch" on "origin" remote --> <gitpush - repository="${repo.dir.resolved}" + repository="${repo.dir.resolved}" refspec="master:foobranch" tags="true" /> <!-- create new branch "newbranch" on "origin" remote --> <gitpush - repository="${repo.dir.resolved}" + repository="${repo.dir.resolved}" refspec="master:newbranch" quiet="true" /> <!-- delete "newbranch" branch from "origin" remote --> <gitpush - repository="${repo.dir.resolved}" + repository="${repo.dir.resolved}" delete="true" refspec="newbranch" quiet="true" /> @@ -2437,28 +2447,28 @@

Example

<resolvepath propertyName="repo.dir.resolved" file="${repo.dir}" /> <!-- clone repository --> -<gitclone +<gitclone repository="git://github.com/path/to/repo/repo.git" targetPath="${repo.dir.resolved}" /> <gittag repository="${repo.dir.resolved}" name="ver1.0" /> <!-- Force duplicate tag creation --> -<gittag - repository="${repo.dir.resolved}" +<gittag + repository="${repo.dir.resolved}" name="ver1.0" force="true"/> <!-- Create tag with annotation and message --> -<gittag - repository="${repo.dir.resolved}" +<gittag + repository="${repo.dir.resolved}" name="ver1.0" annotate="true" message="Version 1.0 tag"/> <!-- Delete tag --> -<gittag +<gittag repository="${repo.dir.resolved}" name="ver2.0" delete="true" /> <!-- List tags matching to pattern "marked" into "tags" variable --> -<gittag repository="${repo.dir.resolved}" +<gittag repository="${repo.dir.resolved}" list="true" - outputProperty="tags" + outputProperty="tags" pattern="marked" />

@@ -2574,11 +2584,11 @@

Example

<resolvepath propertyName="repo.dir.resolved" file="${repo.dir}" /> <!-- clone repository --> -<gitclone +<gitclone repository="git://github.com/path/to/repo/repo.git" targetPath="${repo.dir.resolved}" /> -<gitlog +<gitlog paths="${repo.dir.resolved}" format="oneline" maxCount="2" @@ -2586,12 +2596,12 @@

Example

noMerges="false" since="Sun Jan 23 23:55:42 2011 +0300" until="Mon Jan 24 09:59:33 2011 +0300" - outputProperty="logs" + outputProperty="logs" repository="${repo.dir.resolved}" />

GrowlNotifyTask

-

When you have a long process and want to be notified when it is finished, without to stay +

When you have a long process and want to be notified when it is finished, without to stay focused on the console windows. Then use the GrowlNotify task.

This task requires the PEAR Net_Growl package installed (version 2.6.0).

@@ -2742,7 +2752,7 @@

Send a single notification on a remote host

Send a single notification with UDP protocol

- When you don't have a Macintosh, OS compatible with Growl GNTP, you + When you don't have a Macintosh, OS compatible with Growl GNTP, you should use the basic UDP protocol. 

@@ -2787,8 +2797,8 @@ 
Send an important notification

Use your icons to identify an application

- You may customize the Growl notification system, with different icons - and more. + You may customize the Growl notification system, with different icons + and more. 

 <?xml version="1.0" encoding="UTF-8"?>
@@ -3525,7 +3535,7 @@ 
Supported Nested Tags

 		
 
 		
LiquibaseChangeLogTask 

-		
 The LiquibaseChangeLogTask writes the Change Log XML to copy the 
+		
 The LiquibaseChangeLogTask writes the Change Log XML to copy the
 		 current state of the database to the given changeLogFile.

 		
Example

 		
@@ -5000,7 +5010,7 @@ 
Attributes

 				
 					signature
 					String
-					Signature algorithm (md5, sha1, sha256, sha512, openssl), used for this 
+					Signature algorithm (md5, sha1, sha256, sha512, openssl), used for this
 						package.
 					sha1
 					No
@@ -6674,9 +6684,9 @@ 
Attributes

 			
 		
 		
Examples

-		
<phpunitreport infile="reports/testsuites.xml" 
-    format="frames" 
-    todir="reports/tests" 
+		
<phpunitreport infile="reports/testsuites.xml"
+    format="frames"
+    todir="reports/tests"
     styledir="/home/phing/etc"/>
 

 		
 Generates a framed report in the directory reports/tests using the file
@@ -6945,7 +6955,7 @@ 
Examples

 	<fileset dir="${project.basedir}">
 		<include name="**/*.jpg" />
 	</fileset>
-</s3put>	
+</s3put>
 	

 		
Attributes

 		
@@ -7017,7 +7027,7 @@ 
Attributes

-				  				
+				

 					
Whether filenames should contain paths when uploaded to an S3 bucket
 					false
 					No

 			
 		

 		
Supported Nested Tags

@@ -7688,14 +7698,14 @@ 
Examples

     username="anony"
     password="anony"
     nocache="true"
-    workingcopy="/home/joe/dev/project"    
+    workingcopy="/home/joe/dev/project"
     message="Updated documentation, fixed typos" />
 

 		
The most basic usage only needs the working copy and the commit message as in

 		
<svncommit
     workingcopy="/home/joe/dev/project"
     message="Updated documentation, fixed typos" />
-<echo message="Committed revision: ${svn.committedrevision}"/>    
+<echo message="Committed revision: ${svn.committedrevision}"/>
 

 		
Attributes

 		
@@ -8575,7 +8585,7 @@ 
Attributes

-            
+
         

                     
no
                 

             

         
Supported Nested Tags

         
diff --git a/etc/phing-grammar.rng b/etc/phing-grammar.rng
index 9ab94ab9d2..7ac66887dd 100644
--- a/etc/phing-grammar.rng
+++ b/etc/phing-grammar.rng
@@ -8,7 +8,7 @@
     ==================================================================================
 
     Relax-NG XML Schema For Phing build XML scripts. (See http://www.relaxng.org)
-    
+
     The purpose of this schema is to facilitate the writing of correct Phing build
     scripts in a XML and schema aware editor. The schema will help the editor verify
     the input as well as providing tag completion making it easier and faster to
@@ -17,14 +17,14 @@
     It can also be used together with one of the many existing R-NG validators to
     validate a Phing script for adherence to the Phing syntax, like a "lint"
     for Phing scripts.
-    
-    Note however that it is actually impossible to write a generic schema for 
+
+    Note however that it is actually impossible to write a generic schema for
     Phing since it is possible to define new elements dynamically which means
-    that the  grammar can never be complete. 
+    that the  grammar can never be complete.
 
     However, in a particular setup only a few custom tasks is usually
     used. This is easy to add att the end of this schema so it can be extended to
-    include those additional elements as well. 
+    include those additional elements as well.
 
     ==================================================================================
 -->
@@ -39,7 +39,7 @@
     
     
         
@@ -70,10 +70,10 @@
         
     
 
-    
 
     
@@ -234,8 +234,8 @@
 
     
     
         
@@ -267,8 +267,8 @@
 
     
 
     
@@ -460,8 +460,8 @@
 
     
 
     
@@ -929,35 +929,35 @@
                 
                 
                 
-                                
-                        
+                
+            
         
     
-    
+
     
         
-                        
+            
         
     
-    
+
     
         
             
         
     
-    
+
     
         
             
         
     
-    
+
     
         
             
         
     
-    
+
     
         
             
@@ -969,7 +969,7 @@
             
         
     
-    
+
     
         
             
@@ -1045,7 +1045,7 @@
                     
                     
                     
-                                        
+                    
                 
             
         
@@ -1061,7 +1061,7 @@
                     
                     
                     
-                                        
+                    
                 
             
         
@@ -1580,11 +1580,11 @@
 
     
 
-    
     
         
@@ -2485,7 +2493,7 @@
         
     
 
-    
     
@@ -3424,7 +3432,7 @@
     
 
 
-    
-<gitlog
+<gitlog 
     paths="${repo.dir.resolved}"
     format="oneline"
     maxCount="2"
@@ -2596,12 +2596,12 @@ 
Example

     noMerges="false"
     since="Sun Jan 23 23:55:42 2011 +0300"
     until="Mon Jan 24 09:59:33 2011 +0300"
-    outputProperty="logs"
+    outputProperty="logs" 
     repository="${repo.dir.resolved}" />

GrowlNotifyTask

-

When you have a long process and want to be notified when it is finished, without to stay +

When you have a long process and want to be notified when it is finished, without to stay focused on the console windows. Then use the GrowlNotify task.

This task requires the PEAR Net_Growl package installed (version 2.6.0).

@@ -2752,7 +2752,7 @@

Send a single notification on a remote host

Send a single notification with UDP protocol

- When you don't have a Macintosh, OS compatible with Growl GNTP, you + When you don't have a Macintosh, OS compatible with Growl GNTP, you should use the basic UDP protocol. 

@@ -2797,8 +2797,8 @@ 
Send an important notification

Use your icons to identify an application

- You may customize the Growl notification system, with different icons - and more. + You may customize the Growl notification system, with different icons + and more. 

 <?xml version="1.0" encoding="UTF-8"?>
@@ -3535,7 +3535,7 @@ 
Supported Nested Tags

 		
 
 		
LiquibaseChangeLogTask 

-		
 The LiquibaseChangeLogTask writes the Change Log XML to copy the
+		
 The LiquibaseChangeLogTask writes the Change Log XML to copy the 
 		 current state of the database to the given changeLogFile.

 		
Example

 		
@@ -5010,7 +5010,7 @@ 
Attributes

 				
 					signature
 					String
-					Signature algorithm (md5, sha1, sha256, sha512, openssl), used for this
+					Signature algorithm (md5, sha1, sha256, sha512, openssl), used for this 
 						package.
 					sha1
 					No
@@ -6684,9 +6684,9 @@ 
Attributes

 			
 		
 		
Examples

-		
<phpunitreport infile="reports/testsuites.xml"
-    format="frames"
-    todir="reports/tests"
+		
<phpunitreport infile="reports/testsuites.xml" 
+    format="frames" 
+    todir="reports/tests" 
     styledir="/home/phing/etc"/>
 

 		
 Generates a framed report in the directory reports/tests using the file
@@ -6955,7 +6955,7 @@ 
Examples

 	<fileset dir="${project.basedir}">
 		<include name="**/*.jpg" />
 	</fileset>
-</s3put>
+</s3put>	
 	

 		
Attributes

 		
@@ -7027,7 +7027,7 @@ 
Attributes

-				
+				

 					
Whether filenames should contain paths when uploaded to an S3 bucket
 					false
 					No
  				
 			
 		

 		
Supported Nested Tags

@@ -7698,14 +7698,14 @@ 
Examples

     username="anony"
     password="anony"
     nocache="true"
-    workingcopy="/home/joe/dev/project"
+    workingcopy="/home/joe/dev/project"    
     message="Updated documentation, fixed typos" />
 

 		
The most basic usage only needs the working copy and the commit message as in

 		
<svncommit
     workingcopy="/home/joe/dev/project"
     message="Updated documentation, fixed typos" />
-<echo message="Committed revision: ${svn.committedrevision}"/>
+<echo message="Committed revision: ${svn.committedrevision}"/>    
 

 		
Attributes

 		
@@ -8624,7 +8624,7 @@ 
Attributes

-
+            
         

                     
no
                 

             

             
         
diff --git a/etc/phing-grammar.rng b/etc/phing-grammar.rng
index 7ac66887dd..9842c7d08b 100644
--- a/etc/phing-grammar.rng
+++ b/etc/phing-grammar.rng
@@ -8,7 +8,7 @@
     ==================================================================================
 
     Relax-NG XML Schema For Phing build XML scripts. (See http://www.relaxng.org)
-
+    
     The purpose of this schema is to facilitate the writing of correct Phing build
     scripts in a XML and schema aware editor. The schema will help the editor verify
     the input as well as providing tag completion making it easier and faster to
@@ -17,14 +17,14 @@
     It can also be used together with one of the many existing R-NG validators to
     validate a Phing script for adherence to the Phing syntax, like a "lint"
     for Phing scripts.
-
-    Note however that it is actually impossible to write a generic schema for
+    
+    Note however that it is actually impossible to write a generic schema for 
     Phing since it is possible to define new elements dynamically which means
-    that the  grammar can never be complete.
+    that the  grammar can never be complete. 
 
     However, in a particular setup only a few custom tasks is usually
     used. This is easy to add att the end of this schema so it can be extended to
-    include those additional elements as well.
+    include those additional elements as well. 
 
     ==================================================================================
 -->
@@ -39,7 +39,7 @@
     
     
         
@@ -70,10 +70,10 @@
         
     
 
-    
 
     
@@ -234,8 +234,8 @@
 
     
     
         
@@ -267,8 +267,8 @@
 
     
 
     
@@ -460,8 +460,8 @@
 
     
 
     
@@ -929,35 +929,35 @@
                 
                 
                 
-                
-            
+                                
+                        
         
     
-
+    
     
         
-            
+                        
         
     
-
+    
     
         
             
         
     
-
+    
     
         
             
         
     
-
+    
     
         
             
         
     
-
+    
     
         
             
@@ -969,7 +969,7 @@
             
         
     
-
+    
     
         
             
@@ -1045,7 +1045,7 @@
                     
                     
                     
-                    
+                                        
                 
             
         
@@ -1061,7 +1061,7 @@
                     
                     
                     
-                    
+                                        
                 
             
         
@@ -1580,11 +1580,11 @@
 
     
 
-    
     
         
@@ -2493,7 +2493,7 @@
         
     
 
-    
     
@@ -3432,7 +3432,7 @@
     
 
 
-