Message info
 
To:zanata-commits@redhat.com From:GitHub Subject:[zanata/zanata] 52b726: Update .gitignore Date:Wed, 28 Mar 2012 23:17:15 -0700
 

Branch: refs/heads/search-replace
Home: https://github.com/zanata/zanata
Commit: 52b726d4e9fc282880292d89588ca2652d512d7d
https://github.com/zanata/zanata/commit/52b726d4e9fc282880292d89588ca2652d512d7d
Author: Sean Flanigan <sflaniga@redhat.com>
Date: 2012-03-26 (Mon, 26 Mar 2012)

Changed paths:
A server/zanata-war/src/test/jboss-embedded-bootstrap/.gitignore

Log Message:
-----------
Update .gitignore


Commit: 166a871427f06d9075c08af7d65a04a454683c8c
https://github.com/zanata/zanata/commit/166a871427f06d9075c08af7d65a04a454683c8c
Author: Sean Flanigan <sflaniga@redhat.com>
Date: 2012-03-26 (Mon, 26 Mar 2012)

Changed paths:
M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
M common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTest.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

Log Message:
-----------
Add plural boolean to TextFlow/HTextFlow


Commit: 44928ab6024737777f6db4fa901252165be1fb24
https://github.com/zanata/zanata/commit/44928ab6024737777f6db4fa901252165be1fb24
Author: Carlos Munoz <camunoz@redhat.com>
Date: 2012-03-26 (Mon, 26 Mar 2012)

Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
M server/zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java

Log Message:
-----------
Add list-based plural support for Text Flow targets.


Commit: cd2b7039462e69d3a67bf3255a54a363ccf0089a
https://github.com/zanata/zanata/commit/cd2b7039462e69d3a67bf3255a54a363ccf0089a
Author: Carlos Munoz <camunoz@redhat.com>
Date: 2012-03-27 (Tue, 27 Mar 2012)

Changed paths:
M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropReader.java
M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffReader.java
M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffReaderTest.java
M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullPropertiesStrategyTest.java
M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushPropertiesStrategyTest.java
M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
A common/zanata-common-api/src/main/java/org/zanata/common/HasContents.java
M common/zanata-common-api/src/main/java/org/zanata/rest/dto/DTOUtil.java
A common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
A common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTargetTest.java
A common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTest.java
M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
A common/zanata-common-util/src/main/java/org/zanata/util/StringUtil.java
A server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
A server/zanata-model/src/main/java/org/zanata/util/ListUtil.java
M server/zanata-war/eclipse/launch/Liquibase updateSQL.launch
M server/zanata-war/pom.xml
M server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
M server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M server/zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
M server/zanata-war/src/main/java/org/zanata/rest/service/MergeType.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
R server/zanata-war/src/main/java/org/zanata/util/StringUtil.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
A server/zanata-war/src/main/resources/db/changelogs/db.changelog-triggers.xml
M server/zanata-war/src/main/resources/db/db.changelog.xml
M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/resources/security.drl
M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
R server/zanata-war/src/main/webapp/iteration/iteration.xhtml
A server/zanata-war/src/main/webapp/iteration/view.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
M server/zanata-war/src/main/webapp/stylesheet/zanata.css
M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
A server/zanata-war/src/test/jboss-embedded-bootstrap/.gitignore
M server/zanata-war/src/test/resources/META-INF/persistence.xml
M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
M zanata-parent/pom.xml

Log Message:
-----------
Merge branch 'plurals' into plural-lists

Also made some non-conflict resolution changes to get plural lists working.

Conflicts:
server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
server/zanata-war/src/main/resources/db/db.changelog.xml
server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml


Commit: 0f60796c9e2c36b435682d413ed1b171d75ddbc7
https://github.com/zanata/zanata/commit/0f60796c9e2c36b435682d413ed1b171d75ddbc7
Author: Carlos Munoz <camunoz@redhat.com>
Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths:
M server/zanata-war/src/main/webapp/project/project.xhtml
M server/zanata-war/src/main/webapp/stylesheet/zanata.css

Log Message:
-----------
Add tiled interface for Project page.

