Merge branch 'integration/master' into rhbz903926

zanata · Jan 31, 2013 · f5eae0a · f5eae0a
2 parents e182d96 + d609058
commit f5eae0a
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 41 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
       <seam.version>2.2.2.Final</seam.version>
 
       <zanata.api.version>2.1.1-SNAPSHOT</zanata.api.version>
-      <zanata.client.version>1.6.0</zanata.client.version>
+      <zanata.client.version>2.0.2-SNAPSHOT</zanata.client.version>
       <zanata.common.version>2.1.1</zanata.common.version>
 
 	  <richfaces.version>3.3.3.Final</richfaces.version>

diff --git a/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java b/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
@@ -151,22 +151,18 @@ public Long getTotalWordCountForDocument(HDocument document)
 
    public HTextFlowTarget getLastTranslated(long docId, LocaleId localeId)
    {
-       StringBuilder queryStr = new StringBuilder(
-             "select tft, max(tft.lastChanged)" +
-             "from HTextFlowTarget tft " +
-             "where tft.textFlow.document.id = :docId " +
-             "and tft.locale.localeId = :localeId"
-
-       );
+      String query = "from HTextFlowTarget tft " +
+            "where tft.textFlow.document.id = :docId and tft.locale.localeId = :localeId and " +
+            "tft.lastChanged = (select max(t.lastChanged) from HTextFlowTarget t " +
+            "where t.id = :docId and t.locale.localeId = :localeId )";
 
-      Query q = getSession().createQuery( queryStr.toString() );
+      Query q = getSession().createQuery( query );
       q.setParameter("docId", docId);
       q.setParameter("localeId", localeId);
       q.setCacheable(true);
       q.setComment("DocumentDAO.getLastTranslated");
 
-      Object[] obj = (Object[]) q.uniqueResult();
-      return (HTextFlowTarget) obj[0];
+      return  (HTextFlowTarget) q.uniqueResult();
    }
 
 

