Merge branch 'release' into integration/master

Conflicts: functional-test/pom.xml pom.xml zanata-model/pom.xml zanata-test-war/pom.xml zanata-war/pom.xml zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml The pom conflicts were just the release version conflicting with the development version. Kept the development version (3.7.0-SNAPSHOT) in all cases. The conflict in db.changelog-3.7.xml was caused by the file being created in both release and master branches. In the release branch it had a single changeset that was already in the master branch, so the master copy was kept in its entirety. There was an XML comment on the changeset in release, this was kept and put above the identical changeset in master.
zanata · Mar 19, 2015 · a1a8a60 · a1a8a60
2 parents 75a2127 + dddea7d
commit a1a8a60
Show file tree

Hide file tree

Showing 18 changed files with 168 additions and 220 deletions.
diff --git a/functional-test/pom.xml b/functional-test/pom.xml
@@ -427,12 +427,9 @@
                 </goals>
                 <configuration>
                   <target xmlns:if="ant:if">
-                    <echo if:set="skipFuncTests"
-                      message="WARNING: -DskipFuncTests takes precedence over -DallFuncTests" />
-                    <echo if:set="skipITs"
-                      message="WARNING: -DskipITs takes precedence over -DallFuncTests" />
-                    <echo if:set="skipTests"
-                      message="WARNING: -DskipTests takes precedence over -DallFuncTests" />
+                    <echo if:set="skipFuncTests" message="WARNING: -DskipFuncTests takes precedence over -DallFuncTests" />
+                    <echo if:set="skipITs" message="WARNING: -DskipITs takes precedence over -DallFuncTests" />
+                    <echo if:set="skipTests" message="WARNING: -DskipTests takes precedence over -DallFuncTests" />
                   </target>
                 </configuration>
               </execution>
@@ -809,7 +806,7 @@
                 <echo>===== Properties that can be set for functional test =====</echo>
                 <echo>-DskipFuncTests : to skip running functional tests, and/or:</echo>
                 <echo>-DskipArqTests : to skip Arquillian integration tests (if building zanata-war)</echo>
-                <echo/>
+                <echo />
                 <echo>Unless skipping tests, you must choose an appserver:</echo>
                 <echo>-Dappserver=jbosseap6 -Dcargo.installation=http://example.com/jbosseap632.zip -Dcargo.basename=jbosseap632</echo>
                 <echo>or -Dappserver=wildfly8</echo>
@@ -818,9 +815,9 @@
                 <echo>appserver.dir.name is top-level dir inside zip.  For jbosseap6, default is jboss-eap-6.3.  Override for later versions.</echo>
                 <echo/>
                 <echo>-DallFuncTests to enable all functional tests (defaults to smoke tests)</echo>
-                <echo/>
+                <echo />
                 <echo>-Dcargo.debug.jvm.args : If not set by default will listen to port 8787. Need to set to empty on jenkins</echo>
-                <echo/>
+                <echo />
                 <echo>-Dzanata.target.version=version of zanata to deploy. Default is: ${project.parent.version}</echo>
                 <echo>-Dzanata.instance.url=http://${cargo.host}:${cargo.servlet.port}/${context.path}</echo>
                 <echo>-Dzanata.apikey=b6d7044e9ee3b2447c28fb7c50d86d98</echo>
@@ -845,10 +842,8 @@
             <goals><goal>run</goal></goals>
             <configuration>
               <target unless="skipFuncTests">
-                <fail message="'appserver' property must be set to run integration tests (or else use -DskipFuncTests)"
-                  unless="appserver" />
-                <fail message="'cargo.installation' property must be set to run integration tests (or else use -DskipFuncTests)"
-                  unless="cargo.installation"/>
+                <fail message="'appserver' property must be set to run integration tests (or else use -DskipFuncTests)" unless="appserver" />
+                <fail message="'cargo.installation' property must be set to run integration tests (or else use -DskipFuncTests)" unless="cargo.installation" />
               </target>
             </configuration>
           </execution>

