From 78a1726160ca1ac7a17fea71f8426bc43b47ef52 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Wed, 25 May 2011 09:24:39 +0000 Subject: [PATCH] Use the new CompositeStage to draw up common import actions into a single stage to simplify import flows. Move all validation steps inside the aggregator using XSLValidationStage. Move to lazy initialization of most Spring beans (which really means lazy _instantiation_). Add explicit init-method settings for most beans, as CompositeStage does not guarantee to do this on the fly (SimplePipeline did, but only as a convenience). --- build.xml | 34 +--- mdx/aaf/aaf-import.xml | 6 +- mdx/arnes/arnes-import.xml | 6 +- mdx/caf/caf-import.xml | 6 +- mdx/common-beans.xml | 52 +++++- mdx/edugain/edugain-import.xml | 6 +- mdx/edugate/edugate-import.xml | 6 +- mdx/incommon/incommon-import.xml | 6 +- mdx/swamid/swamid-import.xml | 6 +- mdx/switch/switch-import.xml | 6 +- mdx/uk/uk-beans.xml | 15 +- mdx/uk/uk-collect.xml | 24 ++- mdx/validation-beans.xml | 242 +++++++++++++++++++++++++ tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar | Bin 7913 -> 7914 bytes 14 files changed, 348 insertions(+), 67 deletions(-) create mode 100644 mdx/validation-beans.xml diff --git a/build.xml b/build.xml index 31edf09d..1c8355c7 100644 --- a/build.xml +++ b/build.xml @@ -571,6 +571,12 @@ + + + + + + @@ -1030,16 +1036,6 @@ ********************************************* --> - - - - - - - - - - - - - - Collection completed. diff --git a/mdx/aaf/aaf-import.xml b/mdx/aaf/aaf-import.xml index 04eddfcb..cb3ea051 100644 --- a/mdx/aaf/aaf-import.xml +++ b/mdx/aaf/aaf-import.xml @@ -22,10 +22,10 @@ - - - + + + diff --git a/mdx/arnes/arnes-import.xml b/mdx/arnes/arnes-import.xml index 3141aaed..e2828578 100644 --- a/mdx/arnes/arnes-import.xml +++ b/mdx/arnes/arnes-import.xml @@ -22,10 +22,10 @@ - - - + + + diff --git a/mdx/caf/caf-import.xml b/mdx/caf/caf-import.xml index 78e9ce85..11687e00 100644 --- a/mdx/caf/caf-import.xml +++ b/mdx/caf/caf-import.xml @@ -22,10 +22,10 @@ - - - + + + diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml index e3b99861..3f106229 100644 --- a/mdx/common-beans.xml +++ b/mdx/common-beans.xml @@ -9,12 +9,18 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"> + + + - + @@ -101,7 +107,8 @@ A pipeline stage that checks against all the common schemas, as above. --> - + @@ -112,7 +119,8 @@ A pipeline stage that checks for any errors, and then announces and filters any encountered. --> - + @@ -123,7 +131,8 @@ presented, for example by removing redundant attributes or elements which only have meaning when added by the UK federation registrar. --> - + @@ -135,14 +144,45 @@ - + + + + + + + + + + + + + + + + + + + + - + diff --git a/mdx/edugain/edugain-import.xml b/mdx/edugain/edugain-import.xml index cdcc2fc5..06f41acc 100644 --- a/mdx/edugain/edugain-import.xml +++ b/mdx/edugain/edugain-import.xml @@ -26,10 +26,10 @@ - - - + + + diff --git a/mdx/edugate/edugate-import.xml b/mdx/edugate/edugate-import.xml index a9fe987a..63b1bc5d 100644 --- a/mdx/edugate/edugate-import.xml +++ b/mdx/edugate/edugate-import.xml @@ -22,10 +22,10 @@ - - - + + + diff --git a/mdx/incommon/incommon-import.xml b/mdx/incommon/incommon-import.xml index 903fb3e2..450918dd 100644 --- a/mdx/incommon/incommon-import.xml +++ b/mdx/incommon/incommon-import.xml @@ -22,10 +22,10 @@ - - - + + + diff --git a/mdx/swamid/swamid-import.xml b/mdx/swamid/swamid-import.xml index 83bbf2a6..a6f84091 100644 --- a/mdx/swamid/swamid-import.xml +++ b/mdx/swamid/swamid-import.xml @@ -22,10 +22,10 @@ - - - + + + diff --git a/mdx/switch/switch-import.xml b/mdx/switch/switch-import.xml index 868f54d6..1f2e0bc9 100644 --- a/mdx/switch/switch-import.xml +++ b/mdx/switch/switch-import.xml @@ -22,10 +22,10 @@ - - - + + + diff --git a/mdx/uk/uk-beans.xml b/mdx/uk/uk-beans.xml index 1b0edcfc..369d1edc 100644 --- a/mdx/uk/uk-beans.xml +++ b/mdx/uk/uk-beans.xml @@ -10,13 +10,16 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"> + - - - + + + - - --> + diff --git a/mdx/uk/uk-collect.xml b/mdx/uk/uk-collect.xml index 7c529bd2..8eba035f 100644 --- a/mdx/uk/uk-collect.xml +++ b/mdx/uk/uk-collect.xml @@ -18,14 +18,23 @@ Import UK-specific beans. --> + + + - + @@ -47,8 +56,17 @@ - + + + + + + diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml new file mode 100644 index 00000000..3cd385de --- /dev/null +++ b/mdx/validation-beans.xml @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar b/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar index 8850de41487ce5c7e47b86fa276682819ae0cb60..84721d55806096524c9fba28460cd3ae59c7fe07 100644 GIT binary patch delta 1827 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