changeset 255:fdd7ed360a48 Implementation_of_communication

add uploadArchives in build.gradke
author tatsuki
date Fri, 18 Nov 2016 22:02:48 +0900
parents 803ab4479b7e
children 547a88631e55
files build.gradle src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/Jungle.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/JungleTreeEditor.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/DefaultJungleTreeEditor.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/DefaultTreeNodeAttribute.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/util/DefaultEither.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/persistent/PersistentJungleTreeEditor.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/transaction/NetworkDefaultJungleTreeEditor.java
diffstat 8 files changed, 15 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Mon Nov 07 03:40:57 2016 +0900
+++ b/build.gradle	Fri Nov 18 22:02:48 2016 +0900
@@ -1,5 +1,6 @@
 apply plugin: "java"
 
+
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
@@ -8,7 +9,7 @@
 repositories {
   mavenCentral()
     maven { url "http://eaio.com/maven2" }
-  maven { url "http://repo.maven.apache.org/maven2" }
+    maven { url "http://repo.maven.apache.org/maven2" }
 }
 
 dependencies {
@@ -23,10 +24,12 @@
     compile group: 'org.hectorclient', name: 'hector-core', version:'1.1-2'
     compile group: 'com.github.stephenc.eaio-uuid', name: 'uuid', version:'3.3.0'
     compile group: 'org.apache.cassandra', name: 'cassandra-all', version: '3.9'
+    
 }
 
-
-
+ext {
+      mavenRepository = System.getenv()['HOME']+'/Documents/workspace/maven'
+}
 
 jar {
   manifest {
@@ -38,8 +41,8 @@
 
 uploadArchives {
   repositories {
-    flatDir {
-      dirs '.'
+    mavenDeployer {
+      repository(url: uri(mavenRepository))
     }
   }
 }
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/Jungle.java	Mon Nov 07 03:40:57 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/Jungle.java	Fri Nov 18 22:02:48 2016 +0900
@@ -5,7 +5,7 @@
 
 import java.util.Iterator;
 
-public interface Jungle
+public interface 	Jungle
 {
 	public JungleTree getTreeByName(String name);
 	public JungleTree createNewTree(String name);
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/JungleTreeEditor.java	Mon Nov 07 03:40:57 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/JungleTreeEditor.java	Fri Nov 18 22:02:48 2016 +0900
@@ -1,7 +1,6 @@
 package jp.ac.u_ryukyu.ie.cr.jungle;
 
 import jp.ac.u_ryukyu.ie.cr.jungle.store.NodePath;
-import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.DefaultNodePath;
 import jp.ac.u_ryukyu.ie.cr.jungle.store.trasnformer.NodeEditor;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.Either;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.Error;
@@ -26,5 +25,5 @@
 
     public Either<Error, JungleTreeEditor> flushSuccess();
 
-    public Either<Error, JungleTreeEditor> moveChild(DefaultNodePath path,int childNum ,String move);
+    public Either<Error, JungleTreeEditor> moveChild(NodePath path,int childNum ,String move);
 }
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/DefaultJungleTreeEditor.java	Mon Nov 07 03:40:57 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/DefaultJungleTreeEditor.java	Fri Nov 18 22:02:48 2016 +0900
@@ -104,7 +104,7 @@
 	}
 
 	@Override
-	public Either<Error, JungleTreeEditor> moveChild(DefaultNodePath path,int childNum, String move) {
+	public Either<Error, JungleTreeEditor> moveChild(NodePath path,int childNum, String move) {
 		MoveChild movechild = new MoveChild(move, childNum);
 		return _edit(path,movechild);
 	}
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/DefaultTreeNodeAttribute.java	Mon Nov 07 03:40:57 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/DefaultTreeNodeAttribute.java	Fri Nov 18 22:02:48 2016 +0900
@@ -61,9 +61,7 @@
         }
         Optional<ByteBuffer> op = attrs.get(_key);
         if (op.isPresent()) {
-            ByteBuffer b = op.get();
-            b.position(0);
-            return b;
+            return op.get();
         }
         return null;
     }
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/util/DefaultEither.java	Mon Nov 07 03:40:57 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/util/DefaultEither.java	Fri Nov 18 22:02:48 2016 +0900
@@ -10,7 +10,7 @@
 		theA = _theA;
 		theB = _theB;
 	}
-	
+
 	public static final <A,B> DefaultEither<A,B> newA(A _theA)
 	{
 		return new DefaultEither<A,B>(_theA,null);
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/persistent/PersistentJungleTreeEditor.java	Mon Nov 07 03:40:57 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/persistent/PersistentJungleTreeEditor.java	Fri Nov 18 22:02:48 2016 +0900
@@ -84,7 +84,7 @@
     }
 
     @Override
-    public Either<Error, JungleTreeEditor> moveChild(DefaultNodePath path,int childNum, String move) {
+    public Either<Error, JungleTreeEditor> moveChild(NodePath path,int childNum, String move) {
         MoveChild movechild = new MoveChild(move, childNum);
         return _edit(path,movechild);
     }
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/transaction/NetworkDefaultJungleTreeEditor.java	Mon Nov 07 03:40:57 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/transaction/NetworkDefaultJungleTreeEditor.java	Fri Nov 18 22:02:48 2016 +0900
@@ -5,7 +5,6 @@
 import jp.ac.u_ryukyu.ie.cr.jungle.JungleTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.jungle.store.NodePath;
 import jp.ac.u_ryukyu.ie.cr.jungle.store.TreeEditor;
-import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.DefaultNodePath;
 import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.TreeNode;
 import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.logger.DefaultTreeOperationLog;
 import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.logger.LoggingNode;
@@ -122,7 +121,7 @@
 	}
 
 	@Override
-	public Either<Error, JungleTreeEditor> moveChild(DefaultNodePath path, int childNum, String move) {
+	public Either<Error, JungleTreeEditor> moveChild(NodePath path, int childNum, String move) {
 		MoveChild movechild = new MoveChild(move, childNum);
 		return _edit(path,movechild);
 	}