diff --git a/pom.xml b/pom.xml
@@ -16,6 +16,7 @@
     <connection>scm:git:git://github.com/zanata/zanata-server.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-server.git</developerConnection>
     <url>https://github.com/zanata/zanata-server</url>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>
@@ -1435,20 +1436,10 @@
                 <configuration>
                   <target unless="skipITs">
                     <mkdir dir="${download.dir}" />
-                    <get
-                      src="http://sourceforge.net/projects/zanata/files/wildfly/${mojarra.module.name}/download"
-                      dest="${download.dir}/${mojarra.module.name}"
-                      skipexisting="true" />
-                    <get
-                      src="http://sourceforge.net/projects/zanata/files/wildfly/${hibernate.module.name}/download"
-                      dest="${download.dir}/${hibernate.module.name}"
-                      skipexisting="true" />
-                    <unzip
-                      src="${download.dir}/${mojarra.module.name}"
-                      dest="${appserver.home}" />
-                    <unzip
-                      src="${download.dir}/${hibernate.module.name}"
-                      dest="${appserver.home}" />
+                    <get src="http://sourceforge.net/projects/zanata/files/wildfly/${mojarra.module.name}/download" dest="${download.dir}/${mojarra.module.name}" skipexisting="true" />
+                    <get src="http://sourceforge.net/projects/zanata/files/wildfly/${hibernate.module.name}/download" dest="${download.dir}/${hibernate.module.name}" skipexisting="true" />
+                    <unzip src="${download.dir}/${mojarra.module.name}" dest="${appserver.home}" />
+                    <unzip src="${download.dir}/${hibernate.module.name}" dest="${appserver.home}" />
                   </target>
                 </configuration>
               </execution>

diff --git a/zanata-model/pom.xml b/zanata-model/pom.xml
@@ -15,6 +15,7 @@
     <connection>scm:git:git://github.com/zanata/zanata.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata.git</developerConnection>
     <url>https://github.com/zanata/zanata</url>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>

diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
@@ -15,6 +15,7 @@
     <connection>scm:git:git://github.com/zanata/zanata.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata.git</developerConnection>
     <url>https://github.com/zanata/zanata</url>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>
@@ -987,10 +988,8 @@
                 <goals><goal>run</goal></goals>
                 <configuration>
                   <target unless="skipArqTests">
-                    <fail message="'appserver' property must be set to run integration tests (or else use -DskipArqTests)"
-                      unless="appserver" />
-                    <fail message="'cargo.installation' property must be set to run integration tests (or else use -DskipArqTests)"
-                      unless="cargo.installation"/>
+                    <fail message="'appserver' property must be set to run integration tests (or else use -DskipArqTests)" unless="appserver" />
+                    <fail message="'cargo.installation' property must be set to run integration tests (or else use -DskipArqTests)" unless="cargo.installation" />
                   </target>
                 </configuration>
               </execution>
@@ -1050,9 +1049,7 @@
                 </goals>
                 <configuration>
                   <target unless="skipArqTests">
-                    <copy overwrite="true"
-                      file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian.xml"
-                      tofile="${appserver.home}/standalone/configuration/standalone-arquillian.xml" />
+                    <copy overwrite="true" file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian.xml" tofile="${appserver.home}/standalone/configuration/standalone-arquillian.xml" />
                   </target>
                 </configuration>
               </execution>
@@ -1182,10 +1179,7 @@
                 </goals>
                 <configuration>
                   <target unless="skipArqTests">
-                    <copy
-                      overwrite="true"
-                      file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian-wildfly.xml"
-                      tofile="${appserver.home}/standalone/configuration/standalone.xml" />
+                    <copy overwrite="true" file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian-wildfly.xml" tofile="${appserver.home}/standalone/configuration/standalone.xml" />
                   </target>
                 </configuration>
               </execution>

diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
@@ -27,6 +27,7 @@
     </addColumn>
   </changeSet>
 
+  <!-- This change was added in the 3.7 development branch, but back-ported to the 3.6 branch at patch 3.6.1 -->
   <changeSet author="damason@redhat.com" id="1">
     <comment>Modify existing id for plaintext and libreoffice documents to use content hash instead of old positional id.</comment>
     <customChange class="org.zanata.liquibase.custom.ChangePositionalResIdToContentHash" />

diff --git a/zanata-war/src/main/resources/messages_br.properties b/zanata-war/src/main/resources/messages_br.properties
@@ -321,7 +321,6 @@ jsf.iteration.files.Path=Treug
 jsf.iteration.files.Filter.title=Sila\u00F1 dre anv an teulio\u00F9
 jsf.Upload.Label=Kas an droidigezh
 jsf.iteration.files.Merge=Touezia\u00F1
-jsf.iteration.files.MergeCheckbox.Title=Enrollet e vo an troidigezhio\u00F9 hizivaet ma'z eo gweredekaet. A re all a chomo evel m'emaint.
 jsf.iteration.files.Download=Pellgarga\u00F1
 jsf.iteration.files.dotpot=.pot
 jsf.iteration.files.dotofflinepot=.pot ezlinenn
@@ -332,7 +331,6 @@ jsf.iteration.files.dotofflinepo=.po ezlinenn
 jsf.iteration.files.dotofflinepo.description=Mentrezh po arbennik hag a arver msgctx evit kadavi\u00F1 an naoudi Zanata.
 jsf.iteration.files.dotofflinepo.purpose=Azgoulennet eo ar mentrezh-ma\u00F1 gant Zanata pa vez karget restro\u00F9 po evit un teul ne oa ket e mentrezh po da genta\u00F1.
 jsf.iteration.files.ConfirmDocDeletion=Ha sur oc'h e fell deoc'h dilemel tarzh ar restr-ma\u00F1 ?
-jsf.iteration.files.ProcessDlgTitle=O keweria\u00F1 restro\u00F9 ar raktres...
 jsf.iteration.files.UpdateDocument=Hizivaat an teul-ma\u00F1
 jsf.iteration.files.DeleteDocument=Dilemel an teul-ma\u00F1
 jsf.iteration.files.DownloadDocument=Pellgarga\u00F1 an teul-ma\u00F1 [{0}]
@@ -350,7 +348,6 @@ jsf.iteration.files.DownloadTranslated=Pellgarga\u00F1 [{0}] bet troet
 jsf.iteration.files.DownloadAll=Pellgarga\u00F1 pep tra (zip)
 jsf.iteration.files.DownloadAllOfflinePo=Pellgarga\u00F1 pep tra evit un droidigezh ezlinenn
 jsf.iteration.files.DownloadAllFiles.ProjectTypeNotSet=Rizh ar raktres n'eo ket bet arventennet evit an arredoadur-ma\u00F1. Kit e darempred gant ardead ar raktres.
-jsf.iteration.files.ConfirmDownloadAllFiles=Ema\u00F1 ho pellgargadur o vont da veza\u00F1 prientet hag an dra-se a c'hellfe padout un tammig amzer. Mat eo ?
 jsf.iteration.files.WhyCantITranslate=Perak n'hallan ket trei\u00F1 ?
 jsf.iteration.files.translateDenied.NotLoggedIn=N'oc'h ket kennasket ken.
 jsf.iteration.files.translateDenied.VersionIsReadOnly=Ar raktres-ma\u00F1 zo e lenn hepken.
@@ -448,7 +445,6 @@ jsf.register.LogIn.label=En em gennaska\u00F1
 jsf.ForgotYourPassword=Ankouaet hoc'h eus ho ker-tremen ?
 jsf.ResetPassword=Adderaouekaat ar ger-tremen
 jsf.SubmitRequest=Kinnig ur goulenn
