Skip to content

Commit 86ae0a1

Browse files
LeroyRLeroyR
committed
cleanup p2
1 parent 6353908 commit 86ae0a1

20 files changed

+36
-49
lines changed

‎.gitignore‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
adevel/
2-
abuild/
3-
a.gradle/
4-
a*.*~
5-
asrc/CMakeLists.txt
6-
a.catkin_workspace
1+
build/
2+
.gradle/
3+
*.*~

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ https://youtu.be/FmmsMdEbYFs
3030
2. In another terminal run the actionlib sample server: ```$ rosrun actionlib_tutorials fibonacci_server```
3131
3. Run our client:
3232
* Source the project environment: ```$ source devel/setup.bash```
33-
* Run the client: ```$ rosrun rosjava_actionlib execute com.github.ekumen.rosjava_actionlib.TestClient```
33+
* Run the client: ```$ rosrun rosjava_actionlib execute com.github.rosjava_actionlib.TestClient```
3434

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

‎build.gradle‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
task wrapper(type: Wrapper) {
18-
gradleVersion = '2.2.1'
18+
gradleVersion = '2.14.1'
1919
}
2020

2121
repositories {
@@ -24,11 +24,12 @@ repositories {
2424
}
2525

2626
buildscript {
27-
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/indigo/buildscript.gradle"
27+
apply from: "https://github.com/CentralLabFacilities/rosjava_bootstrap/raw/kinetic/buildscript.gradle"
2828
}
2929

3030
apply plugin: 'catkin'
3131
apply plugin: 'java'
32+
apply plugin: "ros-java"
3233

3334
allprojects {
3435
/*
@@ -39,26 +40,17 @@ allprojects {
3940
version = project.catkin.pkg.version
4041
}
4142

42-
subprojects {
43-
/*
44-
* The ros plugin configures a few things:
45-
*
46-
* - local deployment repository : where it dumps the jars and packaged artifacts)
47-
* - local maven repositories : where it finds your locally installed/built artifacts)
48-
* - external maven repositories : where it goes looking if it can't find dependencies locally
49-
*
50-
* To modify, or add repos to the default external maven repositories list, pull request against this code:
51-
*
52-
* https://github.com/rosjava/rosjava_bootstrap/blob/indigo/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
53-
*/
43+
dependencies {
44+
/* An external maven artifact dependency */
5445

55-
apply plugin: "ros-java"
46+
compile 'org.ros.rosjava_core:rosjava:[0.2,0.3)'
47+
compile 'org.apache.directory.studio:org.apache.commons.logging:[1.1,1.2)'
48+
testCompile 'junit:junit:4.12'
5649

57-
/*
58-
* Some IDE support if you use it.
59-
*/
60-
/* apply plugin: "eclipse" */
61-
/* apply plugin: "idea" */
50+
/* Example of a local subproject dependency */
51+
/* compile project(':sibling_gradle_project') */
52+
53+
compile 'org.ros.rosjava_messages:actionlib_tutorials:[0.1,)'
6254
}
6355

6456
/*

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Nov 05 14:26:23 ART 2015
1+
#Fri Mar 17 14:27:20 CET 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

‎launch/client_demo.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<launch>
22
<node pkg="actionlib_tutorials" type="fibonacci_server" name="fibonacci_server"/>
3-
<node pkg="rosjava_actionlib" type="execute" name="rosjava_actionlib_client_demo" args="com.github.ekumen.rosjava_actionlib.TestClient"/>
3+
<node pkg="rosjava_actionlib" type="execute" name="rosjava_actionlib_client_demo" args="com.github.rosjava_actionlib.TestClient"/>
44
</launch>

‎launch/server_demo.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<launch>
2-
<node pkg="rosjava_actionlib" type="execute" name="rosjava_actionlib_server_demo" args="com.github.ekumen.rosjava_actionlib.TestServer"/>
2+
<node pkg="rosjava_actionlib" type="execute" name="rosjava_actionlib_server_demo" args="com.github.rosjava_actionlib.TestServer"/>
33
<node pkg="actionlib_tutorials" type="fibonacci_client" name="fibonacci_client"/>
44
</launch>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.github.ekumen.rosjava_actionlib;
17+
package com.github.rosjava_actionlib;
1818

1919
import org.ros.namespace.GraphName;
2020
import org.ros.node.AbstractNodeMain;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.github.ekumen.rosjava_actionlib;
17+
package com.github.rosjava_actionlib;
1818

1919
import org.ros.internal.message.Message;
2020
import actionlib_msgs.GoalStatusArray;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.github.ekumen.rosjava_actionlib;
17+
package com.github.rosjava_actionlib;
1818

1919
import java.lang.reflect.Method;
2020
import org.ros.internal.message.Message;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.github.ekumen.rosjava_actionlib;
17+
package com.github.rosjava_actionlib;
1818

1919
import java.lang.reflect.Method;
2020
import org.ros.internal.message.Message;

0 commit comments

Comments
 (0)