diff --git a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
@@ -419,7 +419,7 @@ private HDocumentUpload saveFirstUploadPart(String projectSlug, String iteration
    private void saveUploadPart(DocumentFileUploadForm uploadForm, HDocumentUpload upload) throws IOException
    {
       Blob partContent;
-      partContent = Hibernate.createBlob(uploadForm.getFileStream());
+      partContent = Hibernate.createBlob(uploadForm.getFileStream(), uploadForm.getSize().intValue());
       HDocumentUploadPart newPart = new HDocumentUploadPart();
       newPart.setContent(partContent);
       upload.getParts().add(newPart);

diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
@@ -246,8 +246,16 @@ public static void transfer(Project from, HProject to)
       to.setDefaultProjectType(from.getDefaultType());
       // TODO Currently all Projects are created as Current
       // to.setStatus(from.getStatus());
-      to.setSourceViewURL(from.getSourceViewURL());
-      to.setSourceCheckoutURL(from.getSourceCheckoutURL());
+
+      // keep source URLs unless they are specifically overwritten
+      if (from.getSourceViewURL() != null)
+      {
+         to.setSourceViewURL(from.getSourceViewURL());
+      }
+      if (from.getSourceCheckoutURL() != null)
+      {
+         to.setSourceCheckoutURL(from.getSourceCheckoutURL());
+      }
    }
 
    public static void transfer(HProject from, Project to)

diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties
@@ -561,13 +561,11 @@ jsf.SignUp=Sign Up
 jsf.SiteMap=Site map
 jsf.SizeMembers=#{languageTeamAction.locale.members.size} members
 jsf.Slug=Slug
-jsf.SourceCheckoutUrl=Source Checkout
+jsf.SourceCheckoutUrl=Source Download/Checkout
 jsf.SourceDocuments=Source Documents
 jsf.SourceDocs=Source Docs
-jsf.SourceUrlHumanReadable=Source URL (human-readable)
-jsf.SourceUrlHumanReadableExample=e.g. https://github.com/zanata/zanata
-jsf.SourceUrlMachineReadable=Source URL (machine-readable)
-jsf.SourceUrlMachineReadableExample=e.g. git@github.com:zanata/zanata.git
+jsf.SourceUrlHumanReadableExample=Link to human-readable source, e.g. https://github.com/zanata/zanata
+jsf.SourceUrlMachineReadableExample=URL for checkout of source by version control software, e.g. git@github.com:zanata/zanata.git
 jsf.Start=Start
 jsf.Statistics=Statistics
 jsf.Status=Status

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
@@ -47,7 +47,7 @@
         </s:decorate>
 
         <s:decorate id="humanViewableSourceUrlField" template="edit.xhtml">
-            <ui:define name="label">#{messages['jsf.SourceUrlHumanReadable']}</ui:define>
+            <ui:define name="label">#{messages['jsf.viewSourceFiles']}</ui:define>
             <h:inputText id="humanViewableSourceUrl" required="false"
                          value="#{projectHome.instance.sourceViewURL}" style="width:400px;"/>
             <s:span styleClass="icon-info-circle-2 input_help" id="humanSourceUrlHelp">
@@ -58,7 +58,7 @@
         </s:decorate>
 
         <s:decorate id="machineReadableSourceUrlField" template="edit.xhtml">
-            <ui:define name="label">#{messages['jsf.SourceUrlMachineReadable']}</ui:define>
+            <ui:define name="label">#{messages['jsf.SourceCheckoutUrl']}</ui:define>
             <h:inputText id="machineReadableSourceUrl" required="false"
                          value="#{projectHome.instance.sourceCheckoutURL}" style="width:400px;"/>
             <s:span styleClass="icon-info-circle-2 input_help" id="machineSourceUrlHelp">

diff --git a/zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java b/zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
@@ -96,7 +96,7 @@ public void startCopyTrans()
    {
       CopyTransResource copyTransResource = getClientRequestFactory().createProxy(CopyTransResource.class);
 
-      copyTransResource.startCopyTrans("sample-project", "1.0", "/my/path/document.txt");
+      copyTransResource.startCopyTrans("sample-project", "1.0", "my/path/document.txt");
       verify(mockIdentity).getCredentials();
    }
 
@@ -105,10 +105,10 @@ public void startCopyTransAndCheckStatus()
    {
       CopyTransResource copyTransResource = getClientRequestFactory().createProxy(CopyTransResource.class);
 
-      copyTransResource.startCopyTrans("sample-project", "1.0", "/my/path/document.txt");
+      copyTransResource.startCopyTrans("sample-project", "1.0", "my/path/document.txt");
       verify(mockIdentity).getCredentials();
 
-      CopyTransStatus status = copyTransResource.getCopyTransStatus("sample-project", "1.0", "/my/path/document.txt");
+      CopyTransStatus status = copyTransResource.getCopyTransStatus("sample-project", "1.0", "my/path/document.txt");
       assertThat(status, notNullValue());
       verify(mockIdentity, atLeast(1)).checkPermission(eq("copy-trans"), anyVararg());
    }
@@ -137,7 +137,7 @@ public void unauthorizedStartCopyTrans()
 
       try
       {
-         copyTransResource.startCopyTrans("sample-project", "1.0", "/my/path/document.txt");
+         copyTransResource.startCopyTrans("sample-project", "1.0", "my/path/document.txt");
          assertThat("startCopyTrans should have returned 401 in the form of an exception.", false);
       }
       catch (ClientResponseFailure failure)

diff --git a/zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java b/zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java
@@ -11,6 +11,7 @@
 
 import javax.ws.rs.core.MediaType;
 
+import org.jboss.resteasy.core.Headers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.DataProvider;
@@ -69,7 +70,7 @@ private <T extends Serializable> void testRestUtilUnmarshall(T entity, Class<T>
          log.info("expect:" + testStr);
 
          messageBody = new ByteArrayInputStream(testStr.getBytes("UTF-8"));
-         T unmarshall = (T) RestUtils.unmarshall(type, messageBody, MediaType.APPLICATION_XML_TYPE, null);
+         T unmarshall = (T) RestUtils.unmarshall(type, messageBody, MediaType.APPLICATION_XML_TYPE, new Headers<String>());
          Log.info("got:" + unmarshall.toString());
          assertThat(entity.toString(), is(testStr));
       }

diff --git a/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java b/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
@@ -62,7 +62,7 @@ public void getPo() throws Exception
          protected void prepareRequest(EnhancedMockHttpServletRequest request)
          {
             request.setQueryString(""); // Need to add this when using query params or else the test fails
-            request.addQueryParameter("docId", "/my/path/document.txt");
+            request.addQueryParameter("docId", "my/path/document.txt");
          }
 
          @Override

diff --git a/zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java b/zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java
@@ -141,7 +141,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response)
    public void getDocumentStatisticsXml() throws Exception
    {
       new ResourceRequestEnvironment.ResourceRequest(unauthorizedEnvironment, ResourceRequestEnvironment.Method.GET,
-            "/restv1/stats/proj/sample-project/iter/1.0/doc//my/path/document.txt")
+            "/restv1/stats/proj/sample-project/iter/1.0/doc/my/path/document.txt")
       {
          @Override
          protected void prepareRequest(EnhancedMockHttpServletRequest request)
@@ -156,7 +156,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response)
             assertJaxbUnmarshal(response, ContainerTranslationStatistics.class);
 
             ContainerTranslationStatistics stats = jaxbUnmarshal(response, ContainerTranslationStatistics.class);
