[Yanel-commits] [wyona/yanel] b45ff8: Merge branch 'master' into target-environment

[Michael Wechner]

  Branch: refs/heads/master
  Home:   https://github.com/wyona/yanel
  Commit: b45ff8ac34aec0c3b1a33372cd955ae63bed0ceb
      https://github.com/wyona/yanel/commit/b45ff8ac34aec0c3b1a33372cd955ae63bed0ceb
  Author: Michael Wechner <michael.wechner at wyona.com>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M src/contributions/resources/search/htdocs/reindexer.xsl
  M src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/ReindexResource.java

  Log Message:
  -----------
  Merge branch 'master' into target-environment


  Commit: b1c233c05a4a8f11ee3e2c37ab16d68f667dd2d0
      https://github.com/wyona/yanel/commit/b1c233c05a4a8f11ee3e2c37ab16d68f667dd2d0
  Author: Michael Wechner <michael.wechner at wyona.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M src/core/java/org/wyona/yanel/core/ResourceConfiguration.java

  Log Message:
  -----------
  reading properties with target environment implemented


  Commit: 999fd336ecea4e5ed9b37ce204066a569e8965d5
      https://github.com/wyona/yanel/commit/999fd336ecea4e5ed9b37ce204066a569e8965d5
  Author: Michael Wechner <michael.wechner at wyona.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M src/core/java/org/wyona/yanel/core/Resource.java

  Log Message:
  -----------
  if target environment set, then try to read properties accordingly


  Commit: 12d3ad10f5e68a1a3a17267b01b46f6b7e1f9485
      https://github.com/wyona/yanel/commit/12d3ad10f5e68a1a3a17267b01b46f6b7e1f9485
  Author: Michael Wechner <michael.wechner at wyona.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M src/realms/yanel-website/data-repo/data/en/documentation/index.html
  A src/realms/yanel-website/data-repo/data/en/documentation/target-environment.html

  Log Message:
  -----------
  documentation on target environment started


  Commit: d8ab5b5df02852217336ecd5da82d7769fd3f014
      https://github.com/wyona/yanel/commit/d8ab5b5df02852217336ecd5da82d7769fd3f014
  Author: Michael Wechner <michael.wechner at wyona.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java

  Log Message:
  -----------
  yulup link replaced by more toolbar link


  Commit: b314cd1838c3b9ea2f5fee65db8799769338958f
      https://github.com/wyona/yanel/commit/b314cd1838c3b9ea2f5fee65db8799769338958f
  Author: Michael Wechner <michael.wechner at wyona.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    A src/realms/yanel-website/data-repo/yarep-meta/en/documentation/target-environment.html.yarep/meta

  Log Message:
  -----------
  meta information of target env pag added


  Commit: a836934230703cfe10afcb0a335526276de461bf
      https://github.com/wyona/yanel/commit/a836934230703cfe10afcb0a335526276de461bf
  Author: Michael Wechner <michael.wechner at wyona.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M src/realms/yanel-website/data-repo/data/en/documentation/target-environment.html

  Log Message:
  -----------
  documentation finished


Compare: https://github.com/wyona/yanel/compare/6a04a31...a836934