4.4 merge branch

.gitignore

@@ -26,6 +26,7 @@
 .vscode/
 wrapper
 /target
+/**/essentials-deploy/work
 /**/target
 /mvnw
 /mvnw.cmd
@@ -44,3 +45,4 @@ wrapper
 /deb-installer/.settings
 deviceregistry/bin
 /qos-monitor/bin
+/**/.DS_Store

core-common/essentials-deploy/ReadMe.txt

@@ -0,0 +1,24 @@
+1) Copy the arrowhead-core-common-essentials-java-spring.jar and its source jar into this folder and add the version to its names.
+	E.g.: arrowhead-core-common-essentials-java-spring-4.4.0.0.jar
+
+2) Duplicate the source jar and change "source" to "javadoc"
+
+2) Set the same version in the pom file and change the file name accordingly
+
+4) You have to have these files with the actual version:
+
+	arrowhead-core-common-essentials-java-spring-4.4.0.0.jar
+	arrowhead-core-common-essentials-java-spring-4.4.0.0.pom
+	arrowhead-core-common-essentials-java-spring-4.4.0.0-sources.pom
+	arrowhead-core-common-essentials-java-spring-4.4.0.0-javadoc.pom
+
+5) Make sure you have ossrh server is added to your maven settings.xml file
+
+6) Make sure you have gpg installed, key pair generated and your public key is uploded to the keyserver.
+   see: https://central.sonatype.org/publish/requirements/gpg/#installing-gnupg
+
+7) run: mvn gpg:sign-and-deploy-file -Durl=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=ossrh -DpomFile=arrowhead-core-common-essentials-java-spring-4.4.0.0.pom -Dfile=arrowhead-core-common-essentials-java-spring-4.4.0.0.jar
+
+8) run: mvn gpg:sign-and-deploy-file -Durl=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=ossrh -DpomFile=arrowhead-core-common-essentials-java-spring-4.4.0.0.pom -Dfile=arrowhead-core-common-essentials-java-spring-4.4.0.0-sources.jar -Dclassifier=sources
+
+9) run: mvn gpg:sign-and-deploy-file -Durl=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=ossrh -DpomFile=arrowhead-core-common-essentials-java-spring-4.4.0.0.pom -Dfile=arrowhead-core-common-essentials-java-spring-4.4.0.0-javadoc.jar -Dclassifier=javadoc

core-common/essentials-deploy/arrowhead-core-common-essentials-java-spring-version.pom

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>ai.aitia</groupId>
+	<artifactId>arrowhead-core-common-essentials-java-spring</artifactId>
+	<version>VERSION</version>
+
+	<name>Arrowhead Core Common Essentials for Java Spring</name>
+	<description>Extracted components from Arrowhead Core Common for apllication systems</description>
+	<url>https://github.com/eclipse-arrowhead/core-java-spring</url>
+
+	<licenses>
+    	<license>
+	     	<name>Eclipse Public License - v 2.0</name>
+			<url>https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt</url>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<name>Tamas Bordi</name>
+			<email>tbordi@aitia.ai</email>
+			<organization>AITIA International Inc.</organization>
+			<organizationUrl>http://www.aitia.ai/</organizationUrl>
+		</developer>
+		<developer>
+			<name>Gabor Majoros</name>
+			<email>gmajoros@aitia.ai</email>
+			<organization>AITIA International Inc.</organization>
+			<organizationUrl>http://www.aitia.ai/</organizationUrl>
+		</developer>
+		<developer>
+			<name>Rajmund Bocsi</name>
+			<email>rbocsi@aitia.ai</email>
+			<organization>AITIA International Inc.</organization>
+			<organizationUrl>http://www.aitia.ai/</organizationUrl>
+		</developer>
+		<developer>
+			<name>Szvetlin Tanyi</name>
+			<email>szvetlin@aitia.ai</email>
+			<organization>AITIA International Inc.</organization>
+			<organizationUrl>http://www.aitia.ai/</organizationUrl>
+		</developer>
+	</developers>
+
+	<scm>
+		<connection>scm:git:git://github.com/eclipse-arrowhead/core-java-spring.git</connection>
+		<developerConnection>scm:git:ssh://github.com:eclipse-arrowhead/core-java-spring.git</developerConnection>
+		<url>https://github.com/eclipse-arrowhead/core-java-spring/tree/master</url>
+	</scm>
+</project>

core-common/pom.xml

@@ -12,14 +12,15 @@
   <description>Common resources for the Arrowhead core services</description>
 
   <properties>