-            assertThat(stats.getId(), is("/my/path/document.txt"));
+            assertThat(stats.getId(), is("my/path/document.txt"));
             assertThat(stats.getRefs().size(), greaterThan(0));
             assertThat(stats.getDetailedStats(), nullValue()); // No detailed stats
             assertThat(stats.getStats().size(), greaterThan(0));
@@ -178,7 +178,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response)
    public void getDocumentStatisticsXmlWithDetails() throws Exception
    {
       new ResourceRequestEnvironment.ResourceRequest(unauthorizedEnvironment, ResourceRequestEnvironment.Method.GET,
-            "/restv1/stats/proj/sample-project/iter/1.0/doc//my/path/document.txt")
+            "/restv1/stats/proj/sample-project/iter/1.0/doc/my/path/document.txt")
       {
          @Override
          protected void prepareRequest(EnhancedMockHttpServletRequest request)
@@ -194,7 +194,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response)
             assertJaxbUnmarshal(response, ContainerTranslationStatistics.class);
 
             ContainerTranslationStatistics stats = jaxbUnmarshal(response, ContainerTranslationStatistics.class);
-            assertThat(stats.getId(), is("/my/path/document.txt"));
+            assertThat(stats.getId(), is("my/path/document.txt"));
             assertThat(stats.getRefs().size(), greaterThan(0));
             //assertThat(stats.getDetailedStats().size(), greaterThan(0)); // No detailed stats (maybe later)
             assertThat(stats.getStats().size(), greaterThan(0));
@@ -303,7 +303,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response)
    public void getDocumentStatisticsJson() throws Exception
    {
       new ResourceRequestEnvironment.ResourceRequest(unauthorizedEnvironment, ResourceRequestEnvironment.Method.GET,
-            "/restv1/stats/proj/sample-project/iter/1.0/doc//my/path/document.txt")
+            "/restv1/stats/proj/sample-project/iter/1.0/doc/my/path/document.txt")
       {
          @Override
          protected void prepareRequest(EnhancedMockHttpServletRequest request)
@@ -318,7 +318,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response)
             assertJsonUnmarshal(response, ContainerTranslationStatistics.class);
 
             ContainerTranslationStatistics stats = jsonUnmarshal(response, ContainerTranslationStatistics.class);
