UNOMI-106 Infinite loop on startup - Removed CXF bus configuration that might be causing CXF restarts that were noticed in some of the logs.
Signed-off-by: Serge Huber <shu...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/8860ddff Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/8860ddff Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/8860ddff Branch: refs/heads/feature-UNOMI-102 Commit: 8860ddffa9bc4387f3e9b7a7973a8345102562a2 Parents: 74fdd9c Author: Serge Huber <shu...@apache.org> Authored: Tue Jun 27 11:09:37 2017 +0200 Committer: Serge Huber <shu...@apache.org> Committed: Tue Jun 27 11:09:37 2017 +0200 ---------------------------------------------------------------------- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 11 ++--------- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 11 ++--------- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 11 ++--------- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 10 ++-------- rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- 5 files changed, 9 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/8860ddff/extensions/geonames/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/extensions/geonames/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/geonames/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 590fef7..47036b0 100644 --- a/extensions/geonames/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/extensions/geonames/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -17,17 +17,10 @@ --> <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:cxf="http://cxf.apache.org/blueprint/core"; xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; + xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd - http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd - http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd";> - - <cxf:bus id="cxsServiceBus"> - <cxf:features> - <cxf:logging/> - </cxf:features> - </cxf:bus> + http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd";> <bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter"/> <bean id="jacksonMapper" class="org.apache.unomi.persistence.spi.CustomObjectMapper"/> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/8860ddff/extensions/lists-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/extensions/lists-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/lists-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 7b7e626..01762ad 100644 --- a/extensions/lists-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/extensions/lists-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -17,17 +17,10 @@ --> <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:cxf="http://cxf.apache.org/blueprint/core"; xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; + xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd - http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd - http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd";> - - <cxf:bus id="cxsServiceBus"> - <cxf:features> - <cxf:logging/> - </cxf:features> - </cxf:bus> + http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd";> <bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter"/> <bean id="jacksonMapper" class="org.apache.unomi.persistence.spi.CustomObjectMapper"/> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/8860ddff/extensions/privacy-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/extensions/privacy-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/privacy-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml index c7089e6..772f348 100644 --- a/extensions/privacy-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/extensions/privacy-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -17,17 +17,10 @@ --> <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:cxf="http://cxf.apache.org/blueprint/core"; xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; + xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd - http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd - http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd";> - - <cxf:bus id="cxsServiceBus"> - <cxf:features> - <cxf:logging/> - </cxf:features> - </cxf:bus> + http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd";> <bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter"/> <bean id="jacksonMapper" class="org.apache.unomi.persistence.spi.CustomObjectMapper"/> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/8860ddff/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 8728a7f..69fa336 100644 --- a/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -18,11 +18,11 @@ <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"; - xmlns:cxf="http://cxf.apache.org/blueprint/core"; xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; + xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd - http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd + http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd";> <cm:property-placeholder persistent-id="org.apache.unomi.router" update-strategy="reload"> <cm:default-properties> @@ -37,12 +37,6 @@ </cm:default-properties> </cm:property-placeholder> - <cxf:bus id="cxsServiceBus"> - <cxf:features> - <cxf:logging/> - </cxf:features> - </cxf:bus> - <bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter"/> <bean id="jacksonMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/> <bean id="json-provider" class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/8860ddff/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 6c43256..2741fcf 100644 --- a/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -28,7 +28,7 @@ update-strategy="reload"> </cm:property-placeholder> - <cxf:bus id="cxsServiceBus"> + <cxf:bus> <cxf:features> <cxf:logging/> </cxf:features>
