[zanata/zanata] 84dbb5: Correct issue with History objects.

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: 84dbb52cc921ace9c0e9ff8ab368e19fcd5bff49
      https://github.com/zanata/zanata/commit/84dbb52cc921ace9c0e9ff8ab368e19fcd5bff49
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 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

  Log Message:
  -----------
  Correct issue with History objects.

Correct an issue that was causing a LazyLoadException in certain cases when trying to generate history objects.


  Commit: f708732fff2709f064ae3d39df08caa62b4f924f
      https://github.com/zanata/zanata/commit/f708732fff2709f064ae3d39df08caa62b4f924f
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/pom.xml
  A server/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopyDataToEditorEvent.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUpdateValidationWarning.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelDisplay.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StaticWidgetColumn.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/move_task_down.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  M server/zanata-war/src/main/webapp/iteration/view.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/webtrans/client/editor/table/TargetContentsPresenterTest.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java


Compare: https://github.com/zanata/zanata/compare/8904f5a...f708732