-jsf.ResetYourPassword=Adderaouekaat ho ker-tremen
 jsf.NewPassword=Ger-tremen nevez
 jsf.OldPassword=Ger-tremen kozh
 jsf.ChangePassword=Kemma\u00F1 ar ger-tremen
@@ -457,12 +453,7 @@ jsf.login.WithZanata.label=En em gennaska\u00F1 gant hoc'h anv arveriad
 jsf.login.DontHaveAnAccount.label=Ur gont hoc'h eus ?
 jsf.ActivateAccount=Gweredekaat ar gont
 jsf.ValidateEmail=Talvoudekaat ar postel
-jsf.InactiveAccount=Kont dizoberiant
-jsf.inactiveaccount.PleaseSelectOne=N'eo ket bet gweredekaet ho kont evit poent. Mar plij, dibabit unan eus an dibarzhio\u00F9 ama\u00F1 dindan \:
-jsf.ResendActivationEmail=Kas ar postel gweredekaat en-dro
 jsf.or=PE
-jsf.inactiveaccount.UpdateAndResend=Hizivaat ar chomlec'h postel ha kas ar postel gweredekaat en-dro \:
-jsf.UpdateEmail=Hizivaat ho chomlec'h postel
 jsf.InvalidActivationKey=Alc'hwez gweredekaat didalvoudek
 jsf.Error=Fazi
 jsf.ErrorTitle=Digarezit
@@ -528,10 +519,6 @@ jsf.CreateRole=Kroui\u00F1 ur roll
 jsf.AreYouSureYouWishToDeleteThisRoleThisActionCannotBeUndone=Ha sur oc'h e fell deoc'h dilemel ar roll-ma\u00F1 ? N'hall ket beza\u00F1 disc'hraet.
 jsf.Role=Roll
 jsf.RoleDetails=Munudo\u00F9 ar roll
-jsf.EnabledByDefault=Gweredekaet dre ziouer
-jsf.AreYouSureYouWishToEnableThisLanguage=Ha sur oc'h e fell deoc'h gweredekaat ar yezh-ma\u00F1 ?
-jsf.AreYouSureYouWishToDisableThisLanguage=Ha fellout a ra deoc'h diweredekaat ar yezh-ma\u00F1 ?
-jsf.TeamMembers=Izili ar skipailh
 jsf.language.validation.ReplaceUnderscores=Amsavi\u00F1 i
 jsf.language.validation.Underscores="_" a zlefe beza\u00F1 amsavet gant "/"
 jsf.CountryCode=Boneg ar vro

diff --git a/zanata-war/src/main/resources/messages_cs.properties b/zanata-war/src/main/resources/messages_cs.properties
@@ -424,7 +424,6 @@ jsf.iteration.files.Filter.title=Filtrovat podle n\u00E1zvu dokumentu
 jsf.Upload.Label=Nahr\u00E1t p\u0159eklad
 jsf.iteration.files.Merge=Slou\u010Dit
 jsf.iteration.files.Merge.title=Je-li zatr\u017Eeno, sou\u010Dasn\u00E9 \u00FAdaje budou slou\u010Deny s nahran\u00FDm dokumentem. V opa\u010Dn\u00E9m p\u0159\u00EDpad\u011B budou \u00FAdaje nahran\u00FDm dokumentem potla\u010Deny.
-jsf.iteration.files.MergeCheckbox.Title=Je-li zatr\u017Eeno, aktualizovan\u00E9 p\u0159eklady budou zaps\u00E1ny, v\u0161e ostatn\u00ED z\u016Fstane nezm\u011Bn\u011Bno.
 jsf.iteration.files.Download=St\u00E1hnout
 jsf.iteration.files.dotpot=.pot
 jsf.iteration.files.dotofflinepot=offline .pot
