cleanup p2

Author: LeroyR

.gitignore

@@ -1,6 +1,3 @@
-adevel/
-abuild/
-a.gradle/
-a*.*~
-asrc/CMakeLists.txt
-a.catkin_workspace
+build/
+.gradle/
+*.*~

README.md

@@ -30,14 +30,14 @@ https://youtu.be/FmmsMdEbYFs
 2. In another terminal run the actionlib sample server: ```$ rosrun actionlib_tutorials fibonacci_server```
 3. Run our client:
   * Source the project environment: ```$ source devel/setup.bash```
-  * Run the client: ```$ rosrun rosjava_actionlib execute com.github.ekumen.rosjava_actionlib.TestClient```
+  * Run the client: ```$ rosrun rosjava_actionlib execute com.github.rosjava_actionlib.TestClient```
 
 ## Output from the test client
 The test client will connect to the fibonacci server and send it a goal. It
 should then receive feedback from the server and a final response. The output
 should look something like this:
 ```
-Loading node class: com.github.ekumen.rosjava_actionlib.TestClient
+Loading node class: com.github.rosjava_actionlib.TestClient
 
 Waiting for action server to start...
 Action server started.
@@ -64,7 +64,7 @@ Bye!
 ## Running a test server:
 1. Run our server:
   * Source the project environment: ```$ source devel/setup.bash```
-  * Run the server: ```$ rosrun rosjava_actionlib execute com.github.ekumen.rosjava_actionlib.TestServer```
+  * Run the server: ```$ rosrun rosjava_actionlib execute com.github.rosjava_actionlib.TestServer```
 2. If its not already running, open a new terminal and get a ros master running: ```$ roscore```
 3. In another terminal run the actionlib sample client: ```$ rosrun actionlib_tutorials fibonacci_client```
 4. Once finished, use Ctrl+C to close the server.

build.gradle

@@ -15,7 +15,7 @@
  */
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.2.1'
+    gradleVersion = '2.14.1'
 }
 
 repositories {
@@ -24,11 +24,12 @@ repositories {
 }
 
 buildscript {
-  apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/indigo/buildscript.gradle"
+  apply from: "https://github.com/CentralLabFacilities/rosjava_bootstrap/raw/kinetic/buildscript.gradle"
 }
 
 apply plugin: 'catkin'
 apply plugin: 'java'
+apply plugin: "ros-java"
 
 allprojects {
     /*
@@ -39,26 +40,17 @@ allprojects {
     version = project.catkin.pkg.version
 }
 
-subprojects {
-    /*
-     * The ros plugin configures a few things:
-     *
-     *  - local deployment repository : where it dumps the jars and packaged artifacts)
-     *  - local maven repositories    : where it finds your locally installed/built artifacts)
-     *  - external maven repositories : where it goes looking if it can't find dependencies locally
-     *
-     * To modify, or add repos to the default external maven repositories list, pull request against this code:
-     *
-     *   https://github.com/rosjava/rosjava_bootstrap/blob/indigo/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
-     */
+dependencies {
+    /* An external maven artifact dependency */
 
-    apply plugin: "ros-java"
+    compile 'org.ros.rosjava_core:rosjava:[0.2,0.3)'
+    compile 'org.apache.directory.studio:org.apache.commons.logging:[1.1,1.2)'
+    testCompile 'junit:junit:4.12'
 
-    /*
-     * Some IDE support if you use it.
-     */
-    /* apply plugin: "eclipse" */
-    /* apply plugin: "idea"    */
+    /* Example of a local subproject dependency */
+    /* compile project(':sibling_gradle_project') */
+
+    compile 'org.ros.rosjava_messages:actionlib_tutorials:[0.1,)'
 }
 
 /*

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Nov 05 14:26:23 ART 2015
+#Fri Mar 17 14:27:20 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

launch/client_demo.launch

@@ -1,4 +1,4 @@
 <launch>
   <node pkg="actionlib_tutorials" type="fibonacci_server" name="fibonacci_server"/>
-  <node pkg="rosjava_actionlib" type="execute" name="rosjava_actionlib_client_demo" args="com.github.ekumen.rosjava_actionlib.TestClient"/>
+  <node pkg="rosjava_actionlib" type="execute" name="rosjava_actionlib_client_demo" args="com.github.rosjava_actionlib.TestClient"/>
 </launch>

launch/server_demo.launch

@@ -1,4 +1,4 @@
 <launch>
-  <node pkg="rosjava_actionlib" type="execute" name="rosjava_actionlib_server_demo" args="com.github.ekumen.rosjava_actionlib.TestServer"/>
+  <node pkg="rosjava_actionlib" type="execute" name="rosjava_actionlib_server_demo" args="com.github.rosjava_actionlib.TestServer"/>
   <node pkg="actionlib_tutorials" type="fibonacci_client" name="fibonacci_client"/>
 </launch>

src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java src/main/java/com/github/rosjava_actionlib/ActionClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import org.ros.namespace.GraphName;
 import org.ros.node.AbstractNodeMain;

src/main/java/com/github/ekumen/rosjava_actionlib/ActionClientListener.java src/main/java/com/github/rosjava_actionlib/ActionClientListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import org.ros.internal.message.Message;
 import actionlib_msgs.GoalStatusArray;

src/main/java/com/github/ekumen/rosjava_actionlib/ActionFeedback.java src/main/java/com/github/rosjava_actionlib/ActionFeedback.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import java.lang.reflect.Method;
 import org.ros.internal.message.Message;

src/main/java/com/github/ekumen/rosjava_actionlib/ActionGoal.java src/main/java/com/github/rosjava_actionlib/ActionGoal.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import java.lang.reflect.Method;
 import org.ros.internal.message.Message;

src/main/java/com/github/ekumen/rosjava_actionlib/ActionResult.java src/main/java/com/github/rosjava_actionlib/ActionResult.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import java.lang.reflect.Method;
 import org.ros.internal.message.Message;

src/main/java/com/github/ekumen/rosjava_actionlib/ActionServer.java src/main/java/com/github/rosjava_actionlib/ActionServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import org.ros.namespace.GraphName;
 import org.ros.node.AbstractNodeMain;

src/main/java/com/github/ekumen/rosjava_actionlib/ActionServerListener.java src/main/java/com/github/rosjava_actionlib/ActionServerListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import org.ros.internal.message.Message;
 import actionlib_msgs.GoalID;

src/main/java/com/github/ekumen/rosjava_actionlib/ClientGoalManager.java src/main/java/com/github/rosjava_actionlib/ClientGoalManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import org.ros.internal.message.Message;
 import actionlib_msgs.GoalID;

src/main/java/com/github/ekumen/rosjava_actionlib/ClientStateMachine.java src/main/java/com/github/rosjava_actionlib/ClientStateMachine.java

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
-import java.lang.Exception;
 import actionlib_msgs.GoalStatus;
 import java.util.Vector;
 import java.util.Iterator;

src/main/java/com/github/ekumen/rosjava_actionlib/GoalIDGenerator.java src/main/java/com/github/rosjava_actionlib/GoalIDGenerator.java

@@ -15,7 +15,7 @@
  * the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import org.ros.message.Time;
 import actionlib_msgs.GoalID;

src/main/java/com/github/ekumen/rosjava_actionlib/ServerStateMachine.java src/main/java/com/github/rosjava_actionlib/ServerStateMachine.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import java.lang.Exception;
 import actionlib_msgs.GoalStatus;

src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java src/main/java/com/github/rosjava_actionlib/TestClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
 import java.util.List;
 import org.ros.namespace.GraphName;

src/main/java/com/github/ekumen/rosjava_actionlib/TestServer.java src/main/java/com/github/rosjava_actionlib/TestServer.java

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.github.ekumen.rosjava_actionlib;
+package com.github.rosjava_actionlib;
 
-import java.util.List;
 import org.ros.namespace.GraphName;
 import org.ros.node.AbstractNodeMain;
 import org.ros.node.ConnectedNode;

src/test/java/TestClientStateMachine.java

@@ -1,4 +1,4 @@
-import com.github.ekumen.rosjava_actionlib.*;
+import com.github.rosjava_actionlib.*;
 import static org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.Before;