-            assertThat(stats.getId(), is("/my/path/document.txt"));
+            assertThat(stats.getId(), is("my/path/document.txt"));
             assertThat(stats.getRefs().size(), greaterThan(0));
             assertThat(stats.getDetailedStats(), nullValue()); // No detailed stats
             assertThat(stats.getStats().size(), greaterThan(0));
@@ -340,7 +340,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response)
    public void getDocumentStatisticsJsonWithDetails() throws Exception
    {
       new ResourceRequestEnvironment.ResourceRequest(unauthorizedEnvironment, ResourceRequestEnvironment.Method.GET,
-            "/restv1/stats/proj/sample-project/iter/1.0/doc//my/path/document.txt")
+            "/restv1/stats/proj/sample-project/iter/1.0/doc/my/path/document.txt")
       {
          @Override
          protected void prepareRequest(EnhancedMockHttpServletRequest request)
@@ -356,7 +356,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response)
             assertJsonUnmarshal(response, ContainerTranslationStatistics.class);
 
             ContainerTranslationStatistics stats = jsonUnmarshal(response, ContainerTranslationStatistics.class);
-            assertThat(stats.getId(), is("/my/path/document.txt"));
+            assertThat(stats.getId(), is("my/path/document.txt"));
             assertThat(stats.getRefs().size(), greaterThan(0));
             //assertThat(stats.getDetailedStats().size(), greaterThan(0)); // No detailed stats (maybe later)
             assertThat(stats.getStats().size(), greaterThan(0));

diff --git a/zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
@@ -159,10 +159,10 @@ public void getSimpleDocumentStatisticsForAllLocales()
    {
       StatisticsServiceImpl statisticsService = seam.autowire(StatisticsServiceImpl.class);
       ContainerTranslationStatistics stats =
-            statisticsService.getStatistics("sample-project", "1.0", "/my/path/document.txt", false, new String[]{});
+            statisticsService.getStatistics("sample-project", "1.0", "my/path/document.txt", false, new String[]{});
 
       // Make sure the id matches
-      assertThat(stats.getId(), is("/my/path/document.txt"));
+      assertThat(stats.getId(), is("my/path/document.txt"));
       // Make sure there are links
       assertThat(stats.getRefs().size(), greaterThan(0));
 
@@ -187,10 +187,10 @@ public void getDetailedDocumentStatisticsForSpecificLocales()
 
       StatisticsServiceImpl statisticsService = seam.autowire(StatisticsServiceImpl.class);
       ContainerTranslationStatistics stats =
-            statisticsService.getStatistics("sample-project", "1.0", "/my/path/document.txt", true, locales);
+            statisticsService.getStatistics("sample-project", "1.0", "my/path/document.txt", true, locales);
 
       // Make sure the id matches
-      assertThat(stats.getId(), is("/my/path/document.txt"));
+      assertThat(stats.getId(), is("my/path/document.txt"));
       // Make sure there are links
       assertThat(stats.getRefs().size(), greaterThan(0));
 

diff --git a/zanata-war/src/test/resources/log4j.xml b/zanata-war/src/test/resources/log4j.xml
@@ -21,6 +21,12 @@
         <level value="info" />
     </logger>
 -->
+    <!-- below will log hibernate generated SQL-->
+    <!--
+    <logger name="org.hibernate.SQL">
+        <level value="TRACE" />
+    </logger>
+    -->
     <logger name="gwt-log">
         <level value="OFF" />
     </logger>

diff --git a/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml b/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
@@ -6,10 +6,10 @@
     creationDate="2009-09-01 20:30:16"
     lastChanged="2009-09-01 20:30:16" 
     contentType="text/plain"
-    docId="/my/path/document.txt"
+    docId="my/path/document.txt"
     locale="4"
     name="document.txt"
-    path="/my/path"
+    path="my/path"
     project_iteration_id="1"
     revision="1"
     obsolete="0"