Merge branch '1.4' of github.com:zanata/zanata into 1.4

zanata · Aug 9, 2011 · 35688fa · 35688fa
2 parents c4bfc2c + 9717c45
commit 35688fa
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 27 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
     <relativePath>../zanata-parent/pom.xml</relativePath>
   </parent>
   <modules>

diff --git a/client/zanata-adapter-po/pom.xml b/client/zanata-adapter-po/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
     <relativePath>../../zanata-parent/pom.xml</relativePath>
   </parent>
   <packaging>jar</packaging>

diff --git a/client/zanata-adapter-properties/pom.xml b/client/zanata-adapter-properties/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
     <relativePath>../../zanata-parent/pom.xml</relativePath>
   </parent>
   <packaging>jar</packaging>

diff --git a/client/zanata-adapter-xliff/pom.xml b/client/zanata-adapter-xliff/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>zanata-adapter-xliff</artifactId>
 	<name>Zanata Adapter for XLIFF file</name>
 	<parent>
 		<groupId>org.zanata</groupId>
 		<artifactId>zanata-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.4-SNAPSHOT</version>
 		<relativePath>../../zanata-parent/pom.xml</relativePath>
 	</parent>
 	<packaging>jar</packaging>

diff --git a/client/zanata-client-ant-po/pom.xml b/client/zanata-client-ant-po/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.zanata</groupId>
         <artifactId>zanata-parent</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../../zanata-parent/pom.xml</relativePath>
     </parent>
     <dependencies>

diff --git a/client/zanata-client-ant-properties/pom.xml b/client/zanata-client-ant-properties/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
     <relativePath>../../zanata-parent/pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/client/zanata-client-commands/pom.xml b/client/zanata-client-commands/pom.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.zanata</groupId>
 		<artifactId>zanata-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.4-SNAPSHOT</version>
 		<relativePath>../../zanata-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>zanata-client-commands</artifactId>

diff --git a/client/zanata-maven-plugin/pom.xml b/client/zanata-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
     <relativePath>../../zanata-parent/pom.xml</relativePath>
   </parent>
   <artifactId>zanata-maven-plugin</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
     <relativePath>../zanata-parent/pom.xml</relativePath>
   </parent>
   <modules>

diff --git a/common/zanata-common-api/pom.xml b/common/zanata-common-api/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>zanata-parent</artifactId>
 		<groupId>org.zanata</groupId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.4-SNAPSHOT</version>
 		<relativePath>../../zanata-parent/pom.xml</relativePath>
 	</parent>
 	<packaging>jar</packaging>

diff --git a/common/zanata-common-util/pom.xml b/common/zanata-common-util/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>zanata-parent</artifactId>
 		<groupId>org.zanata</groupId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.4-SNAPSHOT</version>
 		<relativePath>../../zanata-parent/pom.xml</relativePath>
 	</parent>
 	<packaging>jar</packaging>

diff --git a/common/zanata-rest-client/pom.xml b/common/zanata-rest-client/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>zanata-parent</artifactId>
 		<groupId>org.zanata</groupId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.4-SNAPSHOT</version>
 		<relativePath>../../zanata-parent/pom.xml</relativePath>
 	</parent>
 	<packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -3,15 +3,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.zanata</groupId>
 	<artifactId>zanata</artifactId>
-	<version>1.5-SNAPSHOT</version>
+	<version>1.4-SNAPSHOT</version>
 	<name>Zanata Root POM</name>
 	<url>http://zanata.org/</url>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.zanata</groupId>
 		<artifactId>zanata-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.4-SNAPSHOT</version>
 		<relativePath>zanata-parent/pom.xml</relativePath>
 	</parent>
 

diff --git a/server/pom.xml b/server/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
     <relativePath>../zanata-parent/pom.xml</relativePath>
   </parent>
   <modules>

diff --git a/server/zanata-model/pom.xml b/server/zanata-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
     <relativePath>../../zanata-parent/pom.xml</relativePath>
   </parent>
   <artifactId>zanata-model</artifactId>

diff --git a/server/zanata-war/pom.xml b/server/zanata-war/pom.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.zanata</groupId>
 		<artifactId>zanata-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.4-SNAPSHOT</version>
 		<relativePath>../../zanata-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>zanata-war</artifactId>
@@ -29,7 +30,7 @@
 		<extra.servlets />
 		<!-- Default MySql login -->
 		<mysql.user>root</mysql.user>
-		<mysql.password />
+		<mysql.password></mysql.password>
 	</properties>
 
 	<build>

diff --git a/...n/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/fuzzy.png b/...n/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/fuzzy.png
diff --git a/zanata-parent/pom.xml b/zanata-parent/pom.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.zanata</groupId>
 	<artifactId>zanata-parent</artifactId>
-	<version>1.5-SNAPSHOT</version>
+	<version>1.4-SNAPSHOT</version>
 	<name>Zanata Parent POM</name>
 	<url>http://zanata.org/</url>
 	<packaging>pom</packaging>
@@ -150,10 +151,10 @@
 		<javadoc.skip>true</javadoc.skip>
 
 		<checkstyle.skip>false</checkstyle.skip>
-		<checkstyle.configLocation />
-		<checkstyle.propertiesLocation />
-		<checkstyle.suppressionsLocation />
-		<checkstyle.suppressionsFileExpression />
+		<checkstyle.configLocation></checkstyle.configLocation>
+		<checkstyle.propertiesLocation></checkstyle.propertiesLocation>
+		<checkstyle.suppressionsLocation></checkstyle.suppressionsLocation>
+		<checkstyle.suppressionsFileExpression></checkstyle.suppressionsFileExpression>
 
 		<reports-plugin.dependencyDetailsEnabled>false</reports-plugin.dependencyDetailsEnabled>
 		<reports-plugin.dependencyLocationsEnabled>false</reports-plugin.dependencyLocationsEnabled>