diff --git a/cnf/releaserepo/index.xml b/cnf/releaserepo/index.xml index ac26e047..8fad8f93 100644 --- a/cnf/releaserepo/index.xml +++ b/cnf/releaserepo/index.xml @@ -1,5 +1,5 @@ - + @@ -583,33 +583,180 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1145,21 +1292,21 @@ - + - + - + - + - + @@ -1200,29 +1347,56 @@ - + - + - - - + + + - - + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1230,29 +1404,56 @@ - + - + - - - + + + - - + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1260,29 +1461,56 @@ - + - + - - - + + + - - + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1290,29 +1518,56 @@ - + - + - - - + + + - - + + - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -1320,29 +1575,56 @@ - + - + - - - + + + - - + + - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -1350,29 +1632,56 @@ - + - + - - - + + + - - + + - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -1380,29 +1689,56 @@ - + - + - - - + + + - - + + - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -1410,29 +1746,56 @@ - + - + - - - + + + - - + + - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -1440,29 +1803,56 @@ - + - + - - - + + + - - + + - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -1470,105 +1860,56 @@ - + - + - - - + + + - - + + - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - + - + - + - + - + - + @@ -1576,72 +1917,56 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + @@ -1649,72 +1974,56 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + @@ -1722,72 +2031,56 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + @@ -1795,72 +2088,56 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + @@ -1868,72 +2145,2950 @@ - + - + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + + + @@ -1941,69 +5096,47 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - - - - - - - - - - - - - + - + - + - - - - + - + - + - + @@ -2014,66 +5147,44 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - - - - - - - - - - - - - + - + - + - - - - + - + - + @@ -2087,69 +5198,56 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - - - - + - + - + - + - + - + - + - + - + - - - - + @@ -2160,119 +5258,59 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - + - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + @@ -2280,79 +5318,59 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + @@ -2360,39 +5378,59 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2400,39 +5438,59 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2440,39 +5498,59 @@ - + - + - - - + + + - - + + - - - - - - - - - + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2480,47 +5558,56 @@ - + - + - - - + + + - - + + - - + + - + + + + + + + + + + - + - + - + - + - + - + - + @@ -2531,50 +5618,59 @@ - + - + - - - + + + - - + + - - + + - + - + - + - + - + - + - + - + - + + + + + + + + + + @@ -2582,47 +5678,56 @@ - + - + - - - + + + - - + + - - + + - + - + - + - + - + - + - + - + + + + + + + + + + @@ -2633,44 +5738,77 @@ - + - + - - - + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -2684,44 +5822,77 @@ - + - + - - - + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -2735,44 +5906,77 @@ - + - + - - - + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -2786,95 +5990,77 @@ - + - + - - - + + + - - + + - - + + + + + - + - + - + - + - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + @@ -2888,38 +6074,56 @@ - + - + - - - + + + - - + + - - + + - + - + - + - + + + + + + + + + + + + + + + + + + + @@ -2928,16 +6132,22 @@ - + - + - + + + + + + + @@ -2948,38 +6158,56 @@ - + - + - - - + + + - - + + - - + + - + - + - + - + + + + + + + + + + + + + + + + + + + @@ -2988,16 +6216,22 @@ - + - + - + + + + + + + @@ -3008,38 +6242,56 @@ - + - + - - - + + + - - + + - - + + - + - + - + - + + + + + + + + + + + + + + + + + + + @@ -3048,16 +6300,22 @@ - + - + - + + + + + + + @@ -3070,21 +6328,21 @@ - + - - - + + + - + - + @@ -3126,7 +6384,7 @@ - + @@ -3138,7 +6396,7 @@ - + @@ -3154,21 +6412,21 @@ - + - - - + + + - + - + @@ -3210,7 +6468,7 @@ - + @@ -3222,7 +6480,7 @@ - + @@ -3238,21 +6496,21 @@ - + - - - + + + - + - + @@ -3294,7 +6552,7 @@ - + @@ -3322,21 +6580,21 @@ - + - - - + + + - + - + @@ -3378,7 +6636,7 @@ - + @@ -3390,7 +6648,7 @@ - + @@ -3406,21 +6664,21 @@ - + - - - + + + - + - + @@ -3462,7 +6720,7 @@ - + @@ -3474,7 +6732,7 @@ - + @@ -3490,21 +6748,21 @@ - + - - - + + + - + - + @@ -3546,7 +6804,7 @@ - + @@ -3558,7 +6816,7 @@ - + @@ -3574,21 +6832,21 @@ - + - - - + + + - + - + @@ -3630,7 +6888,7 @@ - + @@ -3642,7 +6900,7 @@ - + @@ -3658,21 +6916,21 @@ - + - - - + + + - + - + @@ -3726,10 +6984,10 @@ - + - + @@ -3742,21 +7000,21 @@ - + - - - + + + - + - + @@ -3810,13 +7068,13 @@ - + - + - + @@ -3826,21 +7084,21 @@ - + - - - + + + - + - + @@ -3894,13 +7152,13 @@ - + - + - + @@ -3910,21 +7168,21 @@ - + - - - + + + - + - + @@ -3978,10 +7236,10 @@ - + - + @@ -3994,21 +7252,21 @@ - + - - - + + + - + - + @@ -4062,13 +7320,13 @@ - + - + - + @@ -4078,21 +7336,21 @@ - + - - - + + + - + - + @@ -4146,10 +7404,10 @@ - + - + @@ -4162,21 +7420,21 @@ - + - - - + + + - + - + @@ -4230,10 +7488,10 @@ - + - + @@ -4458,21 +7716,66 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -4503,21 +7806,117 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + diff --git a/cnf/releaserepo/index.xml.sha b/cnf/releaserepo/index.xml.sha index 99cfcd60..3b1af74b 100644 --- a/cnf/releaserepo/index.xml.sha +++ b/cnf/releaserepo/index.xml.sha @@ -1 +1 @@ -11b48e5330364fac1fb35f837d3672857c541979eb579d74a764fb94891d5c7b \ No newline at end of file +1e6a93c9b5e2007c5dd50eedb51243aec8257e7a57c021c66e0ee3b7382fb989 \ No newline at end of file diff --git a/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-7.1.1.jar b/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-7.1.1.jar index a1431a76..279b2bb5 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-7.1.1.jar and b/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-7.1.1.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-8.0.0.jar b/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-8.0.0.jar new file mode 100644 index 00000000..afd6f015 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-8.0.0.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-8.0.1.jar b/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-8.0.1.jar new file mode 100644 index 00000000..97f8d8f7 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-8.0.1.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-8.0.2.jar b/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-8.0.2.jar new file mode 100644 index 00000000..66ec3b65 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-8.0.2.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.29.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.29.jar index 2d51c955..ffafbdbe 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.29.jar and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.29.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.42.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.42.jar new file mode 100644 index 00000000..54246e9b Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.42.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.43.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.43.jar new file mode 100644 index 00000000..66ab994c Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.43.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.44.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.44.jar new file mode 100644 index 00000000..4d5667d6 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.44.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.45.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.45.jar new file mode 100644 index 00000000..f50a1b25 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.45.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.46.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.46.jar new file mode 100644 index 00000000..13190508 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.46.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.47.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.47.jar new file mode 100644 index 00000000..f2d79e15 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.47.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.48.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.48.jar new file mode 100644 index 00000000..7bdf2b13 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.48.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.49.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.49.jar new file mode 100644 index 00000000..5efec38c Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.49.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.50.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.50.jar new file mode 100644 index 00000000..c9626135 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.50.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.51.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.51.jar new file mode 100644 index 00000000..36cf3519 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.51.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.52.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.52.jar new file mode 100644 index 00000000..f11046ac Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.52.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.53.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.53.jar new file mode 100644 index 00000000..45248805 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.53.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.54.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.54.jar new file mode 100644 index 00000000..03f6fa11 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.54.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.55.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.55.jar new file mode 100644 index 00000000..bb389c5b Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.55.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.56.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.56.jar new file mode 100644 index 00000000..e53bb7ba Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.56.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.18.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.18.jar index 7f129902..28b8c414 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.18.jar and b/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.18.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.31.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.31.jar new file mode 100644 index 00000000..c3813f7b Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.31.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.32.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.32.jar new file mode 100644 index 00000000..8c137844 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.32.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.33.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.33.jar new file mode 100644 index 00000000..fc1317d2 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.33.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-exceptions/pnnl.goss.core.goss-core-exceptions-2.1.0.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-exceptions/pnnl.goss.core.goss-core-exceptions-2.1.0.jar index 5ebfa747..d5c89feb 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.goss-core-exceptions/pnnl.goss.core.goss-core-exceptions-2.1.0.jar and b/cnf/releaserepo/pnnl.goss.core.goss-core-exceptions/pnnl.goss.core.goss-core-exceptions-2.1.0.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.1.17.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.1.17.jar index 8fb04ed1..a67d6912 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.1.17.jar and b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.1.17.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.2.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.2.jar new file mode 100644 index 00000000..3c4cb473 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.2.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.3.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.3.jar new file mode 100644 index 00000000..19ab6e57 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.3.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.4.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.4.jar new file mode 100644 index 00000000..cf5adb71 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.4.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.5.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.5.jar new file mode 100644 index 00000000..af0ca192 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.5.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.6.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.6.jar new file mode 100644 index 00000000..65bf1a12 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.6.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.7.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.7.jar new file mode 100644 index 00000000..1ad6ce9b Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.7.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.8.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.8.jar new file mode 100644 index 00000000..111c94e9 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.8.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.9.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.9.jar new file mode 100644 index 00000000..dfc0a9b1 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-2.4.9.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-2.0.18.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-2.0.18.jar index 68085c34..f9254651 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-2.0.18.jar and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-2.0.18.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.0.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.0.jar new file mode 100644 index 00000000..08861792 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.0.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.1.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.1.jar new file mode 100644 index 00000000..cdce4bc4 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.1.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.2.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.2.jar new file mode 100644 index 00000000..c8556be3 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.2.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.3.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.3.jar new file mode 100644 index 00000000..3aaddd7a Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.3.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.4.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.4.jar new file mode 100644 index 00000000..4487d077 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.4.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.5.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.5.jar new file mode 100644 index 00000000..d47b29e2 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.5.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.6.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.6.jar new file mode 100644 index 00000000..10664a1a Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.6.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.18.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.18.jar index b309f303..e61e61d7 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.18.jar and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.18.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.50.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.50.jar new file mode 100644 index 00000000..374ccb99 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.50.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.51.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.51.jar new file mode 100644 index 00000000..13e2e4e9 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.51.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.52.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.52.jar new file mode 100644 index 00000000..de323ae2 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.52.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.53.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.53.jar new file mode 100644 index 00000000..b99dc524 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.53.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.54.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.54.jar new file mode 100644 index 00000000..5e334bff Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.54.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.55.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.55.jar new file mode 100644 index 00000000..a7ff2337 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.55.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.1.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.1.jar index 805226a9..03f258a2 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.1.jar and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.1.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.28.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.28.jar new file mode 100644 index 00000000..693d31ff Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.28.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.29.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.29.jar new file mode 100644 index 00000000..6ddfeca6 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.29.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.30.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.30.jar new file mode 100644 index 00000000..ba0d051c Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.30.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.31.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.31.jar new file mode 100644 index 00000000..f365e161 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.31.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.32.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.32.jar new file mode 100644 index 00000000..b3b13e99 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.32.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.33.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.33.jar new file mode 100644 index 00000000..1405f485 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.33.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.27.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.27.jar index 019e9ff4..4443beeb 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.27.jar and b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.27.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.66.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.66.jar new file mode 100644 index 00000000..d28f2f30 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.66.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.67.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.67.jar new file mode 100644 index 00000000..929877f3 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.67.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.68.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.68.jar new file mode 100644 index 00000000..7a27619d Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.68.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.69.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.69.jar new file mode 100644 index 00000000..13135d17 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.69.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.70.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.70.jar new file mode 100644 index 00000000..ca9e0c3f Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.70.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.71.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.71.jar new file mode 100644 index 00000000..f64145fa Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.71.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.72.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.72.jar new file mode 100644 index 00000000..b3de5799 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.72.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.security-ldap/pnnl.goss.core.security-ldap-1.0.11.jar b/cnf/releaserepo/pnnl.goss.core.security-ldap/pnnl.goss.core.security-ldap-1.0.11.jar new file mode 100644 index 00000000..93f9c79f Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.security-ldap/pnnl.goss.core.security-ldap-1.0.11.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.security-ldap/pnnl.goss.core.security-ldap-1.0.5.jar b/cnf/releaserepo/pnnl.goss.core.security-ldap/pnnl.goss.core.security-ldap-1.0.5.jar index 4e71fa24..917e3d08 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.security-ldap/pnnl.goss.core.security-ldap-1.0.5.jar and b/cnf/releaserepo/pnnl.goss.core.security-ldap/pnnl.goss.core.security-ldap-1.0.5.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.18.jar b/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.18.jar new file mode 100644 index 00000000..f400f48b Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.18.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.19.jar b/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.19.jar new file mode 100644 index 00000000..89842507 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.19.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.8.jar b/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.8.jar index 34f51fe2..98cee82e 100644 Binary files a/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.8.jar and b/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.8.jar differ diff --git a/pnnl.goss.core.runner/conf/pnnl.goss.core.server.cfg b/pnnl.goss.core.runner/conf/pnnl.goss.core.server.cfg index a30d96b4..ae9b0ee9 100644 --- a/pnnl.goss.core.runner/conf/pnnl.goss.core.server.cfg +++ b/pnnl.goss.core.runner/conf/pnnl.goss.core.server.cfg @@ -5,8 +5,8 @@ # This user is equivelant to root. Must have '*' # permissions on the message bus. -goss.system.manager = ${goss.system.manager} -goss.system.manager.password = ${goss.system.manager.password} +goss.system.manager = system +goss.system.manager.password = managera # The following are used for the core-client connection. goss.openwire.uri = tcp://${activemq.host}:${openwire.port} diff --git a/pnnl.goss.core/core-api.bnd b/pnnl.goss.core/core-api.bnd index ee7ee9cb..b7098994 100644 --- a/pnnl.goss.core/core-api.bnd +++ b/pnnl.goss.core/core-api.bnd @@ -1,4 +1,4 @@ Export-Package: \ com.northconcepts.exception,\ pnnl.goss.core -Bundle-Version: 7.1.1.${tstamp} \ No newline at end of file +Bundle-Version: 8.0.3.${tstamp} diff --git a/pnnl.goss.core/goss-client.bnd b/pnnl.goss.core/goss-client.bnd index dd9c9e4b..547b1f1e 100644 --- a/pnnl.goss.core/goss-client.bnd +++ b/pnnl.goss.core/goss-client.bnd @@ -1,3 +1,3 @@ Private-Package: \ pnnl.goss.core.client -Bundle-Version: 2.0.29.${tstamp} \ No newline at end of file +Bundle-Version: 2.0.56.${tstamp} \ No newline at end of file diff --git a/pnnl.goss.core/goss-core-commands.bnd b/pnnl.goss.core/goss-core-commands.bnd index a3e861ec..36722c28 100644 --- a/pnnl.goss.core/goss-core-commands.bnd +++ b/pnnl.goss.core/goss-core-commands.bnd @@ -1,3 +1,3 @@ Private-Package: \ pnnl.goss.core.commands -Bundle-Version: 2.0.18.${tstamp} \ No newline at end of file +Bundle-Version: 2.0.33.${tstamp} \ No newline at end of file diff --git a/pnnl.goss.core/goss-core-security.bnd b/pnnl.goss.core/goss-core-security.bnd index e7095f69..aa3ed764 100644 --- a/pnnl.goss.core/goss-core-security.bnd +++ b/pnnl.goss.core/goss-core-security.bnd @@ -4,4 +4,4 @@ Private-Package: \ Bundle-Activator: pnnl.goss.core.security.impl.Activator Export-Package: \ pnnl.goss.core.security -Bundle-Version: 2.1.17.${tstamp} \ No newline at end of file +Bundle-Version: 2.4.10.${tstamp} \ No newline at end of file diff --git a/pnnl.goss.core/goss-core-server-api.bnd b/pnnl.goss.core/goss-core-server-api.bnd index 427a6550..fdba8808 100644 --- a/pnnl.goss.core/goss-core-server-api.bnd +++ b/pnnl.goss.core/goss-core-server-api.bnd @@ -1,3 +1,3 @@ Export-Package: \ pnnl.goss.core.server -Bundle-Version: 2.0.18.${tstamp} \ No newline at end of file +Bundle-Version: 3.0.6.${tstamp} \ No newline at end of file diff --git a/pnnl.goss.core/goss-core-server-registry.bnd b/pnnl.goss.core/goss-core-server-registry.bnd index 077ef702..72b89147 100644 --- a/pnnl.goss.core/goss-core-server-registry.bnd +++ b/pnnl.goss.core/goss-core-server-registry.bnd @@ -1,4 +1,4 @@ -Bundle-Version: 1.0.18.${tstamp} +Bundle-Version: 1.0.55.${tstamp} Private-Package: \ pnnl.goss.server.registry DynamicImport-Package: * \ No newline at end of file diff --git a/pnnl.goss.core/goss-core-server-web.bnd b/pnnl.goss.core/goss-core-server-web.bnd index d594abf0..12715b2f 100644 --- a/pnnl.goss.core/goss-core-server-web.bnd +++ b/pnnl.goss.core/goss-core-server-web.bnd @@ -2,7 +2,7 @@ DynamicImport-Package: * Private-Package: \ pnnl.goss.core.server.web -Bundle-Version: 1.1.1.${tstamp} +Bundle-Version: 1.1.34.${tstamp} # Import webroot folder to path resources/webroot Include-Resource: resources/webroot=webroot diff --git a/pnnl.goss.core/goss-core-server.bnd b/pnnl.goss.core/goss-core-server.bnd index e3bea498..43450ae7 100644 --- a/pnnl.goss.core/goss-core-server.bnd +++ b/pnnl.goss.core/goss-core-server.bnd @@ -3,4 +3,4 @@ Private-Package: \ DynamicImport-Package: * #Include-Resource: \ # OSGI-INF/blueprint/blueprint.xml=config/blueprint.xml -Bundle-Version: 2.0.27.${tstamp} \ No newline at end of file +Bundle-Version: 2.0.73.${tstamp} \ No newline at end of file diff --git a/pnnl.goss.core/security-ldap.bnd b/pnnl.goss.core/security-ldap.bnd index 4e5573ec..df375a14 100644 --- a/pnnl.goss.core/security-ldap.bnd +++ b/pnnl.goss.core/security-ldap.bnd @@ -1,3 +1,3 @@ Private-Package: \ pnnl.goss.core.security.ldap -Bundle-Version: 1.0.5.${tstamp} +Bundle-Version: 1.0.11.${tstamp} diff --git a/pnnl.goss.core/security-propertyfile.bnd b/pnnl.goss.core/security-propertyfile.bnd index b21c75e6..b56dee4a 100644 --- a/pnnl.goss.core/security-propertyfile.bnd +++ b/pnnl.goss.core/security-propertyfile.bnd @@ -1,3 +1,3 @@ Private-Package: \ pnnl.goss.core.security.propertyfile -Bundle-Version: 2.0.8.${tstamp} +Bundle-Version: 2.0.19.${tstamp} diff --git a/pnnl.goss.core/src/pnnl/goss/core/client/GossClient.java b/pnnl.goss.core/src/pnnl/goss/core/client/GossClient.java index 6b8c1cc1..513e5f3b 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/client/GossClient.java +++ b/pnnl.goss.core/src/pnnl/goss/core/client/GossClient.java @@ -47,6 +47,7 @@ //import static pnnl.goss.core.GossCoreContants.PROP_CORE_CLIENT_CONFIG; import java.io.Serializable; import java.util.ArrayList; +import java.util.Enumeration; import java.util.List; import java.util.UUID; @@ -312,15 +313,22 @@ public void run() { .substring( buffer.toString().indexOf( ":") + 1); + DataResponse dataResponse = new DataResponse(message); dataResponse.setDestination(msg.getJMSDestination().toString()); - if(msg.getJMSReplyTo() != null) + if(msg.getJMSReplyTo() != null) { dataResponse.setReplyDestination(msg.getJMSReplyTo()); - if(msg.getBooleanProperty(SecurityConstants.HAS_SUBJECT_HEADER)) - dataResponse.setUsername(msg.getStringProperty(SecurityConstants.SUBJECT_HEADER)); + } + + if(msg.getBooleanProperty(SecurityConstants.HAS_SUBJECT_HEADER)) { + String username = msg.getStringProperty(SecurityConstants.SUBJECT_HEADER); + dataResponse.setUsername(username); + } else { + log.warn("No username received in stomp message"); + } event.onMessage(dataResponse); } - if (msg instanceof StompJmsTextMessage) { + else if (msg instanceof StompJmsTextMessage) { StompJmsTextMessage stompMessage = (StompJmsTextMessage) msg; org.fusesource.hawtbuf.Buffer buffer = stompMessage @@ -330,18 +338,31 @@ public void run() { .substring( buffer.toString().indexOf( ":") + 1); + Gson gson = new Gson(); DataResponse dataResponse; try{ - dataResponse = DataResponse.parse(message); + try { + // don't fail if the message isn't already in data response format + dataResponse = DataResponse.parse(message); + } catch(JsonSyntaxException e){ + dataResponse = new DataResponse(); + dataResponse.setData(message); + } dataResponse.setDestination(stompMessage.getStompJmsDestination().toString()); - if(msg.getJMSReplyTo() != null) + if(msg.getJMSReplyTo() != null) { dataResponse.setReplyDestination(msg.getJMSReplyTo()); - if(msg.getBooleanProperty(SecurityConstants.HAS_SUBJECT_HEADER)) - dataResponse.setUsername(msg.getStringProperty(SecurityConstants.SUBJECT_HEADER)); + } + if(msg.getBooleanProperty(SecurityConstants.HAS_SUBJECT_HEADER)) { + String username = msg.getStringProperty(SecurityConstants.SUBJECT_HEADER); + dataResponse.setUsername(username); + } else { + log.warn("No username received in stomp message"); + } event.onMessage(dataResponse); } catch(JsonSyntaxException e){ + e.printStackTrace(); dataResponse = new DataResponse(message); dataResponse.setDestination(stompMessage.getStompJmsDestination().toString()); if(msg.getJMSReplyTo() != null) @@ -351,6 +372,8 @@ public void run() { event.onMessage(dataResponse); } + } else { + //TODO warn of unknown message type??? } } catch (JMSException ex) { // Happens when a timeout occurs. diff --git a/pnnl.goss.core/src/pnnl/goss/core/packageinfo b/pnnl.goss.core/src/pnnl/goss/core/packageinfo index eabbf4e7..8ce03712 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/packageinfo +++ b/pnnl.goss.core/src/pnnl/goss/core/packageinfo @@ -1 +1 @@ -version 4.1.0 +version 5.0.0 diff --git a/pnnl.goss.core/src/pnnl/goss/core/security/GossSecurityManager.java b/pnnl.goss.core/src/pnnl/goss/core/security/GossSecurityManager.java new file mode 100644 index 00000000..e9a735cd --- /dev/null +++ b/pnnl.goss.core/src/pnnl/goss/core/security/GossSecurityManager.java @@ -0,0 +1,13 @@ +package pnnl.goss.core.security; + + +public interface GossSecurityManager extends org.apache.shiro.mgt.SecurityManager { + + public static final String PROP_SYSTEM_MANAGER = "goss.system.manager"; + public static final String PROP_SYSTEM_MANAGER_PASSWORD = "goss.system.manager.password"; + + + public String getProperty(String key, String defaultValue); + + +} diff --git a/pnnl.goss.core/src/pnnl/goss/core/security/SecurityConfig.java b/pnnl.goss.core/src/pnnl/goss/core/security/SecurityConfig.java new file mode 100644 index 00000000..0b0dfbaa --- /dev/null +++ b/pnnl.goss.core/src/pnnl/goss/core/security/SecurityConfig.java @@ -0,0 +1,6 @@ +package pnnl.goss.core.security; + +public interface SecurityConfig { + public String getManagerUser(); + public String getManagerPassword(); +} diff --git a/pnnl.goss.core/src/pnnl/goss/core/security/SecurityConstants.java b/pnnl.goss.core/src/pnnl/goss/core/security/SecurityConstants.java index 222f8346..8fb4f560 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/security/SecurityConstants.java +++ b/pnnl.goss.core/src/pnnl/goss/core/security/SecurityConstants.java @@ -3,4 +3,7 @@ public class SecurityConstants { public static final String HAS_SUBJECT_HEADER = "GOSS_HAS_SUBJECT"; public static final String SUBJECT_HEADER = "GOSS_SUBJECT"; + + public static final String PROP_SYSTEM_MANAGER = "goss.system.manager"; + public static final String PROP_SYSTEM_MANAGER_PASSWORD = "goss.system.manager.password"; } diff --git a/pnnl.goss.core/src/pnnl/goss/core/security/impl/Activator.java b/pnnl.goss.core/src/pnnl/goss/core/security/impl/Activator.java index f4003358..e7454862 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/security/impl/Activator.java +++ b/pnnl.goss.core/src/pnnl/goss/core/security/impl/Activator.java @@ -1,43 +1,45 @@ package pnnl.goss.core.security.impl; -import java.util.HashSet; -import java.util.Set; -import org.apache.activemq.shiro.mgt.DefaultActiveMqSecurityManager; import org.apache.felix.dm.DependencyActivatorBase; import org.apache.felix.dm.DependencyManager; -import org.apache.shiro.SecurityUtils; +import org.apache.felix.dm.annotation.api.Component; +import org.apache.felix.dm.annotation.api.ServiceDependency; import org.apache.shiro.mgt.SecurityManager; -import org.apache.shiro.realm.Realm; import org.osgi.framework.BundleContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import pnnl.goss.core.security.SecurityConfig; + + + +@Component public class Activator extends DependencyActivatorBase { + + @ServiceDependency + private DependencyManager manager; + private static final Logger log = LoggerFactory.getLogger(Activator.class); + + private static final String CONFIG_PID = "pnnl.goss.security"; + + @Override public void init(BundleContext context, DependencyManager manager) throws Exception { - - //Factory factory = new DefaultSecurityManager(); - //Secu new IniSecurityManagerFactory( - // "conf/shiro.ini"); - - Realm defaultRealm = new SystemRealm("system", "manager"); - Set realms = new HashSet<>(); - realms.add(defaultRealm); - DefaultActiveMqSecurityManager securityManager = new DefaultActiveMqSecurityManager(); - - securityManager.setRealms(realms); - //CurrentAuthorizedPrincipals principleHandler = new CurrentAuthorizedPrincipals(); - - //gt((AbstractAuthenticator)securityManager.getAuthenticator()).getAuthenticationListeners().add(principleHandler); + manager.add(createComponent() + .setInterface( + SecurityConfig.class.getName(), null) + .setImplementation(SecurityConfigImpl.class) + .add(createConfigurationDependency().setPid(CONFIG_PID))); + manager.add(createComponent() + .setInterface( + SecurityManager.class.getName(), null) + .setImplementation(SecurityManagerImpl.class) + .add(createConfigurationDependency().setPid(CONFIG_PID))); - SecurityUtils.setSecurityManager(securityManager); - - - manager.add(createComponent().setInterface( - SecurityManager.class.getName(), null).setImplementation( - securityManager)); } @Override @@ -45,4 +47,9 @@ public void destroy(BundleContext context, DependencyManager manager) throws Exception { // } + + + + + } diff --git a/pnnl.goss.core/src/pnnl/goss/core/security/impl/GossAuthorizingRealm.java b/pnnl.goss.core/src/pnnl/goss/core/security/impl/GossAuthorizingRealm.java index 11a2e949..b0f76ad7 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/security/impl/GossAuthorizingRealm.java +++ b/pnnl.goss.core/src/pnnl/goss/core/security/impl/GossAuthorizingRealm.java @@ -1,6 +1,7 @@ package pnnl.goss.core.security.impl; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.Set; @@ -17,13 +18,21 @@ import org.apache.shiro.realm.Realm; import org.apache.shiro.subject.PrincipalCollection; +import pnnl.goss.core.security.SecurityConfig; + @Component public class GossAuthorizingRealm extends AuthorizingRealm implements Realm { + public static final String DEFAULT_SYSTEM_USER = "system"; + // Depend on this so that the security manager service is loaded before // this package. @ServiceDependency private volatile SecurityManager securityManager; + @ServiceDependency + private volatile SecurityConfig securityConfig; + private HashMap accountCache = new HashMap(); + private Collection getPermissionsByRole(String role){ Set permissions = new HashSet<>(); @@ -45,25 +54,23 @@ private Collection getPermissionsByRole(String role){ return permissions; } - protected SimpleAccount getAccount(String username) { + protected SimpleAccount getAccount(String username, String password) { + String systemUserName = DEFAULT_SYSTEM_USER; + if(securityConfig!=null){ + systemUserName = securityConfig.getManagerUser(); + } + + SimpleAccount account = null; Set defaultRoles = new HashSet(); defaultRoles.add("users"); defaultRoles.add("advisory"); - // Populate a dummy instance based upon the username's access privileges. - switch(username){ - case "darkhelmet": - account = new SimpleAccount(username, "ludicrousspeed", getName()); - //account.addRole("darklord"); - //account.addStringPermissions(getPermissionsByRole("users")); - break; - case "system": - account = new SimpleAccount(username, "manager", getName()); - account.addRole("system"); - account.addStringPermissions(getPermissionsByRole("system")); - break; + if(username.equals(systemUserName)){ + account = new SimpleAccount(username, password, getName()); + account.addRole(systemUserName); + account.addStringPermissions(getPermissionsByRole(systemUserName)); } if (account == null){ @@ -99,9 +106,9 @@ protected AuthorizationInfo doGetAuthorizationInfo( //get the principal this realm cares about: String username = (String) getAvailablePrincipal(principals); - //call the underlying EIS for the account data: - return getAccount(username); +// return getAccount(username); + return accountCache.get(username); } @Override @@ -111,6 +118,6 @@ protected AuthenticationInfo doGetAuthenticationInfo( //we can safely cast to a UsernamePasswordToken here, because this class 'supports' UsernamePasswordToken //objects. See the Realm.supports() method if your application will use a different type of token. UsernamePasswordToken upToken = (UsernamePasswordToken) token; - return getAccount(upToken.getUsername()); + return getAccount(upToken.getUsername(), upToken.getPassword().toString()); } } diff --git a/pnnl.goss.core/src/pnnl/goss/core/security/impl/SecurityConfigImpl.java b/pnnl.goss.core/src/pnnl/goss/core/security/impl/SecurityConfigImpl.java new file mode 100644 index 00000000..b6dbba58 --- /dev/null +++ b/pnnl.goss.core/src/pnnl/goss/core/security/impl/SecurityConfigImpl.java @@ -0,0 +1,78 @@ +package pnnl.goss.core.security.impl; + +import java.util.Dictionary; + +import org.apache.felix.dm.annotation.api.Component; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.northconcepts.exception.SystemException; + +import pnnl.goss.core.security.SecurityConfig; +import pnnl.goss.core.security.SecurityConstants; + + +@Component +public class SecurityConfigImpl implements SecurityConfig { + + private String managerUser; + private String managerPassword; + + private Dictionary properties; + private static final Logger log = LoggerFactory.getLogger(SecurityConfigImpl.class); + + + public SecurityConfigImpl(){ + } + + + + void updated(Dictionary properties) { + if (properties != null) { + this.properties = properties; + + // create system realm + managerUser = getProperty(SecurityConstants.PROP_SYSTEM_MANAGER + ,null); + managerPassword = getProperty(SecurityConstants.PROP_SYSTEM_MANAGER_PASSWORD + ,null); + System.out.println("SYSTEM CONFIG UPDATED "+managerUser+" "+managerPassword+" "+this); + + } else { + log.error("No core config properties received by security activator"); + throw new SystemException("No security config properties received by activator", null); + } + } + + + + public String getProperty(String key, String defaultValue){ + String retValue = defaultValue; + + if (key != null && !key.isEmpty() && properties.get(key)!=null){ + String value = properties.get(key).toString(); + // Let the value pass through because it doesn't + // start with ${ + if (!value.startsWith("${")){ + retValue = value; + } + } + + return retValue; + } + + + @Override + public String getManagerUser() { + return managerUser; + } + + @Override + public String getManagerPassword() { + return managerPassword; + } + + + + +} diff --git a/pnnl.goss.core/src/pnnl/goss/core/security/impl/SecurityManagerImpl.java b/pnnl.goss.core/src/pnnl/goss/core/security/impl/SecurityManagerImpl.java new file mode 100644 index 00000000..fbbf5b7a --- /dev/null +++ b/pnnl.goss.core/src/pnnl/goss/core/security/impl/SecurityManagerImpl.java @@ -0,0 +1,71 @@ +package pnnl.goss.core.security.impl; + +import java.util.Dictionary; +import java.util.HashSet; +import java.util.Set; + +import org.apache.activemq.shiro.mgt.DefaultActiveMqSecurityManager; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.realm.Realm; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.northconcepts.exception.SystemException; + +import pnnl.goss.core.security.GossSecurityManager; + +public class SecurityManagerImpl extends DefaultActiveMqSecurityManager implements GossSecurityManager{ + private static final Logger log = LoggerFactory.getLogger(SecurityManagerImpl.class); + + private Dictionary properties; + + + void updated(Dictionary properties) { + if (properties != null) { + this.properties = properties; + + // create system realm + String systemManager = getProperty(PROP_SYSTEM_MANAGER + ,null); + String systemManagerPassword = getProperty(PROP_SYSTEM_MANAGER_PASSWORD + ,null); + + System.out.println("SYSTEM MANAGER UPDATED "+systemManager); + Realm defaultRealm; + try { + defaultRealm = new SystemRealm(systemManager, systemManagerPassword); + + Set realms = new HashSet(); + realms.add(defaultRealm); + + setRealms(realms); + + SecurityUtils.setSecurityManager(this); + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } else { + log.error("No core config properties received by security activator"); + throw new SystemException("No security config properties received by activator", null); + } + } + + + public String getProperty(String key, String defaultValue){ + String retValue = defaultValue; + + if (key != null && !key.isEmpty() && properties.get(key)!=null){ + String value = properties.get(key).toString(); + // Let the value pass through because it doesn't + // start with ${ + if (!value.startsWith("${")){ + retValue = value; + } + } + + return retValue; + } + +} diff --git a/pnnl.goss.core/src/pnnl/goss/core/security/impl/SystemRealm.java b/pnnl.goss.core/src/pnnl/goss/core/security/impl/SystemRealm.java index 2f0bef5a..7e9f5fad 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/security/impl/SystemRealm.java +++ b/pnnl.goss.core/src/pnnl/goss/core/security/impl/SystemRealm.java @@ -26,7 +26,7 @@ public SystemRealm(String systemUserName, String systemPassword) throws Exceptio } SimpleAccount accnt = new SimpleAccount(systemUserName, systemPassword, getName()); accnt.addStringPermission("*"); - accntMap.put("system", accnt); + accntMap.put(systemUserName, accnt); } @Override diff --git a/pnnl.goss.core/src/pnnl/goss/core/security/impl/packageinfo b/pnnl.goss.core/src/pnnl/goss/core/security/impl/packageinfo new file mode 100644 index 00000000..a2afe579 --- /dev/null +++ b/pnnl.goss.core/src/pnnl/goss/core/security/impl/packageinfo @@ -0,0 +1 @@ +version 2.1.0 diff --git a/pnnl.goss.core/src/pnnl/goss/core/security/packageinfo b/pnnl.goss.core/src/pnnl/goss/core/security/packageinfo index a2afe579..8d46cda2 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/security/packageinfo +++ b/pnnl.goss.core/src/pnnl/goss/core/security/packageinfo @@ -1 +1 @@ -version 2.1.0 +version 2.2.0 diff --git a/pnnl.goss.core/src/pnnl/goss/core/server/impl/GridOpticsServer.java b/pnnl.goss.core/src/pnnl/goss/core/server/impl/GridOpticsServer.java index 4ce26d31..9c6896f7 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/server/impl/GridOpticsServer.java +++ b/pnnl.goss.core/src/pnnl/goss/core/server/impl/GridOpticsServer.java @@ -77,13 +77,13 @@ import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.SslBrokerService; import org.apache.activemq.shiro.ShiroPlugin; +import org.apache.shiro.mgt.SecurityManager; import org.apache.commons.io.FilenameUtils; import org.apache.felix.dm.annotation.api.Component; import org.apache.felix.dm.annotation.api.ConfigurationDependency; import org.apache.felix.dm.annotation.api.ServiceDependency; import org.apache.felix.dm.annotation.api.Start; import org.apache.felix.dm.annotation.api.Stop; -import org.apache.shiro.mgt.SecurityManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -92,6 +92,9 @@ import pnnl.goss.core.GossCoreContants; import pnnl.goss.core.security.GossRealm; +import pnnl.goss.core.security.GossSecurityManager; +import pnnl.goss.core.security.SecurityConfig; +//import pnnl.goss.core.security.SecurityConfig; import pnnl.goss.core.server.RequestHandlerRegistry; import pnnl.goss.core.server.ServerControl; @@ -169,6 +172,8 @@ public class GridOpticsServer implements ServerControl { @ServiceDependency private volatile SecurityManager securityManager; + @ServiceDependency + private volatile SecurityConfig securityConfig; @ServiceDependency @@ -177,6 +182,9 @@ public class GridOpticsServer implements ServerControl { @ServiceDependency private volatile GossRealm permissionAdapter; + + + private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); @@ -206,13 +214,8 @@ private String getProperty(String value, String defaultValue){ @ConfigurationDependency(pid=CONFIG_PID) public synchronized void updated(Dictionary properties) throws SystemException { - if (properties != null) { - systemManager = getProperty((String) properties.get(PROP_SYSTEM_MANAGER), - "system"); - systemManagerPassword = getProperty((String) properties.get(PROP_SYSTEM_MANAGER_PASSWORD), - "manager"); shouldStartBroker = Boolean.parseBoolean( getProperty((String) properties.get(PROP_START_BROKER), "true")); @@ -303,7 +306,7 @@ private boolean shouldUsSsl(){ private void createBroker() throws Exception{ // Create shiro broker plugin ShiroPlugin shiroPlugin = new ShiroPlugin(); - + shiroPlugin.setSecurityManager(securityManager); //shiroPlugin.setIniConfig("conf/shiro.ini"); @@ -407,6 +410,11 @@ public void run() { @Override @Start public void start() { + + if(securityManager!=null){ + systemManager = ((GossSecurityManager)securityManager).getProperty(GossSecurityManager.PROP_SYSTEM_MANAGER,null);//securityConfig.getManagerUser(); + systemManagerPassword = ((GossSecurityManager)securityManager).getProperty(GossSecurityManager.PROP_SYSTEM_MANAGER_PASSWORD,null);;//securityConfig.getManagerPassword(); + } // If goss should have start the broker service then this will be set. // this variable is mapped from goss.start.broker @@ -433,7 +441,7 @@ public void start() { connectionFactory = new ActiveMQConnectionFactory(openwireTransport); } - connection = connectionFactory.createConnection("system", "manager"); + connection = connectionFactory.createConnection(systemManager, systemManagerPassword); connection.start(); } catch (Exception e) { log.debug("Error Connecting to ActiveMQ", e); diff --git a/pnnl.goss.core/src/pnnl/goss/core/server/impl/ManagementLauncher.java b/pnnl.goss.core/src/pnnl/goss/core/server/impl/ManagementLauncher.java index 7ec028a8..046f233f 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/server/impl/ManagementLauncher.java +++ b/pnnl.goss.core/src/pnnl/goss/core/server/impl/ManagementLauncher.java @@ -13,6 +13,7 @@ import pnnl.goss.core.ClientFactory; import pnnl.goss.core.DataResponse; import pnnl.goss.core.GossResponseEvent; +import pnnl.goss.core.security.SecurityConfig; import pnnl.goss.core.server.DataSourceRegistry; import pnnl.goss.core.server.RequestHandlerRegistry; import pnnl.goss.core.server.ServerControl; @@ -27,6 +28,9 @@ public class ManagementLauncher { @ServiceDependency private volatile ServerControl serverControl; + + @ServiceDependency + private volatile SecurityConfig securityConfig; @ServiceDependency private volatile RequestHandlerRegistry handlerRegistry; @@ -67,8 +71,9 @@ else if (request.trim().equals("list_datasources")){ @Start public void start(){ try { + System.out.println("START "+securityConfig.getManagerUser()+" "+securityConfig.getManagerPassword()+" "+securityConfig); Client client = clientFactory.create(PROTOCOL.STOMP, - new UsernamePasswordCredentials("system", "manager")); + new UsernamePasswordCredentials(securityConfig.getManagerUser(), securityConfig.getManagerPassword())); client.subscribe("/topic/goss/management/request", new ResponseEvent(client)); client.subscribe("/topic/goss/management/go", new ResponseEvent(client)); } catch (Exception e) { diff --git a/pnnl.goss.core/src/pnnl/goss/core/server/impl/ServerListener.java b/pnnl.goss.core/src/pnnl/goss/core/server/impl/ServerListener.java index 6bddcbe7..db46e2d1 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/server/impl/ServerListener.java +++ b/pnnl.goss.core/src/pnnl/goss/core/server/impl/ServerListener.java @@ -102,6 +102,7 @@ public void onMessage(Message message1) { Thread thread = new Thread(new Runnable() { public void run() { ServerPublisher serverPublisher = new ServerPublisher(session); + String username = ""; try { ObjectMessage objectMessage = (ObjectMessage) message; @@ -119,7 +120,7 @@ public void run() { } String identifier = message.getStringProperty(SecurityConstants.SUBJECT_HEADER); - + username = identifier; boolean allowed = handlerRegistry.checkAccess(request, identifier); if (!allowed){ @@ -150,6 +151,7 @@ public void run() { if (data instanceof Event) { DataResponse dataResponse = new DataResponse(); + dataResponse.setUsername(username); dataResponse.setData(data); serverPublisher.sendEvent(dataResponse, data.getClass().getName().substring(data.getClass().getName().lastIndexOf(".") + 1)); serverPublisher.close(); @@ -170,6 +172,7 @@ public void run() { //AbstractRequestHandler handler = handlerService.getHandler(request); DataResponse response = (DataResponse) handlerRegistry.handle(request); + response.setUsername(username); response.setId(request.getId()); if (message.getStringProperty("RESPONSE_FORMAT") != null) { @@ -198,6 +201,7 @@ public void run() { //DataResponse response = (DataResponse) ServerRequestHandler.handle(request); response.setResponseComplete(true); + response.setUsername(username); response.setId(request.getId()); if (message.getStringProperty("RESPONSE_FORMAT") != null) @@ -211,7 +215,9 @@ public void run() { e.printStackTrace(); try { - serverPublisher.sendResponse(new DataResponse(new DataError("Exception occured: "+e.getMessage())) , message.getJMSReplyTo()); + DataResponse response = new DataResponse(new DataError("Exception occured: "+e.getMessage())); + response.setUsername(username); + serverPublisher.sendResponse(response , message.getJMSReplyTo()); } catch (JMSException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -221,7 +227,9 @@ public void run() { e.printStackTrace(); try { - serverPublisher.sendResponse(new DataResponse(new DataError("Exception occured")) , message.getJMSReplyTo()); + DataResponse response = new DataResponse(new DataError("Exception occured")); + response.setUsername(username); + serverPublisher.sendResponse(response , message.getJMSReplyTo()); } catch (JMSException e1) { // TODO Auto-generated catch block e1.printStackTrace(); diff --git a/pnnl.goss.core/src/pnnl/goss/core/server/packageinfo b/pnnl.goss.core/src/pnnl/goss/core/server/packageinfo index fd75ac90..68cb5141 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/server/packageinfo +++ b/pnnl.goss.core/src/pnnl/goss/core/server/packageinfo @@ -1 +1 @@ -version 2.0.3 +version 2.0.4