Merge pull request #7 from Distributed-Noracle/develop

Develop

Author: junpls

.classpath

@@ -5,7 +5,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/las2peer-bundle-0.7.1.jar"/>
+	<classpathentry kind="lib" path="lib/las2peer-bundle-0.7-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/jersey-media-json-jackson-2.25.1.jar"/>
 	<classpathentry kind="output" path="output"/>
 </classpath>

.gitignore

@@ -21,3 +21,4 @@ ivy.jar
 archiva_credentials.xml
 join-example-space.html
 /frontend/
+node-screen.pid

build.xml

@@ -1,6 +1,6 @@
 <project name="Distributed-Noracle-Service" default="jar" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
 
-	<property name="core.version" value="0.7.1" />
+	<property name="core.version" value="0.7-SNAPSHOT" />
 
 	<property name="service.name" value="i5.las2peer.services.noracleService" />
 	<property name="service.class" value="NoracleService" />
@@ -63,7 +63,7 @@
 			<credentials host="role.dbis.rwth-aachen.de:9911/archiva" realm="Repository internal" />
 		</ivy:settings>
 		<ivy:retrieve type="jar, bundle" conf="*" pattern="${lib}/[artifact]-[revision].[ext]" />
-		<get src="https://github.com/rwth-acis/las2peer-FileService/releases/download/2.2.0/i5.las2peer.services.fileService-2.2.0.jar" dest="service/"/>
+		<get src="https://github.com/rwth-acis/las2peer-FileService/releases/download/2.2.5/i5.las2peer.services.fileService-2.2.5.jar" dest="service/"/>
 	</target>
 
 
@@ -101,8 +101,8 @@
 		<jar jarfile="${service}/${service.name}-${service.version}.jar">
 			<fileset dir="${tmp.classes}" />
 			<manifest>
-				<attribute name="las2peer-service-name" value="${service.name}" />
-				<attribute name="las2peer-service-version" value="${service.version}" />
+                <attribute name="Library-Version" value="${service.version}" />
+				<attribute name="Library-SymbolicName" value="${service.name}" />
 			</manifest>
 		</jar>
 	</target>

launcher-configuration.ini

@@ -9,8 +9,8 @@ service
 
 [commands]
 uploadStartupDirectory('example')
-uploadServicePackage('service/i5.las2peer.services.fileService-2.2.0.jar', 'agent-developer.xml', 'topsecret')
-startService('[email protected].0','testtest')
+uploadServicePackage('service/i5.las2peer.services.fileService-2.2.5.jar', 'agent-developer.xml', 'topsecret')
+startService('[email protected].5','testtest')
 uploadServicePackage('service/i5.las2peer.services.noracleService-0.5.0.jar', 'agent-developer.xml', 'topsecret')
 startService('[email protected]','testtest')
 startService('[email protected]','testtest')
@@ -20,4 +20,3 @@ startService('[email protected]','tes
 startService('[email protected]','testtest')
 startWebConnector
 interactive
-

start-local.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+PORT=9012
+
+echo "launching node at port ${PORT}"
+java -cp "lib/*" i5.las2peer.tools.L2pNodeLauncher

upload-frontend.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cd frontend && find "noracle/" -type f -exec curl --user "noracle-example-smith:testtest" --form "filecontent=@{};filename={}" --form identifier="{}" http://localhost:9082/fileservice/files --insecure \;
+cd frontend && find "noracle/" -type f -exec curl --user "noracle-example-smith:testtest" --form "filecontent=@{};filename={}" --form identifier="{}" http://localhost:9082/fileservice/files --insecure \; -exec echo "" \;