@@ -436,13 +435,11 @@ jsf.iteration.files.dotofflinepo.description=Zvl\u00E1\u0161tn\u00ED form\u00E1t
 jsf.iteration.files.dotofflinepo.purpose=Tento form\u00E1t vy\u017Eaduje Zanata p\u0159i nahr\u00E1v\u00E1n\u00ED p\u0159eklad\u016F po pro dokument, kter\u00FD byl p\u016Fvodn\u011B ve form\u00E1tu neodpov\u00EDdaj\u00EDc\u00EDm form\u00E1tu po.
 jsf.iteration.files.ConfirmDocDeletion=Opravdu chcete odstranit tento zdrojov\u00FD soubor?
 jsf.iteration.files.DocumentDeleted=Dokument \u00FAsp\u011B\u0161n\u011B smaz\u00E1n.
-jsf.iteration.files.ProcessDlgTitle=Zpracov\u00E1n\u00ED soubor\u016F projektu...
 jsf.iteration.files.UpdateDocument=Aktualizovat tento dokument
 jsf.iteration.files.DeleteDocument=Smazat tento dokument
 jsf.iteration.files.DownloadDocument=St\u00E1hnout dokument [{0}]
 jsf.iteration.files.UploadNewSourceDocument=Nahr\u00E1t nov\u00FD zdrojov\u00FD dokument
 jsf.iteration.files.FilenameWithSemicolonNotSupported=Zanata nepodporuje n\u00E1zvy soubor\u016F obsahuj\u00EDc\u00ED st\u0159edn\u00EDk.
-jsf.SupportedUploadFormats=Podporovan\u00E9 typy\: .pot .dtd .txt .html .htm .odt .odp .ods .odg .idml .srt .vtt. .sub .sbt
 jsf.SourceLanguage=Jazyk zdroje
 jsf.iteration.files.DocumentPath=Cesta k dokumentu
 jsf.iteration.files.CustomParams=Vlastn\u00ED parametry parsov\u00E1n\u00ED
@@ -456,8 +453,6 @@ jsf.iteration.files.DownloadAll=St\u00E1hnout v\u0161e (zip)
 jsf.iteration.files.DownloadAllOfflinePo=St\u00E1hnout v\u0161e pro p\u0159eklad bez p\u0159ipojen\u00ED
 jsf.iteration.files.DownloadAllFiles.ProjectTypeNotAllowed=Typ projektu mus\u00ED b\u00FDt nastaven na "Gettext" nebo "Podir". Kontaktujte vedouc\u00EDho projektu.
 jsf.iteration.files.DownloadAllFiles.ProjectTypeNotSet=Typ projektu nebyl pro toto opakov\u00E1n\u00ED zad\u00E1n. Kontaktujte vedouc\u00EDho projektu.
-jsf.iteration.files.ConfirmDownloadAllFiles=Sta\u017Een\u00ED bude pro v\u00E1s p\u0159ipraveno, jeho dokon\u010Den\u00ED m\u016F\u017Ee trvat n\u011Bkolik m\u00E1lo minut. Je to v po\u0159\u00E1dku?
-jsf.generatezip.ProgressLabel={0} z {1}
 jsf.iteration.files.WhyCantITranslate=Pro\u010D nelze p\u0159ekl\u00E1dat?
 jsf.iteration.files.translateDenied.NotLoggedIn=Nejste p\u0159ihl\u00E1\u0161en(a).
 jsf.iteration.files.translateDenied.VersionIsReadOnly=Tato verze projektu je pouze pro \u010Dten\u00ED.
@@ -611,7 +606,6 @@ jsf.register.LogIn.label=P\u0159ihl\u00E1sit se
 jsf.ForgotYourPassword=Zapomn\u011Bli jste sv\u00E9 heslo?
 jsf.ResetPassword=Znovu nastavit heslo
 jsf.SubmitRequest=Odeslat \u017E\u00E1dost
-jsf.ResetYourPassword=Nastavte znovu sv\u00E9 heslo
 jsf.NewPassword=Nov\u00E9 heslo
 jsf.OldPassword=Star\u00E9 heslo
 jsf.ChangePassword=Zm\u011Bnit heslo
