integrated latest gsn with security module and lsm

Author: jpcik

modules/x-gsn/conf/bind/VirtualSensorDescription.xml

@@ -73,6 +73,7 @@
         <value name="name"  field="name" style="attribute"/>
         <value name="type" field="type" style="attribute"/>
         <value field="description" style="text" usage="optional"/>
+        <value name="property" field="property" style="attribute" usage="optional"/>
     </mapping>
 
     <mapping name="command" class="org.openiot.gsn.beans.WebInput">

modules/x-gsn/conf/lsm_config.properties

@@ -7,4 +7,5 @@ for jarFile in $( ls target/**/*jar ); do
      cp=$cp:./$jarFile
 done
 #echo $cp
+#java -classpath target/dependencies/resteasy-jaxrs-2.3.5.Final.jar:target/classes:$cp -splash:lib/logo.png -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger -Dorg.mortbay.log.LogFactory.noDiscovery=false org.openiot.gsn.Main 22232 &
 java -classpath target/classes:$cp -splash:lib/logo.png -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger -Dorg.mortbay.log.LogFactory.noDiscovery=false org.openiot.gsn.Main 22232 &

modules/x-gsn/conf/openiot.properties

@@ -1 +1 @@
-java -classpath "./target/*;./target/dependencies/*;./conf/*" -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger -Dorg.mortbay.log.LogFactory.noDiscovery=false org.openiot.gsn.metadata.LSM.utils %1
+java -classpath "./target/*;./target/dependencies/*;./conf/*" -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger -Dorg.mortbay.log.LogFactory.noDiscovery=false org.openiot.gsn.metadata.LSM.SensorAnnotator %1

modules/x-gsn/gsn-start.sh

@@ -4,4 +4,4 @@ for jarFile in $( ls target/**/*jar ); do
      cp=$cp:./$jarFile
 done
 
-java -classpath target/classes:$cp:conf org.openiot.gsn.metadata.LSM.MetadataCreator "$@" &
+java -classpath target/classes:$cp:conf org.openiot.gsn.metadata.LSM.SensorAnnotator "$@" &

modules/x-gsn/lsm-register.bat

@@ -63,6 +63,11 @@
 					<target>1.7</target>
 				</configuration>
 			</plugin>
+			 <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+      </plugin>
 			<plugin>
 				<groupId>org.jibx</groupId>
 				<artifactId>maven-jibx-plugin</artifactId>
@@ -156,11 +161,11 @@
 			<version>7.1.0.v20100505</version>
 			<!-- <version>7.0.2.v20100331</version> -->
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.apache.jena</groupId>
 			<artifactId>jena-core</artifactId>
 			<version>2.11.1</version>
-		</dependency>
+		</dependency>-->
 		<dependency>
 			<groupId>com.vividsolutions</groupId>
 			<artifactId>jts</artifactId>
@@ -385,6 +390,10 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-jaxrs</artifactId>
+                </exclusion>
              </exclusions>
 		</dependency>
 		<dependency>
@@ -422,17 +431,22 @@
 			<version>1.7.5</version>
 		</dependency>
 		<dependency>
-    <groupId>org.glassfish.jersey.containers</groupId>
-    <!-- if your container implements Servlet API older than 3.0, use "jersey-container-servlet-core"  -->
-    <artifactId>jersey-container-servlet-core</artifactId>
-    <version>2.7</version>
-</dependency>
-<!-- Required only when you are using JAX-RS Client -->
-<dependency>
-    <groupId>org.glassfish.jersey.core</groupId>
-    <artifactId>jersey-client</artifactId>
-    <version>2.7</version>
-</dependency>
+    		<groupId>org.glassfish.jersey.containers</groupId>    		
+    		<artifactId>jersey-container-servlet-core</artifactId>
+    		<version>2.7</version>
+		</dependency>
+		<!-- Required only when you are using JAX-RS Client -->
+		<!--<dependency>
+    		<groupId>org.glassfish.jersey.core</groupId>
+    		<artifactId>jersey-client</artifactId>
+    		<version>2.7</version>
+		</dependency>-->
+		<dependency>
+	 		<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-jaxrs</artifactId>
+			<version>3.0.8.Final</version>
+		</dependency>
+            
 	</dependencies>
 
 </project>

modules/x-gsn/lsm-register.sh

@@ -92,6 +92,9 @@
 import org.openiot.gsn.vsensor.SQLValidatorIntegration;
 import org.openiot.gsn.wrappers.WrappersUtil;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+
 /**
  * Web Service URLs : Microsoft SensorMap:
  * http://localhost:22001/services/Service?wsdl GSN:
@@ -310,10 +313,8 @@ public static void main(String[] args) {
 			Main.getInstance();
 			// checks to see if dynamic sensor control is active
 			// and starts timer accordingly
-			boolean isTrueDynamicControl = Boolean
-					.parseBoolean(PropertiesReader.readProperty(
-							LSMRepository.LSM_CONFIG_PROPERTIES_FILE,
-							"dynamicControl").trim());
+			Config conf=ConfigFactory.load();
+			boolean isTrueDynamicControl = conf.getBoolean("dynamicControl");
 			if (isTrueDynamicControl)
 				DynamicControlTaskTimer.getInstance().startTimer();
 

modules/x-gsn/pom.xml

@@ -40,6 +40,8 @@ public final class DataField implements Serializable {
 
     private String            type;
 
+    private String property;
+    
     private DataField ( ) {}
 
     public DataField ( final String fieldName , final String type , final String description ) throws GSNRuntimeException {
@@ -119,4 +121,7 @@ public String getType ( ) {
         return this.type;
     }
 
+    public String getProperty(){
+    	return property;
+    }
 }

modules/x-gsn/src/main/java/org/openiot/gsn/Main.java

@@ -37,7 +37,7 @@
 import org.openiot.gsn.Main;
 import org.openiot.gsn.VSensorLoader;
 import org.openiot.gsn.metadata.LSM.LSMSensorMetaData;
-import org.openiot.gsn.metadata.LSM.MetadataCreator;
+import org.openiot.gsn.metadata.LSM.SensorAnnotator;
 import org.openiot.gsn.metadata.rdf.SensorMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -92,7 +92,7 @@ public Response registerRdfVS(Reader metadata,@PathParam("vsname") String vsname
 				concat+=line;			
 			InputStream is=new ByteArrayInputStream(concat.getBytes());
 			meta.load(is);
-		    MetadataCreator.addRdfMetadatatoLSM(meta);
+		    SensorAnnotator.addRdfMetadatatoLSM(meta);
 			FileWriter fw = new FileWriter(filePath, true);			
 		    IOUtils.writeLines(lines, "\n", fw);
 	        fw.close();
@@ -117,7 +117,7 @@ public Response registerVS(InputStream metadata,@PathParam("vsname") String vsna
 			LSMSensorMetaData lsmmd=new LSMSensorMetaData();
 
 			lsmmd.init(ConfigFactory.parseFile(new File(filePath)));
-			sensorId=MetadataCreator.addSensorToLSM(lsmmd);
+			sensorId=SensorAnnotator.addSensorToLSM(lsmmd);
 
 		} catch (Exception e) {
 			e.printStackTrace();