Break job engine to rest api dependency

assembly/api/pom.xml

@@ -148,10 +148,6 @@
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>javax.persistence</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>

assembly/console/pom.xml

@@ -146,10 +146,6 @@
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>javax.persistence</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>

broker/artemis/plugin/pom.xml

@@ -64,7 +64,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-security-authentication-api</artifactId>
+            <artifactId>kapua-service-client</artifactId>
         </dependency>
 
         <dependency>
@@ -93,10 +93,6 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-service-client</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

client/gateway/profile/kura/pom.xml

@@ -21,7 +21,7 @@
         <groupId>org.eclipse.kapua</groupId>
         <artifactId>kapua-client-gateway</artifactId>
         <version>2.1.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <name>Eclipse Kapua :: Gateway Client :: Profile :: Eclipse Kura</name>
@@ -41,16 +41,6 @@
             <artifactId>kapua-client-gateway-provider-mqtt</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-client-gateway-spi</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>

client/gateway/provider/fuse/pom.xml

@@ -42,17 +42,7 @@
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-client-gateway-provider-mqtt</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-client-gateway-spi</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
+
         <dependency>
             <groupId>org.fusesource.mqtt-client</groupId>
             <artifactId>mqtt-client</artifactId>

client/gateway/provider/paho/pom.xml

@@ -40,16 +40,6 @@
             <artifactId>kapua-client-gateway-provider-mqtt</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-client-gateway-spi</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>

client/security/pom.xml

@@ -23,97 +23,24 @@
     <artifactId>kapua-client-security</artifactId>
 
     <dependencies>
-        <!-- ActiveMQ Artemis -->
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-amqp-protocol</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-commons</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-server</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-core-client</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.qpid</groupId>
-            <artifactId>qpid-jms-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-service-api</artifactId>
-        </dependency>
-        <!-- just for service bus settings - should be moved to service-api???? -->
         <dependency>
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-commons</artifactId>
         </dependency>
+        <!-- External Dependencies -->
         <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-datastore-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-device-management-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-device-registry-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-security-authentication-api</artifactId>
-        </dependency>
-
-        <!-- needed to set the theadcontext on login
-        TODO find a way to remove this dependency -->
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-core</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-server</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <!-- Dependencies are required to provide ActiveMQ the JARs -->
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

client/security/src/main/java/org/eclipse/kapua/client/security/bean/AuthContext.java

@@ -12,13 +12,12 @@
  *******************************************************************************/
 package org.eclipse.kapua.client.security.bean;
 
-import org.eclipse.kapua.model.id.KapuaId;
-import org.eclipse.kapua.service.device.registry.connection.DeviceConnection;
-
 import java.security.cert.Certificate;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.kapua.model.id.KapuaId;
+
 public class AuthContext {
 
     private String clusterName;
@@ -136,19 +135,20 @@ public boolean getSslEnabled() {
     }
 
     /**
-     * Gets the {@link DeviceConnection#getAuthenticationType()} used when connecting.
+     * Gets the device connection's authentication type used when connecting.
      *
-     * @return The {@link DeviceConnection#getAuthenticationType()} used when connecting.
+     * @return The device connection's authentication type used when connecting.
      * @since 2.0.0
      */
     public String getAuthenticationType() {
         return authenticationType;
     }
 
     /**
-     * Sets the {@link DeviceConnection#getAuthenticationType()} used to connection.
+     * Sets the device connection's authentication type used to connection.
      *
-     * @param authenticationType The {@link DeviceConnection#getAuthenticationType()} used to connection.
+     * @param authenticationType
+     *         The device connection's authentication type used to connection.
      * @since 2.0.0
      */
     public void setAuthenticationType(String authenticationType) {

commons-rest/pom.xml → commons-jersey/pom.xml

@@ -21,11 +21,10 @@
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kapua-commons-rest</artifactId>
+    <artifactId>kapua-commons-jersey</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>model</module>
-        <module>errors</module>
-        <module>filters</module>
+        <module>rest</module>
+        <module>web</module>
     </modules>
 </project>

commons-rest/model/pom.xml → commons-jersey/rest/pom.xml

@@ -15,14 +15,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
-        <artifactId>kapua-commons-rest</artifactId>
+        <artifactId>kapua-commons-jersey</artifactId>
         <groupId>org.eclipse.kapua</groupId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kapua-commons-rest-model</artifactId>
+    <artifactId>kapua-commons-jersey-rest</artifactId>
 
     <dependencies>
         <!-- Internal dependencies -->
@@ -36,33 +35,64 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-job-engine-api</artifactId>
+            <artifactId>kapua-endpoint-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-scheduler-api</artifactId>
+            <artifactId>kapua-security-shiro</artifactId>
+        </dependency>
+
+        <!-- re-declare as provided as our web container will provide this -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Testing dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-web</artifactId>
+        </dependency>
+        <!-- Moxy for object marshalling unmarshalling -->
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-moxy</artifactId>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.eclipse.kapua</groupId>
+            <artifactId>kapua-locator-guice</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-qa-markers</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.ws.rs</groupId>
-            <artifactId>jakarta.ws.rs-api</artifactId>
-            <scope>test</scope>
+            <groupId>org.eclipse.kapua</groupId>
+            <artifactId>kapua-scheduler-api</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>

commons-rest/errors/src/main/java/org/eclipse/kapua/commons/rest/errors/ExceptionConfigurationProvider.java → commons-jersey/rest/src/main/java/org/eclipse/kapua/commons/jersey/rest/ExceptionConfigurationProvider.java

@@ -10,9 +10,9 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.rest.errors;
-
+package org.eclipse.kapua.commons.jersey.rest;
 
 public interface ExceptionConfigurationProvider {
+
     boolean showStackTrace();
 }

rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/ExceptionConfigurationProviderImpl.java → commons-jersey/rest/src/main/java/org/eclipse/kapua/commons/jersey/rest/ExceptionConfigurationProviderImpl.java

@@ -10,18 +10,18 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.app.api.web;
-
-import org.eclipse.kapua.commons.rest.errors.ExceptionConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package org.eclipse.kapua.commons.jersey.rest;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 @Singleton
 public class ExceptionConfigurationProviderImpl implements ExceptionConfigurationProvider {
+
     private final boolean showStackTrace;
     private final Logger logger = LoggerFactory.getLogger(this.getClass());