@@ -622,12 +616,7 @@ jsf.login.OrLoginUsing.label=nebo se p\u0159ihlaste pou\u017Eit\u00EDm
 jsf.UsernameNotAvailable=U\u017Eivatel "{0}" nen\u00ED k dispozici
 jsf.ActivateAccount=Aktivovat \u00FA\u010Det
 jsf.ValidateEmail=Ov\u011B\u0159it e-mail
-jsf.InactiveAccount=Neaktivn\u00ED \u00FA\u010Det
-jsf.inactiveaccount.PleaseSelectOne=V\u00E1\u0161 \u00FA\u010Det nebyl dosud aktivov\u00E1n. Pros\u00EDme, vyberte jednu z n\u00E1sleduj\u00EDc\u00EDch mo\u017Enost\u00ED\:
-jsf.ResendActivationEmail=Op\u011Bt zaslat aktiva\u010Dn\u00ED e-mail
 jsf.or=NEBO
-jsf.inactiveaccount.UpdateAndResend=Zaktualizovat e-mailovou adresu a op\u011Bt zaslat aktiva\u010Dn\u00ED e-mail\:
-jsf.UpdateEmail=Aktualizovat e-mailovou adresu
 jsf.InvalidActivationKey=Neplatn\u00FD aktiva\u010Dn\u00ED kl\u00ED\u010D
 jsf.ActivationLinkExpired=\u010Casov\u00E1 platnost aktiva\u010Dn\u00EDho odkazu vypr\u0161ela. Pros\u00EDme, p\u0159ihlaste se a klepn\u011Bte na "Znovu zaslat aktiva\u010Dn\u00ED kl\u00ED\u010D".
 jsf.Error=Chyba
@@ -707,10 +696,6 @@ jsf.CreateRole=Vytvo\u0159it roli
 jsf.AreYouSureYouWishToDeleteThisRoleThisActionCannotBeUndone=Opravdu si p\u0159ejete smazat tuto roli? Tuto akci nelze vz\u00EDt zp\u011Bt.
 jsf.Role=Role
 jsf.RoleDetails=Podrobnosti o roli
-jsf.EnabledByDefault=Standardn\u011B povoleno
-jsf.AreYouSureYouWishToEnableThisLanguage=Opravdu si p\u0159ejete povolit tento jazyk?
-jsf.AreYouSureYouWishToDisableThisLanguage=Opravdu si p\u0159ejete zak\u00E1zat tento projekt?
-jsf.TeamMembers=\u010Clenov\u00E9 t\u00FDmu
 jsf.language.validation.ReplaceUnderscores=Nahradit v\u0161echny.
 jsf.language.validation.Underscores=Podr\u017E\u00EDtka by m\u011Bla b\u00FDt nahrazena poml\u010Dkami.
 jsf.CountryCode=K\u00F3d zem\u011B
@@ -748,8 +733,6 @@ jsf.manageSearch.ErrorMessage=N\u011Bkter\u00E9 objekty nelze p\u0159eindexovat
 jsf.manageSearch.PleaseReindex=Pros\u00EDm, p\u0159eindexovat znovu, aby se zajistilo, \u017Ee index vyhled\u00E1v\u00E1n\u00ED je aktu\u00E1ln\u00ED.
 jsf.manageSearch.ProgressMessage=dokon\u010Deno {0} z {1} operac\u00ED
 jsf.manageSearch.CurrentTable=Zpracov\u00E1n\u00ED tabulky\: {0}
-jsf.ManageSearch.ElapsedTime=\u010Cas trv\u00E1n\u00ED\: {0}
-jsf.ManageSearch.RemainingTime=Zb\u00FDv\u00E1 (asi)\: {0}
 jsf.ManageSearch.Abort=Zru\u0161it
 jsf.TotalTranslators=P\u0159ekladatel\u00E9
 jsf.TotalReviewers=Kontrolo\u0159i