[midPoint-git] [Evolveum/midpoint] 574d64: small fix for serialization..and fixing starting i...

[katkav]

  Branch: refs/heads/parser
  Home:   https://github.com/Evolveum/midpoint
  Commit: 574d6475e052ba9dc272ab53f53474dbe020da17
      https://github.com/Evolveum/midpoint/commit/574d6475e052ba9dc272ab53f53474dbe020da17
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/050-user-administrator.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/crypto/TestProtector.java
    R model/model-impl/src/main/resources/ctx-camel-imports.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java
    M repo/system-init/src/main/resources/ctx-configuration.xml

  Log Message:
  -----------
  small fix for serialization..and fixing starting in tomcat..