Merge pull request #174 from rosjava/releases

First official hydro release going in

CMakeLists.txt

+##############################################################################
+# CMake
+##############################################################################
+
 cmake_minimum_required(VERSION 2.8.3)
 project(rosjava_core)
 
-find_package(catkin REQUIRED rosjava_tools)
+##############################################################################
+# Catkin
+##############################################################################
+
+find_package(catkin REQUIRED rosjava_build_tools)
 
-catkin_rosjava_setup()
+catkin_rosjava_setup(uploadArchives)
 
 catkin_package()
 
+##############################################################################
+# Installation
+##############################################################################
+
+install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}/org/ros/rosjava_core/ 
+        DESTINATION ${CATKIN_GLOBAL_MAVEN_DESTINATION}/org/ros/rosjava_core)

build.gradle

@@ -14,33 +14,37 @@
  * the License.
  */
 
-task wrapper(type: Wrapper) {
-  gradleVersion = '1.5'
+buildscript {
+    def rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':').collect { 'file://' + it }
+    repositories {
+        rosMavenPath.each { p ->
+            maven {
+                url p
             }
-
-allprojects {
-  group 'ros.rosjava_core'
-  version = '0.0.0-SNAPSHOT'
         }
-
-subprojects {
-  if (name != 'docs') {
-    apply plugin: 'java'
-    apply plugin: 'osgi'
-    apply plugin: 'eclipse'
-    apply plugin: 'maven'
-
-    sourceCompatibility = 1.6
-    targetCompatibility = 1.6
-
-    repositories {
         mavenLocal()
         maven {
             url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
         }
     }
+    dependencies {
+        classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '0.1.+'
+    }
+}
+
+apply plugin: 'catkin'
+
+allprojects {
+    group 'org.ros.rosjava_core'
+    version = project.catkin.pkg.version
+}
+
+subprojects {
+    if (name != 'docs') {
+        apply plugin: 'ros'
+        apply plugin: 'ros-java'
     }
 }
 
-defaultTasks 'install'
+defaultTasks 'uploadArchives'
 

docs/src/main/sphinx/getting_started.rst

@@ -241,7 +241,7 @@ Services
 The following class (:javadoc:`org.ros.rosjava_tutorial_services.Server`) is
 available from the rosjava_tutorial_services package. In this example, we
 create a :javadoc:`org.ros.node.service.ServiceServer` for the
-``test_ros.AddTwoInts`` service. This should feel relatively familiar if you're
+``rosjava_test_msgs.AddTwoInts`` service. This should feel relatively familiar if you're
 a ROS veteran.
 
 .. literalinclude:: ../../../../rosjava_tutorial_services/src/main/java/org/ros/rosjava_tutorial_services/Server.java

rosjava_bootstrap/build.gradle → message_generation_tests/build.gradle

@@ -15,19 +15,23 @@
  */
 
 dependencies {
-  compile 'org.apache.commons:com.springsource.org.apache.commons.codec:1.3.0'
-  compile 'org.apache.commons:com.springsource.org.apache.commons.lang:2.4.0'
-  compile 'org.apache.commons:com.springsource.org.apache.commons.io:1.4.0'
-  compile 'commons-pool:commons-pool:1.6'
-  compile 'com.google.guava:guava:12.0'
-  compile 'io.netty:netty:3.5.2.Final'
+  compile 'org.ros.rosjava_messages:rosjava_test_msgs:0.1.+'
+  compile 'org.ros.rosjava_bootstrap:message_generation:0.1.+'
   testCompile 'junit:junit:4.8.2'
 }
-
 jar {
   manifest {
-    version = '0.0.0-SNAPSHOT'
-    symbolicName = 'org.ros.rosjava_bootstrap'
+    version = project.version
+    symbolicName = 'org.ros.rosjava_core.message_generation_tests'
+  }
 }
+
+/* 
+ * Ugly hack to stop osgi/java plugin combination from barfing
+ * when there are no sources. 
+ */
+task bugfixtask << {
+    mkdir sourceSets.main.output.classesDir
 }
 
+jar.dependsOn(bugfixtask)

rosjava_bootstrap/src/test/java/org/ros/internal/message/Md5GeneratorTest.java → message_generation_tests/src/test/java/org/ros/internal/message/Md5GeneratorTest.java

@@ -52,31 +52,31 @@ public class Md5GeneratorTest {
   @Test
   public void testPrimitives() {
     TopicDescription topicDescription =
-        topicDescriptionFactory.newFromType("test_ros/TestPrimitives");
+        topicDescriptionFactory.newFromType("rosjava_test_msgs/TestPrimitives");
     assertEquals("3e70f428a22c0d26ca67f87802c8e00f", topicDescription.getMd5Checksum());
   }
 
   @Test
   public void testString() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/TestString");
+    TopicDescription topicDescription = topicDescriptionFactory.newFromType("rosjava_test_msgs/TestString");
     assertEquals("334ff4377be93faa44ebc66d23d40fd3", topicDescription.getMd5Checksum());
   }
 
   @Test
   public void testHeader() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/TestHeader");
+    TopicDescription topicDescription = topicDescriptionFactory.newFromType("rosjava_test_msgs/TestHeader");
     assertEquals("4b5a00f536da2f756ba6aebcf795a967", topicDescription.getMd5Checksum());
   }
 
   @Test
   public void testArrays() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/TestArrays");
+    TopicDescription topicDescription = topicDescriptionFactory.newFromType("rosjava_test_msgs/TestArrays");
     assertEquals("4cc9b5e2cebe791aa3e994f5bc159eb6", topicDescription.getMd5Checksum());
   }
 
   @Test
   public void testComposite() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_ros/Composite");
+    TopicDescription topicDescription = topicDescriptionFactory.newFromType("rosjava_test_msgs/Composite");
     assertEquals("d8fb6eb869ad3956b50e8737d96dc9fa", topicDescription.getMd5Checksum());
   }
 
@@ -95,14 +95,14 @@ public class Md5GeneratorTest {
   @Test
   public void testAddTwoInts() {
     ServiceDescription serviceDescription =
-        serviceDescriptionFactory.newFromType("test_ros/AddTwoInts");
+        serviceDescriptionFactory.newFromType("rosjava_test_msgs/AddTwoInts");
     assertEquals("6a2e34150c00229791cc89ff309fff21", serviceDescription.getMd5Checksum());
   }
 
   @Test
   public void testTransitiveSrv() {
     ServiceDescription serviceDescription =
-        serviceDescriptionFactory.newFromType("test_rospy/TransitiveSrv");
+        serviceDescriptionFactory.newFromType("rosjava_test_msgspy/TransitiveSrv");
     assertEquals("8b7918ee2b81eaf825f4c70de011f6fa", serviceDescription.getMd5Checksum());
   }
 }

package.xml

 <?xml version="1.0"?>
 <package>
   <name>rosjava_core</name>
-  <version>0.0.0</version>
+  <version>0.1.0</version>
   <description>
     An implementation of ROS in pure-Java with Android support.
   </description>
@@ -10,6 +10,8 @@
   <license>Apache 2.0</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>rosjava_tools</build_depend>
+  <build_depend>rosjava_build_tools</build_depend>
+  <build_depend>rosjava_bootstrap</build_depend>
+  <build_depend>rosjava_messages</build_depend>
 </package>
 

rosdep.yaml

-java:
-  ubuntu: openjdk-6-jdk
-  debian: openjdk-6-jdk
-  arch: openjdk6
-  macports: |
-  gentoo: dev-java/sun-jdk
-  freebsd: openjdk6
-ant:
-  ubuntu: 
-    lucid: ant1.8
-    maverick: ant
-    natty: ant
-    oneiric: ant

rosjava/build.gradle

@@ -15,21 +15,26 @@
  */
 
 dependencies {
-  compile project(':rosjava_bootstrap')
-  compile project(':rosjava_messages')
   compile project(':apache_xmlrpc_common')
   compile project(':apache_xmlrpc_server')
   compile project(':apache_xmlrpc_client')
+  compile 'org.ros.rosjava_bootstrap:message_generation:0.1.+'
+  compile 'org.ros.rosjava_messages:rosjava_test_msgs:0.1.+'
+  compile 'org.ros.rosjava_messages:rosgraph_msgs:1.9.+'
+  compile 'org.ros.rosjava_messages:geometry_msgs:1.10.+'
+  compile 'org.ros.rosjava_messages:nav_msgs:1.10.+'
+  compile 'org.ros.rosjava_messages:tf2_msgs:0.4.+'
   compile 'dnsjava:dnsjava:2.1.1'
   compile 'org.apache.commons:com.springsource.org.apache.commons.logging:1.1.1'
   compile 'org.apache.commons:com.springsource.org.apache.commons.net:2.0.0'
+  compile 'com.google.guava:guava:12.0'
   testCompile 'junit:junit:4.8.2'
   testCompile 'org.mockito:mockito-all:1.8.5'
 }
 
 jar {
   manifest {
-    version = '0.0.0-SNAPSHOT'
+    version = project.version
     symbolicName = 'org.ros.rosjava'
     instruction 'Export-Package', '!org.ros.internal.*, org.ros.*'
     instruction 'Private-Package', 'org.ros.internal.*'