[zanata/zanata] 588b74: add properties-service.xml sample file

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 588b747645d7a8323787fe5cfe93de1e9e7733fe
      https://github.com/zanata/zanata/commit/588b747645d7a8323787fe5cfe93de1e9e7733fe
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/etc/properties-service-sample.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml

  Log Message:
  -----------
  add properties-service.xml sample file


  Commit: db612503aedb710f87cf2dc104e4e686797bd48c
      https://github.com/zanata/zanata/commit/db612503aedb710f87cf2dc104e4e686797bd48c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PreviewState.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReplacementState.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitReplaceInfo.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java

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


Compare: https://github.com/zanata/zanata/compare/a17b393...db61250