[midPoint-svn] midPoint branch master updated. v2.2-26-ge68f023

[Radovan Semancik]

Project "midPoint" branch master has been updated
       via  e68f023380ebe786fbd352737061c1f882efd996 (commit) v2.2-26-ge68f023
      from  efe50d17ba7fb49245c9c6f1320bc4923b8b7812 (commit) v2.2-25-gefe50d1

- Log -----------------------------------------------------------------
commit e68f023380ebe786fbd352737061c1f882efd996
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Sep 18 16:50:05 2013 +0200

    Merging schema extensions (MID-1600)

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../midpoint/prism/ComplexTypeDefinition.java      |   10 ++++
 .../midpoint/prism/PrismPropertyDefinition.java    |    2 +-
 .../midpoint/prism/schema/SchemaRegistry.java      |   49 +++++++++++---------
 .../evolveum/midpoint/prism/TestExtraSchema.java   |   16 ++++++-
 .../resources/schema-extra/extension/user2.xsd     |   16 ++++---
 5 files changed, 61 insertions(+), 32 deletions(-)
 copy samples/samples-test/src/test/resources/schema/extension-piracy.xsd => infra/prism/src/test/resources/schema-extra/extension/user2.xsd (73%)


hooks/post-receive
-- 
midPoint