Update to las2peer 0.7.6

rwth-acis · Oct 1, 2018 · 430d403 · 430d403
1 parent 641c555
commit 430d403
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.classpath b/.classpath
@@ -4,6 +4,6 @@
 	<classpathentry kind="src" path="src/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
-	<classpathentry kind="lib" path="lib/las2peer-bundle-0.7.0.jar"/>
+	<classpathentry kind="lib" path="lib/las2peer-bundle-0.7.6.jar"/>
 	<classpathentry kind="output" path="output"/>
 </classpath>
diff --git a/etc/ivy/ivy.xml b/etc/ivy/ivy.xml
@@ -9,7 +9,7 @@
 		<artifact type="jar" ext="jar" conf="*"/>
 	</publications>
     <dependencies>
-        <dependency org="i5" name="las2peer-bundle" rev="0.7.0" changing="true" conf="platform->*" />
+        <dependency org="i5" name="las2peer-bundle" rev="0.7.6" changing="true" conf="platform->*" />
         <dependency org="junit" name="junit" rev="4.12" conf="platform->default" />
 		<dependency org="org.apache.commons" name="commons-pool2" rev="2.2" conf="platform->default" />
 		<dependency org="org.apache.commons" name="commons-dbcp2" rev="2.0" conf="platform->default" />

diff --git a/src/main/i5/las2peer/services/calendar/MyCalendar.java b/src/main/i5/las2peer/services/calendar/MyCalendar.java
@@ -154,6 +154,7 @@ protected void initResources() {
 	public static class Resource {
 		private MyCalendar service = (MyCalendar) Context.getCurrent().getService();
 		private final String STORAGE_NAME = "entrystorage";
+		private static String tcs = "i5.las2peer.services.threadedCommentService.ThreadedCommentService@0.2";
 		// put here all your service methods
 
 		@POST
@@ -188,10 +189,8 @@ public Response create(String content) {
 
 				try {
 					// RMI call without parameters
-					Object result = Context.getCurrent().invoke(
-							"i5.las2peer.services.threadedCommentService.ThreadedCommentService@0.1",
-							"createCommentThread", new Serializable[] {
-									Context.getCurrent().getMainAgent().getIdentifier(), groupID, groupID });
+					Object result = Context.getCurrent().invoke(tcs, "createCommentThread", new Serializable[] {
+							Context.getCurrent().getMainAgent().getIdentifier(), groupID, groupID });
 					if (result != null) {
 						threadID = (String) result;
 					} else {

diff --git a/src/test/i5/las2peer/services/calendar/ServiceTest.java b/src/test/i5/las2peer/services/calendar/ServiceTest.java
@@ -118,7 +118,7 @@ public void shutDownServer() throws Exception {
 	@Test
 	public void intervallTest() {
 		MiniClient c = new MiniClient();
-		c.setAddressPort(HTTP_ADDRESS, HTTP_PORT);
+		c.setConnectorEndpoint(connector.getHttpEndpoint());
 
 		try {
 
@@ -151,7 +151,7 @@ public void intervallTest() {
 	@Test
 	public void dateTEST() {
 		MiniClient c = new MiniClient();
-		c.setAddressPort(HTTP_ADDRESS, HTTP_PORT);
+		c.setConnectorEndpoint(connector.getHttpEndpoint());
 
 		try {
 
@@ -184,7 +184,7 @@ public void dateTEST() {
 	@Test
 	public void nameTest() {
 		MiniClient c = new MiniClient();
-		c.setAddressPort(HTTP_ADDRESS, HTTP_PORT);
+		c.setConnectorEndpoint(connector.getHttpEndpoint());
 
 		try {