diff --git a/cnf/releaserepo/index.xml b/cnf/releaserepo/index.xml index 9a0ddcbc..f13705e2 100644 --- a/cnf/releaserepo/index.xml +++ b/cnf/releaserepo/index.xml @@ -1,5 +1,5 @@ - + @@ -98,6 +98,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5927,21 +5976,21 @@ - + - - - + + + - + - + @@ -5959,7 +6008,7 @@ - + @@ -5974,7 +6023,7 @@ - + @@ -5984,21 +6033,21 @@ - + - - - + + + - + - + @@ -6031,7 +6080,7 @@ - + @@ -6041,21 +6090,21 @@ - + - - - + + + - + - + @@ -6088,7 +6137,7 @@ - + @@ -6098,135 +6147,21 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -6244,7 +6179,7 @@ - + @@ -6269,21 +6204,21 @@ - + - - - + + + - + - + @@ -6326,21 +6261,21 @@ - + - - - + + + - + - + @@ -6373,7 +6308,7 @@ - + @@ -6383,21 +6318,21 @@ - + - - - + + + - + - + @@ -6430,7 +6365,7 @@ - + @@ -6440,21 +6375,21 @@ - + - - - + + + - + - + @@ -6487,7 +6422,7 @@ - + @@ -6497,21 +6432,21 @@ - + - - - + + + - + - + @@ -6544,7 +6479,7 @@ - + @@ -6554,21 +6489,21 @@ - + - - - + + + - + - + @@ -6601,7 +6536,7 @@ - + @@ -6611,78 +6546,21 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -6715,7 +6593,7 @@ - + @@ -6725,21 +6603,21 @@ - + - - - + + + - + - + @@ -6772,7 +6650,7 @@ - + @@ -6782,21 +6660,21 @@ - + - - - + + + - + - + @@ -6839,21 +6717,21 @@ - + - - - + + + - + - + @@ -6896,21 +6774,21 @@ - + - - - + + + - + - + @@ -6953,21 +6831,21 @@ - + - - - + + + - + - + @@ -7010,21 +6888,21 @@ - + - - - + + + - + - + @@ -7067,21 +6945,21 @@ - + - - - + + + - + - + @@ -7124,21 +7002,21 @@ - + - - - + + + - + - + @@ -7181,21 +7059,21 @@ - + - - - + + + - + - + @@ -7238,21 +7116,21 @@ - + - - - + + + - + - + @@ -7295,21 +7173,21 @@ - + - - - + + + - + - + @@ -7352,21 +7230,21 @@ - + - - - + + + - + - + @@ -7409,21 +7287,249 @@ - + - - - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10147,6 +10253,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12463,6 +12599,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -23306,6 +23475,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -25066,6 +25332,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -31698,21 +32004,72 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + @@ -35681,6 +36038,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -42989,6 +43406,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -48589,10 +49090,124 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -48602,21 +49217,21 @@ - + - - - + + + - + - + @@ -48646,10 +49261,10 @@ - + - + @@ -48659,21 +49274,21 @@ - + - - - + + + - + - + @@ -48716,87 +49331,36 @@ - + - - - + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -48817,10 +49381,7 @@ - - - - + @@ -48830,22 +49391,25 @@ - + - - - + + + - + - + + + + @@ -48859,7 +49423,13 @@ - + + + + + + + @@ -48880,7 +49450,10 @@ - + + + + @@ -55999,6 +56572,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -60538,6 +61156,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65626,6 +66292,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cnf/releaserepo/index.xml.sha b/cnf/releaserepo/index.xml.sha index d9d00a4b..49c1c9dc 100644 --- a/cnf/releaserepo/index.xml.sha +++ b/cnf/releaserepo/index.xml.sha @@ -1 +1 @@ -2f1b4421a414355139f0762e8c7554420544339e17def36ef196e99f842b6ad1 \ No newline at end of file +09d0338768762e1375192d9c6fbb8d7f2afbd12f02bc9f0afb41be31753ebbb8 \ No newline at end of file diff --git a/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-10.0.10.jar b/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-10.0.10.jar new file mode 100644 index 00000000..df8f13b5 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.core-api/pnnl.goss.core.core-api-10.0.10.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.180.jar b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.180.jar new file mode 100644 index 00000000..8e84b036 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-client/pnnl.goss.core.goss-client-2.0.180.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.120.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.120.jar new file mode 100644 index 00000000..70cf87a9 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-commands/pnnl.goss.core.goss-core-commands-2.0.120.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-exceptions/pnnl.goss.core.goss-core-exceptions-2.1.2.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-exceptions/pnnl.goss.core.goss-core-exceptions-2.1.2.jar new file mode 100644 index 00000000..be1d2f92 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-exceptions/pnnl.goss.core.goss-core-exceptions-2.1.2.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-9.0.4.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-9.0.4.jar new file mode 100644 index 00000000..149abcc2 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-security/pnnl.goss.core.goss-core-security-9.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.138.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.138.jar new file mode 100644 index 00000000..e125fa3e Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-api/pnnl.goss.core.goss-core-server-api-3.0.138.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.185.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.185.jar new file mode 100644 index 00000000..61ec1cc5 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-registry/pnnl.goss.core.goss-core-server-registry-1.0.185.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.50.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.50.jar new file mode 100644 index 00000000..9f896032 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server-web/pnnl.goss.core.goss-core-server-web-1.1.50.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.203.jar b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.203.jar new file mode 100644 index 00000000..9eb4f144 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.goss-core-server/pnnl.goss.core.goss-core-server-2.0.203.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.security-jwt/pnnl.goss.core.security-jwt-1.0.150.jar b/cnf/releaserepo/pnnl.goss.core.security-jwt/pnnl.goss.core.security-jwt-1.0.150.jar new file mode 100644 index 00000000..5750e5ef Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.security-jwt/pnnl.goss.core.security-jwt-1.0.150.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.security-ldap/pnnl.goss.core.security-ldap-1.0.135.jar b/cnf/releaserepo/pnnl.goss.core.security-ldap/pnnl.goss.core.security-ldap-1.0.135.jar new file mode 100644 index 00000000..150e4b47 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.security-ldap/pnnl.goss.core.security-ldap-1.0.135.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.146.jar b/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.146.jar new file mode 100644 index 00000000..e0e716fe Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.security-propertyfile/pnnl.goss.core.security-propertyfile-2.0.146.jar differ diff --git a/cnf/releaserepo/pnnl.goss.core.security-system/pnnl.goss.core.security-system-2.0.145.jar b/cnf/releaserepo/pnnl.goss.core.security-system/pnnl.goss.core.security-system-2.0.145.jar new file mode 100644 index 00000000..73ed0038 Binary files /dev/null and b/cnf/releaserepo/pnnl.goss.core.security-system/pnnl.goss.core.security-system-2.0.145.jar differ diff --git a/pnnl.goss.core/core-api.bnd b/pnnl.goss.core/core-api.bnd index 4a8aa050..00cca23c 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: 10.0.9.${tstamp} +Bundle-Version: 10.0.10.${tstamp} diff --git a/pnnl.goss.core/goss-client.bnd b/pnnl.goss.core/goss-client.bnd index c8d36f86..3b6c87b7 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.179.${tstamp} \ No newline at end of file +Bundle-Version: 2.0.180.${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 da74af14..9ce877a9 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.119.${tstamp} \ No newline at end of file +Bundle-Version: 2.0.120.${tstamp} \ No newline at end of file diff --git a/pnnl.goss.core/goss-core-exceptions.bnd b/pnnl.goss.core/goss-core-exceptions.bnd index b089125f..30bd32ca 100644 --- a/pnnl.goss.core/goss-core-exceptions.bnd +++ b/pnnl.goss.core/goss-core-exceptions.bnd @@ -1,5 +1,5 @@ Private-Package: \ pnnl.goss.core.exception -Bundle-Version: 2.1.1.${tstamp} +Bundle-Version: 2.1.2.${tstamp} Export-Package: \ com.northconcepts.exception \ 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 8d17973c..e473603b 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: 9.0.3.${tstamp} \ No newline at end of file +Bundle-Version: 9.0.4.${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 cbcdf91c..873ed564 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: 3.0.137.${tstamp} \ No newline at end of file +Bundle-Version: 3.0.138.${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 8e5b6de3..22ea6168 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.184.${tstamp} +Bundle-Version: 1.0.185.${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 3b6210a5..3afaafe4 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.49.${tstamp} +Bundle-Version: 1.1.50.${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 71525d9f..f991353e 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.202.${tstamp} \ No newline at end of file +Bundle-Version: 2.0.203.${tstamp} \ No newline at end of file diff --git a/pnnl.goss.core/security-jwt.bnd b/pnnl.goss.core/security-jwt.bnd index a7440d2a..1ec5a72d 100644 --- a/pnnl.goss.core/security-jwt.bnd +++ b/pnnl.goss.core/security-jwt.bnd @@ -1,2 +1,2 @@ Private-Package: pnnl.goss.core.security.jwt -Bundle-Version: 1.0.149.${tstamp} +Bundle-Version: 1.0.150.${tstamp} diff --git a/pnnl.goss.core/security-ldap.bnd b/pnnl.goss.core/security-ldap.bnd index 137340a2..ef569d17 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.134.${tstamp} +Bundle-Version: 1.0.135.${tstamp} diff --git a/pnnl.goss.core/security-propertyfile.bnd b/pnnl.goss.core/security-propertyfile.bnd index 5ffc45a3..eaf88c2f 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.145.${tstamp} +Bundle-Version: 2.0.146.${tstamp} diff --git a/pnnl.goss.core/security-system.bnd b/pnnl.goss.core/security-system.bnd index dbb6dea4..1294709d 100644 --- a/pnnl.goss.core/security-system.bnd +++ b/pnnl.goss.core/security-system.bnd @@ -1,2 +1,2 @@ Private-Package: pnnl.goss.core.security.system -Bundle-Version: 2.0.144.${tstamp} +Bundle-Version: 2.0.145.${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 e97aa005..ef2e0297 100644 --- a/pnnl.goss.core/src/pnnl/goss/core/client/GossClient.java +++ b/pnnl.goss.core/src/pnnl/goss/core/client/GossClient.java @@ -490,10 +490,46 @@ public void publish(String topic, Serializable data) throws SystemException { } catch (JMSException e) { log.error("publish error", e); + + try{ + //Ran into error publishing, reset the session and try again + log.info("Renewing session"); + session = null; + getSession(); + Destination destination = getDestination(topic, connection, getSession()); + + if (data instanceof String){ + clientPublisher.publish(destination, data); + } + else { + Gson gson = new Gson(); + clientPublisher.publish(destination, gson.toJson(data)); + } + } catch (Exception e2) { + log.error("Failed second attempt to publish ",e2); + e.printStackTrace(); + } } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); - throw SystemException.wrap(e); + try{ + //Ran into error publishing, reset the session and try again + log.info("Renewing session"); + session = null; + getSession(); + Destination destination = getDestination(topic, connection, getSession()); + + if (data instanceof String){ + clientPublisher.publish(destination, data); + } + else { + Gson gson = new Gson(); + clientPublisher.publish(destination, gson.toJson(data)); + } + } catch (Exception e2) { + log.error("Failed second attempt to publish ",e2); + e.printStackTrace(); + throw SystemException.wrap(e); + } } } @@ -504,6 +540,7 @@ public void publish(Destination destination, Serializable data) throws SystemExc if (data == null) throw new NullPointerException("data cannot be null"); + if (data instanceof String){ clientPublisher.publish(destination, data); } @@ -514,10 +551,45 @@ public void publish(Destination destination, Serializable data) throws SystemExc } catch (JMSException e) { log.error("publish error", e); + + try{ + //Ran into error publishing, reset the session and try again + log.info("Renewing session"); + session = null; + getSession(); + if (data instanceof String){ + clientPublisher.publish(destination, data); + } + else { + Gson gson = new Gson(); + clientPublisher.publish(destination, gson.toJson(data)); + } + } catch (Exception e2) { + log.error("Failed second attempt to publish ",e2); + e.printStackTrace(); + } + + } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); - throw SystemException.wrap(e); + try{ + //Ran into error publishing, reset the session and try again + log.info("Renewing session"); + getSession(); + session = null; + if (data instanceof String){ + clientPublisher.publish(destination, data); + } + else { + Gson gson = new Gson(); + clientPublisher.publish(destination, gson.toJson(data)); + } + } catch (Exception e2) { + log.error("Failed second attempt to publish ",e2); + e.printStackTrace(); + throw SystemException.wrap(e); + } + } }