updated to release 4.4

Aeronbroker · Sep 28, 2015 · b05f212 · b05f212
1 parent e4cbcb9
commit b05f212
Show file tree

Hide file tree

Showing 153 changed files with 2,894 additions and 1,583 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,7 @@
+*.project
+*.classpath
+*.settings
+*.MF
+*/target/*
+*.log
+IoTBroker-runner/work/
diff --git a/IoTBroker-runner/configuration/config.ini b/IoTBroker-runner/configuration/config.ini
@@ -0,0 +1,112 @@
+##############################
+# Equinox settings
+##############################
+eclipse.ignoreApp=true
+osgi.clean=true
+osgi.noShutdown=true
+osgi.bundles.defaultStartLevel=4
+osgi.java.profile=java6-server.profile
+osgi.java.profile.bootdelegation=override
+# PaxLogging configuration folder
+bundles.configuration.location=..//fiwareRelease//iotbrokerconfig//bundleConfigurations
+# IoT Broker Server port
+tomcat.init.port=80
+# Internal Database folder
+hsqldb.directory=..//SQL_database//database//linkDB
+# Internal Database port
+hsqldb.port=9001
+# Enable the Database Logs
+hsqldb.silent=false
+# Absolute path to the config folder
+dir.config=//root//Aeron//fiwareRelease
+ngsiclient.layer=connector
+java.awt.headless=true 
+file.encoding=UTF-8
+-server -Xms2048m -Xmx2048m
+-XX:NewSize=1024m -XX:MaxNewSize=1024m -XX:PermSize=1024m
+-XX:MaxPermSize=1024m -XX:+DisableExplicitGC
+##############################
+# Client bundles to install
+##############################
+osgi.bundles= ../targetPlatform/equinox/org.eclipse.core.contenttype-3.4.100.v20100505-1235.jar@start, \
+../targetPlatform/equinox/org.eclipse.equinox.common-3.6.0.v20110506.jar@2:start, \
+../targetPlatform/equinox/org.eclipse.core.jobs-3.5.0.v20100515.jar@start, \
+../targetPlatform/equinox/org.eclipse.equinox.app-1.3.0.v20100512.jar@start, \
+../targetPlatform/equinox/org.eclipse.equinox.preferences-3.3.0.v20100503.jar@start, \
+../targetPlatform/equinox/org.eclipse.equinox.registry-3.5.0.v20100503.jar@start, \
+../targetPlatform/equinox/org.eclipse.osgi.services-3.2.100.v20100503.jar@start, \
+../targetPlatform/equinox/org.eclipse.equinox.cm_3.2.0.v20070116.jar@1:start, \
+../targetPlatform/pax/pax-confman-propsloader-0.2.2.jar@2:start, \
+../targetPlatform/pax/pax-logging-api-1.7.0-20120710.130402-38.jar@2:start, \
+../targetPlatform/pax/pax-logging-service-1.7.0-20120710.130445-38.jar@2:start, \
+../targetPlatform/bundles/com.springsource.javax.activation-1.1.1.jar@start, \
+../targetPlatform/bundles/javax.persistence-2.0.0.jar@start, \
+../targetPlatform/bundles/httpclient-4.2.0-osgi.jar@start, \
+../targetPlatform/bundles/httpcore-4.2.0-osgi.jar@start, \
+../targetPlatform/bundles/com.springsource.org.apache.commons.io-1.4.0.jar, \
+../targetPlatform/bundles/com.springsource.org.apache.commons.codec-1.6.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.annotation-1.0.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.ejb-3.0.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.el-1.0.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.mail-1.4.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.persistence-1.0.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.servlet.jsp.jstl-1.1.2.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.servlet.jsp-2.1.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.servlet-2.5.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.xml.bind-2.0.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.xml.stream-1.0.1.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.xml.rpc-1.1.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.xml.soap-1.3.0.jar@start, \
+../targetPlatform/bundles/com.springsource.javax.xml.ws-2.1.1.jar@start, \
+../targetPlatform/bundles/com.springsource.org.aopalliance-1.0.0.jar@start, \
+../targetPlatform/bundles/com.springsource.org.apache.catalina-6.0.18.jar@start, \
+../targetPlatform/bundles/com.springsource.org.apache.coyote-6.0.18.jar, \
+../targetPlatform/bundles/com.springsource.org.apache.el-6.0.18.jar@start, \
+../targetPlatform/bundles/com.springsource.org.apache.juli.extras-6.0.18.jar@start, \
+../targetPlatform/bundles/com.springsource.org.apache.taglibs.standard-1.1.2.jar@start, \
+../targetPlatform/bundles/catalina.start.osgi-1.0.0.jar@start, \
+../targetPlatform/bundles/jasper.osgi-5.5.23-SNAPSHOT.jar@start, \
+../targetPlatform/bundles/catalina-config-3.5.1.jar, \
+../targetPlatform/jaxb/jaxb-impl-2.1.5_1.0.0.jar@start, \
+../targetPlatform/db/hsqldb_1.0.0.jar@start, \
+../targetPlatform/json/org.json_1.0.0.jar@start, \
+../targetPlatform/json/gson-2.2.2.jar@start, \
+../targetPlatform/json/jackson-core-asl-1.9.2.jar@start, \
+../targetPlatform/json/jackson-mapper-asl-1.9.2.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.aop-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.aspects-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.beans-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.context.support-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.context-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.core-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.expression-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.jdbc-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.orm-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.oxm-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.transaction-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.web.servlet-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.web-3.2.3.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.security.config-3.1.4.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.security.core-3.1.4.RELEASE.jar@start, \
+../targetPlatform/spring 3.2.3/org.springframework.security.web-3.1.4.RELEASE.jar@start, \
+../targetPlatform/spring DM/spring-osgi-annotation-2.0.0.M1.jar@start, \
+../targetPlatform/spring DM/spring-osgi-core-2.0.0.M1.jar@start, \
+../targetPlatform/spring DM/spring-osgi-extender-2.0.0.M1.jar@start, \
+../targetPlatform/spring DM/spring-osgi-io-2.0.0.M1.jar@start, \
+../targetPlatform/spring DM/spring-osgi-web-2.0.0.M1.jar@start, \
+../targetPlatform/spring DM/spring-osgi-web-extender-2.0.0.M1.jar@start, \
+../targetPlatform/monitor/javamelodybundle_1.0.0.jar@start, \
+../targetPlatform/monitor/jrobin_1.5.9.1.jar@start, \
+../targetPlatform/bundles/guava-18.0.jar@start, \
+../eu.neclab.iotplatform.iotbroker.builder/target/iotbroker.builder-4.4.3-assembly/bundle/iotbroker.commons-4.4.3.jar@start, \
+../eu.neclab.iotplatform.iotbroker.builder/target/iotbroker.builder-4.4.3-assembly/bundle/iotbroker.storage-4.4.3.jar@start, \
+../eu.neclab.iotplatform.iotbroker.builder/target/iotbroker.builder-4.4.3-assembly/bundle/iotbroker.client-4.4.3.jar@start, \
+../eu.neclab.iotplatform.iotbroker.builder/target/iotbroker.builder-4.4.3-assembly/bundle/iotbroker.core-4.4.3.jar@start, \
+../eu.neclab.iotplatform.iotbroker.builder/target/iotbroker.builder-4.4.3-assembly/bundle/iotbroker.restcontroller-4.4.3.jar@start, \
+../eu.neclab.iotplatform.iotbroker.builder/target/iotbroker.builder-4.4.3-assembly/bundle/ngsi.api-4.4.3.jar@start, \
+../eu.neclab.iotplatform.iotbroker.builder/target/iotbroker.builder-4.4.3-assembly/bundle/iotbroker.ext.resultfilter-4.4.3.jar@start, \
+../eu.neclab.iotplatform.iotbroker.builder/target/iotbroker.builder-4.4.3-assembly/bundle/tomcat-configuration-fragment-4.4.3.jar, \
+#../eu.neclab.iotplatform.iotbroker.builder/target/iotbroker.builder-4.4.3-assembly/bundle/iotbroker.couchdb-4.4.3.jar@start,\
+../eu.neclab.iotplatform.iotbroker.builder/target/iotbroker.builder-4.4.3-assembly/bundle/entitycomposer-4.4.3.jar@start
+
+
diff --git a/IoTBroker-runner/org.eclipse.osgi.jar b/IoTBroker-runner/org.eclipse.osgi.jar
diff --git a/IoTBroker-runner/org.eclipse.update.configurator_3.3.100.v20100512.jar b/IoTBroker-runner/org.eclipse.update.configurator_3.3.100.v20100512.jar
diff --git a/IoTBroker-runner/unix64_start-IoTBroker.sh b/IoTBroker-runner/unix64_start-IoTBroker.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -jar org.eclipse.osgi.jar -console
diff --git a/IoTBroker-runner/unix64_start-IoTBroker_as_Demon.sh b/IoTBroker-runner/unix64_start-IoTBroker_as_Demon.sh
@@ -0,0 +1,2 @@
+#/bin/bash
+nohup java -jar org.eclipse.osgi.jar &
diff --git a/IoTBroker-runner/unix64_stop-IoTBroker.sh b/IoTBroker-runner/unix64_stop-IoTBroker.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+pkill -f 'java -jar org.eclipse.osgi.jar'
diff --git a/IoTBroker-runner/winx64_start-IoTBroker.bat b/IoTBroker-runner/winx64_start-IoTBroker.bat
@@ -0,0 +1 @@
+java -jar org.eclipse.osgi.jar -console
diff --git a/IoTbrokerParent/pom.xml b/IoTbrokerParent/pom.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-<!-- 
-	<scm>		
-		<developerConnection>scm:svn:https://svn.office.hd/repos/csst-sw/trunk/sw/FI-WARE/IoTBroker_OpenSource/IoTbrokerParent/</developerConnection>
-	</scm>
- -->
-
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eu.neclab.iotplatform</groupId>
 	<artifactId>IoTbrokerParent</artifactId>
 	<packaging>pom</packaging>
-
-	<version>4.4.1</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<!-- 		<iotbroker.version>4.3.3</iotbroker.version> -->
+		<iotbroker.version>4.4.3</iotbroker.version>
 		<spring.version>3.2.3.RELEASE</spring.version>
 		<spring.osgi.version>2.0.0.M1</spring.osgi.version>
 		<equinox.version>3.7.0.v20110221</equinox.version>
@@ -244,6 +236,9 @@
 			<version>2.5.0</version>
 		</dependency>
 
+		<!-- <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> 
+			<version>4.2.0-osgi</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> 
+			<artifactId>httpclient</artifactId> <version>4.2.0-osgi</version> </dependency> -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>com.springsource.org.apache.commons.codec</artifactId>
@@ -376,7 +371,6 @@
 				</configuration>
 			</plugin>
 
-<!-- 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
@@ -397,7 +391,6 @@
 					<tagNameFormat>Fiware_IotBroker_Release-@{project.version}</tagNameFormat>
 				</configuration>
 			</plugin>
--->
 		</plugins>
 	</build>
 
@@ -438,15 +431,6 @@
 			<url>https://oss.sonatype.org/content/repositories/springsource-milestones</url>
 		</repository>
 
-<!-- 
-		<repository>
-			<id>nexus.office.hd</id>
-			<name>NEC Europe Labs Software 
-			and Services Maven Repository</name>
-			<url>http://nexus.office.hd/content/groups/public/</url>
-		</repository>
- -->
-
 	</repositories>
 
 	<dependencyManagement>
@@ -487,5 +471,6 @@
 				<version>${project.version}</version>
 			</dependency>
 		</dependencies>
-	</dependencyManagement>	
+	</dependencyManagement>
+	<version>4.4.3</version>
 </project>
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2015, NEC Europe Ltd.
+Copyright (c) 2014, NEC Europe Ltd.
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		java -jar org.eclipse.osgi.jar -console
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#/bin/bash
		nohup java -jar org.eclipse.osgi.jar &
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		pkill -f 'java -jar org.eclipse.osgi.jar'