From e77c23440fec67fdd745815c60ac77654493da8b Mon Sep 17 00:00:00 2001 From: Jens Reimann Date: Mon, 10 Jul 2017 15:30:59 +0100 Subject: [PATCH] Fix XML headers and validate --- assembly/api/pom.xml | 791 +++++++++++---------- assembly/api/src/main/descriptors/jetty-base.xml | 4 +- .../api/src/main/descriptors/kapua-api-jetty.xml | 4 +- .../src/main/descriptors/kapua-cucumber-report.xml | 5 +- .../main/resources/conf/console-tomcat/logback.xml | 29 +- assembly/broker/pom.xml | 12 +- .../broker/src/main/descriptors/kapua-broker.xml | 4 +- .../resources/conf/broker/camel-experimental.xml | 1 - .../src/main/resources/conf/broker/camel.xml | 1 - .../src/main/resources/conf/broker/logback.xml | 29 +- assembly/console/pom.xml | 4 +- .../src/main/descriptors/kapua-console-jetty.xml | 4 +- assembly/java-base/pom.xml | 12 +- assembly/jetty-base/pom.xml | 28 +- .../jetty-base/src/main/descriptors/jetty-base.xml | 4 +- .../src/main/descriptors/kapua-api-jetty.xml | 4 +- .../src/main/descriptors/kapua-cucumber-report.xml | 7 +- .../main/resources/conf/console-tomcat/logback.xml | 29 +- assembly/pom.xml | 4 +- assembly/sql/pom.xml | 18 +- assembly/sql/src/main/descriptors/kapua-sql.xml | 4 +- broker-core/pom.xml | 416 +++++------ broker-core/src/main/resources/locator.xml | 8 +- broker-core/src/test/resources/logback.xml | 30 +- build-tools/pom.xml | 4 +- .../resources/checkstyle/kapua.suppressions.xml | 11 + .../src/main/resources/checkstyle/kapua.xml | 14 +- .../src/main/toolchains/fedora-rhel-centos.xml | 72 +- build-tools/src/main/toolchains/travis-ci.xml | 66 +- commons/pom.xml | 5 +- .../src/main/resources/META-INF/persistence.xml | 31 +- .../0.2.0/changelog-system-configuration-0.2.0.xml | 4 +- .../changelog-system-configurations-master.xml | 4 +- .../src/test/resources/META-INF/persistence.xml | 13 +- commons/src/test/resources/logback.xml | 30 +- console/pom.xml | 86 +-- console/src/main/resources/locator.xml | 8 +- .../org/eclipse/kapua/app/console/admin.gwt.xml | 7 +- .../org/eclipse/kapua/app/console/adminDev.gwt.xml | 9 +- console/src/main/webapp/META-INF/context.xml | 10 +- console/src/main/webapp/WEB-INF/web.xml | 126 ++-- console/src/test/resources/logback.xml | 30 +- dev-tools/cucumber-reports/pom.xml | 179 ++--- .../src/main/descriptors/kapua-cucumber-report.xml | 5 +- .../main/eclipse/codeStyle/KapuaCleanup_v_1.0.xml | 6 +- .../eclipse/codeStyle/KapuaFormatter_v_2.1.xml | 11 + external/pom.xml | 68 +- external/swagger-ui-lib/pom.xml | 20 +- external/swagger-ui/pom.xml | 20 +- locator/guice/pom.xml | 112 +-- locator/guice/src/test/resources/locator-1.xml | 26 +- locator/guice/src/test/resources/locator.xml | 28 +- locator/guice/src/test/resources/logback.xml | 30 +- locator/pom.xml | 5 +- message/api/pom.xml | 5 +- message/internal/pom.xml | 16 +- message/internal/src/test/resources/locator.xml | 88 +-- message/internal/src/test/resources/logback.xml | 30 +- message/pom.xml | 5 +- pom.xml | 8 +- qa-openshift/pom.xml | 5 +- qa/pom.xml | 4 +- qa/src/test/resources/activemq.xml | 2 - qa/src/test/resources/camel-experimental.xml | 1 - qa/src/test/resources/camel.xml | 1 - qa/src/test/resources/locator.xml | 4 +- qa/src/test/resources/logback.xml | 26 +- rest-api/pom.xml | 602 ++++++++-------- rest-api/src/main/resources/locator.xml | 8 +- rest-api/src/main/webapp/WEB-INF/web.xml | 22 +- rest-api/src/test/resources/logback.xml | 30 +- service/account/api/pom.xml | 45 +- service/account/internal/pom.xml | 16 +- ...clipse.kapua.service.account.AccountService.xml | 12 +- .../src/main/resources/META-INF/persistence.xml | 43 +- .../liquibase/0.2.0/changelog-account-0.2.0.xml | 4 +- .../liquibase/changelog-account-master.xml | 4 +- .../internal/src/test/resources/locator.xml | 58 +- .../internal/src/test/resources/logback.xml | 30 +- service/account/pom.xml | 5 +- service/api/pom.xml | 6 +- service/datastore/api/pom.xml | 7 +- service/datastore/client-api/pom.xml | 21 +- service/datastore/client-embedded/pom.xml | 5 +- service/datastore/client-rest/pom.xml | 39 +- service/datastore/client-transport/pom.xml | 21 +- service/datastore/internal/pom.xml | 2 +- ...kapua.service.datastore.MessageStoreService.xml | 14 +- .../src/main/resources/META-INF/persistence.xml | 27 +- .../internal/src/test/resources/locator.xml | 6 +- .../internal/src/test/resources/logback.xml | 40 +- service/datastore/pom.xml | 5 +- service/device/api/pom.xml | 5 +- service/device/asset/api/pom.xml | 4 +- service/device/asset/internal/pom.xml | 4 +- .../asset/internal/src/test/resources/logback.xml | 30 +- service/device/asset/pom.xml | 4 +- service/device/bundle/api/pom.xml | 5 +- service/device/bundle/internal/pom.xml | 4 +- .../bundle/internal/src/test/resources/logback.xml | 30 +- service/device/bundle/pom.xml | 5 +- service/device/call/api/pom.xml | 5 +- service/device/call/kura/pom.xml | 4 +- .../call/kura/src/test/resources/logback.xml | 30 +- service/device/call/pom.xml | 5 +- service/device/call/test/pom.xml | 4 +- .../call/test/src/test/resources/logback.xml | 30 +- service/device/command/api/pom.xml | 5 +- service/device/command/internal/pom.xml | 4 +- .../internal/src/test/resources/logback.xml | 30 +- service/device/command/pom.xml | 5 +- service/device/command/test/pom.xml | 5 +- .../command/test/src/test/resources/logback.xml | 30 +- service/device/commons/pom.xml | 5 +- service/device/configuration/api/pom.xml | 9 +- service/device/configuration/internal/pom.xml | 5 +- .../internal/src/test/resources/logback.xml | 30 +- service/device/configuration/pom.xml | 5 +- service/device/packages/api/pom.xml | 7 +- service/device/packages/internal/pom.xml | 7 +- .../internal/src/test/resources/logback.xml | 32 +- service/device/packages/pom.xml | 5 +- service/device/pom.xml | 5 +- service/device/registry/api/pom.xml | 5 +- service/device/registry/internal/pom.xml | 4 +- ...rvice.device.registry.DeviceRegistryService.xml | 12 +- .../src/main/resources/META-INF/persistence.xml | 11 +- .../liquibase/0.2.0/changelog-device-0.2.0.xml | 4 +- .../liquibase/0.3.0/changelog-device-0.3.0.xml | 24 +- .../liquibase/changelog-device-master.xml | 4 +- .../internal/src/test/resources/locator.xml | 62 +- .../internal/src/test/resources/logback.xml | 30 +- service/device/registry/pom.xml | 5 +- service/device/request/api/pom.xml | 22 +- service/device/request/internal/pom.xml | 4 +- service/device/request/pom.xml | 22 +- .../random-mysql/src/test/resources/locator.xml | 20 +- .../sequence/src/test/resources/locator.xml | 20 +- service/liquibase/pom.xml | 8 +- .../liquibase/changelog-liquibase-master.xml | 4 +- service/liquibase/src/test/resources/logback.xml | 30 +- service/pom.xml | 5 +- service/security/authentication/api/pom.xml | 5 +- service/security/authentication/pom.xml | 5 +- service/security/authorization/api/pom.xml | 5 +- service/security/authorization/pom.xml | 5 +- service/security/pom.xml | 4 +- service/security/registration/api/pom.xml | 1 - service/security/registration/pom.xml | 1 - service/security/registration/simple/pom.xml | 1 - service/security/shiro/pom.xml | 5 +- ...authentication.credential.CredentialService.xml | 12 +- ...ua.service.authorization.group.GroupService.xml | 12 +- ...apua.service.authorization.role.RoleService.xml | 12 +- .../src/main/resources/META-INF/persistence.xml | 91 ++- .../0.2.0/changelog-authentication-0.2.0.xml | 4 +- .../0.2.0/changelog-authorization-0.2.0.xml | 4 +- .../0.3.0/changelog-authentication-0.3.0.xml | 22 +- .../liquibase/changelog-authentication-master.xml | 4 +- .../liquibase/changelog-authorization-master.xml | 4 +- .../security/shiro/src/test/resources/locator.xml | 92 +-- .../security/shiro/src/test/resources/logback.xml | 30 +- service/stream/api/pom.xml | 22 +- service/stream/internal/pom.xml | 22 +- service/stream/pom.xml | 22 +- service/tag/api/pom.xml | 4 +- service/tag/internal/pom.xml | 4 +- .../org.eclipse.kapua.service.tag.TagService.xml | 14 +- .../src/main/resources/META-INF/persistence.xml | 40 +- .../liquibase/0.3.0/changelog-tag-0.3.0.xml | 4 +- .../resources/liquibase/changelog-tag-master.xml | 4 +- service/tag/pom.xml | 4 +- service/user/api/pom.xml | 16 +- service/user/internal/pom.xml | 16 +- .../org.eclipse.kapua.service.user.UserService.xml | 14 +- .../src/main/resources/META-INF/persistence.xml | 37 +- .../liquibase/0.2.0/changelog-user-0.2.0.xml | 4 +- .../liquibase/0.3.0/changelog-user-0.3.0.xml | 24 +- .../resources/liquibase/changelog-user-master.xml | 4 +- .../user/internal/src/test/resources/locator.xml | 46 +- .../user/internal/src/test/resources/logback.xml | 30 +- service/user/pom.xml | 5 +- simulator-kura/pom.xml | 462 ++++++------ simulator-kura/src/main/docker/kura-simulator.xml | 57 +- simulator-kura/src/main/docker/logback.xml | 30 +- simulator-kura/src/test/resources/logback.xml | 34 +- src/main/dependency-checker/suppress.xml | 11 + sso/api/pom.xml | 31 +- sso/jwt/pom.xml | 38 +- sso/pom.xml | 5 +- sso/provider-generic/pom.xml | 63 +- sso/provider-keycloak/pom.xml | 63 +- sso/provider/pom.xml | 55 +- test/pom.xml | 4 +- test/src/test/resources/logback.xml | 30 +- translator/api/pom.xml | 5 +- translator/kapua/kura/pom.xml | 4 +- .../kapua/kura/src/test/resources/logback.xml | 30 +- translator/kapua/pom.xml | 5 +- translator/kura/jms/pom.xml | 4 +- translator/kura/jms/src/test/resources/logback.xml | 30 +- translator/kura/mqtt/pom.xml | 4 +- .../kura/mqtt/src/test/resources/logback.xml | 30 +- translator/kura/pom.xml | 5 +- translator/pom.xml | 5 +- transport/api/pom.xml | 5 +- transport/jms/pom.xml | 4 +- transport/jms/src/test/resources/logback.xml | 30 +- transport/mqtt/pom.xml | 4 +- transport/mqtt/src/test/resources/logback.xml | 30 +- transport/pom.xml | 5 +- transport/test/pom.xml | 4 +- transport/test/src/test/resources/logback.xml | 30 +- 213 files changed, 3278 insertions(+), 2907 deletions(-) diff --git a/assembly/api/pom.xml b/assembly/api/pom.xml index 0951cf799..1933d27b5 100644 --- a/assembly/api/pom.xml +++ b/assembly/api/pom.xml @@ -1,416 +1,423 @@ + - + - 4.0.0 - - kapua-assembly - org.eclipse.kapua - 0.3.0-SNAPSHOT - + 4.0.0 + + kapua-assembly + org.eclipse.kapua + 0.3.0-SNAPSHOT + - kapua-assembly-api - pom + kapua-assembly-api + pom - - kapua - openjdk:8u121-jre-alpine - + + kapua + openjdk:8u121-jre-alpine + - + - - org.eclipse.kapua - kapua-assembly-java-base - ${project.version} - pom - + + org.eclipse.kapua + kapua-assembly-java-base + ${project.version} + pom + - - - org.apache.tomcat - tomcat - ${tomcat.version} - tar.gz - + + + org.apache.tomcat + tomcat + ${tomcat.version} + tar.gz + - - org.apache.tomcat.extras - tomcat-extras-juli - ${tomcat.version} - + + org.apache.tomcat.extras + tomcat-extras-juli + ${tomcat.version} + - - org.apache.tomcat.extras - tomcat-extras-juli-adapters - ${tomcat.version} - + + org.apache.tomcat.extras + tomcat-extras-juli-adapters + ${tomcat.version} + - - org.eclipse.kapua - kapua-rest-api - ${project.version} - war - + + org.eclipse.kapua + kapua-rest-api + ${project.version} + war + - - org.eclipse.kapua - kapua-guice - - - aopalliance - aopalliance - 1.0 - - - org.eclipse.kapua - kapua-commons - - - org.eclipse.kapua - kapua-message-internal - - - org.eclipse.kapua - kapua-account-internal - - - org.eclipse.kapua - kapua-datastore-internal - - - org.eclipse.kapua - kapua-device-configuration-internal - - - org.eclipse.kapua - kapua-security-shiro - - - org.eclipse.kapua - kapua-liquibase - - - org.eclipse.kapua - kapua-device-registry-api - - - org.eclipse.kapua - kapua-device-registry-internal - - - org.eclipse.kapua - kapua-user-api - - - org.eclipse.kapua - kapua-user-internal - + + org.eclipse.kapua + kapua-guice + + + aopalliance + aopalliance + 1.0 + + + org.eclipse.kapua + kapua-commons + + + org.eclipse.kapua + kapua-message-internal + + + org.eclipse.kapua + kapua-account-internal + + + org.eclipse.kapua + kapua-datastore-internal + + + org.eclipse.kapua + kapua-device-configuration-internal + + + org.eclipse.kapua + kapua-security-shiro + + + org.eclipse.kapua + kapua-liquibase + + + org.eclipse.kapua + kapua-device-registry-api + + + org.eclipse.kapua + kapua-device-registry-internal + + + org.eclipse.kapua + kapua-user-api + + + org.eclipse.kapua + kapua-user-internal + - - - org.eclipse.kapua - kapua-device-bundle-api - runtime - - - org.eclipse.kapua - kapua-device-bundle-internal - runtime - - - org.eclipse.kapua - kapua-device-command-api - runtime - - - org.eclipse.kapua - kapua-device-command-internal - runtime - - - org.eclipse.kapua - kapua-device-packages-api - runtime - - - org.eclipse.kapua - kapua-device-packages-internal - runtime - - - org.eclipse.kapua - kapua-translator-kapua-kura - runtime - - - org.eclipse.kapua - kapua-translator-kura-jms - runtime - - - org.eclipse.kapua - kapua-translator-kura-mqtt - runtime - - - org.eclipse.kapua - kapua-transport-api - runtime - - - org.eclipse.kapua - kapua-transport-jms - runtime - - - org.eclipse.kapua - kapua-transport-mqtt - runtime - - - - com.google.protobuf - protobuf-java - + + + org.eclipse.kapua + kapua-device-bundle-api + runtime + + + org.eclipse.kapua + kapua-device-bundle-internal + runtime + + + org.eclipse.kapua + kapua-device-command-api + runtime + + + org.eclipse.kapua + kapua-device-command-internal + runtime + + + org.eclipse.kapua + kapua-device-packages-api + runtime + + + org.eclipse.kapua + kapua-device-packages-internal + runtime + + + org.eclipse.kapua + kapua-translator-kapua-kura + runtime + + + org.eclipse.kapua + kapua-translator-kura-jms + runtime + + + org.eclipse.kapua + kapua-translator-kura-mqtt + runtime + + + org.eclipse.kapua + kapua-transport-api + runtime + + + org.eclipse.kapua + kapua-transport-jms + runtime + + + org.eclipse.kapua + kapua-transport-mqtt + runtime + + + + com.google.protobuf + protobuf-java + - - org.eclipse.persistence - javax.persistence - - 2.1.1 - - - org.eclipse.persistence - eclipselink - - - com.google.guava - guava - - - commons-configuration - commons-configuration - - - org.springframework.security - spring-security-core - 4.1.3.RELEASE - - - io.dropwizard.metrics - metrics-core - - - org.reflections - reflections - - - org.javassist - javassist - - - commons-io - commons-io - - - org.apache.commons - commons-lang3 - - - org.liquibase - liquibase-core - - - org.yaml - snakeyaml - - - org.jolokia - jolokia-jvm - 1.3.4 - agent - - - ch.qos.logback - logback-core - - - ch.qos.logback - logback-classic - - - org.slf4j - log4j-over-slf4j - + + org.eclipse.persistence + javax.persistence + + 2.1.1 + + + org.eclipse.persistence + eclipselink + + + com.google.guava + guava + + + commons-configuration + commons-configuration + + + org.springframework.security + spring-security-core + 4.1.3.RELEASE + + + io.dropwizard.metrics + metrics-core + + + org.reflections + reflections + + + org.javassist + javassist + + + commons-io + commons-io + + + org.apache.commons + commons-lang3 + + + org.liquibase + liquibase-core + + + org.yaml + snakeyaml + + + org.jolokia + jolokia-jvm + 1.3.4 + agent + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.slf4j + log4j-over-slf4j + - - - org.apache.tomcat - tomcat-servlet-api - 8.0.38 - - - org.apache.tomcat - tomcat-websocket-api - 8.0.38 - - + + + org.apache.tomcat + tomcat-servlet-api + 8.0.38 + + + org.apache.tomcat + tomcat-websocket-api + 8.0.38 + + - - - - org.apache.maven.plugins - maven-assembly-plugin - - - kapua-api - package - - single - - - - src/main/descriptors/kapua-api-jetty.xml - - posix - kapua-api-${project.version} - false - - - - + + + + org.apache.maven.plugins + maven-assembly-plugin + + + kapua-api + package + + single + + + + src/main/descriptors/kapua-api-jetty.xml + + posix + kapua-api-${project.version} + false + + + + - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-tomcat - generate-resources - - unpack - - - - - org.apache.tomcat - tomcat - tar.gz - target/dependencies/tomcat - - - - - - - - + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-tomcat + generate-resources + + unpack + + + + + org.apache.tomcat + tomcat + tar.gz + target/dependencies/tomcat + + + + + + + + - - - deploy - - false - - - - - org.codehaus.mojo - exec-maven-plugin - 1.1 - - - ${project.version} - ${tomcat.version} - ${activemq.version} - - - - - vagrant_console_deploy - install - - exec - - - ./deploy-apps.sh - ${basedir}/../../dev-tools/src/main/vagrant/demo - - - - vagrant_broker_deploy - install - - exec - - - ./deploy-broker.sh - ${basedir}/../../dev-tools/src/main/vagrant/demo - - - - - - - + + + deploy + + false + + + + + org.codehaus.mojo + exec-maven-plugin + 1.1 + + + ${project.version} + ${tomcat.version} + ${activemq.version} + + + + + vagrant_console_deploy + install + + exec + + + ./deploy-apps.sh + ${basedir}/../../dev-tools/src/main/vagrant/demo + + + + vagrant_broker_deploy + install + + exec + + + ./deploy-broker.sh + ${basedir}/../../dev-tools/src/main/vagrant/demo + + + + + + + - - release - - latest - - + + release + + latest + + - - docker - - - - io.fabric8 - docker-maven-plugin - - - - ${docker.account}/kapua-api - - ${docker.account}/jetty-base - - ${basedir}/src/main/descriptors/kapua-api-jetty.xml - /var/lib/jetty - - - \${DB_PORT_3306_TCP_PORT} - \${DB_PORT_3306_TCP_ADDR} - \${ES_PORT_9200_TCP_PORT} - \${ES_PORT_9200_TCP_ADDR} - org.eclipse.kapua.service.datastore.client.rest.RestDatastoreClient - -Dcommons.db.connection.host=\${SQL_DB_ADDR} -Dcommons.db.connection.port=\${SQL_DB_PORT} -Dbroker.host=\${BROKER_PORT_1883_TCP_ADDR} -Ddatastore.elasticsearch.nodes=\${DATASTORE_ADDR} -Ddatastore.elasticsearch.port=\${DATASTORE_PORT} -Ddatastore.client.class=\${DATASTORE_CLIENT} - - kapua - - - - - - - - - + + docker + + + + io.fabric8 + docker-maven-plugin + + + + ${docker.account}/kapua-api + + ${docker.account}/jetty-base + + ${basedir}/src/main/descriptors/kapua-api-jetty.xml + /var/lib/jetty + + + \${DB_PORT_3306_TCP_PORT} + \${DB_PORT_3306_TCP_ADDR} + \${ES_PORT_9200_TCP_PORT} + \${ES_PORT_9200_TCP_ADDR} + org.eclipse.kapua.service.datastore.client.rest.RestDatastoreClient + -Dcommons.db.connection.host=\${SQL_DB_ADDR} + -Dcommons.db.connection.port=\${SQL_DB_PORT} + -Dbroker.host=\${BROKER_PORT_1883_TCP_ADDR} + -Ddatastore.elasticsearch.nodes=\${DATASTORE_ADDR} + -Ddatastore.elasticsearch.port=\${DATASTORE_PORT} + -Ddatastore.client.class=\${DATASTORE_CLIENT} + + kapua + + + + + + + + + diff --git a/assembly/api/src/main/descriptors/jetty-base.xml b/assembly/api/src/main/descriptors/jetty-base.xml index 89afee446..736b048ea 100644 --- a/assembly/api/src/main/descriptors/jetty-base.xml +++ b/assembly/api/src/main/descriptors/jetty-base.xml @@ -6,10 +6,10 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: Red Hat Inc - initial API and implementation - --> +--> +--> + + Contributors: + Eurotech - initial API and implementation + --> + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/assembly/broker/pom.xml b/assembly/broker/pom.xml index 27274ed7f..18149dd86 100644 --- a/assembly/broker/pom.xml +++ b/assembly/broker/pom.xml @@ -1,12 +1,12 @@ +--> + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/assembly/console/pom.xml b/assembly/console/pom.xml index c6179786e..eca19f584 100644 --- a/assembly/console/pom.xml +++ b/assembly/console/pom.xml @@ -1,12 +1,12 @@ +--> @@ -49,10 +49,10 @@ ${java.base.image} + apk update && apk add curl tar && \ + adduser -D -g "Eclipse Kapua" kapua && \ + curl -s https://repo1.maven.org/maven2/org/jolokia/jolokia-jvm/1.3.4/jolokia-jvm-1.3.4-agent.jar -o /jolokia-jvm-agent.jar + ]]> diff --git a/assembly/jetty-base/pom.xml b/assembly/jetty-base/pom.xml index 08b5f45bf..20192dc8b 100644 --- a/assembly/jetty-base/pom.xml +++ b/assembly/jetty-base/pom.xml @@ -1,12 +1,12 @@ @@ -49,18 +49,18 @@ ${docker.account}/java-base + apk update && apk add bash && \ + cd /home/kapua && \ + curl -s https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.2.v20170220/jetty-distribution-9.4.2.v20170220.tar.gz -o jetty-distribution.tar.gz && \ + mkdir -p jetty && cd jetty && \ + tar --strip=1 -xzf ../jetty-distribution.tar.gz && \ + rm ../jetty-distribution.tar.gz && \ + chown -R kapua:kapua /home/kapua && \ + mkdir -p /var/lib/jetty/lib/ext /var/lib/jetty/start.d && \ + chown kapua:kapua /var/lib/jetty && \ + cd /var/lib/jetty && \ + java -jar /home/kapua/jetty/start.jar --approve-all-licenses --create-startd --add-to-start=http,jsp,jstl,websocket,deploy,logging-logback,jmx,stats + ]]> ${basedir}/src/main/descriptors/jetty-base.xml diff --git a/assembly/jetty-base/src/main/descriptors/jetty-base.xml b/assembly/jetty-base/src/main/descriptors/jetty-base.xml index 89afee446..736b048ea 100644 --- a/assembly/jetty-base/src/main/descriptors/jetty-base.xml +++ b/assembly/jetty-base/src/main/descriptors/jetty-base.xml @@ -6,10 +6,10 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: Red Hat Inc - initial API and implementation - --> +--> +--> + + Contributors: + Eurotech - initial API and implementation + --> + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/assembly/pom.xml b/assembly/pom.xml index fb2e0d275..b1b504f06 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -1,12 +1,12 @@ @@ -53,13 +53,13 @@ + mkdir -p /var/h2/data && \ + chown kapua:kapua /var/h2/data && \ + chmod a+rw /var/h2/data && \ + cd /home/kapua && \ + mkdir tmp && chmod a+rwx tmp && \ + curl -s http://repo2.maven.org/maven2/com/h2database/h2/1.4.193/h2-1.4.193.jar -o h2.jar + ]]> /var/h2/data diff --git a/assembly/sql/src/main/descriptors/kapua-sql.xml b/assembly/sql/src/main/descriptors/kapua-sql.xml index 1bf9b629e..c14454cfe 100644 --- a/assembly/sql/src/main/descriptors/kapua-sql.xml +++ b/assembly/sql/src/main/descriptors/kapua-sql.xml @@ -6,10 +6,10 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: Red Hat Inc - initial API and implementation - --> +--> - 4.0.0 - - org.eclipse.kapua - kapua - 0.3.0-SNAPSHOT - + 4.0.0 + + org.eclipse.kapua + kapua + 0.3.0-SNAPSHOT + - kapua-broker-core + kapua-broker-core - - - org.eclipse.kapua - kapua-commons - provided - - - org.eclipse.kapua - kapua-message-api - provided - - - org.eclipse.kapua - kapua-service-api - provided - - - org.eclipse.kapua - kapua-account-api - provided - - - org.eclipse.kapua - kapua-security-shiro - provided - - - org.eclipse.kapua - kapua-security-authentication-api - provided - - - org.eclipse.kapua - kapua-security-authorization-api - - - org.eclipse.kapua - kapua-datastore-api - provided - - - org.eclipse.kapua - kapua-datastore-internal - provided - - - org.eclipse.kapua - kapua-datastore-client-api - provided - - - org.eclipse.kapua - kapua-datastore-client-transport - provided - - - org.eclipse.kapua - kapua-device-call-kura - provided - - - org.eclipse.kapua - kapua-device-registry-api - provided - - - org.eclipse.kapua - kapua-user-api - provided - + + + org.eclipse.kapua + kapua-commons + provided + + + org.eclipse.kapua + kapua-message-api + provided + + + org.eclipse.kapua + kapua-service-api + provided + + + org.eclipse.kapua + kapua-account-api + provided + + + org.eclipse.kapua + kapua-security-shiro + provided + + + org.eclipse.kapua + kapua-security-authentication-api + provided + + + org.eclipse.kapua + kapua-security-authorization-api + + + org.eclipse.kapua + kapua-datastore-api + provided + + + org.eclipse.kapua + kapua-datastore-internal + provided + + + org.eclipse.kapua + kapua-datastore-client-api + provided + + + org.eclipse.kapua + kapua-datastore-client-transport + provided + + + org.eclipse.kapua + kapua-device-call-kura + provided + + + org.eclipse.kapua + kapua-device-registry-api + provided + + + org.eclipse.kapua + kapua-user-api + provided + org.eclipse.kapua kapua-tag-api provided - - org.eclipse.kapua - kapua-translator-api - provided - - - org.eclipse.kapua - kapua-translator-kapua-kura - provided - - - org.eclipse.kapua - kapua-translator-kura-jms - provided - - - org.eclipse.kapua - kapua-transport-api - provided - - - org.eclipse.kapua - kapua-transport-jms - provided - - - org.eclipse.kapua - kapua-device-api - provided - - - org.eclipse.kapua - kapua-device-commons - provided - - - org.eclipse.kapua - kapua-device-request-api - - - org.eclipse.kapua - kapua-device-request-internal - - - - org.apache.activemq - activemq-broker - ${activemq.version} - provided - - - - org.apache.camel - camel-core - provided - - - org.apache.camel - camel-jms - provided - - - - org.elasticsearch - elasticsearch - provided - - - org.elasticsearch.client - transport - provided - - - - org.slf4j - slf4j-api - provided - - - com.google.guava - guava - provided - - - org.apache.commons - commons-pool2 - provided - + + org.eclipse.kapua + kapua-translator-api + provided + + + org.eclipse.kapua + kapua-translator-kapua-kura + provided + + + org.eclipse.kapua + kapua-translator-kura-jms + provided + + + org.eclipse.kapua + kapua-transport-api + provided + + + org.eclipse.kapua + kapua-transport-jms + provided + + + org.eclipse.kapua + kapua-device-api + provided + + + org.eclipse.kapua + kapua-device-commons + provided + + + org.eclipse.kapua + kapua-device-request-api + + + org.eclipse.kapua + kapua-device-request-internal + + + + org.apache.activemq + activemq-broker + ${activemq.version} + provided + + + + org.apache.camel + camel-core + provided + + + org.apache.camel + camel-jms + provided + + + + org.elasticsearch + elasticsearch + provided + + + org.elasticsearch.client + transport + provided + + + + org.slf4j + slf4j-api + provided + + + com.google.guava + guava + provided + + + org.apache.commons + commons-pool2 + provided + - - - junit - junit - - - ch.qos.logback - logback-classic - test - - - org.apache.logging.log4j - log4j-to-slf4j - test - - - de.dentrassi.elasticsearch - log4j2-mock - test - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - copy-dependencies - package - - copy-dependencies - - - - - - - - + + + junit + junit + + + ch.qos.logback + logback-classic + test + + + org.apache.logging.log4j + log4j-to-slf4j + test + + + de.dentrassi.elasticsearch + log4j2-mock + test + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + copy-dependencies + package + + copy-dependencies + + + + + + + + diff --git a/broker-core/src/main/resources/locator.xml b/broker-core/src/main/resources/locator.xml index 211b1e67f..4125acd32 100644 --- a/broker-core/src/main/resources/locator.xml +++ b/broker-core/src/main/resources/locator.xml @@ -1,17 +1,17 @@ - + org.eclipse.kapua.service.account.AccountFactory diff --git a/broker-core/src/test/resources/logback.xml b/broker-core/src/test/resources/logback.xml index d7f725b21..f87e925ab 100644 --- a/broker-core/src/test/resources/logback.xml +++ b/broker-core/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/build-tools/pom.xml b/build-tools/pom.xml index f8fe9d442..e6dff60d2 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -1,12 +1,12 @@ diff --git a/build-tools/src/main/resources/checkstyle/kapua.suppressions.xml b/build-tools/src/main/resources/checkstyle/kapua.suppressions.xml index d568ff0ee..8533828d4 100644 --- a/build-tools/src/main/resources/checkstyle/kapua.suppressions.xml +++ b/build-tools/src/main/resources/checkstyle/kapua.suppressions.xml @@ -1,4 +1,15 @@ + diff --git a/build-tools/src/main/resources/checkstyle/kapua.xml b/build-tools/src/main/resources/checkstyle/kapua.xml index e72ae1ddc..8007bcda9 100644 --- a/build-tools/src/main/resources/checkstyle/kapua.xml +++ b/build-tools/src/main/resources/checkstyle/kapua.xml @@ -1,13 +1,12 @@ - @@ -82,6 +81,7 @@ + @@ -90,6 +90,14 @@ + + + + + + + diff --git a/build-tools/src/main/toolchains/fedora-rhel-centos.xml b/build-tools/src/main/toolchains/fedora-rhel-centos.xml index 522bc7a71..662272f2d 100644 --- a/build-tools/src/main/toolchains/fedora-rhel-centos.xml +++ b/build-tools/src/main/toolchains/fedora-rhel-centos.xml @@ -1,36 +1,48 @@ + + - - jdk - - 1.6 - JavaSE-1.6 - - - /usr/lib/jvm/java-1.6.0/jre - - - - jdk - - 1.7 - JavaSE-1.7 - - - /usr/lib/jvm/java-1.7.0 - - - - jdk - - 1.8 - JavaSE-1.8 - - - /usr/lib/jvm/java-1.8.0 - - + + jdk + + 1.6 + JavaSE-1.6 + + + /usr/lib/jvm/java-1.6.0/jre + + + + jdk + + 1.7 + JavaSE-1.7 + + + /usr/lib/jvm/java-1.7.0 + + + + jdk + + 1.8 + JavaSE-1.8 + + + /usr/lib/jvm/java-1.8.0 + + diff --git a/build-tools/src/main/toolchains/travis-ci.xml b/build-tools/src/main/toolchains/travis-ci.xml index c4db5dd5c..2f3e4677e 100644 --- a/build-tools/src/main/toolchains/travis-ci.xml +++ b/build-tools/src/main/toolchains/travis-ci.xml @@ -1,32 +1,44 @@ + + - - jdk - - 6 - - - /usr/lib/jvm/java-6-openjdk-amd64/jre - - - - jdk - - 7 - - - /usr/lib/jvm/java-7-openjdk-amd64/jre - - - - jdk - - 8 - - - /usr/lib/jvm/java-8-oracle/jre - - + + jdk + + 6 + + + /usr/lib/jvm/java-6-openjdk-amd64/jre + + + + jdk + + 7 + + + /usr/lib/jvm/java-7-openjdk-amd64/jre + + + + jdk + + 8 + + + /usr/lib/jvm/java-8-oracle/jre + + diff --git a/commons/pom.xml b/commons/pom.xml index 9b6e07f53..0a1060669 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -1,16 +1,15 @@ 4.0.0 diff --git a/commons/src/main/resources/META-INF/persistence.xml b/commons/src/main/resources/META-INF/persistence.xml index 9a743dd1d..38826abab 100644 --- a/commons/src/main/resources/META-INF/persistence.xml +++ b/commons/src/main/resources/META-INF/persistence.xml @@ -1,32 +1,31 @@ - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + + + org.eclipse.persistence.jpa.PersistenceProvider - org.eclipse.persistence.jpa.PersistenceProvider + org.eclipse.kapua.commons.configuration.ServiceConfigImpl - org.eclipse.kapua.commons.configuration.ServiceConfigImpl + + + - - - - - - - + + + diff --git a/commons/src/main/resources/liquibase/0.2.0/changelog-system-configuration-0.2.0.xml b/commons/src/main/resources/liquibase/0.2.0/changelog-system-configuration-0.2.0.xml index 212bc31c2..d7dc475cd 100644 --- a/commons/src/main/resources/liquibase/0.2.0/changelog-system-configuration-0.2.0.xml +++ b/commons/src/main/resources/liquibase/0.2.0/changelog-system-configuration-0.2.0.xml @@ -1,12 +1,12 @@ diff --git a/commons/src/main/resources/liquibase/changelog-system-configurations-master.xml b/commons/src/main/resources/liquibase/changelog-system-configurations-master.xml index 293849262..22ecde8b1 100644 --- a/commons/src/main/resources/liquibase/changelog-system-configurations-master.xml +++ b/commons/src/main/resources/liquibase/changelog-system-configurations-master.xml @@ -1,12 +1,12 @@ diff --git a/commons/src/test/resources/META-INF/persistence.xml b/commons/src/test/resources/META-INF/persistence.xml index 45ecd3503..2ac4d9d8c 100644 --- a/commons/src/test/resources/META-INF/persistence.xml +++ b/commons/src/test/resources/META-INF/persistence.xml @@ -1,24 +1,23 @@ - - org.eclipse.persistence.jpa.PersistenceProvider + + org.eclipse.persistence.jpa.PersistenceProvider org.eclipse.kapua.commons.model.misc.CollisionEntity - + - + diff --git a/commons/src/test/resources/logback.xml b/commons/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/commons/src/test/resources/logback.xml +++ b/commons/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/console/pom.xml b/console/pom.xml index 6e7e54c5e..c7b9e6c13 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -252,49 +252,49 @@ runtime - - - org.elasticsearch - elasticsearch - - - org.elasticsearch.client - transport - - - org.elasticsearch.plugin - transport-netty3-client - ${elasticsearch-client-transport.version} - - - org.elasticsearch.plugin - transport-netty4-client - ${elasticsearch-client-transport.version} - - - org.elasticsearch.plugin - reindex-client - ${elasticsearch-client-transport.version} - - - org.elasticsearch.plugin - lang-mustache-client - ${elasticsearch-client-transport.version} - - - org.elasticsearch.plugin - percolator-client - ${elasticsearch-client-transport.version} - - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - + + + org.elasticsearch + elasticsearch + + + org.elasticsearch.client + transport + + + org.elasticsearch.plugin + transport-netty3-client + ${elasticsearch-client-transport.version} + + + org.elasticsearch.plugin + transport-netty4-client + ${elasticsearch-client-transport.version} + + + org.elasticsearch.plugin + reindex-client + ${elasticsearch-client-transport.version} + + + org.elasticsearch.plugin + lang-mustache-client + ${elasticsearch-client-transport.version} + + + org.elasticsearch.plugin + percolator-client + ${elasticsearch-client-transport.version} + + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + diff --git a/console/src/main/resources/locator.xml b/console/src/main/resources/locator.xml index a629929a0..8937ad739 100644 --- a/console/src/main/resources/locator.xml +++ b/console/src/main/resources/locator.xml @@ -1,17 +1,17 @@ - + org.eclipse.kapua.service.account.AccountFactory diff --git a/console/src/main/resources/org/eclipse/kapua/app/console/admin.gwt.xml b/console/src/main/resources/org/eclipse/kapua/app/console/admin.gwt.xml index d254b2531..b14e9e721 100644 --- a/console/src/main/resources/org/eclipse/kapua/app/console/admin.gwt.xml +++ b/console/src/main/resources/org/eclipse/kapua/app/console/admin.gwt.xml @@ -1,18 +1,17 @@ - - + diff --git a/console/src/main/resources/org/eclipse/kapua/app/console/adminDev.gwt.xml b/console/src/main/resources/org/eclipse/kapua/app/console/adminDev.gwt.xml index 89dfef0bc..c944bb783 100644 --- a/console/src/main/resources/org/eclipse/kapua/app/console/adminDev.gwt.xml +++ b/console/src/main/resources/org/eclipse/kapua/app/console/adminDev.gwt.xml @@ -1,17 +1,16 @@ - - + diff --git a/console/src/main/webapp/META-INF/context.xml b/console/src/main/webapp/META-INF/context.xml index 42f043844..fd1094762 100644 --- a/console/src/main/webapp/META-INF/context.xml +++ b/console/src/main/webapp/META-INF/context.xml @@ -1,19 +1,19 @@ - - + + - + diff --git a/console/src/main/webapp/WEB-INF/web.xml b/console/src/main/webapp/WEB-INF/web.xml index 8a3d8529c..51b52cde5 100644 --- a/console/src/main/webapp/WEB-INF/web.xml +++ b/console/src/main/webapp/WEB-INF/web.xml @@ -1,12 +1,12 @@ - - console.jsp - + + + console.jsp + - - - 30 - + + + 30 + @@ -152,32 +152,32 @@ /device_snapshots/* - - accountServlet - org.eclipse.kapua.app.console.server.GwtAccountServiceImpl - - - accountServlet - /account - - - - authorizationServlet - org.eclipse.kapua.app.console.server.GwtAuthorizationServiceImpl - - - authorizationServlet - /auth - - - - deviceServlet - org.eclipse.kapua.app.console.server.GwtDeviceServiceImpl - - - deviceServlet - /device - + + accountServlet + org.eclipse.kapua.app.console.server.GwtAccountServiceImpl + + + accountServlet + /account + + + + authorizationServlet + org.eclipse.kapua.app.console.server.GwtAuthorizationServiceImpl + + + authorizationServlet + /auth + + + + deviceServlet + org.eclipse.kapua.app.console.server.GwtDeviceServiceImpl + + + deviceServlet + /device + deviceManagementServlet @@ -251,25 +251,25 @@ /group - - dataServlet - org.eclipse.kapua.app.console.server.GwtDataServiceImpl - - - dataServlet - /data - - - - dataExporterServlet - org.eclipse.kapua.app.console.servlet.DataExporterServlet - + + dataServlet + org.eclipse.kapua.app.console.server.GwtDataServiceImpl + + + dataServlet + /data + + + + dataExporterServlet + org.eclipse.kapua.app.console.servlet.DataExporterServlet + - - dataExporterServlet - /exporter_data/* - - + + dataExporterServlet + /exporter_data/* + + tagServlet org.eclipse.kapua.app.console.server.GwtTagServiceImpl @@ -279,15 +279,15 @@ /tag - - userServlet - org.eclipse.kapua.app.console.server.GwtUserServiceImpl - - - userServlet - /user - - + + userServlet + org.eclipse.kapua.app.console.server.GwtUserServiceImpl + + + userServlet + /user + + assetServlet org.eclipse.kapua.app.console.server.GwtDeviceAssetServiceImpl diff --git a/console/src/test/resources/logback.xml b/console/src/test/resources/logback.xml index d7f725b21..f87e925ab 100644 --- a/console/src/test/resources/logback.xml +++ b/console/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/dev-tools/cucumber-reports/pom.xml b/dev-tools/cucumber-reports/pom.xml index 7ecbdbd1b..839a32a68 100644 --- a/dev-tools/cucumber-reports/pom.xml +++ b/dev-tools/cucumber-reports/pom.xml @@ -1,100 +1,101 @@ + - 4.0.0 - - kapua-dev-tools - org.eclipse.kapua - 0.3.0-SNAPSHOT - + 4.0.0 + + kapua-dev-tools + org.eclipse.kapua + 0.3.0-SNAPSHOT + - kapua-cucumber-reports - pom + kapua-cucumber-reports + pom - - - - org.apache.maven.plugins - maven-assembly-plugin - - - kapua-cucumber-report - package - - single - - - - src/main/descriptors/kapua-cucumber-report.xml - - kapua-cucumber-report - false - false - - - - - - + + + + org.apache.maven.plugins + maven-assembly-plugin + + + kapua-cucumber-report + package + + single + + + + src/main/descriptors/kapua-cucumber-report.xml + + kapua-cucumber-report + false + false + + + + + + - - - deploy - - false - - - - - org.codehaus.mojo - exec-maven-plugin - 1.1 - - - ${project.version} - ${tomcat.version} - ${activemq.version} - - - - - vagrant_console_deploy - install - - exec - - - ./deploy-apps.sh - ${basedir}/../src/main/vagrant/demo - - - - vagrant_broker_deploy - install - - exec - - - ./deploy-broker.sh - ${basedir}/../src/main/vagrant/demo - - - - - - - - + + + deploy + + false + + + + + org.codehaus.mojo + exec-maven-plugin + 1.1 + + + ${project.version} + ${tomcat.version} + ${activemq.version} + + + + + vagrant_console_deploy + install + + exec + + + ./deploy-apps.sh + ${basedir}/../src/main/vagrant/demo + + + + vagrant_broker_deploy + install + + exec + + + ./deploy-broker.sh + ${basedir}/../src/main/vagrant/demo + + + + + + + + diff --git a/dev-tools/cucumber-reports/src/main/descriptors/kapua-cucumber-report.xml b/dev-tools/cucumber-reports/src/main/descriptors/kapua-cucumber-report.xml index 853965f4e..e3fce7443 100644 --- a/dev-tools/cucumber-reports/src/main/descriptors/kapua-cucumber-report.xml +++ b/dev-tools/cucumber-reports/src/main/descriptors/kapua-cucumber-report.xml @@ -6,7 +6,10 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - --> + + Contributors: + Eurotech - initial API and implementation +--> - diff --git a/dev-tools/src/main/eclipse/codeStyle/KapuaFormatter_v_2.1.xml b/dev-tools/src/main/eclipse/codeStyle/KapuaFormatter_v_2.1.xml index a210a9edd..955a90737 100644 --- a/dev-tools/src/main/eclipse/codeStyle/KapuaFormatter_v_2.1.xml +++ b/dev-tools/src/main/eclipse/codeStyle/KapuaFormatter_v_2.1.xml @@ -1,4 +1,15 @@ + diff --git a/external/pom.xml b/external/pom.xml index 9163d88bf..8fa7c76e4 100644 --- a/external/pom.xml +++ b/external/pom.xml @@ -1,6 +1,6 @@ + - 4.0.0 - - org.eclipse.kapua - kapua-locator - 0.3.0-SNAPSHOT - - - kapua-guice - - - - - org.eclipse.kapua - kapua-commons - - - - - com.google.inject - guice - - - com.google.guava - guava - - - commons-configuration - commons-configuration - - - - org.slf4j - jcl-over-slf4j - - - - - junit - junit - test - - - ch.qos.logback - logback-classic - test - - - + 4.0.0 + + org.eclipse.kapua + kapua-locator + 0.3.0-SNAPSHOT + + + kapua-guice + + + + + org.eclipse.kapua + kapua-commons + + + + + com.google.inject + guice + + + com.google.guava + guava + + + commons-configuration + commons-configuration + + + + org.slf4j + jcl-over-slf4j + + + + + junit + junit + test + + + ch.qos.logback + logback-classic + test + + + diff --git a/locator/guice/src/test/resources/locator-1.xml b/locator/guice/src/test/resources/locator-1.xml index b5b973e47..5dd0ab8b9 100644 --- a/locator/guice/src/test/resources/locator-1.xml +++ b/locator/guice/src/test/resources/locator-1.xml @@ -1,25 +1,25 @@ - + - - org.eclipse.kapua.locator.internal.guice.ServiceC - - annotation - Impl - - - - org.eclipse.kapua.locator.internal.guice - + + org.eclipse.kapua.locator.internal.guice.ServiceC + + annotation + Impl + + + + org.eclipse.kapua.locator.internal.guice + diff --git a/locator/guice/src/test/resources/locator.xml b/locator/guice/src/test/resources/locator.xml index cd71bda69..b317cedb1 100644 --- a/locator/guice/src/test/resources/locator.xml +++ b/locator/guice/src/test/resources/locator.xml @@ -1,26 +1,26 @@ - + - - org.eclipse.kapua.locator.internal.guice.ServiceA - org.eclipse.kapua.locator.internal.guice.FactoryA - - annotation - Impl - - - - org.eclipse.kapua.locator.internal.guice - + + org.eclipse.kapua.locator.internal.guice.ServiceA + org.eclipse.kapua.locator.internal.guice.FactoryA + + annotation + Impl + + + + org.eclipse.kapua.locator.internal.guice + diff --git a/locator/guice/src/test/resources/logback.xml b/locator/guice/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/locator/guice/src/test/resources/logback.xml +++ b/locator/guice/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/locator/pom.xml b/locator/pom.xml index 2c2d11281..49932195c 100644 --- a/locator/pom.xml +++ b/locator/pom.xml @@ -1,15 +1,14 @@ diff --git a/message/api/pom.xml b/message/api/pom.xml index cf0861d5e..9e4a00c74 100644 --- a/message/api/pom.xml +++ b/message/api/pom.xml @@ -1,15 +1,14 @@ diff --git a/message/internal/pom.xml b/message/internal/pom.xml index 9ab4acb31..95a1bf1b5 100644 --- a/message/internal/pom.xml +++ b/message/internal/pom.xml @@ -1,9 +1,15 @@ - + 4.0.0 diff --git a/message/internal/src/test/resources/locator.xml b/message/internal/src/test/resources/locator.xml index c055fb2ab..ffcb02552 100644 --- a/message/internal/src/test/resources/locator.xml +++ b/message/internal/src/test/resources/locator.xml @@ -1,70 +1,70 @@ - + - - org.eclipse.kapua.service.authentication.AuthenticationService + + org.eclipse.kapua.service.authentication.AuthenticationService org.eclipse.kapua.service.authentication.CredentialsFactory - - org.eclipse.kapua.service.authentication.credential.CredentialFactory + + org.eclipse.kapua.service.authentication.credential.CredentialFactory org.eclipse.kapua.service.authentication.credential.CredentialService - + org.eclipse.kapua.service.authorization.AuthorizationService - org.eclipse.kapua.service.authorization.permission.PermissionFactory - org.eclipse.kapua.service.authorization.role.RolePermissionFactory - org.eclipse.kapua.service.authorization.role.RolePermissionService - org.eclipse.kapua.service.authorization.role.RoleFactory - org.eclipse.kapua.service.authorization.role.RoleService - org.eclipse.kapua.service.authorization.access.AccessInfoFactory - org.eclipse.kapua.service.authorization.access.AccessInfoService - org.eclipse.kapua.service.authorization.access.AccessPermissionFactory - org.eclipse.kapua.service.authorization.access.AccessPermissionService - org.eclipse.kapua.service.authorization.access.AccessRoleFactory - org.eclipse.kapua.service.authorization.access.AccessRoleService + org.eclipse.kapua.service.authorization.permission.PermissionFactory + org.eclipse.kapua.service.authorization.role.RolePermissionFactory + org.eclipse.kapua.service.authorization.role.RolePermissionService + org.eclipse.kapua.service.authorization.role.RoleFactory + org.eclipse.kapua.service.authorization.role.RoleService + org.eclipse.kapua.service.authorization.access.AccessInfoFactory + org.eclipse.kapua.service.authorization.access.AccessInfoService + org.eclipse.kapua.service.authorization.access.AccessPermissionFactory + org.eclipse.kapua.service.authorization.access.AccessPermissionService + org.eclipse.kapua.service.authorization.access.AccessRoleFactory + org.eclipse.kapua.service.authorization.access.AccessRoleService org.eclipse.kapua.service.authorization.group.GroupFactory org.eclipse.kapua.service.authorization.group.GroupService - org.eclipse.kapua.service.authorization.domain.DomainFactory - org.eclipse.kapua.service.authorization.domain.DomainService - org.eclipse.kapua.service.authorization.role.RoleFactory - org.eclipse.kapua.service.authorization.role.RoleService - + org.eclipse.kapua.service.authorization.domain.DomainFactory + org.eclipse.kapua.service.authorization.domain.DomainService + org.eclipse.kapua.service.authorization.role.RoleFactory + org.eclipse.kapua.service.authorization.role.RoleService + org.eclipse.kapua.service.account.AccountFactory - org.eclipse.kapua.service.account.AccountService - + org.eclipse.kapua.service.account.AccountService + org.eclipse.kapua.service.user.UserFactory - org.eclipse.kapua.service.user.UserService - + org.eclipse.kapua.service.user.UserService + org.eclipse.kapua.message.KapuaMessageFactory - + org.eclipse.kapua.model.id.KapuaIdFactory - - - org.eclipse.kapua.service.authentication.credential.shiro + + + org.eclipse.kapua.service.authentication.credential.shiro org.eclipse.kapua.service.authorization.domain.shiro - org.eclipse.kapua.service.authorization.permission.shiro - org.eclipse.kapua.service.authorization.role.shiro + org.eclipse.kapua.service.authorization.permission.shiro + org.eclipse.kapua.service.authorization.role.shiro org.eclipse.kapua.service.authorization.group.shiro - org.eclipse.kapua.service.authorization.access.shiro - org.eclipse.kapua.service.authorization.role.shiro - org.eclipse.kapua.service.authorization.shiro + org.eclipse.kapua.service.authorization.access.shiro + org.eclipse.kapua.service.authorization.role.shiro + org.eclipse.kapua.service.authorization.shiro + + org.eclipse.kapua.test.user + org.eclipse.kapua.test.account + org.eclipse.kapua.test.authentication - org.eclipse.kapua.test.user - org.eclipse.kapua.test.account - org.eclipse.kapua.test.authentication - org.eclipse.kapua.commons.model.id - + org.eclipse.kapua.message - + diff --git a/message/internal/src/test/resources/logback.xml b/message/internal/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/message/internal/src/test/resources/logback.xml +++ b/message/internal/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/message/pom.xml b/message/pom.xml index cc46fc2b0..f5bebdf7a 100644 --- a/message/pom.xml +++ b/message/pom.xml @@ -1,15 +1,14 @@ diff --git a/pom.xml b/pom.xml index 9dd241db4..131246a4d 100644 --- a/pom.xml +++ b/pom.xml @@ -345,8 +345,12 @@ checkstyle/kapua.xml checkstyle/kapua.suppressions.xml - true - true + false + false + + ${project.basedir} + **/*.java, **/*.xml + **/target/**/*, **/.settings/**/*, maven/**/* diff --git a/qa-openshift/pom.xml b/qa-openshift/pom.xml index 46f81b9bd..2670df427 100644 --- a/qa-openshift/pom.xml +++ b/qa-openshift/pom.xml @@ -1,15 +1,14 @@ 4.0.0 diff --git a/qa/pom.xml b/qa/pom.xml index 5891db6c9..0b17011bd 100644 --- a/qa/pom.xml +++ b/qa/pom.xml @@ -1,12 +1,12 @@ - - + org.eclipse.kapua.service.account.AccountFactory diff --git a/qa/src/test/resources/logback.xml b/qa/src/test/resources/logback.xml index 8f64824ec..5212447a7 100644 --- a/qa/src/test/resources/logback.xml +++ b/qa/src/test/resources/logback.xml @@ -1,8 +1,6 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/rest-api/pom.xml b/rest-api/pom.xml index 27da3b592..0d23a01b5 100644 --- a/rest-api/pom.xml +++ b/rest-api/pom.xml @@ -1,185 +1,185 @@ - - 4.0.0 + 4.0.0 - - org.eclipse.kapua - kapua - 0.3.0-SNAPSHOT - + + org.eclipse.kapua + kapua + 0.3.0-SNAPSHOT + - kapua-rest-api - war + kapua-rest-api + war - - 2.23.2 - 1.5.12 - 2.1.4 - + + 2.23.2 + 1.5.12 + 2.1.4 + - + - - - org.glassfish.jersey.containers - jersey-container-servlet-core - ${jersey.version} - + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey.version} + - - - io.swagger - swagger-jersey2-jaxrs - ${swagger.version} - + + + io.swagger + swagger-jersey2-jaxrs + ${swagger.version} + - - - org.glassfish.jersey.media - jersey-media-moxy - 2.23.2 - + + + org.glassfish.jersey.media + jersey-media-moxy + 2.23.2 + - - - org.apache.shiro - shiro-core - ${shiro.version} - + + + org.apache.shiro + shiro-core + ${shiro.version} + - - org.apache.shiro - shiro-web - ${shiro.version} - + + org.apache.shiro + shiro-web + ${shiro.version} + - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + - - - org.eclipse.kapua - kapua-commons - - - org.eclipse.kapua - kapua-guice - - - org.eclipse.kapua - kapua-account-internal - + + + org.eclipse.kapua + kapua-commons + + + org.eclipse.kapua + kapua-guice + + + org.eclipse.kapua + kapua-account-internal + - - org.eclipse.kapua - kapua-datastore-api - - - org.eclipse.kapua - kapua-datastore-internal - + + org.eclipse.kapua + kapua-datastore-api + + + org.eclipse.kapua + kapua-datastore-internal + - - org.eclipse.kapua - kapua-datastore-client-transport - + + org.eclipse.kapua + kapua-datastore-client-transport + org.eclipse.kapua kapua-datastore-client-rest - + org.eclipse.kapua kapua-message-internal - - - org.eclipse.kapua - kapua-security-shiro - - - org.eclipse.kapua - kapua-device-registry-api - - - org.eclipse.kapua - kapua-device-asset-api - - - org.eclipse.kapua - kapua-translator-api - - - org.eclipse.kapua - kapua-translator-kapua-kura - - - org.eclipse.kapua - kapua-translator-kura-jms - - - org.eclipse.kapua - kapua-translator-kura-mqtt - - - org.eclipse.kapua - kapua-transport-jms - - - org.eclipse.kapua - kapua-transport-mqtt - - - org.eclipse.kapua - kapua-transport-test - + + + org.eclipse.kapua + kapua-security-shiro + + + org.eclipse.kapua + kapua-device-registry-api + + + org.eclipse.kapua + kapua-device-asset-api + + + org.eclipse.kapua + kapua-translator-api + + + org.eclipse.kapua + kapua-translator-kapua-kura + + + org.eclipse.kapua + kapua-translator-kura-jms + + + org.eclipse.kapua + kapua-translator-kura-mqtt + + + org.eclipse.kapua + kapua-transport-jms + + + org.eclipse.kapua + kapua-transport-mqtt + + + org.eclipse.kapua + kapua-transport-test + - - org.eclipse.kapua - kapua-device-asset-internal - - - org.eclipse.kapua - kapua-device-bundle-internal - - - org.eclipse.kapua - kapua-device-command-internal - - - org.eclipse.kapua - kapua-device-configuration-internal - - - org.eclipse.kapua - kapua-device-packages-internal - + + org.eclipse.kapua + kapua-device-asset-internal + + + org.eclipse.kapua + kapua-device-bundle-internal + + + org.eclipse.kapua + kapua-device-command-internal + + + org.eclipse.kapua + kapua-device-configuration-internal + + + org.eclipse.kapua + kapua-device-packages-internal + org.eclipse.kapua kapua-user-api - - org.eclipse.kapua - kapua-user-internal - + + org.eclipse.kapua + kapua-user-internal + org.eclipse.kapua @@ -190,167 +190,167 @@ kapua-tag-internal - - joda-time - joda-time - - - - - ch.qos.logback - logback-classic - test - + + joda-time + joda-time + + + + + ch.qos.logback + logback-classic + test + - - - org.slf4j - slf4j-api - provided - - - - - org.elasticsearch - elasticsearch - - - org.elasticsearch.client - transport - - - org.elasticsearch.plugin - transport-netty3-client - ${elasticsearch-client-transport.version} - - - org.elasticsearch.plugin - transport-netty4-client - ${elasticsearch-client-transport.version} - - - org.elasticsearch.plugin - reindex-client - ${elasticsearch-client-transport.version} - - - org.elasticsearch.plugin - lang-mustache-client - ${elasticsearch-client-transport.version} - - - org.elasticsearch.plugin - percolator-client - ${elasticsearch-client-transport.version} - - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - + + + org.slf4j + slf4j-api + provided + + + + + org.elasticsearch + elasticsearch + + + org.elasticsearch.client + transport + + + org.elasticsearch.plugin + transport-netty3-client + ${elasticsearch-client-transport.version} + + + org.elasticsearch.plugin + transport-netty4-client + ${elasticsearch-client-transport.version} + + + org.elasticsearch.plugin + reindex-client + ${elasticsearch-client-transport.version} + + + org.elasticsearch.plugin + lang-mustache-client + ${elasticsearch-client-transport.version} + + + org.elasticsearch.plugin + percolator-client + ${elasticsearch-client-transport.version} + + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + org.eclipse.kapua kapua-device-request-api - - org.eclipse.kapua - kapua-device-request-internal - + + org.eclipse.kapua + kapua-device-request-internal + org.eclipse.kapua kapua-stream-api - org.eclipse.kapua - kapua-stream-internal - + org.eclipse.kapua + kapua-stream-internal + - - api - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-swagger-ui - prepare-package - - unpack - - - - - org.eclipse.kapua.external - swagger-ui - ${swagger-ui.version}-CQ-10792 - true - ${project.build.directory}/tmp/swagger-ui - - - org.eclipse.kapua.external - swagger-ui-lib - ${swagger-ui.version} - ${project.build.directory}/tmp/swagger-ui-lib - - - - - - + + api + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-swagger-ui + prepare-package + + unpack + + + + + org.eclipse.kapua.external + swagger-ui + ${swagger-ui.version}-CQ-10792 + true + ${project.build.directory}/tmp/swagger-ui + + + org.eclipse.kapua.external + swagger-ui-lib + ${swagger-ui.version} + ${project.build.directory}/tmp/swagger-ui-lib + + + + + + - - org.apache.maven.plugins - maven-antrun-plugin - - - package swagger ui - prepare-package - - run - - - - Swagger-ui: create doc dir - - - - Swagger-ui-lib: create lib dir for swagger-ui - - - - - - - - - + + org.apache.maven.plugins + maven-antrun-plugin + + + package swagger ui + prepare-package + + run + + + + Swagger-ui: create doc dir + + + + Swagger-ui-lib: create lib dir for swagger-ui + + + + + + + + + - - - org.apache.maven.plugins - maven-war-plugin - - - - ${basedir} - - about.html - epl-v10.html - notice.html - - - - - - WEB-INF/lib/slf4j-api-*.jar, - WEB-INF/lib/logback*.jar - - - - - + + + org.apache.maven.plugins + maven-war-plugin + + + + ${basedir} + + about.html + epl-v10.html + notice.html + + + + + + WEB-INF/lib/slf4j-api-*.jar, + WEB-INF/lib/logback*.jar + + + + + diff --git a/rest-api/src/main/resources/locator.xml b/rest-api/src/main/resources/locator.xml index 7aed919df..28e8fa6f4 100644 --- a/rest-api/src/main/resources/locator.xml +++ b/rest-api/src/main/resources/locator.xml @@ -1,16 +1,16 @@ - + org.eclipse.kapua.service.account.AccountFactory diff --git a/rest-api/src/main/webapp/WEB-INF/web.xml b/rest-api/src/main/webapp/WEB-INF/web.xml index 91d81d955..e3d56be4c 100644 --- a/rest-api/src/main/webapp/WEB-INF/web.xml +++ b/rest-api/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,15 @@ - + @@ -44,9 +50,9 @@ jersey.config.server.provider.packages - io.swagger.jaxrs.listing - + io.swagger.jaxrs.listing + 1 diff --git a/rest-api/src/test/resources/logback.xml b/rest-api/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/rest-api/src/test/resources/logback.xml +++ b/rest-api/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/account/api/pom.xml b/service/account/api/pom.xml index 2f7d99a23..38c67bd43 100644 --- a/service/account/api/pom.xml +++ b/service/account/api/pom.xml @@ -1,27 +1,32 @@ - + - 4.0.0 - - org.eclipse.kapua - kapua-account - 0.3.0-SNAPSHOT - + 4.0.0 + + org.eclipse.kapua + kapua-account + 0.3.0-SNAPSHOT + - kapua-account-api - ${project.artifactId} + kapua-account-api + ${project.artifactId} - - - - org.eclipse.kapua - kapua-service-api - - + + + + org.eclipse.kapua + kapua-service-api + + diff --git a/service/account/internal/pom.xml b/service/account/internal/pom.xml index 61c51d474..a0f7bf9f5 100644 --- a/service/account/internal/pom.xml +++ b/service/account/internal/pom.xml @@ -1,9 +1,15 @@ - + 4.0.0 diff --git a/service/account/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.account.AccountService.xml b/service/account/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.account.AccountService.xml index eaa9d0e16..1d6d9882d 100644 --- a/service/account/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.account.AccountService.xml +++ b/service/account/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.account.AccountService.xml @@ -1,16 +1,14 @@ - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + - org.eclipse.persistence.jpa.PersistenceProvider + org.eclipse.persistence.jpa.PersistenceProvider - org.eclipse.kapua.service.account.internal.AccountImpl - org.eclipse.kapua.service.account.internal.OrganizationImpl - org.eclipse.kapua.commons.configuration.ServiceConfigImpl + org.eclipse.kapua.service.account.internal.AccountImpl + org.eclipse.kapua.service.account.internal.OrganizationImpl + org.eclipse.kapua.commons.configuration.ServiceConfigImpl - - org.eclipse.kapua.commons.model.id.KapuaEid - org.eclipse.kapua.commons.model.AbstractKapuaEntity - org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity - org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity + + org.eclipse.kapua.commons.model.id.KapuaEid + org.eclipse.kapua.commons.model.AbstractKapuaEntity + org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity + org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity - - - - - - + + + + + + diff --git a/service/account/internal/src/main/resources/liquibase/0.2.0/changelog-account-0.2.0.xml b/service/account/internal/src/main/resources/liquibase/0.2.0/changelog-account-0.2.0.xml index ab679f3ac..5dd76c05d 100644 --- a/service/account/internal/src/main/resources/liquibase/0.2.0/changelog-account-0.2.0.xml +++ b/service/account/internal/src/main/resources/liquibase/0.2.0/changelog-account-0.2.0.xml @@ -1,12 +1,12 @@ diff --git a/service/account/internal/src/main/resources/liquibase/changelog-account-master.xml b/service/account/internal/src/main/resources/liquibase/changelog-account-master.xml index 887ee244e..7886c9e96 100644 --- a/service/account/internal/src/main/resources/liquibase/changelog-account-master.xml +++ b/service/account/internal/src/main/resources/liquibase/changelog-account-master.xml @@ -1,12 +1,12 @@ diff --git a/service/account/internal/src/test/resources/locator.xml b/service/account/internal/src/test/resources/locator.xml index de55cceda..a771ea985 100644 --- a/service/account/internal/src/test/resources/locator.xml +++ b/service/account/internal/src/test/resources/locator.xml @@ -1,40 +1,40 @@ - + - - org.eclipse.kapua.service.account.AccountService - org.eclipse.kapua.service.account.AccountFactory - org.eclipse.kapua.service.authentication.AuthenticationService - org.eclipse.kapua.service.authentication.UsernamePasswordTokenFactory - org.eclipse.kapua.service.authorization.AuthorizationService - org.eclipse.kapua.service.authorization.domain.DomainFactory - org.eclipse.kapua.service.authorization.domain.DomainService - org.eclipse.kapua.service.authorization.permission.PermissionFactory - org.eclipse.kapua.service.user.UserService - - - - org.eclipse.kapua.commons - org.eclipse.kapua.service.account.internal - org.eclipse.kapua.test.steps - org.eclipse.kapua.test.user - org.eclipse.kapua.test.authentication - org.eclipse.kapua.test.authorization - + + org.eclipse.kapua.service.account.AccountService + org.eclipse.kapua.service.account.AccountFactory + org.eclipse.kapua.service.authentication.AuthenticationService + org.eclipse.kapua.service.authentication.UsernamePasswordTokenFactory + org.eclipse.kapua.service.authorization.AuthorizationService + org.eclipse.kapua.service.authorization.domain.DomainFactory + org.eclipse.kapua.service.authorization.domain.DomainService + org.eclipse.kapua.service.authorization.permission.PermissionFactory + org.eclipse.kapua.service.user.UserService + + + + org.eclipse.kapua.commons + org.eclipse.kapua.service.account.internal + org.eclipse.kapua.test.steps + org.eclipse.kapua.test.user + org.eclipse.kapua.test.authentication + org.eclipse.kapua.test.authorization + diff --git a/service/account/internal/src/test/resources/logback.xml b/service/account/internal/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/service/account/internal/src/test/resources/logback.xml +++ b/service/account/internal/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/account/pom.xml b/service/account/pom.xml index cc9004ab0..9210ae7dc 100644 --- a/service/account/pom.xml +++ b/service/account/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/api/pom.xml b/service/api/pom.xml index 27025fca9..0ed1eec32 100644 --- a/service/api/pom.xml +++ b/service/api/pom.xml @@ -1,15 +1,14 @@ @@ -21,7 +20,6 @@ kapua-service-api - ${project.artifactId} diff --git a/service/datastore/api/pom.xml b/service/datastore/api/pom.xml index 2a5f973cf..e8f8ca5f9 100644 --- a/service/datastore/api/pom.xml +++ b/service/datastore/api/pom.xml @@ -1,15 +1,14 @@ @@ -30,7 +29,7 @@ kapua-message-api - + org.eclipse.kapua kapua-datastore-client-api diff --git a/service/datastore/client-api/pom.xml b/service/datastore/client-api/pom.xml index 8d6168169..4dbfb3a5e 100644 --- a/service/datastore/client-api/pom.xml +++ b/service/datastore/client-api/pom.xml @@ -1,15 +1,14 @@ + 4.0.0 diff --git a/service/datastore/client-embedded/pom.xml b/service/datastore/client-embedded/pom.xml index a2f39b1de..150c739a0 100644 --- a/service/datastore/client-embedded/pom.xml +++ b/service/datastore/client-embedded/pom.xml @@ -1,11 +1,12 @@ + diff --git a/service/datastore/client-rest/pom.xml b/service/datastore/client-rest/pom.xml index 9d456fe48..c8b21fc0f 100644 --- a/service/datastore/client-rest/pom.xml +++ b/service/datastore/client-rest/pom.xml @@ -1,15 +1,14 @@ + @@ -22,15 +21,15 @@ kapua-datastore-client-rest - - org.eclipse.kapua - kapua-commons - - - - org.eclipse.kapua - kapua-datastore-client-api - + + org.eclipse.kapua + kapua-commons + + + + org.eclipse.kapua + kapua-datastore-client-api + diff --git a/service/datastore/client-transport/pom.xml b/service/datastore/client-transport/pom.xml index 66a22b606..fb698a079 100644 --- a/service/datastore/client-transport/pom.xml +++ b/service/datastore/client-transport/pom.xml @@ -1,15 +1,14 @@ + 4.0.0 diff --git a/service/datastore/internal/pom.xml b/service/datastore/internal/pom.xml index e07eff591..4af3c64c6 100644 --- a/service/datastore/internal/pom.xml +++ b/service/datastore/internal/pom.xml @@ -74,7 +74,7 @@ + or in the test dependencies --> org.eclipse.kapua diff --git a/service/datastore/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.datastore.MessageStoreService.xml b/service/datastore/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.datastore.MessageStoreService.xml index bc9373f23..77386930b 100644 --- a/service/datastore/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.datastore.MessageStoreService.xml +++ b/service/datastore/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.datastore.MessageStoreService.xml @@ -1,16 +1,14 @@ - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + - org.eclipse.persistence.jpa.PersistenceProvider + org.eclipse.persistence.jpa.PersistenceProvider - org.eclipse.kapua.commons.configuration.ServiceConfigImpl - - - - + org.eclipse.kapua.commons.configuration.ServiceConfigImpl + + + + - + diff --git a/service/datastore/internal/src/test/resources/locator.xml b/service/datastore/internal/src/test/resources/locator.xml index cad41f457..7c9adbca5 100644 --- a/service/datastore/internal/src/test/resources/locator.xml +++ b/service/datastore/internal/src/test/resources/locator.xml @@ -1,16 +1,16 @@ - + org.eclipse.kapua.service.datastore.ClientInfoRegistryService diff --git a/service/datastore/internal/src/test/resources/logback.xml b/service/datastore/internal/src/test/resources/logback.xml index d3642836d..b4df83422 100644 --- a/service/datastore/internal/src/test/resources/logback.xml +++ b/service/datastore/internal/src/test/resources/logback.xml @@ -1,31 +1,27 @@ + Copyright (c) 2017 Eurotech and/or its affiliates and others + + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + Contributors: + Eurotech - initial API and implementation + --> - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/datastore/pom.xml b/service/datastore/pom.xml index 16e8d6ef8..78028bf27 100644 --- a/service/datastore/pom.xml +++ b/service/datastore/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/api/pom.xml b/service/device/api/pom.xml index 02f7211ed..e7522e881 100644 --- a/service/device/api/pom.xml +++ b/service/device/api/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/asset/api/pom.xml b/service/device/asset/api/pom.xml index 416bb130e..93bcea6c9 100644 --- a/service/device/asset/api/pom.xml +++ b/service/device/asset/api/pom.xml @@ -1,12 +1,12 @@ diff --git a/service/device/asset/internal/pom.xml b/service/device/asset/internal/pom.xml index ef723f9ec..22c242035 100644 --- a/service/device/asset/internal/pom.xml +++ b/service/device/asset/internal/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/device/asset/pom.xml b/service/device/asset/pom.xml index 8344b36c9..9b1a8f9cd 100644 --- a/service/device/asset/pom.xml +++ b/service/device/asset/pom.xml @@ -1,12 +1,12 @@ diff --git a/service/device/bundle/api/pom.xml b/service/device/bundle/api/pom.xml index e9573e5da..f36a99bcd 100644 --- a/service/device/bundle/api/pom.xml +++ b/service/device/bundle/api/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/bundle/internal/pom.xml b/service/device/bundle/internal/pom.xml index d1dde4dc8..19f95b543 100644 --- a/service/device/bundle/internal/pom.xml +++ b/service/device/bundle/internal/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/device/bundle/pom.xml b/service/device/bundle/pom.xml index 7529cca8c..a04f3c1ab 100644 --- a/service/device/bundle/pom.xml +++ b/service/device/bundle/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/call/api/pom.xml b/service/device/call/api/pom.xml index 20030b68e..4af36b819 100644 --- a/service/device/call/api/pom.xml +++ b/service/device/call/api/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/call/kura/pom.xml b/service/device/call/kura/pom.xml index aadd0f7c1..38f22faf2 100644 --- a/service/device/call/kura/pom.xml +++ b/service/device/call/kura/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/device/call/pom.xml b/service/device/call/pom.xml index 28234ef33..a3ec4bab3 100644 --- a/service/device/call/pom.xml +++ b/service/device/call/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/call/test/pom.xml b/service/device/call/test/pom.xml index 5b9057635..6c86f7966 100644 --- a/service/device/call/test/pom.xml +++ b/service/device/call/test/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/device/command/api/pom.xml b/service/device/command/api/pom.xml index 91cad95bb..0b9f65b79 100644 --- a/service/device/command/api/pom.xml +++ b/service/device/command/api/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/command/internal/pom.xml b/service/device/command/internal/pom.xml index 231900e78..0a90744c0 100644 --- a/service/device/command/internal/pom.xml +++ b/service/device/command/internal/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/device/command/pom.xml b/service/device/command/pom.xml index bfa64d7f9..c9a8d6355 100644 --- a/service/device/command/pom.xml +++ b/service/device/command/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/command/test/pom.xml b/service/device/command/test/pom.xml index eb44d4375..0650e8235 100644 --- a/service/device/command/test/pom.xml +++ b/service/device/command/test/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/command/test/src/test/resources/logback.xml b/service/device/command/test/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/service/device/command/test/src/test/resources/logback.xml +++ b/service/device/command/test/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/device/commons/pom.xml b/service/device/commons/pom.xml index c08f1e8c5..042e696b7 100644 --- a/service/device/commons/pom.xml +++ b/service/device/commons/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/configuration/api/pom.xml b/service/device/configuration/api/pom.xml index d3514903b..d41aca97b 100644 --- a/service/device/configuration/api/pom.xml +++ b/service/device/configuration/api/pom.xml @@ -1,15 +1,14 @@ @@ -31,8 +30,8 @@ kapua-service-api - joda-time - joda-time + joda-time + joda-time org.eclipse.kapua diff --git a/service/device/configuration/internal/pom.xml b/service/device/configuration/internal/pom.xml index 825210764..e743f0c3d 100644 --- a/service/device/configuration/internal/pom.xml +++ b/service/device/configuration/internal/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/configuration/internal/src/test/resources/logback.xml b/service/device/configuration/internal/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/service/device/configuration/internal/src/test/resources/logback.xml +++ b/service/device/configuration/internal/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/device/configuration/pom.xml b/service/device/configuration/pom.xml index c0ca183df..8c61e73e9 100644 --- a/service/device/configuration/pom.xml +++ b/service/device/configuration/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/packages/api/pom.xml b/service/device/packages/api/pom.xml index cd247d485..69c8d95fa 100644 --- a/service/device/packages/api/pom.xml +++ b/service/device/packages/api/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/packages/internal/pom.xml b/service/device/packages/internal/pom.xml index 83d8a19c2..cd82740c7 100644 --- a/service/device/packages/internal/pom.xml +++ b/service/device/packages/internal/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/packages/internal/src/test/resources/logback.xml b/service/device/packages/internal/src/test/resources/logback.xml index ed52b4f5d..99dacf798 100644 --- a/service/device/packages/internal/src/test/resources/logback.xml +++ b/service/device/packages/internal/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - - - - - + + + + + \ No newline at end of file diff --git a/service/device/packages/pom.xml b/service/device/packages/pom.xml index 3ac8ecb99..39ce8db32 100644 --- a/service/device/packages/pom.xml +++ b/service/device/packages/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/pom.xml b/service/device/pom.xml index ca5723a05..60cfb9dc7 100644 --- a/service/device/pom.xml +++ b/service/device/pom.xml @@ -1,15 +1,16 @@ + 4.0.0 diff --git a/service/device/registry/api/pom.xml b/service/device/registry/api/pom.xml index 5bfb12257..b32e4af94 100644 --- a/service/device/registry/api/pom.xml +++ b/service/device/registry/api/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/registry/internal/pom.xml b/service/device/registry/internal/pom.xml index dc5d501fb..671a8a11f 100644 --- a/service/device/registry/internal/pom.xml +++ b/service/device/registry/internal/pom.xml @@ -1,12 +1,12 @@ diff --git a/service/device/registry/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.device.registry.DeviceRegistryService.xml b/service/device/registry/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.device.registry.DeviceRegistryService.xml index 87faf4117..d4bb9affd 100644 --- a/service/device/registry/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.device.registry.DeviceRegistryService.xml +++ b/service/device/registry/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.device.registry.DeviceRegistryService.xml @@ -1,16 +1,14 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> org.eclipse.persistence.jpa.PersistenceProvider diff --git a/service/device/registry/internal/src/main/resources/liquibase/0.2.0/changelog-device-0.2.0.xml b/service/device/registry/internal/src/main/resources/liquibase/0.2.0/changelog-device-0.2.0.xml index bc80f60b2..6b701364f 100644 --- a/service/device/registry/internal/src/main/resources/liquibase/0.2.0/changelog-device-0.2.0.xml +++ b/service/device/registry/internal/src/main/resources/liquibase/0.2.0/changelog-device-0.2.0.xml @@ -1,12 +1,12 @@ diff --git a/service/device/registry/internal/src/main/resources/liquibase/0.3.0/changelog-device-0.3.0.xml b/service/device/registry/internal/src/main/resources/liquibase/0.3.0/changelog-device-0.3.0.xml index 9e59c1678..d7a285f62 100644 --- a/service/device/registry/internal/src/main/resources/liquibase/0.3.0/changelog-device-0.3.0.xml +++ b/service/device/registry/internal/src/main/resources/liquibase/0.3.0/changelog-device-0.3.0.xml @@ -1,15 +1,15 @@ - + - + diff --git a/service/device/registry/internal/src/main/resources/liquibase/changelog-device-master.xml b/service/device/registry/internal/src/main/resources/liquibase/changelog-device-master.xml index 2fab92268..d6bbab629 100644 --- a/service/device/registry/internal/src/main/resources/liquibase/changelog-device-master.xml +++ b/service/device/registry/internal/src/main/resources/liquibase/changelog-device-master.xml @@ -1,12 +1,12 @@ diff --git a/service/device/registry/internal/src/test/resources/locator.xml b/service/device/registry/internal/src/test/resources/locator.xml index 9986fc233..918523bb9 100644 --- a/service/device/registry/internal/src/test/resources/locator.xml +++ b/service/device/registry/internal/src/test/resources/locator.xml @@ -1,50 +1,50 @@ - + - - org.eclipse.kapua.service.authentication.AuthenticationService + + org.eclipse.kapua.service.authentication.AuthenticationService org.eclipse.kapua.service.authentication.CredentialsFactory - + org.eclipse.kapua.service.authorization.AuthorizationService - org.eclipse.kapua.service.authorization.domain.DomainFactory - org.eclipse.kapua.service.authorization.domain.DomainService - org.eclipse.kapua.service.authorization.permission.PermissionFactory - + org.eclipse.kapua.service.authorization.domain.DomainFactory + org.eclipse.kapua.service.authorization.domain.DomainService + org.eclipse.kapua.service.authorization.permission.PermissionFactory + org.eclipse.kapua.service.account.AccountFactory - org.eclipse.kapua.service.account.AccountService + org.eclipse.kapua.service.account.AccountService org.eclipse.kapua.service.device.registry.DeviceRegistryService org.eclipse.kapua.service.device.registry.DeviceFactory - - org.eclipse.kapua.service.device.registry.event.DeviceEventService - + + org.eclipse.kapua.service.device.registry.event.DeviceEventService + org.eclipse.kapua.service.user.UserFactory - org.eclipse.kapua.service.user.UserService - - org.eclipse.kapua.model.id.KapuaIdFactory - - - - org.eclipse.kapua.service.device.registry.internal - org.eclipse.kapua.service.device.registry.event.internal - - org.eclipse.kapua.test.steps - org.eclipse.kapua.test.user - org.eclipse.kapua.test.account - org.eclipse.kapua.test.authentication - org.eclipse.kapua.test.authorization - + org.eclipse.kapua.service.user.UserService + + org.eclipse.kapua.model.id.KapuaIdFactory + + + + org.eclipse.kapua.service.device.registry.internal + org.eclipse.kapua.service.device.registry.event.internal + + org.eclipse.kapua.test.steps + org.eclipse.kapua.test.user + org.eclipse.kapua.test.account + org.eclipse.kapua.test.authentication + org.eclipse.kapua.test.authorization + org.eclipse.kapua.commons.model.id - + diff --git a/service/device/registry/internal/src/test/resources/logback.xml b/service/device/registry/internal/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/service/device/registry/internal/src/test/resources/logback.xml +++ b/service/device/registry/internal/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/device/registry/pom.xml b/service/device/registry/pom.xml index 8df14ce84..aa86b1c7c 100644 --- a/service/device/registry/pom.xml +++ b/service/device/registry/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/device/request/api/pom.xml b/service/device/request/api/pom.xml index 75514a08e..494158a05 100644 --- a/service/device/request/api/pom.xml +++ b/service/device/request/api/pom.xml @@ -1,15 +1,15 @@ - + 4.0.0 diff --git a/service/device/request/internal/pom.xml b/service/device/request/internal/pom.xml index 25020452f..e088a0040 100644 --- a/service/device/request/internal/pom.xml +++ b/service/device/request/internal/pom.xml @@ -1,12 +1,12 @@ + 4.0.0 diff --git a/service/idgenerator/random-mysql/src/test/resources/locator.xml b/service/idgenerator/random-mysql/src/test/resources/locator.xml index 95a6848c2..a4bd691fd 100644 --- a/service/idgenerator/random-mysql/src/test/resources/locator.xml +++ b/service/idgenerator/random-mysql/src/test/resources/locator.xml @@ -1,21 +1,21 @@ - + - - org.eclipse.kapua.service.generator.id.IdGeneratorService - - - org.eclipse.kapua.service.generator.id.random.mysql - + + org.eclipse.kapua.service.generator.id.IdGeneratorService + + + org.eclipse.kapua.service.generator.id.random.mysql + diff --git a/service/idgenerator/sequence/src/test/resources/locator.xml b/service/idgenerator/sequence/src/test/resources/locator.xml index d8b988684..399541750 100644 --- a/service/idgenerator/sequence/src/test/resources/locator.xml +++ b/service/idgenerator/sequence/src/test/resources/locator.xml @@ -1,21 +1,21 @@ - + - - org.eclipse.kapua.service.generator.id.IdGeneratorService - - - org.eclipse.kapua.service.generator.id.sequence - + + org.eclipse.kapua.service.generator.id.IdGeneratorService + + + org.eclipse.kapua.service.generator.id.sequence + \ No newline at end of file diff --git a/service/liquibase/pom.xml b/service/liquibase/pom.xml index 4022fb8e4..de25074ed 100644 --- a/service/liquibase/pom.xml +++ b/service/liquibase/pom.xml @@ -1,12 +1,14 @@ diff --git a/service/liquibase/src/test/resources/liquibase/changelog-liquibase-master.xml b/service/liquibase/src/test/resources/liquibase/changelog-liquibase-master.xml index 5fb28a979..a2f244b24 100644 --- a/service/liquibase/src/test/resources/liquibase/changelog-liquibase-master.xml +++ b/service/liquibase/src/test/resources/liquibase/changelog-liquibase-master.xml @@ -1,12 +1,12 @@ diff --git a/service/liquibase/src/test/resources/logback.xml b/service/liquibase/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/service/liquibase/src/test/resources/logback.xml +++ b/service/liquibase/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/pom.xml b/service/pom.xml index 22b5924cc..1ff37b738 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -1,15 +1,16 @@ + 4.0.0 diff --git a/service/security/authentication/api/pom.xml b/service/security/authentication/api/pom.xml index ad4303356..2a5991529 100644 --- a/service/security/authentication/api/pom.xml +++ b/service/security/authentication/api/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/security/authentication/pom.xml b/service/security/authentication/pom.xml index 0ca98a4d7..4b92222a2 100644 --- a/service/security/authentication/pom.xml +++ b/service/security/authentication/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/security/authorization/api/pom.xml b/service/security/authorization/api/pom.xml index 4e3951a3d..eeeffa5f9 100644 --- a/service/security/authorization/api/pom.xml +++ b/service/security/authorization/api/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/security/authorization/pom.xml b/service/security/authorization/pom.xml index 92d383aad..6c4cffa22 100644 --- a/service/security/authorization/pom.xml +++ b/service/security/authorization/pom.xml @@ -1,15 +1,14 @@ diff --git a/service/security/pom.xml b/service/security/pom.xml index 736031502..51603a743 100644 --- a/service/security/pom.xml +++ b/service/security/pom.xml @@ -1,12 +1,12 @@ diff --git a/service/security/shiro/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.authentication.credential.CredentialService.xml b/service/security/shiro/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.authentication.credential.CredentialService.xml index b1d805fe5..0fb5b4aa9 100644 --- a/service/security/shiro/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.authentication.credential.CredentialService.xml +++ b/service/security/shiro/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.authentication.credential.CredentialService.xml @@ -1,16 +1,14 @@ - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + - org.eclipse.persistence.jpa.PersistenceProvider + org.eclipse.persistence.jpa.PersistenceProvider - - org.eclipse.kapua.service.authentication.credential.shiro.CredentialImpl - org.eclipse.kapua.service.authentication.token.shiro.AccessTokenImpl + + org.eclipse.kapua.service.authentication.credential.shiro.CredentialImpl + org.eclipse.kapua.service.authentication.token.shiro.AccessTokenImpl - - org.eclipse.kapua.commons.model.id.KapuaEid - org.eclipse.kapua.commons.model.AbstractKapuaEntity - org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity - org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity - org.eclipse.kapua.commons.configuration.ServiceConfigImpl + + org.eclipse.kapua.commons.model.id.KapuaEid + org.eclipse.kapua.commons.model.AbstractKapuaEntity + org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity + org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity + org.eclipse.kapua.commons.configuration.ServiceConfigImpl - - - - - - + + + + + + - + - org.eclipse.persistence.jpa.PersistenceProvider + org.eclipse.persistence.jpa.PersistenceProvider - - org.eclipse.kapua.service.authorization.access.shiro.AccessInfoImpl - org.eclipse.kapua.service.authorization.access.shiro.AccessRoleImpl - org.eclipse.kapua.service.authorization.access.shiro.AccessPermissionImpl + + org.eclipse.kapua.service.authorization.access.shiro.AccessInfoImpl + org.eclipse.kapua.service.authorization.access.shiro.AccessRoleImpl + org.eclipse.kapua.service.authorization.access.shiro.AccessPermissionImpl - org.eclipse.kapua.service.authorization.domain.shiro.DomainImpl + org.eclipse.kapua.service.authorization.domain.shiro.DomainImpl - org.eclipse.kapua.service.authorization.group.shiro.GroupImpl - org.eclipse.kapua.service.authorization.group.shiro.GroupPermissionImpl + org.eclipse.kapua.service.authorization.group.shiro.GroupImpl + org.eclipse.kapua.service.authorization.group.shiro.GroupPermissionImpl - org.eclipse.kapua.service.authorization.permission.shiro.PermissionImpl + org.eclipse.kapua.service.authorization.permission.shiro.PermissionImpl - org.eclipse.kapua.service.authorization.role.shiro.RoleImpl - org.eclipse.kapua.service.authorization.role.shiro.RolePermissionImpl + org.eclipse.kapua.service.authorization.role.shiro.RoleImpl + org.eclipse.kapua.service.authorization.role.shiro.RolePermissionImpl - - org.eclipse.kapua.commons.model.id.KapuaEid - org.eclipse.kapua.commons.model.AbstractKapuaEntity - org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity - org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity - org.eclipse.kapua.commons.configuration.ServiceConfigImpl + + org.eclipse.kapua.commons.model.id.KapuaEid + org.eclipse.kapua.commons.model.AbstractKapuaEntity + org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity + org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity + org.eclipse.kapua.commons.configuration.ServiceConfigImpl - - - - - + + + + + diff --git a/service/security/shiro/src/main/resources/liquibase/0.2.0/changelog-authentication-0.2.0.xml b/service/security/shiro/src/main/resources/liquibase/0.2.0/changelog-authentication-0.2.0.xml index 2c4241471..dd3af970c 100644 --- a/service/security/shiro/src/main/resources/liquibase/0.2.0/changelog-authentication-0.2.0.xml +++ b/service/security/shiro/src/main/resources/liquibase/0.2.0/changelog-authentication-0.2.0.xml @@ -1,12 +1,12 @@ diff --git a/service/security/shiro/src/main/resources/liquibase/0.2.0/changelog-authorization-0.2.0.xml b/service/security/shiro/src/main/resources/liquibase/0.2.0/changelog-authorization-0.2.0.xml index b723b563d..031f507af 100644 --- a/service/security/shiro/src/main/resources/liquibase/0.2.0/changelog-authorization-0.2.0.xml +++ b/service/security/shiro/src/main/resources/liquibase/0.2.0/changelog-authorization-0.2.0.xml @@ -1,12 +1,12 @@ diff --git a/service/security/shiro/src/main/resources/liquibase/0.3.0/changelog-authentication-0.3.0.xml b/service/security/shiro/src/main/resources/liquibase/0.3.0/changelog-authentication-0.3.0.xml index 7ef4a495b..1d5d281c7 100644 --- a/service/security/shiro/src/main/resources/liquibase/0.3.0/changelog-authentication-0.3.0.xml +++ b/service/security/shiro/src/main/resources/liquibase/0.3.0/changelog-authentication-0.3.0.xml @@ -1,15 +1,15 @@ - + diff --git a/service/security/shiro/src/main/resources/liquibase/changelog-authorization-master.xml b/service/security/shiro/src/main/resources/liquibase/changelog-authorization-master.xml index a236e430d..d4d31bcaf 100644 --- a/service/security/shiro/src/main/resources/liquibase/changelog-authorization-master.xml +++ b/service/security/shiro/src/main/resources/liquibase/changelog-authorization-master.xml @@ -1,12 +1,12 @@ diff --git a/service/security/shiro/src/test/resources/locator.xml b/service/security/shiro/src/test/resources/locator.xml index c2e7027a7..0258d52d3 100644 --- a/service/security/shiro/src/test/resources/locator.xml +++ b/service/security/shiro/src/test/resources/locator.xml @@ -1,71 +1,71 @@ - + - - org.eclipse.kapua.service.authentication.AuthenticationService + + org.eclipse.kapua.service.authentication.AuthenticationService org.eclipse.kapua.service.authentication.CredentialsFactory - - org.eclipse.kapua.service.authentication.credential.CredentialFactory + + org.eclipse.kapua.service.authentication.credential.CredentialFactory org.eclipse.kapua.service.authentication.credential.CredentialService - + org.eclipse.kapua.service.authorization.AuthorizationService - org.eclipse.kapua.service.authorization.permission.PermissionFactory - org.eclipse.kapua.service.authorization.role.RolePermissionFactory - org.eclipse.kapua.service.authorization.role.RolePermissionService - org.eclipse.kapua.service.authorization.role.RoleFactory - org.eclipse.kapua.service.authorization.role.RoleService - org.eclipse.kapua.service.authorization.access.AccessInfoFactory - org.eclipse.kapua.service.authorization.access.AccessInfoService - org.eclipse.kapua.service.authorization.access.AccessPermissionFactory - org.eclipse.kapua.service.authorization.access.AccessPermissionService - org.eclipse.kapua.service.authorization.access.AccessRoleFactory - org.eclipse.kapua.service.authorization.access.AccessRoleService + org.eclipse.kapua.service.authorization.permission.PermissionFactory + org.eclipse.kapua.service.authorization.role.RolePermissionFactory + org.eclipse.kapua.service.authorization.role.RolePermissionService + org.eclipse.kapua.service.authorization.role.RoleFactory + org.eclipse.kapua.service.authorization.role.RoleService + org.eclipse.kapua.service.authorization.access.AccessInfoFactory + org.eclipse.kapua.service.authorization.access.AccessInfoService + org.eclipse.kapua.service.authorization.access.AccessPermissionFactory + org.eclipse.kapua.service.authorization.access.AccessPermissionService + org.eclipse.kapua.service.authorization.access.AccessRoleFactory + org.eclipse.kapua.service.authorization.access.AccessRoleService org.eclipse.kapua.service.authorization.group.GroupFactory org.eclipse.kapua.service.authorization.group.GroupService - org.eclipse.kapua.service.authorization.domain.DomainFactory - org.eclipse.kapua.service.authorization.domain.DomainService - org.eclipse.kapua.service.authorization.role.RoleFactory - org.eclipse.kapua.service.authorization.role.RoleService - + org.eclipse.kapua.service.authorization.domain.DomainFactory + org.eclipse.kapua.service.authorization.domain.DomainService + org.eclipse.kapua.service.authorization.role.RoleFactory + org.eclipse.kapua.service.authorization.role.RoleService + org.eclipse.kapua.service.account.AccountFactory - org.eclipse.kapua.service.account.AccountService - + org.eclipse.kapua.service.account.AccountService + org.eclipse.kapua.service.user.UserFactory - org.eclipse.kapua.service.user.UserService - + org.eclipse.kapua.service.user.UserService + org.eclipse.kapua.model.id.KapuaIdFactory org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory - - - org.eclipse.kapua.service.authentication.credential.shiro - - + + + org.eclipse.kapua.service.authentication.credential.shiro + + org.eclipse.kapua.service.authorization.domain.shiro - org.eclipse.kapua.service.authorization.permission.shiro - org.eclipse.kapua.service.authorization.role.shiro + org.eclipse.kapua.service.authorization.permission.shiro + org.eclipse.kapua.service.authorization.role.shiro org.eclipse.kapua.service.authorization.group.shiro - org.eclipse.kapua.service.authorization.access.shiro - org.eclipse.kapua.service.authorization.role.shiro - org.eclipse.kapua.service.authorization.shiro - - org.eclipse.kapua.test.steps + org.eclipse.kapua.service.authorization.access.shiro + org.eclipse.kapua.service.authorization.role.shiro + org.eclipse.kapua.service.authorization.shiro + + org.eclipse.kapua.test.steps org.eclipse.kapua.test.user - org.eclipse.kapua.test.account - org.eclipse.kapua.test.authentication - + org.eclipse.kapua.test.account + org.eclipse.kapua.test.authentication + org.eclipse.kapua.commons.model.id - org.eclipse.kapua.commons.configuration - + org.eclipse.kapua.commons.configuration + diff --git a/service/security/shiro/src/test/resources/logback.xml b/service/security/shiro/src/test/resources/logback.xml index f3325308c..157acc172 100644 --- a/service/security/shiro/src/test/resources/logback.xml +++ b/service/security/shiro/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/stream/api/pom.xml b/service/stream/api/pom.xml index 109654433..b3b17844d 100644 --- a/service/stream/api/pom.xml +++ b/service/stream/api/pom.xml @@ -1,15 +1,15 @@ - + kapua-stream diff --git a/service/stream/internal/pom.xml b/service/stream/internal/pom.xml index 07c73d458..dfe921ab3 100644 --- a/service/stream/internal/pom.xml +++ b/service/stream/internal/pom.xml @@ -1,15 +1,15 @@ - + kapua-stream diff --git a/service/stream/pom.xml b/service/stream/pom.xml index c15ed4e2c..a6091a9fd 100644 --- a/service/stream/pom.xml +++ b/service/stream/pom.xml @@ -1,15 +1,15 @@ - + kapua-service diff --git a/service/tag/api/pom.xml b/service/tag/api/pom.xml index 11a71cd48..8650c098d 100644 --- a/service/tag/api/pom.xml +++ b/service/tag/api/pom.xml @@ -1,12 +1,12 @@ diff --git a/service/tag/internal/pom.xml b/service/tag/internal/pom.xml index ebd9c8c1b..89c1292c3 100644 --- a/service/tag/internal/pom.xml +++ b/service/tag/internal/pom.xml @@ -1,12 +1,12 @@ diff --git a/service/tag/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.tag.TagService.xml b/service/tag/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.tag.TagService.xml index 0f1da7a8f..2ca5c8893 100644 --- a/service/tag/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.tag.TagService.xml +++ b/service/tag/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.tag.TagService.xml @@ -2,13 +2,13 @@ - - + diff --git a/service/tag/internal/src/main/resources/META-INF/persistence.xml b/service/tag/internal/src/main/resources/META-INF/persistence.xml index 2844df9b3..25bcf339f 100644 --- a/service/tag/internal/src/main/resources/META-INF/persistence.xml +++ b/service/tag/internal/src/main/resources/META-INF/persistence.xml @@ -1,36 +1,36 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> - + - org.eclipse.persistence.jpa.PersistenceProvider + org.eclipse.persistence.jpa.PersistenceProvider - org.eclipse.kapua.service.tag.internal.TagImpl - - - org.eclipse.kapua.commons.model.id.KapuaEid - org.eclipse.kapua.commons.model.AbstractKapuaEntity - org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity - org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity - org.eclipse.kapua.commons.configuration.ServiceConfigImpl + org.eclipse.kapua.service.tag.internal.TagImpl + + + org.eclipse.kapua.commons.model.id.KapuaEid + org.eclipse.kapua.commons.model.AbstractKapuaEntity + org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity + org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity + org.eclipse.kapua.commons.configuration.ServiceConfigImpl - - - - - + + + + + diff --git a/service/tag/internal/src/main/resources/liquibase/0.3.0/changelog-tag-0.3.0.xml b/service/tag/internal/src/main/resources/liquibase/0.3.0/changelog-tag-0.3.0.xml index 0cb857b9a..49c917522 100644 --- a/service/tag/internal/src/main/resources/liquibase/0.3.0/changelog-tag-0.3.0.xml +++ b/service/tag/internal/src/main/resources/liquibase/0.3.0/changelog-tag-0.3.0.xml @@ -1,12 +1,12 @@ diff --git a/service/tag/internal/src/main/resources/liquibase/changelog-tag-master.xml b/service/tag/internal/src/main/resources/liquibase/changelog-tag-master.xml index bbc84c30e..33133f74f 100644 --- a/service/tag/internal/src/main/resources/liquibase/changelog-tag-master.xml +++ b/service/tag/internal/src/main/resources/liquibase/changelog-tag-master.xml @@ -1,12 +1,12 @@ diff --git a/service/tag/pom.xml b/service/tag/pom.xml index 69d6b1c5c..c62287f1b 100644 --- a/service/tag/pom.xml +++ b/service/tag/pom.xml @@ -1,12 +1,12 @@ diff --git a/service/user/api/pom.xml b/service/user/api/pom.xml index bd10ddb1c..5bd1e9594 100644 --- a/service/user/api/pom.xml +++ b/service/user/api/pom.xml @@ -1,9 +1,15 @@ - + 4.0.0 diff --git a/service/user/internal/pom.xml b/service/user/internal/pom.xml index 2959b67cf..996c8121e 100644 --- a/service/user/internal/pom.xml +++ b/service/user/internal/pom.xml @@ -1,9 +1,15 @@ - + 4.0.0 diff --git a/service/user/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.user.UserService.xml b/service/user/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.user.UserService.xml index b7f48a9da..26d1f0271 100644 --- a/service/user/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.user.UserService.xml +++ b/service/user/internal/src/main/resources/META-INF/metatypes/org.eclipse.kapua.service.user.UserService.xml @@ -1,16 +1,14 @@ - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + - org.eclipse.persistence.jpa.PersistenceProvider + org.eclipse.persistence.jpa.PersistenceProvider - org.eclipse.kapua.service.user.internal.UserImpl - org.eclipse.kapua.commons.configuration.ServiceConfigImpl + org.eclipse.kapua.service.user.internal.UserImpl + org.eclipse.kapua.commons.configuration.ServiceConfigImpl - - org.eclipse.kapua.commons.model.id.KapuaEid - org.eclipse.kapua.commons.model.AbstractKapuaEntity - org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity - org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity + + org.eclipse.kapua.commons.model.id.KapuaEid + org.eclipse.kapua.commons.model.AbstractKapuaEntity + org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity + org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity - - - + + + - + diff --git a/service/user/internal/src/main/resources/liquibase/0.2.0/changelog-user-0.2.0.xml b/service/user/internal/src/main/resources/liquibase/0.2.0/changelog-user-0.2.0.xml index 491ac6ebc..1df6d5c17 100644 --- a/service/user/internal/src/main/resources/liquibase/0.2.0/changelog-user-0.2.0.xml +++ b/service/user/internal/src/main/resources/liquibase/0.2.0/changelog-user-0.2.0.xml @@ -1,12 +1,12 @@ diff --git a/service/user/internal/src/main/resources/liquibase/0.3.0/changelog-user-0.3.0.xml b/service/user/internal/src/main/resources/liquibase/0.3.0/changelog-user-0.3.0.xml index 2cfc1c980..0a716bfc5 100644 --- a/service/user/internal/src/main/resources/liquibase/0.3.0/changelog-user-0.3.0.xml +++ b/service/user/internal/src/main/resources/liquibase/0.3.0/changelog-user-0.3.0.xml @@ -1,16 +1,16 @@ - - + diff --git a/service/user/internal/src/test/resources/locator.xml b/service/user/internal/src/test/resources/locator.xml index 7a20f33d8..b88b8af48 100644 --- a/service/user/internal/src/test/resources/locator.xml +++ b/service/user/internal/src/test/resources/locator.xml @@ -1,34 +1,34 @@ - + - - org.eclipse.kapua.service.user.UserService - org.eclipse.kapua.service.user.UserFactory - org.eclipse.kapua.service.authentication.AuthenticationService - org.eclipse.kapua.service.authorization.AuthorizationService - org.eclipse.kapua.service.authentication.UsernamePasswordTokenFactory - org.eclipse.kapua.service.authorization.domain.DomainFactory - org.eclipse.kapua.service.authorization.domain.DomainService - org.eclipse.kapua.service.authorization.permission.PermissionFactory - org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory - org.eclipse.kapua.service.generator.id.IdGeneratorService - - - org.eclipse.kapua.commons - org.eclipse.kapua.service.user.internal - org.eclipse.kapua.service.generator.id.sequence - org.eclipse.kapua.test.steps - org.eclipse.kapua.test.auth - + + org.eclipse.kapua.service.user.UserService + org.eclipse.kapua.service.user.UserFactory + org.eclipse.kapua.service.authentication.AuthenticationService + org.eclipse.kapua.service.authorization.AuthorizationService + org.eclipse.kapua.service.authentication.UsernamePasswordTokenFactory + org.eclipse.kapua.service.authorization.domain.DomainFactory + org.eclipse.kapua.service.authorization.domain.DomainService + org.eclipse.kapua.service.authorization.permission.PermissionFactory + org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory + org.eclipse.kapua.service.generator.id.IdGeneratorService + + + org.eclipse.kapua.commons + org.eclipse.kapua.service.user.internal + org.eclipse.kapua.service.generator.id.sequence + org.eclipse.kapua.test.steps + org.eclipse.kapua.test.auth + \ No newline at end of file diff --git a/service/user/internal/src/test/resources/logback.xml b/service/user/internal/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/service/user/internal/src/test/resources/logback.xml +++ b/service/user/internal/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/service/user/pom.xml b/service/user/pom.xml index 65e3d0b06..683af5d04 100644 --- a/service/user/pom.xml +++ b/service/user/pom.xml @@ -1,15 +1,14 @@ diff --git a/simulator-kura/pom.xml b/simulator-kura/pom.xml index df0d33cbb..0ffbd42fd 100644 --- a/simulator-kura/pom.xml +++ b/simulator-kura/pom.xml @@ -1,267 +1,267 @@ - 4.0.0 + 4.0.0 - - org.eclipse.kapua - kapua - 0.3.0-SNAPSHOT - .. - + + org.eclipse.kapua + kapua + 0.3.0-SNAPSHOT + .. + - kapua-simulator-kura + kapua-simulator-kura - This is a framework for simulating Eclipse Kura IoT gateway instances + This is a framework for simulating Eclipse Kura IoT gateway instances - - UTF-8 - kapua - + + UTF-8 + kapua + - - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - - - org.eclipse.neoscada.utils - org.eclipse.scada.utils - 0.4.0 - + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + + + org.eclipse.neoscada.utils + org.eclipse.scada.utils + 0.4.0 + - - com.google.protobuf - protobuf-java - + + com.google.protobuf + protobuf-java + - - org.apache.httpcomponents - httpclient - + + org.apache.httpcomponents + httpclient + - - org.apache.commons - commons-lang3 - + + org.apache.commons + commons-lang3 + - - com.google.guava - guava - + + com.google.guava + guava + - - com.google.code.gson - gson - + + com.google.code.gson + gson + - - org.osgi - org.osgi.core - 6.0.0 - + + org.osgi + org.osgi.core + 6.0.0 + - - org.slf4j - slf4j-api - + + org.slf4j + slf4j-api + - - org.slf4j - jul-to-slf4j - ${slf4j.version} - true - + + org.slf4j + jul-to-slf4j + ${slf4j.version} + true + - - commons-cli - commons-cli - + + commons-cli + commons-cli + - - ch.qos.logback - logback-classic - true - + + ch.qos.logback + logback-classic + true + - - junit - junit - test - + + junit + junit + test + - - org.assertj - assertj-core - test - - + + org.assertj + assertj-core + test + + - - - - com.github.os72 - protoc-jar-maven-plugin - - - generate-sources - - run - - - 2.6.1 - true - - src/main/protobuf - - - - - + + + + com.github.os72 + protoc-jar-maven-plugin + + + generate-sources + + run + + + 2.6.1 + true + + src/main/protobuf + + + + + - - org.apache.maven.plugins - maven-shade-plugin - - - - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - META-INF/maven/** - META-INF/DEPENDENCIES - bundle.properties - about.* - OSGI-OPT/** - LICENSE - - - - - - org.eclipse.kapua.kura.simulator.main.SimulatorRunner - - - false - - - - true - app - - - - package - - shade - - - - + + org.apache.maven.plugins + maven-shade-plugin + + + + true + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + META-INF/maven/** + META-INF/DEPENDENCIES + bundle.properties + about.* + OSGI-OPT/** + LICENSE + + + + + + org.eclipse.kapua.kura.simulator.main.SimulatorRunner + + + false + + + + true + app + + + + package + + shade + + + + - - io.fabric8 - docker-maven-plugin - - - - ${docker.account}/kura-simulator - - java:8-jre-alpine - Jens Reimann <jreimann@redhat.com> - - dir - /opt/${project.artifactId} - kura-simulator.xml - - - adduser -D -g "" simulator - - simulator - - - java - -Dlogback.configurationFile=/opt/${project.artifactId}/logback.xml - -cp - /opt/${project.artifactId}/${project.artifactId}-${project.version}-app.jar - org.eclipse.kapua.kura.simulator.main.SimulatorRunner - - - - - - - + + io.fabric8 + docker-maven-plugin + + + + ${docker.account}/kura-simulator + + java:8-jre-alpine + Jens Reimann <jreimann@redhat.com> + + dir + /opt/${project.artifactId} + kura-simulator.xml + + + adduser -D -g "" simulator + + simulator + + + java + -Dlogback.configurationFile=/opt/${project.artifactId}/logback.xml + -cp + /opt/${project.artifactId}/${project.artifactId}-${project.version}-app.jar + org.eclipse.kapua.kura.simulator.main.SimulatorRunner + + + + + + + - + - - - - io.fabric8 - docker-maven-plugin - - - - ${docker.account}/kura-simulator - - - ${project.version} - ${timestamp} - - - - - - - - + + + + io.fabric8 + docker-maven-plugin + + + + ${docker.account}/kura-simulator + + + ${project.version} + ${timestamp} + + + + + + + + - + - - - release - - - - - io.fabric8 - docker-maven-plugin - - - - ${docker.account}/kura-simulator - - - latest - ${project.version} - ${timestamp} - - - - - - - - - - - + + + release + + + + + io.fabric8 + docker-maven-plugin + + + + ${docker.account}/kura-simulator + + + latest + ${project.version} + ${timestamp} + + + + + + + + + + + \ No newline at end of file diff --git a/simulator-kura/src/main/docker/kura-simulator.xml b/simulator-kura/src/main/docker/kura-simulator.xml index 97fc76e27..1b20670e2 100644 --- a/simulator-kura/src/main/docker/kura-simulator.xml +++ b/simulator-kura/src/main/docker/kura-simulator.xml @@ -1,30 +1,41 @@ + - kura-simulator + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> + kura-simulator - - tar.gz - + + tar.gz + - false + false - - - ${project.build.directory} - . - - *-app.jar - - - - src/main/docker - . - - logback.xml - - - + + + ${project.build.directory} + . + + *-app.jar + + + + src/main/docker + . + + logback.xml + + + \ No newline at end of file diff --git a/simulator-kura/src/main/docker/logback.xml b/simulator-kura/src/main/docker/logback.xml index 940411f62..7e50d2229 100644 --- a/simulator-kura/src/main/docker/logback.xml +++ b/simulator-kura/src/main/docker/logback.xml @@ -1,15 +1,27 @@ + + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/simulator-kura/src/test/resources/logback.xml b/simulator-kura/src/test/resources/logback.xml index 465db22e5..2176110f4 100644 --- a/simulator-kura/src/test/resources/logback.xml +++ b/simulator-kura/src/test/resources/logback.xml @@ -1,18 +1,28 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + - - - - - - + + + \ No newline at end of file diff --git a/src/main/dependency-checker/suppress.xml b/src/main/dependency-checker/suppress.xml index f0571a05e..27005a2f6 100644 --- a/src/main/dependency-checker/suppress.xml +++ b/src/main/dependency-checker/suppress.xml @@ -1,4 +1,15 @@ + - 4.0.0 + 4.0.0 - - org.eclipse.kapua - kapua-sso - 0.3.0-SNAPSHOT - + + org.eclipse.kapua + kapua-sso + 0.3.0-SNAPSHOT + - kapua-sso-api + kapua-sso-api - - - org.glassfish - javax.json - - + + + org.glassfish + javax.json + + diff --git a/sso/jwt/pom.xml b/sso/jwt/pom.xml index eccd9b394..d0ec66b53 100644 --- a/sso/jwt/pom.xml +++ b/sso/jwt/pom.xml @@ -1,35 +1,35 @@ - 4.0.0 + 4.0.0 - - org.eclipse.kapua - kapua-sso - 0.3.0-SNAPSHOT - + + org.eclipse.kapua + kapua-sso + 0.3.0-SNAPSHOT + - kapua-sso-jwt + kapua-sso-jwt - - - org.glassfish - javax.json - - - org.bitbucket.b_c - jose4j - - + + + org.glassfish + javax.json + + + org.bitbucket.b_c + jose4j + + diff --git a/sso/pom.xml b/sso/pom.xml index c21020331..4444124cb 100644 --- a/sso/pom.xml +++ b/sso/pom.xml @@ -1,15 +1,14 @@ diff --git a/sso/provider-generic/pom.xml b/sso/provider-generic/pom.xml index 04423f2d4..9786a3f64 100644 --- a/sso/provider-generic/pom.xml +++ b/sso/provider-generic/pom.xml @@ -1,46 +1,45 @@ - 4.0.0 - - - org.eclipse.kapua - kapua-sso - 0.3.0-SNAPSHOT - - - kapua-sso-provider-generic - - - - org.eclipse.kapua - kapua-commons - - - org.eclipse.kapua - kapua-sso-api - - - org.eclipse.kapua - kapua-sso-provider - - - - org.apache.httpcomponents - httpclient - - + 4.0.0 + + + org.eclipse.kapua + kapua-sso + 0.3.0-SNAPSHOT + + + kapua-sso-provider-generic + + + + org.eclipse.kapua + kapua-commons + + + org.eclipse.kapua + kapua-sso-api + + + org.eclipse.kapua + kapua-sso-provider + + + + org.apache.httpcomponents + httpclient + + diff --git a/sso/provider-keycloak/pom.xml b/sso/provider-keycloak/pom.xml index 6e15653ef..2ea78a345 100644 --- a/sso/provider-keycloak/pom.xml +++ b/sso/provider-keycloak/pom.xml @@ -1,46 +1,45 @@ - 4.0.0 - - - org.eclipse.kapua - kapua-sso - 0.3.0-SNAPSHOT - - - kapua-sso-provider-keycloak - - - - org.eclipse.kapua - kapua-commons - - - org.eclipse.kapua - kapua-sso-api - - - org.eclipse.kapua - kapua-sso-provider - - - - org.apache.httpcomponents - httpclient - - + 4.0.0 + + + org.eclipse.kapua + kapua-sso + 0.3.0-SNAPSHOT + + + kapua-sso-provider-keycloak + + + + org.eclipse.kapua + kapua-commons + + + org.eclipse.kapua + kapua-sso-api + + + org.eclipse.kapua + kapua-sso-provider + + + + org.apache.httpcomponents + httpclient + + diff --git a/sso/provider/pom.xml b/sso/provider/pom.xml index 156ead404..0459f8fe4 100644 --- a/sso/provider/pom.xml +++ b/sso/provider/pom.xml @@ -1,42 +1,41 @@ - 4.0.0 - - - org.eclipse.kapua - kapua-sso - 0.3.0-SNAPSHOT - - - kapua-sso-provider - - - - org.eclipse.kapua - kapua-sso-api - - - org.eclipse.kapua - kapua-commons - - - - org.apache.httpcomponents - httpclient - - + 4.0.0 + + + org.eclipse.kapua + kapua-sso + 0.3.0-SNAPSHOT + + + kapua-sso-provider + + + + org.eclipse.kapua + kapua-sso-api + + + org.eclipse.kapua + kapua-commons + + + + org.apache.httpcomponents + httpclient + + diff --git a/test/pom.xml b/test/pom.xml index 2d129ce33..d82d186e5 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -223,7 +223,7 @@ transport-netty4-client ${elasticsearch.version} - + ch.qos.logback logback-classic test @@ -244,6 +244,6 @@ true - + diff --git a/test/src/test/resources/logback.xml b/test/src/test/resources/logback.xml index d7f725b21..157acc172 100644 --- a/test/src/test/resources/logback.xml +++ b/test/src/test/resources/logback.xml @@ -1,17 +1,27 @@ + - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/translator/api/pom.xml b/translator/api/pom.xml index e976acecb..40860ee65 100644 --- a/translator/api/pom.xml +++ b/translator/api/pom.xml @@ -1,15 +1,14 @@ diff --git a/translator/kapua/kura/pom.xml b/translator/kapua/kura/pom.xml index b0c292b9d..e1720df17 100644 --- a/translator/kapua/kura/pom.xml +++ b/translator/kapua/kura/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/translator/kapua/pom.xml b/translator/kapua/pom.xml index 3107b44f2..95cf5b9c9 100644 --- a/translator/kapua/pom.xml +++ b/translator/kapua/pom.xml @@ -1,15 +1,14 @@ diff --git a/translator/kura/jms/pom.xml b/translator/kura/jms/pom.xml index 4bfcb2866..e25a742e6 100644 --- a/translator/kura/jms/pom.xml +++ b/translator/kura/jms/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/translator/kura/mqtt/pom.xml b/translator/kura/mqtt/pom.xml index 8ecab3fa2..0095b5b68 100644 --- a/translator/kura/mqtt/pom.xml +++ b/translator/kura/mqtt/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/translator/kura/pom.xml b/translator/kura/pom.xml index 682379d58..e9461068f 100644 --- a/translator/kura/pom.xml +++ b/translator/kura/pom.xml @@ -1,15 +1,14 @@ diff --git a/translator/pom.xml b/translator/pom.xml index 3b26c7362..df9d0124d 100644 --- a/translator/pom.xml +++ b/translator/pom.xml @@ -1,15 +1,14 @@ diff --git a/transport/api/pom.xml b/transport/api/pom.xml index 9e6fd96b7..cbb42c204 100644 --- a/transport/api/pom.xml +++ b/transport/api/pom.xml @@ -1,16 +1,15 @@ 4.0.0 diff --git a/transport/jms/pom.xml b/transport/jms/pom.xml index e5e7f8757..1be7c3201 100644 --- a/transport/jms/pom.xml +++ b/transport/jms/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml index c11efb08c..855682b9d 100644 --- a/transport/mqtt/pom.xml +++ b/transport/mqtt/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/transport/pom.xml b/transport/pom.xml index acea86edb..63f68d1b1 100644 --- a/transport/pom.xml +++ b/transport/pom.xml @@ -1,15 +1,14 @@ diff --git a/transport/test/pom.xml b/transport/test/pom.xml index c1f946673..a642853a2 100644 --- a/transport/test/pom.xml +++ b/transport/test/pom.xml @@ -1,12 +1,12 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file