Iterations will now be seen in a "tiled" horizontal view.


Commit: fe0bf7627ef477cdd21bc107abfecd4406df349c
https://github.com/zanata/zanata/commit/fe0bf7627ef477cdd21bc107abfecd4406df349c
Author: Carlos Munoz <camunoz@redhat.com>
Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
R server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
R server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
M server/zanata-war/src/main/resources/db/h2/create_trigger.sql
M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
M server/zanata-war/src/test/resources/import.sql

Log Message:
-----------
Code review Changes.

Completely removed old HTextFlow and HTextFlowTarget database triggers (mysql and h2).
Reenabled history tests.
Changed implementation of contentHash to include all content strings for HTextFlow.


Commit: ed67e6a03db1bdd1f208827748c19c0408bd3cd3
https://github.com/zanata/zanata/commit/ed67e6a03db1bdd1f208827748c19c0408bd3cd3
Author: Sean Flanigan <sflaniga@redhat.com>
Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths:
M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java

Log Message:
-----------
Execute TM searches against content0 for now


Commit: cfec75007e47a216478f470c889478c9dbcb9f9a
https://github.com/zanata/zanata/commit/cfec75007e47a216478f470c889478c9dbcb9f9a
Author: Carlos Munoz <camunoz@redhat.com>
Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths:
A server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
M server/zanata-war/src/test/resources/import.sql
M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

Log Message:
-----------
Add test for TextFlowTargetDAO.

In this revision this test only covers the query that is the base for copy trans.


Commit: ef7fcb4f6e3ef0fb79cc9f97cd999f53d1012489
https://github.com/zanata/zanata/commit/ef7fcb4f6e3ef0fb79cc9f97cd999f53d1012489
Author: Carlos Munoz <camunoz@redhat.com>
Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M server/zanata-war/src/test/resources/META-INF/persistence.xml

Log Message:
-----------
Refactor tests to new plurals model.


Commit: e870eea2b3d5f621f1c8e5f8c1af436dead8c087
https://github.com/zanata/zanata/commit/e870eea2b3d5f621f1c8e5f8c1af436dead8c087
Author: Carlos Munoz <camunoz@redhat.com>
Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths:
M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java

Log Message:
-----------
Merge branch 'plurals' of github.com:zanata/zanata into plural-lists


Commit: 7b830f257902e4bf53040328a0cea33020532ad1
https://github.com/zanata/zanata/commit/7b830f257902e4bf53040328a0cea33020532ad1
Author: David Mason <dr.d.mason@gmail.com>
Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths:
M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

Log Message:
-----------
fix text styling on project-wide search results


Commit: 61779e186793fee3d5d8ea14c6c61381ceb42fbc
https://github.com/zanata/zanata/commit/61779e186793fee3d5d8ea14c6c61381ceb42fbc
Author: David Mason <dr.d.mason@gmail.com>
Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths:
M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
M common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTest.java
M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
M server/zanata-model/src/main/java/org/zanata/model/ITextFlowHistory.java
M server/zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
R server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
R server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
R server/zanata-war/src/main/java/org/zanata/dao/ContentPropertySelector.java
M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
A server/zanata-war/src/main/resources/db/changelogs/db.changelog-triggers.xml
M server/zanata-war/src/main/resources/db/db.changelog.xml
M server/zanata-war/src/main/resources/db/h2/create_trigger.sql
M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
M server/zanata-war/src/main/webapp/WEB-INF/liquibase
M server/zanata-war/src/main/webapp/project/project.xhtml
M server/zanata-war/src/main/webapp/stylesheet/zanata.css
M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
A server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
A server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
A server/zanata-war/src/test/java/org/zanata/testng/TestMethodListener.java
A server/zanata-war/src/test/java/org/zanata/testng/annotations/Disabled.java
A server/zanata-war/src/test/jboss-embedded-bootstrap/.gitignore
M server/zanata-war/src/test/resources/import.sql
M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

Log Message:
-----------
Merge branch 'plurals' into search-replace


Compare: https://github.com/zanata/zanata/compare/fc9df3a...61779e1