-    <client.skeleton>core-client-skeleton</client.skeleton>
+    <core.common.essentials>arrowhead-core-common-essentials-java-spring</core.common.essentials>
+	<bouncy.castle.version>1.65</bouncy.castle.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.65</version>
+      <version>${bouncy.castle.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -40,6 +41,19 @@
         </configuration>
       </plugin>
 
+	 <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-source-plugin</artifactId>
+      <executions>
+        <execution>
+          <id>attach-sources</id>
+          <goals>
+            <goal>jar-no-fork</goal>
+          </goals>
+        </execution>
+      </executions>
+    </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@@ -51,9 +65,11 @@
             </goals>
             <configuration>
               <shadedArtifactAttached>false</shadedArtifactAttached>
-              <finalName>${client.skeleton}</finalName>
+              <finalName>${core.common.essentials}</finalName>
               <createDependencyReducedPom>false</createDependencyReducedPom>
               <minimizeJar>false</minimizeJar>
+              <createSourcesJar>true</createSourcesJar>
+              <shadeSourcesContent>true</shadeSourcesContent>
               <artifactSet>
                 <includes>
                   <include>eu.arrowhead:arrowhead-core-common</include>

core-common/src/main/java/eu/arrowhead/common/CommonConstants.java

@@ -39,7 +39,7 @@ public class CommonConstants {
 	public static final String CORE_SYSTEM_ORCHESTRATOR = "Orchestrator";
 	public static final String CORE_SYSTEM_SERVICEREGISTRY = "Service Registry";
 	public static final String CORE_SYSTEM_QOSMONITOR = "Quality of Service Monitor";
-    public static final String CORE_SYSTEM_TRANSLATOR = "Translator";
+	public static final String CORE_SYSTEM_TRANSLATOR = "Translator";
 
 	public static final String CORE_SYSTEM_SYSTEMREGISTRY = "System Registry";
 	public static final String CORE_SYSTEM_DEVICEREGISTRY = "Device Registry";
@@ -140,11 +140,16 @@ public class CommonConstants {
 
 	public static final String HTTPS = "https";
 	public static final String HTTP = "http";
+	public static final String WSS = "wss";
+	public static final String WS = "ws";
 	public static final String JSON = "JSON";
 	public static final String XML = "XML";
+	public static final String CBOR = "CBOR";
 	public static final String BINARY = "BINARY";
 	public static final String HTTP_SECURE_JSON = HTTP.toUpperCase() + SECURE_INTF + JSON; 
 	public static final String HTTP_INSECURE_JSON = HTTP.toUpperCase() + INSECURE_INTF + JSON;
+	public static final String WS_SECURE_JSON = WS.toUpperCase() + SECURE_INTF + JSON;
+	public static final String WS_INSECURE_JSON = WS.toUpperCase() + INSECURE_INTF + JSON;
 	public static final String UNKNOWN_ORIGIN = "<unknown>";
 
 	public static final String SERVICEREGISTRY_ADDRESS = "sr_address";
@@ -272,9 +277,9 @@ public class CommonConstants {
 	public static final String OP_DATAMANAGER_PROXY = "/proxy";
 	public static final String OP_DATAMANAGER_HISTORIAN = "/historian";
 
-    public static final String TRANSLATOR_URI = "/translator";
-    public static final String OP_TRANSLATOR_FIWARE_URI = "/v2";
-    public static final String OP_TRANSLATOR_PLUGIN_URI = "/plugin";
+	public static final String TRANSLATOR_URI = "/translator";
+	public static final String OP_TRANSLATOR_FIWARE_URI = "/v2";
+	public static final String OP_TRANSLATOR_PLUGIN_URI = "/plugin";
 
 	public static final String SWAGGER_COMMON_PACKAGE = "eu.arrowhead.common.swagger";
 	public static final String SWAGGER_UI_URI = "/swagger-ui.html";

core-common/src/main/java/eu/arrowhead/common/CoreDefaults.java

@@ -25,7 +25,7 @@ public class CoreDefaults {
 
 	public static final boolean DEFAULT_LOG_ALL_REQUEST_AND_RESPONSE = false;
 	public static final boolean DEFAULT_USE_STRICT_SERVICE_INTF_NAME_VERIFIER = false;
-	public static final boolean DEFAULT_USE_STRICT_SERVICE_DEFINITION_VERIFIER = true;
+	public static final boolean DEFAULT_USE_STRICT_SERVICE_DEFINITION_VERIFIER = false;
 	public static final boolean DEFAULT_USE_NETWORK_ADDRESS_DETECTOR = false;
 	public static final String DEFAULT_FILTER_PROXY_ADDRESSES = "";
 	public static final boolean DEFAULT_ALLOW_SELF_ADDRESSING = false;

core-common/src/main/java/eu/arrowhead/common/SecurityUtilities.java

@@ -65,6 +65,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.Base64Utils;
 import org.springframework.util.StringUtils;
+import org.springframework.http.server.ServletServerHttpRequest;
 
 @Component
 public class SecurityUtilities {
@@ -112,6 +113,14 @@ public static String getCertificateCNFromRequest(final HttpServletRequest reques
         return null;
     }
 
+    //-------------------------------------------------------------------------------------------------
+    public static String getCertificateCNFromServerRequest(final ServletServerHttpRequest request) {
+        Assert.notNull(request, "request must not be null");
+        final HttpServletRequest servletRequest = request.getServletRequest();
+
+        return getCertificateCNFromRequest(servletRequest);
+    }
+
     //-------------------------------------------------------------------------------------------------
     private static String getCommonNameFromCloudCertificate(final Principal principal) {
         Assert.notNull(principal, "Principal must not be null");

datamanager/pom.xml

@@ -40,6 +40,7 @@
 		                  			<includes>
 		                  				<include>application.properties</include>
 		                  				<include>log4j2.xml</include>
+		                  				<include>accesslist.acl</include>
 		                  			</includes>
 		                		</resource>
 		              		</resources>