diff --git a/.project b/.project
deleted file mode 100644
index 9e7d83458e3bebfb9d9cca44a2304d9b5bfb03ac..0000000000000000000000000000000000000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>rosjava_bootstrap</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/3rdparty/BUILD b/3rdparty/BUILD
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/3rdparty/jvm/com/google/code/findbugs/BUILD b/3rdparty/jvm/com/google/code/findbugs/BUILD
deleted file mode 100644
index 2a23982e6f02fada213930e0004a199cc4019b45..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/com/google/code/findbugs/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "jsr305",
-    exports = [
-        "//external:jar/com/google/code/findbugs/jsr305"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/com/google/guava/BUILD b/3rdparty/jvm/com/google/guava/BUILD
deleted file mode 100644
index 3cb65a2e3668f4046003f6d7ed529b65bd25bf6c..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/com/google/guava/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "guava",
-    exports = [
-        "//external:jar/com/google/guava/guava"
-    ],
-    runtime_deps = [
-        "//3rdparty/jvm/com/google/code/findbugs:jsr305"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/commons_pool/BUILD b/3rdparty/jvm/commons_pool/BUILD
deleted file mode 100644
index 0bbfd10c7500107d020814500cc66eb0ad09549d..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/commons_pool/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "commons_pool",
-    exports = [
-        "//external:jar/commons_pool/commons_pool"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/dnsjava/BUILD b/3rdparty/jvm/dnsjava/BUILD
deleted file mode 100644
index 7ac97e03db55e04c84acb0cf2192977a80cc36bd..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/dnsjava/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "dnsjava",
-    exports = [
-        "//external:jar/dnsjava/dnsjava"
-    ],
-    runtime_deps = [
-        "//3rdparty/jvm/junit:junit"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/io/netty/BUILD b/3rdparty/jvm/io/netty/BUILD
deleted file mode 100644
index 42fed0c4a07e5be8c3be7b2d2f0b853472e25b5d..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/io/netty/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "netty",
-    exports = [
-        "//external:jar/io/netty/netty"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/junit/BUILD b/3rdparty/jvm/junit/BUILD
deleted file mode 100644
index 7be4bd9660b8c19473bb1334a692a9cb64e8c51f..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/junit/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "junit",
-    exports = [
-        "//external:jar/junit/junit"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/org/apache/commons/BUILD b/3rdparty/jvm/org/apache/commons/BUILD
deleted file mode 100644
index 3c6c77d78a79ae9da1976b0f7d3df7e036c70638..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/org/apache/commons/BUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "com_springsource_org_apache_commons_codec",
-    exports = [
-        "//external:jar/org/apache/commons/com_springsource_org_apache_commons_codec"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
-
-java_library(
-    name = "com_springsource_org_apache_commons_httpclient",
-    exports = [
-        "//external:jar/org/apache/commons/com_springsource_org_apache_commons_httpclient"
-    ],
-    runtime_deps = [
-        ":com_springsource_org_apache_commons_codec",
-        ":com_springsource_org_apache_commons_logging"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
-
-java_library(
-    name = "com_springsource_org_apache_commons_io",
-    exports = [
-        "//external:jar/org/apache/commons/com_springsource_org_apache_commons_io"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
-
-java_library(
-    name = "com_springsource_org_apache_commons_lang",
-    exports = [
-        "//external:jar/org/apache/commons/com_springsource_org_apache_commons_lang"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
-
-java_library(
-    name = "com_springsource_org_apache_commons_logging",
-    exports = [
-        "//external:jar/org/apache/commons/com_springsource_org_apache_commons_logging"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
-
-java_library(
-    name = "com_springsource_org_apache_commons_net",
-    exports = [
-        "//external:jar/org/apache/commons/com_springsource_org_apache_commons_net"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/org/apache/ws/commons/BUILD b/3rdparty/jvm/org/apache/ws/commons/BUILD
deleted file mode 100644
index c538d3b9e856646a04acae5cb8e54a19ec712543..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/org/apache/ws/commons/BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "ws_commons_util",
-    exports = [
-        "//external:jar/org/apache/ws/commons/ws_commons_util"
-    ],
-    runtime_deps = [
-        "//3rdparty/jvm/junit:junit",
-        "//3rdparty/jvm/xml_apis:xml_apis"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/org/mockito/BUILD b/3rdparty/jvm/org/mockito/BUILD
deleted file mode 100644
index 025c073b30ae29c160405728404a8d5788c6c6d2..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/org/mockito/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "mockito_all",
-    exports = [
-        "//external:jar/org/mockito/mockito_all"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/org/ros/rosjava_bootstrap/BUILD b/3rdparty/jvm/org/ros/rosjava_bootstrap/BUILD
deleted file mode 100644
index b74ab7035f9b7a750f989066e8010b2bcf693f92..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/org/ros/rosjava_bootstrap/BUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "gradle_plugins",
-    exports = [
-        "//external:jar/org/ros/rosjava_bootstrap/gradle_plugins"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
-
-java_library(
-    name = "message_generation",
-    exports = [
-        "//external:jar/org/ros/rosjava_bootstrap/message_generation"
-    ],
-    runtime_deps = [
-        "//3rdparty/jvm/com/google/guava:guava",
-        "//3rdparty/jvm/commons_pool:commons_pool",
-        "//3rdparty/jvm/io/netty:netty",
-        "//3rdparty/jvm/org/apache/commons:com_springsource_org_apache_commons_codec",
-        "//3rdparty/jvm/org/apache/commons:com_springsource_org_apache_commons_io",
-        "//3rdparty/jvm/org/apache/commons:com_springsource_org_apache_commons_lang",
-        ":gradle_plugins"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/org/ros/rosjava_messages/BUILD b/3rdparty/jvm/org/ros/rosjava_messages/BUILD
deleted file mode 100644
index c0c6fb5aec94593948f72144ca8dec6c6c572255..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/org/ros/rosjava_messages/BUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "rosgraph_msgs",
-    exports = [
-        "//external:jar/org/ros/rosjava_messages/rosgraph_msgs"
-    ],
-    runtime_deps = [
-        "//3rdparty/jvm/org/ros/rosjava_bootstrap:message_generation",
-        ":std_msgs"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
-
-java_library(
-    name = "std_msgs",
-    exports = [
-        "//external:jar/org/ros/rosjava_messages/std_msgs"
-    ],
-    runtime_deps = [
-        "//3rdparty/jvm/org/ros/rosjava_bootstrap:message_generation"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/xml_apis/BUILD b/3rdparty/jvm/xml_apis/BUILD
deleted file mode 100644
index 473c5ce2f3516bc5c06f4714c3b941971d405913..0000000000000000000000000000000000000000
--- a/3rdparty/jvm/xml_apis/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-java_library(
-    name = "xml_apis",
-    exports = [
-        "//external:jar/xml_apis/xml_apis"
-    ],
-    visibility = [
-        "//visibility:public"
-    ]
-)
-
-
diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
deleted file mode 100644
index 4fbcb05bf9dc05a8d8794572be04939077d67605..0000000000000000000000000000000000000000
--- a/3rdparty/workspace.bzl
+++ /dev/null
@@ -1,37 +0,0 @@
-# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
-
-def declare_maven(hash):
-    native.maven_jar(
-        name = hash["name"],
-        artifact = hash["artifact"],
-        sha1 = hash["sha1"],
-        repository = hash["repository"]
-    )
-    native.bind(
-        name = hash["bind"],
-        actual = hash["actual"]
-    )
-
-def maven_dependencies(callback = declare_maven):
-    callback({"artifact": "com.google.code.findbugs:jsr305:1.3.9", "lang": "java", "sha1": "40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf", "repository": "https://jcenter.bintray.com/", "name": "com_google_code_findbugs_jsr305", "actual": "@com_google_code_findbugs_jsr305//jar", "bind": "jar/com/google/code/findbugs/jsr305"})
-    callback({"artifact": "com.google.guava:guava:12.0", "lang": "java", "sha1": "5bc66dd95b79db1e437eb08adba124a3e4088dc0", "repository": "https://jcenter.bintray.com/", "name": "com_google_guava_guava", "actual": "@com_google_guava_guava//jar", "bind": "jar/com/google/guava/guava"})
-    callback({"artifact": "commons-pool:commons-pool:1.6", "lang": "java", "sha1": "4572d589699f09d866a226a14b7f4323c6d8f040", "repository": "https://jcenter.bintray.com/", "name": "commons_pool_commons_pool", "actual": "@commons_pool_commons_pool//jar", "bind": "jar/commons_pool/commons_pool"})
-    callback({"artifact": "dnsjava:dnsjava:2.1.1", "lang": "java", "sha1": "5708df81cf6dbff545695f0be6380b7bbc85accc", "repository": "https://jcenter.bintray.com/", "name": "dnsjava_dnsjava", "actual": "@dnsjava_dnsjava//jar", "bind": "jar/dnsjava/dnsjava"})
-    callback({"artifact": "io.netty:netty:3.5.13.Final", "lang": "java", "sha1": "389edea561995909d5df3e70fb2c49954ac79a54", "repository": "https://jcenter.bintray.com/", "name": "io_netty_netty", "actual": "@io_netty_netty//jar", "bind": "jar/io/netty/netty"})
-# duplicates in junit:junit fixed to 4.8.2
-# - org.apache.ws.commons:ws-commons-util:1.0.1 wanted version 3.8.1
-# - dnsjava:dnsjava:2.1.1 wanted version 3.8.2
-    callback({"artifact": "junit:junit:4.8.2", "lang": "java", "sha1": "c94f54227b08100974c36170dcb53329435fe5ad", "repository": "https://jcenter.bintray.com/", "name": "junit_junit", "actual": "@junit_junit//jar", "bind": "jar/junit/junit"})
-    callback({"artifact": "org.apache.commons:com.springsource.org.apache.commons.codec:1.3.0", "lang": "java", "sha1": "f8690570eb0913d750262bb4223eed30b0d619ed", "repository": "https://jcenter.bintray.com/", "name": "org_apache_commons_com_springsource_org_apache_commons_codec", "actual": "@org_apache_commons_com_springsource_org_apache_commons_codec//jar", "bind": "jar/org/apache/commons/com_springsource_org_apache_commons_codec"})
-    callback({"artifact": "org.apache.commons:com.springsource.org.apache.commons.httpclient:3.1.0", "lang": "java", "sha1": "c493a925a091ac3d8f449d9265fe12482dabb2a7", "repository": "https://jcenter.bintray.com/", "name": "org_apache_commons_com_springsource_org_apache_commons_httpclient", "actual": "@org_apache_commons_com_springsource_org_apache_commons_httpclient//jar", "bind": "jar/org/apache/commons/com_springsource_org_apache_commons_httpclient"})
-    callback({"artifact": "org.apache.commons:com.springsource.org.apache.commons.io:1.4.0", "lang": "java", "sha1": "51097cd000ec88214ff181c9f059947de1cf4a35", "repository": "https://jcenter.bintray.com/", "name": "org_apache_commons_com_springsource_org_apache_commons_io", "actual": "@org_apache_commons_com_springsource_org_apache_commons_io//jar", "bind": "jar/org/apache/commons/com_springsource_org_apache_commons_io"})
-    callback({"artifact": "org.apache.commons:com.springsource.org.apache.commons.lang:2.4.0", "lang": "java", "sha1": "686e3713650c8e3a5d98723b4d3e239586bf9822", "repository": "https://jcenter.bintray.com/", "name": "org_apache_commons_com_springsource_org_apache_commons_lang", "actual": "@org_apache_commons_com_springsource_org_apache_commons_lang//jar", "bind": "jar/org/apache/commons/com_springsource_org_apache_commons_lang"})
-    callback({"artifact": "org.apache.commons:com.springsource.org.apache.commons.logging:1.1.1", "lang": "java", "sha1": "7657caf2c78e1d79c74d36f2ae128a115f7cc180", "repository": "https://jcenter.bintray.com/", "name": "org_apache_commons_com_springsource_org_apache_commons_logging", "actual": "@org_apache_commons_com_springsource_org_apache_commons_logging//jar", "bind": "jar/org/apache/commons/com_springsource_org_apache_commons_logging"})
-    callback({"artifact": "org.apache.commons:com.springsource.org.apache.commons.net:2.0.0", "lang": "java", "sha1": "03e78766072ff5a5cf3f5431d973c430c94ec612", "repository": "https://jcenter.bintray.com/", "name": "org_apache_commons_com_springsource_org_apache_commons_net", "actual": "@org_apache_commons_com_springsource_org_apache_commons_net//jar", "bind": "jar/org/apache/commons/com_springsource_org_apache_commons_net"})
-    callback({"artifact": "org.apache.ws.commons:ws-commons-util:1.0.1", "lang": "java", "sha1": "126e80ff798fece634bc94e61f8be8a8da00be60", "repository": "https://jcenter.bintray.com/", "name": "org_apache_ws_commons_ws_commons_util", "actual": "@org_apache_ws_commons_ws_commons_util//jar", "bind": "jar/org/apache/ws/commons/ws_commons_util"})
-    callback({"artifact": "org.mockito:mockito-all:1.8.5", "lang": "java", "sha1": "a927d8ae3b8d22eb745a74f94e59ce3882f2b524", "repository": "https://jcenter.bintray.com/", "name": "org_mockito_mockito_all", "actual": "@org_mockito_mockito_all//jar", "bind": "jar/org/mockito/mockito_all"})
-    callback({"artifact": "org.ros.rosjava_bootstrap:gradle_plugins:0.3.0", "lang": "java", "sha1": "9915d897f3b5049e99b268068978a1bca0ae7b5d", "repository": "https://github.com/rosjava/rosjava_mvn_repo/raw/master", "name": "org_ros_rosjava_bootstrap_gradle_plugins", "actual": "@org_ros_rosjava_bootstrap_gradle_plugins//jar", "bind": "jar/org/ros/rosjava_bootstrap/gradle_plugins"})
-    callback({"artifact": "org.ros.rosjava_bootstrap:message_generation:0.3.0", "lang": "java", "sha1": "5141e448f0ea6a2d6f539219d4fc9b296ff07ca4", "repository": "https://github.com/rosjava/rosjava_mvn_repo/raw/master", "name": "org_ros_rosjava_bootstrap_message_generation", "actual": "@org_ros_rosjava_bootstrap_message_generation//jar", "bind": "jar/org/ros/rosjava_bootstrap/message_generation"})
-    callback({"artifact": "org.ros.rosjava_messages:rosgraph_msgs:1.11.2", "lang": "java", "sha1": "adb731dd5181976b23c217872f61c724a3af70fe", "repository": "https://github.com/rosjava/rosjava_mvn_repo/raw/master", "name": "org_ros_rosjava_messages_rosgraph_msgs", "actual": "@org_ros_rosjava_messages_rosgraph_msgs//jar", "bind": "jar/org/ros/rosjava_messages/rosgraph_msgs"})
-    callback({"artifact": "org.ros.rosjava_messages:std_msgs:0.5.11", "lang": "java", "sha1": "a0191f0506dfecfc471eb199a119691717801c0e", "repository": "https://github.com/rosjava/rosjava_mvn_repo/raw/master", "name": "org_ros_rosjava_messages_std_msgs", "actual": "@org_ros_rosjava_messages_std_msgs//jar", "bind": "jar/org/ros/rosjava_messages/std_msgs"})
-    callback({"artifact": "xml-apis:xml-apis:1.0.b2", "lang": "java", "sha1": "3136ca936f64c9d68529f048c2618bd356bf85c9", "repository": "https://jcenter.bintray.com/", "name": "xml_apis_xml_apis", "actual": "@xml_apis_xml_apis//jar", "bind": "jar/xml_apis/xml_apis"})
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
deleted file mode 100644
index 5fce600e311865c79c44f02d1b9b735dd6319a61..0000000000000000000000000000000000000000
--- a/CHANGELOG.rst
+++ /dev/null
@@ -1,141 +0,0 @@
-Changelog
-=========
-
-0.3.3 (2019-01-17)
-------------------
-  Gradle upgrade to version 4.10.2.
-* Adding google to repository list in buildscript.gradle.
-* Using ChannelBuffers for int8[] data; fixing testInt8List.
-* Adding action generation implementation.
-* Add tests for byte arrays.
-* Add tests for incomplete initialization and string arrays.
-* Add tests for fixed sized arrays of floats.
-* Add Bazel build for message_generation.
-* Minor fixes.
-* Contributors: Arne, Ernesto Corbellini, Juan Ignacio Ubeira, Rodrigo Queiro
-
-0.3.2 (2017-05-09)
-------------------
-* Bumping message_generation version to kinetic range in CatkinPlugin script for generating new message artifacts properly.
-* Contributors: Juan Ignacio Ubeira, Julian Cerruti
-
-0.3.1 (2016-12-28)
-------------------
-* Switch Gradle target for rosjava libraries to publish
-* Switch from Maven Central to jcenter
-* Gradle 2.2.1 -> 2.14.1
-* Android SDK Build Tools 21.1.2 -> 25.0.2
-* Contributors: Daniel Stonier, Julian Cerruti
-
-0.3.0 (2016-12-13)
-------------------
-* Updates for Kinetic release.
-
-0.2.1 (2015-02-25)
-------------------
-* minor bugfixes and improvements.
-* java source compatibility for java 1.6 -> 1.7
-* centralised buildscript for java packages.
-* add eclipse and idea plugins for easy ide support.
-* Add support of UTF-8!
-* update to the latest gradle plugin.
-* single interface generator for genjava.
-* Fix SSL connection errors with Java 1.7.
-* Contributors: Damon Kohler, Daniel Stonier, Mickael Gaillard, talregev
-
-0.1.21 (2014-06-09)
--------------------
-* Android gradle plugin 0.9.+->0.11.+ (studio 0.6)
-* Android sdk build tools 19.0.3 -> 19.1 (studio 0.6)
-* Contributors: Daniel Stonier
-
-0.1.20 (2014-03-20)
--------------------
-* Trim maven repository list and backup with maven central.
-* Contributors: Daniel Stonier
-
-0.1.19 (2014-03-19)
--------------------
-* gradle 1.11, buildTools 19.0.3, gradle android plugin 0.9.+
-* remove unused debugging variables
-* Contributors: Daniel Stonier
-
-0.1.18 (2014-02-09)
--------------------
-* set default maven repo if variable is empty and bugfix dynamic property warnings.
-* Contributors: Daniel Stonier
-
-0.1.16 [2013-12-26]
--------------------
-* android plugin 0.6.1 -> 0.7.1
-
-0.1.15 [2013-12-26]
--------------------
-* message generation now has a single api for official and unofficial releases
-* message generation api smart enough to work out internal or external dependencies
-* fix dependency problems on non xxx_msg packages - i.e. check for build_depends on message_generation
-
-0.1.14 [2013-12-11]
--------------------
-* stop unofficial message generation accidentally picking up older versions of packages.
-
-0.1.13 [2013-12-08]
--------------------
-* fix unofficial message package internal/external dependency configuration.
-
-0.1.12 [2013-11-08]
--------------------
-* fix single artifact message generation when there is dependencies.
-
-0.1.11 (2013-10-31)
--------------------
-* catkin tree generator now takes latest versions only.
-
-0.1.9 (2013-10-31)
-------------------
-* utilise ROS_MAVEN_REPOSITORY
-
-0.1.8 (2013-10-26)
-------------------
-* bugfix upgrade version numbers for rosgraph_test_msgs.
-* gradle 1.7->1.8 and android_tools->18.1.1
-* avoid using .+ ranged dependencies as it breaks the repo
-
-0.1.7 (2013-09-23)
-------------------
-* use maven-publish plugin for publishing rosjava packages.
-* centralise last code snippets from android build.gradle's.
-
-0.1.6 (2013-09-22)
-------------------
-* disabling osgi.
-
-0.1.5 (2013-09-18)
-------------------
-* maven deployment path -> maven deployment repository.
-* bugfix install location.
-
-0.1.4 (2013-09-17)
-------------------
-* depend on message generation 0.1.+
-* use package.xml version.
-* run_depends for the build tools.
-
-0.1.3 (2013-09-17)
-------------------
-* added excludes to the ros android plugin.
-
-0.1.2 (2013-09-17)
-------------------
-* ros android plugin added
-* gradle wrapper -> 1.7
-
-0.1.1 (2013-09-13)
-------------------
-* message artifact creation bugfixes.
-
-0.1.0 (2013-09-12)
-------------------
-* several plugins for sharing of ros gradle logic
-* message generation code brought in from rosjava_core
-
diff --git a/WORKSPACE b/WORKSPACE
deleted file mode 100644
index 381ef5913501e6ecee10c3d1b982bd00fd5e6ff1..0000000000000000000000000000000000000000
--- a/WORKSPACE
+++ /dev/null
@@ -1,5 +0,0 @@
-workspace(name = "com_github_rosjava_rosjava_bootstrap")
-
-load("//3rdparty:workspace.bzl", "maven_dependencies")
-
-maven_dependencies()
diff --git a/dependencies.yaml b/dependencies.yaml
deleted file mode 100644
index abbdd2c2746087cf2ba21289480ee83372f9f8ed..0000000000000000000000000000000000000000
--- a/dependencies.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# If you edit this file, follow these instructions to generate the output
-# files:
-#
-# cd ..
-# git clone https://github.com/johnynek/bazel-deps
-# cd bazel-deps
-# bazel build src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar
-# cd ../rosjava_bootstrap
-# ../bazel-deps/gen_maven_deps.sh generate -r $PWD -s 3rdparty/workspace.bzl -d dependencies.yaml
-
-options:
-  languages: [ "java" ]
-  resolvers:
-    - id: "jcenter"
-      type: "default"
-      url: https://jcenter.bintray.com/
-    - id: "rosjava_mvn_repo"
-      type: "default"
-      url: https://github.com/rosjava/rosjava_mvn_repo/raw/master
-  resolverCache: bazel_output_base
-  transitivity: runtime_deps
-  versionConflictPolicy: highest
-  buildHeader:
-    - "# Do not edit. bazel-deps autogenerates this file from dependencies.yaml."
-
-dependencies:
-  commons-pool:
-    commons-pool:
-      lang: java
-      version: "1.6"
-  com.google.guava:
-    guava:
-      lang: java
-      version: "12.0"
-  dnsjava:
-    dnsjava:
-      lang: java
-      version: "2.1.1"
-  io.netty:
-    netty:
-      lang: java
-      version: "3.5.13.Final"
-  junit:
-    junit:
-      lang: java
-      version: "4.8.2"
-  org.apache.commons:
-    com.springsource.org.apache.commons.codec:
-      lang: java
-      version: "1.3.0"
-    com.springsource.org.apache.commons.httpclient:
-      lang: java
-      version: "3.1.0"
-    com.springsource.org.apache.commons.io:
-      lang: java
-      version: "1.4.0"
-    com.springsource.org.apache.commons.lang:
-      lang: java
-      version: "2.4.0"
-    com.springsource.org.apache.commons.logging:
-      lang: java
-      version: "1.1.1"
-    com.springsource.org.apache.commons.net:
-      lang: java
-      version: "2.0.0"
-  org.apache.ws.commons:
-    ws-commons-util:
-      lang: java
-      version: "1.0.1"
-  org.mockito:
-    mockito-all:
-      lang: java
-      version: "1.8.5"
-  org.ros.rosjava_messages:
-    rosgraph_msgs:
-      lang: java
-      version: "1.11.2"
-    std_msgs:
-      lang: java
-      version: "0.5.11"
diff --git a/message_generation/BUILD.bazel b/message_generation/BUILD.bazel
deleted file mode 100644
index bb56c7d50eaadf79efd9edb15bc70cc2dcda7a38..0000000000000000000000000000000000000000
--- a/message_generation/BUILD.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "message_generation",
-    srcs = glob([
-        "src/main/**/*.java",
-    ]),
-    deps = [
-        "//3rdparty/jvm/com/google/guava",
-        "//3rdparty/jvm/commons_pool",
-        "//3rdparty/jvm/io/netty",
-        "//3rdparty/jvm/org/apache/commons:com_springsource_org_apache_commons_codec",
-        "//3rdparty/jvm/org/apache/commons:com_springsource_org_apache_commons_io",
-        "//3rdparty/jvm/org/apache/commons:com_springsource_org_apache_commons_lang",
-    ],
-)
-
-java_test(
-    name = "ArrayFieldTest",
-    size = "small",
-    srcs = ["src/test/java/org/ros/internal/message/field/ArrayFieldTest.java"],
-    deps = [
-        ":message_generation",
-        "//3rdparty/jvm/io/netty",
-        "//3rdparty/jvm/junit",
-    ],
-)
-
-java_test(
-    name = "MessageInterfaceBuilderTest",
-    size = "small",
-    srcs = ["src/test/java/org/ros/internal/message/MessageInterfaceBuilderTest.java"],
-    deps = [
-        ":message_generation",
-        "//3rdparty/jvm/junit",
-    ],
-)
-
-java_test(
-    name = "Md5GeneratorTest",
-    size = "small",
-    srcs = ["src/test/java/org/ros/internal/message/Md5GeneratorTest.java"],
-    resources = glob(["src/test/resources/**/*"]),
-    deps = [
-        ":message_generation",
-        "//3rdparty/jvm/junit",
-    ],
-)
-
-java_test(
-    name = "MessageTest",
-    size = "small",
-    srcs = ["src/test/java/org/ros/internal/message/MessageTest.java"],
-    resources = glob(["src/test/resources/**/*"]),
-    deps = [
-        ":message_generation",
-        "//3rdparty/jvm/com/google/guava",
-        "//3rdparty/jvm/junit",
-    ],
-)
-
-java_test(
-    name = "RawMessageSerializationTest",
-    size = "small",
-    srcs = ["src/test/java/org/ros/internal/message/RawMessageSerializationTest.java"],
-    resources = glob(["src/test/resources/**/*"]),
-    deps = [
-        ":message_generation",
-        "//3rdparty/jvm/com/google/guava",
-        "//3rdparty/jvm/io/netty",
-        "//3rdparty/jvm/junit",
-    ],
-)
-
-java_test(
-    name = "ServiceTest",
-    size = "small",
-    srcs = ["src/test/java/org/ros/internal/message/ServiceTest.java"],
-    deps = [
-        ":message_generation",
-        "//3rdparty/jvm/junit",
-    ],
-)
-
-java_test(
-    name = "DurationTest",
-    size = "small",
-    srcs = ["src/test/java/org/ros/message/DurationTest.java"],
-    deps = [
-        ":message_generation",
-        "//3rdparty/jvm/junit",
-    ],
-)
-
-java_test(
-    name = "TimeTest",
-    size = "small",
-    srcs = ["src/test/java/org/ros/message/TimeTest.java"],
-    deps = [
-        ":message_generation",
-        "//3rdparty/jvm/junit",
-    ],
-)
diff --git a/message_generation/src/test/java/org/ros/internal/message/Md5GeneratorTest.java b/message_generation/src/test/java/org/ros/internal/message/Md5GeneratorTest.java
deleted file mode 100644
index 2ff244a66ee97b7cd953490494cbf5bf6cd7474d..0000000000000000000000000000000000000000
--- a/message_generation/src/test/java/org/ros/internal/message/Md5GeneratorTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.ros.internal.message;
-
-import static org.junit.Assert.assertEquals;
-
-import org.ros.internal.message.definition.MessageDefinitionProviderChain;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.ros.internal.message.service.ServiceDefinitionResourceProvider;
-import org.ros.internal.message.service.ServiceDescription;
-import org.ros.internal.message.service.ServiceDescriptionFactory;
-import org.ros.internal.message.topic.TopicDefinitionResourceProvider;
-import org.ros.internal.message.topic.TopicDescription;
-import org.ros.internal.message.topic.TopicDescriptionFactory;
-
-/**
- * @author damonkohler@google.com (Damon Kohler)
- */
-public class Md5GeneratorTest {
-
-  private TopicDescriptionFactory topicDescriptionFactory;
-  private ServiceDescriptionFactory serviceDescriptionFactory;
-
-  @Before
-  public void setUp() {
-    MessageDefinitionProviderChain messageDefinitionProviderChain =
-        new MessageDefinitionProviderChain();
-    messageDefinitionProviderChain
-        .addMessageDefinitionProvider(new TopicDefinitionResourceProvider());
-    messageDefinitionProviderChain
-        .addMessageDefinitionProvider(new ServiceDefinitionResourceProvider());
-    topicDescriptionFactory = new TopicDescriptionFactory(messageDefinitionProviderChain);
-    serviceDescriptionFactory = new ServiceDescriptionFactory(messageDefinitionProviderChain);
-  }
-
-  @Test
-  public void testPrimitives() {
-    TopicDescription topicDescription =
-        topicDescriptionFactory.newFromType("test_msgs/TestPrimitives");
-    assertEquals("3e70f428a22c0d26ca67f87802c8e00f", topicDescription.getMd5Checksum());
-  }
-
-  @Test
-  public void testString() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_msgs/TestString");
-    assertEquals("334ff4377be93faa44ebc66d23d40fd3", topicDescription.getMd5Checksum());
-  }
-
-  @Test
-  public void testHeader() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_msgs/TestHeader");
-    assertEquals("4b5a00f536da2f756ba6aebcf795a967", topicDescription.getMd5Checksum());
-  }
-
-  @Test
-  public void testArrays() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_msgs/TestArrays");
-    assertEquals("4cc9b5e2cebe791aa3e994f5bc159eb6", topicDescription.getMd5Checksum());
-  }
-
-  @Test
-  public void testComposite() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("test_msgs/Composite");
-    assertEquals("d8fb6eb869ad3956b50e8737d96dc9fa", topicDescription.getMd5Checksum());
-  }
-
-  @Test
-  public void testOdometry() {
-    TopicDescription topicDescription = topicDescriptionFactory.newFromType("nav_msgs/Odometry");
-    assertEquals("cd5e73d190d741a2f92e81eda573aca7", topicDescription.getMd5Checksum());
-  }
-
-  @Test
-  public void testEmpty() {
-    ServiceDescription serviceDescription = serviceDescriptionFactory.newFromType("std_srvs/Empty");
-    assertEquals("d41d8cd98f00b204e9800998ecf8427e", serviceDescription.getMd5Checksum());
-  }
-
-  @Test
-  public void testAddTwoInts() {
-    ServiceDescription serviceDescription =
-        serviceDescriptionFactory.newFromType("test_msgs/AddTwoInts");
-    assertEquals("6a2e34150c00229791cc89ff309fff21", serviceDescription.getMd5Checksum());
-  }
-
-  @Test
-  public void testTransitiveSrv() {
-    ServiceDescription serviceDescription =
-        serviceDescriptionFactory.newFromType("test_msgs/TransitiveSrv");
-    assertEquals("8b7918ee2b81eaf825f4c70de011f6fa", serviceDescription.getMd5Checksum());
-  }
-}
diff --git a/message_generation/src/test/java/org/ros/internal/message/MessageInterfaceBuilderTest.java b/message_generation/src/test/java/org/ros/internal/message/MessageInterfaceBuilderTest.java
deleted file mode 100644
index 38e5316113765c178b347e9eaf82872e4e7a489b..0000000000000000000000000000000000000000
--- a/message_generation/src/test/java/org/ros/internal/message/MessageInterfaceBuilderTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.ros.internal.message;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.ros.internal.message.topic.TopicDefinitionResourceProvider;
-import org.ros.message.MessageDeclaration;
-import org.ros.message.MessageFactory;
-
-/**
- * @author damonkohler@google.com (Damon Kohler)
- */
-public class MessageInterfaceBuilderTest {
-
-  private TopicDefinitionResourceProvider topicDefinitionResourceProvider;
-  private MessageFactory messageFactory;
-
-  @Before
-  public void before() {
-    topicDefinitionResourceProvider = new TopicDefinitionResourceProvider();
-    messageFactory = new DefaultMessageFactory(topicDefinitionResourceProvider);
-  }
-
-  @Test
-  public void testDuplicateFieldNames() {
-    MessageInterfaceBuilder builder = new MessageInterfaceBuilder();
-    builder.setPackageName("foo");
-    builder.setInterfaceName("bar");
-    builder.setMessageDeclaration(MessageDeclaration.of("foo/bar", "int32 foo\nint32 Foo"));
-    builder.setAddConstantsAndMethods(true);
-    String result = builder.build(messageFactory);
-    assertEquals("package foo;\n\n"
-        + "public interface bar extends org.ros.internal.message.Message {\n"
-        + "  static final java.lang.String _TYPE = \"foo/bar\";\n"
-        + "  static final java.lang.String _DEFINITION = \"int32 foo\\nint32 Foo\";\n"
-        + "  int getFoo();\n" + "  void setFoo(int value);\n" + "}\n", result);
-  }
-}
diff --git a/message_generation/src/test/java/org/ros/internal/message/MessageTest.java b/message_generation/src/test/java/org/ros/internal/message/MessageTest.java
deleted file mode 100644
index 241009dfc590ee66ccb2356df3435de392449ae0..0000000000000000000000000000000000000000
--- a/message_generation/src/test/java/org/ros/internal/message/MessageTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.ros.internal.message;
-
-import static org.junit.Assert.assertEquals;
-
-import com.google.common.collect.Lists;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.junit.Before;
-import org.junit.Test;
-import org.ros.internal.message.topic.TopicDefinitionResourceProvider;
-import org.ros.message.MessageFactory;
-
-import java.nio.ByteOrder;
-
-/**
- * @author damonkohler@google.com (Damon Kohler)
- */
-public class MessageTest {
-
-  private TopicDefinitionResourceProvider topicDefinitionResourceProvider;
-  private MessageFactory messageFactory;
-
-  @Before
-  public void before() {
-    topicDefinitionResourceProvider = new TopicDefinitionResourceProvider();
-    messageFactory = new DefaultMessageFactory(topicDefinitionResourceProvider);
-  }
-
-  @Test
-  public void testCreateEmptyMessage() {
-    topicDefinitionResourceProvider.add("foo/foo", "");
-    messageFactory.newFromType("foo/foo");
-  }
-
-  @Test
-  public void testCreateEmptyMessageWithBlankLines() {
-    topicDefinitionResourceProvider.add("foo/foo", "\n\n\n\n\n");
-    messageFactory.newFromType("foo/foo");
-  }
-
-  @Test
-  public void testString() {
-    String data = "Hello, ROS!";
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/String");
-    rawMessage.setString("data", data);
-    assertEquals(data, rawMessage.getString("data"));
-  }
-
-  @Test
-  public void testStringWithComments() {
-    topicDefinitionResourceProvider.add("foo/foo", "# foo\nstring data\n    # string other data");
-    String data = "Hello, ROS!";
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setString("data", data);
-    assertEquals(data, rawMessage.getString("data"));
-  }
-
-  @Test
-  public void testInt8() {
-    byte data = 42;
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/Int8");
-    rawMessage.setInt8("data", data);
-    assertEquals(data, rawMessage.getInt8("data"));
-  }
-
-  @Test
-  public void testNestedMessage() {
-    topicDefinitionResourceProvider.add("foo/foo", "bar data");
-    topicDefinitionResourceProvider.add("foo/bar", "int8 data");
-    RawMessage fooMessage = messageFactory.newFromType("foo/foo");
-    RawMessage barMessage = messageFactory.newFromType("foo/bar");
-    fooMessage.setMessage("data", barMessage);
-    byte data = 42;
-    barMessage.setInt8("data", data);
-    assertEquals(data, fooMessage.getMessage("data").toRawMessage().getInt8("data"));
-  }
-
-  @Test
-  public void testNestedMessageList() {
-    topicDefinitionResourceProvider.add("foo/foo", "bar[] data");
-    topicDefinitionResourceProvider.add("foo/bar", "int8 data");
-    RawMessage fooMessage = messageFactory.newFromType("foo/foo");
-    RawMessage barMessage = messageFactory.newFromType("foo/bar");
-    fooMessage.setMessageList("data", Lists.<Message>newArrayList(barMessage));
-    byte data = 42;
-    barMessage.toRawMessage().setInt8("data", data);
-    assertEquals(data, fooMessage.getMessageList("data").get(0).toRawMessage().getInt8("data"));
-  }
-
-  @Test
-  public void testConstantInt8() {
-    topicDefinitionResourceProvider.add("foo/foo", "int8 data=42");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    assertEquals(42, rawMessage.getInt8("data"));
-  }
-
-  @Test
-  public void testConstantString() {
-    topicDefinitionResourceProvider.add("foo/foo", "string data=Hello, ROS! # comment ");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    assertEquals("Hello, ROS! # comment", rawMessage.getString("data"));
-  }
-
-  @Test
-  public void testInt8List() {
-    topicDefinitionResourceProvider.add("foo/foo", "int8[] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    byte[] rawData = new byte[] { (byte) 1, (byte) 2, (byte) 3 };
-    ChannelBuffer data = ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, rawData);
-    rawMessage.setInt8Array("data", rawData);
-    assertEquals(data, rawMessage.getInt8Array("data"));
-  }
-}
\ No newline at end of file
diff --git a/message_generation/src/test/java/org/ros/internal/message/RawMessageSerializationTest.java b/message_generation/src/test/java/org/ros/internal/message/RawMessageSerializationTest.java
deleted file mode 100644
index cf19530dee2a8e7d2231873cecfff5890f08a5d7..0000000000000000000000000000000000000000
--- a/message_generation/src/test/java/org/ros/internal/message/RawMessageSerializationTest.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.ros.internal.message;
-
-import static org.junit.Assert.assertTrue;
-
-import com.google.common.collect.Lists;
-import java.util.Arrays;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.junit.Before;
-import org.junit.Test;
-import org.ros.internal.message.topic.TopicDefinitionResourceProvider;
-import org.ros.message.Duration;
-import org.ros.message.MessageFactory;
-import org.ros.message.Time;
-
-/**
- * @author damonkohler@google.com (Damon Kohler)
- * @author mick.gaillard@gmail.com (Mickael Gaillard)
- */
-public class RawMessageSerializationTest {
-
-  private TopicDefinitionResourceProvider topicDefinitionResourceProvider;
-  private MessageFactory messageFactory;
-
-  @Before
-  public void before() {
-    topicDefinitionResourceProvider = new TopicDefinitionResourceProvider();
-    messageFactory = new DefaultMessageFactory(topicDefinitionResourceProvider);
-  }
-
-  private void checkSerializeAndDeserialize(Message message) {
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    DefaultMessageSerializer serializer = new DefaultMessageSerializer();
-    serializer.serialize(message, buffer);
-    DefaultMessageDeserializer<RawMessage> deserializer =
-        new DefaultMessageDeserializer<RawMessage>(message.toRawMessage().getIdentifier(),
-            messageFactory);
-    RawMessage deserializedMessage = deserializer.deserialize(buffer);
-    assertTrue(message.equals(deserializedMessage));
-  }
-
-  @Test
-  public void testBool() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/Bool");
-    rawMessage.setBool("data", true);
-    checkSerializeAndDeserialize(rawMessage);
-    rawMessage.setBool("data", false);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testInt8() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/Int8");
-    rawMessage.setInt8("data", (byte) 42);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testUint8() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/UInt8");
-    rawMessage.setUInt8("data", (byte) 42);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testInt16() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/Int16");
-    rawMessage.setInt16("data", (short) 42);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testUInt16() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/UInt16");
-    rawMessage.setUInt16("data", (short) 42);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testInt32() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/Int32");
-    rawMessage.setInt32("data", 42);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testUInt32() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/UInt32");
-    rawMessage.setUInt32("data", 42);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testInt64() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/Int64");
-    rawMessage.setInt64("data", 42);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testUInt64() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/UInt64");
-    rawMessage.setUInt64("data", 42);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testFloat32() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/Float32");
-    rawMessage.setFloat32("data", 42);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testFloat64() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/Float64");
-    rawMessage.setFloat64("data", 42);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testString() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/String");
-    rawMessage.setString("data", "Hello, ROS!");
-    checkSerializeAndDeserialize(rawMessage);
-  }
-  
-  @Test
-  public void testStringUTF8() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/String");
-    rawMessage.setString("data", "éêè €àáßëœ 文字化け");
-    checkSerializeAndDeserialize(rawMessage);
-
-    // i18n test case
-    // base on http://www.inter-locale.com/whitepaper/learn/learn-to-test.html
-
-    // Combining Marks and Accents test
-    rawMessage.setString("data", "àéîōũ");
-    checkSerializeAndDeserialize(rawMessage);
-
-    // DOS 860 test
-    rawMessage.setString("data", "você nós mãe avô irmã criança");
-    checkSerializeAndDeserialize(rawMessage);
-
-    // Windows-1252 test
-    rawMessage.setString("data", "€ŒœŠš™©‰ƒ");
-    checkSerializeAndDeserialize(rawMessage);
-
-    // Turkish test
-    rawMessage.setString("data", "ışık bir İyi Günler");
-    checkSerializeAndDeserialize(rawMessage);
-
-    // Dakuten and handakuten marks test
-    rawMessage.setString("data", "がざばだぱか゛さ゛た゛は");
-    checkSerializeAndDeserialize(rawMessage);
-
-    // Combining Grapheme Joiner character
-    rawMessage.setString("data", "אִ͏ַ");
-    checkSerializeAndDeserialize(rawMessage);
-
-    // Bidi with Latin test
-    rawMessage.setString("data", "abcאבגדabc ");
-    checkSerializeAndDeserialize(rawMessage);
-
-    rawMessage.setString("data", "אבגדabcאבגד");
-    checkSerializeAndDeserialize(rawMessage);
-
-    rawMessage.setString("data", "אבגד012אבגד");
-    checkSerializeAndDeserialize(rawMessage);
-
-    rawMessage.setString("data", "אבגד 012 012");
-    checkSerializeAndDeserialize(rawMessage);
-
-    // Complex Scripts test
-    rawMessage.setString("data", "สวัสดี");
-    checkSerializeAndDeserialize(rawMessage);
-
-    rawMessage.setString("data", "டாஹ்கோ");
-    checkSerializeAndDeserialize(rawMessage);
-
-    rawMessage.setString("data", "بِسْمِ اللّهِ الرَّحْمـَنِ الرَّحِيمِ");
-    checkSerializeAndDeserialize(rawMessage);
-
-    // Numeric Shaping test
-    rawMessage.setString("data", "عدد مارس ١٩٩٨");
-    checkSerializeAndDeserialize(rawMessage);
-
-    // Common Scripts and Encodings test
-    rawMessage.setString("data", "Слава Жанна Ювеналий Ярополк");
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testTime() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/Time");
-    rawMessage.setTime("data", new Time());
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testDuration() {
-    RawMessage rawMessage = messageFactory.newFromType("std_msgs/Duration");
-    rawMessage.setDuration("data", new Duration());
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testNestedMessage() {
-    topicDefinitionResourceProvider.add("foo/foo", "std_msgs/String data");
-    RawMessage fooMessage = messageFactory.newFromType("foo/foo");
-    RawMessage stringMessage = messageFactory.newFromType("std_msgs/String");
-    stringMessage.setString("data", "Hello, ROS!");
-    fooMessage.setMessage("data", stringMessage);
-    checkSerializeAndDeserialize(fooMessage);
-  }
-
-  @Test
-  public void testNestedMessageArray() {
-    topicDefinitionResourceProvider.add("foo/foo", "std_msgs/String[] data");
-    RawMessage fooMessage = messageFactory.newFromType("foo/foo");
-    RawMessage stringMessageA = messageFactory.newFromType("std_msgs/String");
-    stringMessageA.setString("data", "Hello, ROS!");
-    RawMessage stringMessageB = messageFactory.newFromType("std_msgs/String");
-    stringMessageB.setString("data", "Goodbye, ROS!");
-    fooMessage.setMessageList("data", Lists.<Message>newArrayList(stringMessageA, stringMessageB));
-    checkSerializeAndDeserialize(fooMessage);
-  }
-
-  @Test
-  public void testChannelBuffer() {
-    topicDefinitionResourceProvider.add("foo/foo", "uint8[] data");
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    buffer.writeBytes(new byte[] { 1, 2, 3, 4, 5 });
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setChannelBuffer("data", buffer);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testInt32Array() {
-    topicDefinitionResourceProvider.add("foo/foo", "int32[] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setInt32Array("data", new int[] { 1, 2, 3, 4, 5 });
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testFloat64Array() {
-    topicDefinitionResourceProvider.add("foo/foo", "float64[] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setFloat64Array("data", new double[] { 1, 2, 3, 4, 5 });
-    checkSerializeAndDeserialize(rawMessage);
-  }
-  
-  @Test
-  public void testChannelBufferFixedSizeWithInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "uint8[5] data");
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    buffer.writeBytes(new byte[] { 1, 2, 3, 4, 5 });
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setChannelBuffer("data", buffer);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testChannelBufferFixedSizeWithIncompleteInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "uint8[5] data");
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    buffer.writeBytes(new byte[] { 1, 2, 3 });
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setChannelBuffer("data", buffer);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testChannelBufferFixedSizeNoInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "uint8[5] data");
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setChannelBuffer("data", buffer);
-    checkSerializeAndDeserialize(rawMessage);
-  }
-  
-  @Test
-  public void testInt32FixedSizeArrayWithInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "int32[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setInt32Array("data", new int[] { 1, 2, 3, 4, 5 });
-    checkSerializeAndDeserialize(rawMessage);
-  }
-  
-  @Test
-  public void testInt32FixedSizeArrayWithIncompleteInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "int32[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setInt32Array("data", new int[] { 1, 2, 3 });
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testInt32FixedSizeArrayNoInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "int32[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testFloat64FixedSizeArrayWithInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "float64[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setFloat64Array("data", new double[] { 1, 2, 3, 4, 5 });
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testFloat64FixedSizeArrayWithIncompleteInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "float64[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setFloat64Array("data", new double[] { 1, 2, 3 });
-    checkSerializeAndDeserialize(rawMessage);
-  }
-  
-  @Test
-  public void testFloat64FixedSizeArrayNoInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "float64[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testStringFixedSizeArrayWithInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "string[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    String[] stringArray = new String[] { "String 1", "String 2", "String 3", "String 4", "String 5" };
-    rawMessage.setStringList("data", Arrays.asList(stringArray));
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testStringFixedSizeArrayWithIncompleteInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "string[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    String[] stringArray = new String[] { "String 1", "String 2", "String 3" };
-    rawMessage.setStringList("data", Arrays.asList(stringArray));
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testStringFixedSizeArrayWithNoInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "string[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testByteFixedSizeArrayWithInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "byte[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setInt8Array("data", new byte[] { 1, 2, 3, 4, 5 });
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testByteFixedSizeArrayWithIncompleteInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "byte[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    rawMessage.setInt8Array("data", new byte[] { 1, 2, 3 });
-    checkSerializeAndDeserialize(rawMessage);
-  }
-
-  @Test
-  public void testByteFixedSizeArrayWithNoInitialization() {
-    topicDefinitionResourceProvider.add("foo/foo", "byte[5] data");
-    RawMessage rawMessage = messageFactory.newFromType("foo/foo");
-    checkSerializeAndDeserialize(rawMessage);
-  }
-}
diff --git a/message_generation/src/test/java/org/ros/internal/message/ServiceTest.java b/message_generation/src/test/java/org/ros/internal/message/ServiceTest.java
deleted file mode 100644
index decb7c333b0353dedd3c8f61a74ec3dec95acaca..0000000000000000000000000000000000000000
--- a/message_generation/src/test/java/org/ros/internal/message/ServiceTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.ros.internal.message;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.ros.internal.message.service.ServiceDefinitionResourceProvider;
-import org.ros.internal.message.service.ServiceRequestMessageFactory;
-import org.ros.internal.message.service.ServiceResponseMessageFactory;
-
-/**
- * @author damonkohler@google.com (Damon Kohler)
- */
-public class ServiceTest {
-
-  private ServiceDefinitionResourceProvider serviceDefinitionResourceProvider;
-  private ServiceRequestMessageFactory serviceRequestMessageFactory;
-  private ServiceResponseMessageFactory serviceResponseMessageFactory;
-
-  @Before
-  public void setUp() {
-    serviceDefinitionResourceProvider = new ServiceDefinitionResourceProvider();
-    serviceDefinitionResourceProvider.add("foo/Echo", "string data\n---\nstring data");
-    serviceRequestMessageFactory =
-        new ServiceRequestMessageFactory(serviceDefinitionResourceProvider);
-    serviceResponseMessageFactory =
-        new ServiceResponseMessageFactory(serviceDefinitionResourceProvider);
-  }
-
-  @Test
-  public void testCreateEchoService() {
-    RawMessage request = serviceRequestMessageFactory.newFromType("foo/Echo");
-    RawMessage response = serviceResponseMessageFactory.newFromType("foo/Echo");
-    request.setString("data", "Hello, ROS!");
-    response.setString("data", "Hello, ROS!");
-  }
-}
diff --git a/message_generation/src/test/java/org/ros/internal/message/field/ArrayFieldTest.java b/message_generation/src/test/java/org/ros/internal/message/field/ArrayFieldTest.java
deleted file mode 100644
index 7ebb26489cd77a1c252685904b056e97e742b6b9..0000000000000000000000000000000000000000
--- a/message_generation/src/test/java/org/ros/internal/message/field/ArrayFieldTest.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.ros.internal.message.field;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import org.ros.internal.message.MessageBuffers;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.junit.Test;
-
-/**
- * The following unit tests were created by inspecting the serialization of
- * array fields using the ROS Python client library.
- * 
- * @author damonkohler@google.com (Damon Kohler)
- */
-public class ArrayFieldTest {
-
-  @Test
-  public void testBooleanArrayFieldVariableSize() {
-    BooleanArrayField field = BooleanArrayField.newVariable("foo", -1);
-    boolean[] value = new boolean[] { true, false, true, false };
-    field.setValue(value);
-    assertEquals(PrimitiveFieldType.BOOL, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected = new byte[] { 4, 0, 0, 0, 1, 0, 1, 0 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testBooleanArrayFieldFixedSize() {
-    BooleanArrayField field = BooleanArrayField.newVariable("foo", 4);
-    field.setValue(new boolean[] { true, false, true, false });
-    assertEquals(PrimitiveFieldType.BOOL, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected = new byte[] { 1, 0, 1, 0 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void testByteArrayFieldVariableSize() {
-    testByteArrayFieldVariableSize(PrimitiveFieldType.INT8);
-    testByteArrayFieldVariableSize(PrimitiveFieldType.BYTE);
-    testByteArrayFieldVariableSize(PrimitiveFieldType.UINT8);
-    testByteArrayFieldVariableSize(PrimitiveFieldType.CHAR);
-  }
-
-  private void testByteArrayFieldVariableSize(FieldType type) {
-    ByteArrayField field = ByteArrayField.newVariable(type, "foo", -1);
-    field.setValue(new byte[] { 1, 2, 3, 4 });
-    assertEquals(type, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected = new byte[] { 4, 0, 0, 0, 1, 2, 3, 4 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void testByteArrayFieldFixedSize() {
-    testByteArrayFieldFixedSize(PrimitiveFieldType.INT8);
-    testByteArrayFieldFixedSize(PrimitiveFieldType.BYTE);
-    testByteArrayFieldFixedSize(PrimitiveFieldType.UINT8);
-    testByteArrayFieldFixedSize(PrimitiveFieldType.CHAR);
-  }
-
-  private void testByteArrayFieldFixedSize(FieldType type) {
-    ByteArrayField field = ByteArrayField.newVariable(type, "foo", 4);
-    field.setValue(new byte[] { 1, 2, 3, 4 });
-    assertEquals(type, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected = new byte[] { 1, 2, 3, 4 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testDoubleArrayFieldVariableSize() {
-    DoubleArrayField field = DoubleArrayField.newVariable("foo", -1);
-    field.setValue(new double[] { 1, 2, 3, 4 });
-    assertEquals(PrimitiveFieldType.FLOAT64, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected =
-        new byte[] { 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16, 63, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0,
-            0, 8, 64, 0, 0, 0, 0, 0, 0, 16, 64 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testDoubleArrayFieldFixedSize() {
-    DoubleArrayField field = DoubleArrayField.newVariable("foo", 4);
-    field.setValue(new double[] { 1, 2, 3, 4 });
-    assertEquals(PrimitiveFieldType.FLOAT64, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected =
-        new byte[] { 0, 0, 0, 0, 0, 0, -16, 63, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 8, 64,
-            0, 0, 0, 0, 0, 0, 16, 64 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testFloatArrayFieldVariableSize() {
-    FloatArrayField field = FloatArrayField.newVariable("foo", -1);
-    field.setValue(new float[] { 1, 2, 3, 4 });
-    assertEquals(PrimitiveFieldType.FLOAT32, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected =
-        new byte[] { 4, 0, 0, 0, 0, 0, -128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 0, 0, -128, 64 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testFloatArrayFieldFixedSize() {
-    FloatArrayField field = FloatArrayField.newVariable("foo", 4);
-    field.setValue(new float[] { 1, 2, 3, 4 });
-    assertEquals(PrimitiveFieldType.FLOAT32, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected = new byte[] { 0, 0, -128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 0, 0, -128, 64 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testIntegerArrayFieldVariableSize() {
-    testIntegerArrayFieldVariableSize(PrimitiveFieldType.INT32);
-    testIntegerArrayFieldVariableSize(PrimitiveFieldType.UINT32);
-  }
-
-  private void testIntegerArrayFieldVariableSize(FieldType type) {
-    IntegerArrayField field = IntegerArrayField.newVariable(type, "foo", -1);
-    field.setValue(new int[] { 1, 2, 3, 4 });
-    assertEquals(type, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected = new byte[] { 4, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 0 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testIntegerArrayFieldFixedSize() {
-    testIntegerArrayFieldFixedSize(PrimitiveFieldType.INT32);
-    testIntegerArrayFieldFixedSize(PrimitiveFieldType.UINT32);
-  }
-
-  private void testIntegerArrayFieldFixedSize(FieldType type) {
-    IntegerArrayField field = IntegerArrayField.newVariable(type, "foo", 4);
-    field.setValue(new int[] { 1, 2, 3, 4 });
-    assertEquals(type, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected = new byte[] { 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 0 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testLongArrayFieldVariableSize() {
-    testLongArrayFieldVariableSize(PrimitiveFieldType.INT64);
-    testLongArrayFieldVariableSize(PrimitiveFieldType.UINT64);
-  }
-
-  private void testLongArrayFieldVariableSize(FieldType type) {
-    LongArrayField field = LongArrayField.newVariable(type, "foo", -1);
-    field.setValue(new long[] { 1, 2, 3, 4 });
-    assertEquals(type, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected =
-        new byte[] { 4, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0,
-            0, 0, 4, 0, 0, 0, 0, 0, 0, 0 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testLongArrayFieldFixedSize() {
-    testLongArrayFieldFixedSize(PrimitiveFieldType.INT64);
-    testLongArrayFieldFixedSize(PrimitiveFieldType.UINT64);
-  }
-
-  private void testLongArrayFieldFixedSize(FieldType type) {
-    LongArrayField field = LongArrayField.newVariable(type, "foo", 4);
-    field.setValue(new long[] { 1, 2, 3, 4 });
-    assertEquals(type, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected =
-        new byte[] { 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, 0,
-            0, 0, 0, 0, 0, 0 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testShortArrayFieldVariableSize() {
-    testShortArrayFieldVariableSize(PrimitiveFieldType.INT16);
-    testShortArrayFieldVariableSize(PrimitiveFieldType.UINT16);
-  }
-
-  private void testShortArrayFieldVariableSize(FieldType type) {
-    ShortArrayField field = ShortArrayField.newVariable(type, "foo", -1);
-    field.setValue(new short[] { 1, 2, 3, 4 });
-    assertEquals(type, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected = new byte[] { 4, 0, 0, 0, 1, 0, 2, 0, 3, 0, 4, 0 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testShortArrayFieldFixedSize() {
-    testShortArrayFieldFixedSize(PrimitiveFieldType.INT16);
-    testShortArrayFieldFixedSize(PrimitiveFieldType.UINT16);
-  }
-
-  private void testShortArrayFieldFixedSize(FieldType type) {
-    ShortArrayField field = ShortArrayField.newVariable(type, "foo", 4);
-    field.setValue(new short[] { 1, 2, 3, 4 });
-    assertEquals(type, field.getType());
-    ChannelBuffer buffer = MessageBuffers.dynamicBuffer();
-    field.serialize(buffer);
-    byte[] expected = new byte[] { 1, 0, 2, 0, 3, 0, 4, 0 };
-    byte[] actual = new byte[buffer.readableBytes()];
-    buffer.readBytes(actual);
-    assertArrayEquals(expected, actual);
-  }
-}
diff --git a/message_generation/src/test/java/org/ros/message/DurationTest.java b/message_generation/src/test/java/org/ros/message/DurationTest.java
deleted file mode 100644
index fb337eb43c7dc0998f3d830eadc28314e6c85440..0000000000000000000000000000000000000000
--- a/message_generation/src/test/java/org/ros/message/DurationTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.ros.message;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author kwc@willowgarage.com (Ken Conley)
- */
-public class DurationTest {
-
-  @Before
-  public void setUp()  {
-  }
-
-  @Test
-  public void testConstructor() {
-    // Test no args constructor.
-    Duration t = new Duration();
-    assertEquals(0, t.nsecs);
-    assertEquals(0, t.secs);
-      
-    // Test secs/nsecs constructor with no normalization.
-    t = new Duration(1, 2);
-    assertEquals(1, t.secs);
-    assertEquals(2, t.nsecs);
-
-    // Test secs/nsecs constructor with normalization.
-    t = new Duration(2, -1);
-    assertEquals(1, t.secs);
-    assertEquals(1000000000 - 1, t.nsecs);
-    
-    t = new Duration(2, 1000000000 + 2);
-    assertEquals(3, t.secs);
-    assertEquals(2, t.nsecs);
-  }
-  
-  @Test
-  public void testNormalize() { 
-    Duration d = new Duration(0, 0);
-    d.secs = 1;
-    d.nsecs = 1000000000;
-    d.normalize();
-    assertEquals(2, d.secs);
-    assertEquals(0, d.nsecs);
-    
-    d.secs = 1;
-    d.nsecs = -1;
-    d.normalize();
-    assertEquals(0, d.secs);
-    assertEquals(1000000000-1, d.nsecs);
-  }
-  
-  @Test
-  public void testIsZero() {
-    assertTrue(new Duration(0, 0).isZero());
-    assertFalse(new Duration(1, 0).isZero());
-    assertFalse(new Duration(0, 1).isZero());
-  }
-  
-  @Test
-  public void testComparable() {
-    assertEquals(0, new Duration(0, 0).compareTo(new Duration(0, 0)));
-    assertEquals(0, new Duration(1, 0).compareTo(new Duration(1, 0)));
-    
-    assertTrue(new Duration(0, 0).compareTo(new Duration(0, -1)) > 0);
-    assertTrue(new Duration(0, -1).compareTo(new Duration(0, 0)) < 0);
-    
-    assertTrue(new Duration(0, 0).compareTo(new Duration(-1, 0)) > 0);
-    assertTrue(new Duration(-1, 0).compareTo(new Duration(0, 0)) < 0);
-    
-    assertTrue(new Duration(1, 0).compareTo(new Duration(0, 0)) > 0);
-    assertTrue(new Duration(0, 0).compareTo(new Duration(1, 0)) < 0);
-    
-    assertTrue(new Duration(0, 1).compareTo(new Duration(0, 0)) > 0);
-    assertTrue(new Duration(0, 0).compareTo(new Duration(0, 1)) < 0);
-  }
-}
\ No newline at end of file
diff --git a/message_generation/src/test/java/org/ros/message/TimeTest.java b/message_generation/src/test/java/org/ros/message/TimeTest.java
deleted file mode 100644
index 5ef0c4d5c631a23571a2b9261866e1f7d46bc6e3..0000000000000000000000000000000000000000
--- a/message_generation/src/test/java/org/ros/message/TimeTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.ros.message;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author kwc@willowgarage.com (Ken Conley)
- */
-public class TimeTest {
-
-  @Before
-  public void setUp() {
-  }
-
-  @Test
-  public void testConstructor() {
-    // Test no args constructor.
-    Time t = new Time();
-    assertEquals(0, t.nsecs);
-    assertEquals(0, t.secs);
-
-    // Test secs/nsecs constructor with no normalization.
-    t = new Time(1, 2);
-    assertEquals(1, t.secs);
-    assertEquals(2, t.nsecs);
-
-    // Test secs/nsecs constructor with normalization.
-    t = new Time(2, -1);
-    assertEquals(1, t.secs);
-    assertEquals(1000000000 - 1, t.nsecs);
-
-    t = new Time(2, 1000000000 + 2);
-    assertEquals(3, t.secs);
-    assertEquals(2, t.nsecs);
-  }
-
-  @Test
-  public void testFromMillis() {
-    assertEquals(new Time(0, 0), Time.fromMillis(0));
-    assertEquals(new Time(0, 1000000), Time.fromMillis(1));
-    assertEquals(new Time(1, 0), Time.fromMillis(1000));
-    assertEquals(new Time(10, 0), Time.fromMillis(10000));
-    assertEquals(new Time(1, 1000000), Time.fromMillis(1001));
-    assertEquals(new Time(1, 11000000), Time.fromMillis(1011));
-  }
-
-  @Test
-  public void testNormalize() {
-    Time t = new Time(0, 0);
-    t.secs = 1;
-    t.nsecs = 1000000000;
-    t.normalize();
-    assertEquals(2, t.secs);
-    assertEquals(0, t.nsecs);
-
-    t.secs = 1;
-    t.nsecs = -1;
-    t.normalize();
-    assertEquals(0, t.secs);
-    assertEquals(1000000000 - 1, t.nsecs);
-  }
-
-  @Test
-  public void testIsZero() {
-    assertTrue(new Time(0, 0).isZero());
-    assertFalse(new Time(1, 0).isZero());
-    assertFalse(new Time(0, 1).isZero());
-  }
-
-  @Test
-  public void testComparable() {
-    assertEquals(0, new Time(0, 0).compareTo(new Time(0, 0)));
-    assertEquals(0, new Time(1, 1).compareTo(new Time(1, 1)));
-    assertTrue(new Time(0, 1).compareTo(new Time(0, 0)) > 0);
-    
-    assertEquals(-1, new Time(0, 0).compareTo(new Time(0, 1)));
-    assertTrue(new Time(0, 0).compareTo(new Time(0, 1)) < 0);
-    assertTrue(new Time(1, 0).compareTo(new Time(0, 0)) > 0);
-    assertTrue(new Time(0, 0).compareTo(new Time(1, 0)) < 0);
-
-  }
-}
\ No newline at end of file
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Point.msg b/message_generation/src/test/resources/geometry_msgs/msg/Point.msg
deleted file mode 100644
index f1d3a71a853c668f066de795ba5e0f4458f3f1c0..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Point.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-# This contains the position of a point in free space
-float64 x
-float64 y
-float64 z
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Point32.msg b/message_generation/src/test/resources/geometry_msgs/msg/Point32.msg
deleted file mode 100644
index 52af0a29a13b606b40945c2fd96a6473d0b2067e..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Point32.msg
+++ /dev/null
@@ -1,11 +0,0 @@
-# This contains the position of a point in free space(with 32 bits of precision).
-# It is recommeded to use Point wherever possible instead of Point32.  
-# 
-# This recommendation is to promote interoperability.  
-#
-# This message is designed to take up less space when sending
-# lots of points at once, as in the case of a PointCloud.  
-
-float32 x
-float32 y
-float32 z
\ No newline at end of file
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/PointStamped.msg b/message_generation/src/test/resources/geometry_msgs/msg/PointStamped.msg
deleted file mode 100644
index 82c3437946ccaf5c65817a0485cde96992b622dc..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/PointStamped.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# This represents a Point with reference coordinate frame and timestamp
-Header header
-Point point
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Polygon.msg b/message_generation/src/test/resources/geometry_msgs/msg/Polygon.msg
deleted file mode 100644
index c081fc4374ef1f3b560b441da7451829a98f5f76..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Polygon.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-#A specification of a polygon where the first and last points are assumed to be connected
-Point32[] points
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/PolygonStamped.msg b/message_generation/src/test/resources/geometry_msgs/msg/PolygonStamped.msg
deleted file mode 100644
index c9ee413840b3c8bd47d9c41b13a6d68176b29f56..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/PolygonStamped.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# This represents a Polygon with reference coordinate frame and timestamp
-Header header
-Polygon polygon
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Pose.msg b/message_generation/src/test/resources/geometry_msgs/msg/Pose.msg
deleted file mode 100644
index b81919c7b256667be00908b866f8bf63404256c6..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Pose.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# A representation of pose in free space, composed of postion and orientation. 
-Point position
-Quaternion orientation
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Pose2D.msg b/message_generation/src/test/resources/geometry_msgs/msg/Pose2D.msg
deleted file mode 100644
index e9555b466ac37570adcb69619fa3b3b78a9e602e..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Pose2D.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-# This expresses a position and orientation on a 2D manifold.
-
-float64 x
-float64 y
-float64 theta
\ No newline at end of file
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/PoseArray.msg b/message_generation/src/test/resources/geometry_msgs/msg/PoseArray.msg
deleted file mode 100644
index 4fe0cec7c78baf2a9ee60cb751d7f7d617a8fe3a..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/PoseArray.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-# An array of poses with a header for global reference.
-
-Header header
-
-Pose[] poses
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/PoseStamped.msg b/message_generation/src/test/resources/geometry_msgs/msg/PoseStamped.msg
deleted file mode 100644
index 7e3cdc57b7ba5856bce0cb954d20b7a74354bdc2..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/PoseStamped.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# A Pose with reference coordinate frame and timestamp
-Header header
-Pose pose
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/PoseWithCovariance.msg b/message_generation/src/test/resources/geometry_msgs/msg/PoseWithCovariance.msg
deleted file mode 100644
index 86bc45adbb5d7d64e90556ac1f24ca8f725313cd..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/PoseWithCovariance.msg
+++ /dev/null
@@ -1,9 +0,0 @@
-# This represents a pose in free space with uncertainty.
-
-Pose pose
-
-# Row-major representation of the 6x6 covariance matrix
-# The orientation parameters use a fixed-axis representation.
-# In order, the parameters are:
-# (x, y, z, rotation about X axis, rotation about Y axis, rotation about Z axis)
-float64[36] covariance
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/PoseWithCovarianceStamped.msg b/message_generation/src/test/resources/geometry_msgs/msg/PoseWithCovarianceStamped.msg
deleted file mode 100644
index cdc306b906075b54479aa7a6a0db66f7edbc2f45..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/PoseWithCovarianceStamped.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-# This expresses an estimated pose with a reference coordinate frame and timestamp
-
-Header header
-PoseWithCovariance pose
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Quaternion.msg b/message_generation/src/test/resources/geometry_msgs/msg/Quaternion.msg
deleted file mode 100644
index 9f4fde2bf4c13dc86a95688e4b5254aaec186e2a..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Quaternion.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# This represents an orientation in free space in quaternion form.
-
-float64 x
-float64 y
-float64 z
-float64 w
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/QuaternionStamped.msg b/message_generation/src/test/resources/geometry_msgs/msg/QuaternionStamped.msg
deleted file mode 100644
index 62c2fdfe992c1a5eef9bf2c3a07aae7f7ad30b8a..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/QuaternionStamped.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-# This represents an orientation with reference coordinate frame and timestamp.
-
-Header header
-Quaternion quaternion
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Transform.msg b/message_generation/src/test/resources/geometry_msgs/msg/Transform.msg
deleted file mode 100644
index f605c85ea8ec4c4871bdb7d77db6e7011c63e86d..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Transform.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-# This represents the transform between two coordinate frames in free space.
-
-Vector3 translation
-Quaternion rotation
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/TransformStamped.msg b/message_generation/src/test/resources/geometry_msgs/msg/TransformStamped.msg
deleted file mode 100644
index c28ae8af1e841f2f7ef05f83bf570a13b891cb72..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/TransformStamped.msg
+++ /dev/null
@@ -1,10 +0,0 @@
-# This expresses a transform from coordinate frame header.frame_id
-# to the coordinate frame child_frame_id
-#
-# This message is mostly used by the 
-# <a href="http://www.ros.org/wiki/tf">tf</a> package. 
-# See its documentation for more information.
-
-Header header
-string child_frame_id # the frame id of the child frame
-Transform transform
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Twist.msg b/message_generation/src/test/resources/geometry_msgs/msg/Twist.msg
deleted file mode 100644
index 7012c2dd87ea6702f8e37a9cfbb7aab10caa8f7d..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Twist.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# This expresses velocity in free space broken into its linear and angular parts.
-Vector3  linear
-Vector3  angular
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/TwistStamped.msg b/message_generation/src/test/resources/geometry_msgs/msg/TwistStamped.msg
deleted file mode 100644
index 53b8253b4251a4c6637ddd85d9937d796558949c..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/TwistStamped.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# A twist with reference coordinate frame and timestamp
-Header header
-Twist twist
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/TwistWithCovariance.msg b/message_generation/src/test/resources/geometry_msgs/msg/TwistWithCovariance.msg
deleted file mode 100644
index 111a19c5f7da42f846ed9eaff26ffc6a515c9e5f..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/TwistWithCovariance.msg
+++ /dev/null
@@ -1,9 +0,0 @@
-# This expresses velocity in free space with uncertainty.
-
-Twist twist
-
-# Row-major representation of the 6x6 covariance matrix
-# The orientation parameters use a fixed-axis representation.
-# In order, the parameters are:
-# (x, y, z, rotation about X axis, rotation about Y axis, rotation about Z axis)
-float64[36] covariance
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/TwistWithCovarianceStamped.msg b/message_generation/src/test/resources/geometry_msgs/msg/TwistWithCovarianceStamped.msg
deleted file mode 100644
index aba6ebe735871ba35218fcebe021fbef6e11d5d9..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/TwistWithCovarianceStamped.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# This represents an estimated twist with reference coordinate frame and timestamp.
-Header header
-TwistWithCovariance twist
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Vector3.msg b/message_generation/src/test/resources/geometry_msgs/msg/Vector3.msg
deleted file mode 100644
index 00dd4cbac99e2729865cd00faff2ac482c0794cd..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Vector3.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-# This represents a vector in free space. 
-
-float64 x
-float64 y
-float64 z
\ No newline at end of file
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Vector3Stamped.msg b/message_generation/src/test/resources/geometry_msgs/msg/Vector3Stamped.msg
deleted file mode 100644
index e68eb062bebd5bba3cbaf9f33beae5a207f72a51..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Vector3Stamped.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# This represents a Vector3 with reference coordinate frame and timestamp
-Header header
-Vector3 vector
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/Wrench.msg b/message_generation/src/test/resources/geometry_msgs/msg/Wrench.msg
deleted file mode 100644
index 41201d4b844607ee2d3751f3f474774a2ae1e387..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/Wrench.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-# This represents force in free space, separated into
-# its linear and angular parts.
-Vector3  force
-Vector3  torque
diff --git a/message_generation/src/test/resources/geometry_msgs/msg/WrenchStamped.msg b/message_generation/src/test/resources/geometry_msgs/msg/WrenchStamped.msg
deleted file mode 100644
index dad910ed724de005e89e3422ef1ca7cec401e9e4..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/geometry_msgs/msg/WrenchStamped.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# A wrench with reference coordinate frame and timestamp
-Header header
-Wrench wrench
diff --git a/message_generation/src/test/resources/nav_msgs/action/GetMap.action b/message_generation/src/test/resources/nav_msgs/action/GetMap.action
deleted file mode 100644
index 080e54fe195b4dd96a8c5ba0e08e824aa94c0416..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/action/GetMap.action
+++ /dev/null
@@ -1,5 +0,0 @@
-# Get the map as a nav_msgs/OccupancyGrid
----
-nav_msgs/OccupancyGrid map
----
-# no feedback
\ No newline at end of file
diff --git a/message_generation/src/test/resources/nav_msgs/msg/GetMapAction.msg b/message_generation/src/test/resources/nav_msgs/msg/GetMapAction.msg
deleted file mode 100644
index 1cbd69ca56edab0cb1590f60636bdc664eee96c9..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/GetMapAction.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======
-
-GetMapActionGoal action_goal
-GetMapActionResult action_result
-GetMapActionFeedback action_feedback
diff --git a/message_generation/src/test/resources/nav_msgs/msg/GetMapActionFeedback.msg b/message_generation/src/test/resources/nav_msgs/msg/GetMapActionFeedback.msg
deleted file mode 100644
index 485360150b18d2411696610d80cb7758bef9cfbd..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/GetMapActionFeedback.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======
-
-Header header
-actionlib_msgs/GoalStatus status
-GetMapFeedback feedback
diff --git a/message_generation/src/test/resources/nav_msgs/msg/GetMapActionGoal.msg b/message_generation/src/test/resources/nav_msgs/msg/GetMapActionGoal.msg
deleted file mode 100644
index 8782a1e363336ed8220ce9a33547dbd46fd9268c..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/GetMapActionGoal.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======
-
-Header header
-actionlib_msgs/GoalID goal_id
-GetMapGoal goal
diff --git a/message_generation/src/test/resources/nav_msgs/msg/GetMapActionResult.msg b/message_generation/src/test/resources/nav_msgs/msg/GetMapActionResult.msg
deleted file mode 100644
index 707d61d63c5d986a1bb3e1b87c8f21e71dedf351..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/GetMapActionResult.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======
-
-Header header
-actionlib_msgs/GoalStatus status
-GetMapResult result
diff --git a/message_generation/src/test/resources/nav_msgs/msg/GetMapFeedback.msg b/message_generation/src/test/resources/nav_msgs/msg/GetMapFeedback.msg
deleted file mode 100644
index 8eb4d4840eb0d27a33a08d42bfec821e08a2906e..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/GetMapFeedback.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======
-# no feedback
diff --git a/message_generation/src/test/resources/nav_msgs/msg/GetMapGoal.msg b/message_generation/src/test/resources/nav_msgs/msg/GetMapGoal.msg
deleted file mode 100644
index 6354ac1172379e5191897cc96c52cb3f2e753de8..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/GetMapGoal.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======
-# Get the map as a nav_msgs/OccupancyGrid
diff --git a/message_generation/src/test/resources/nav_msgs/msg/GetMapResult.msg b/message_generation/src/test/resources/nav_msgs/msg/GetMapResult.msg
deleted file mode 100644
index b8c9dcd5a819bd847ff29b4b8d6e1bbaa64f4d7b..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/GetMapResult.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======
-nav_msgs/OccupancyGrid map
diff --git a/message_generation/src/test/resources/nav_msgs/msg/GridCells.msg b/message_generation/src/test/resources/nav_msgs/msg/GridCells.msg
deleted file mode 100644
index 2c92894115110f24c745e06d9aeab55d0f3abb1d..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/GridCells.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-#an array of cells in a 2D grid
-Header header
-float32 cell_width
-float32 cell_height
-geometry_msgs/Point[] cells
diff --git a/message_generation/src/test/resources/nav_msgs/msg/MapMetaData.msg b/message_generation/src/test/resources/nav_msgs/msg/MapMetaData.msg
deleted file mode 100644
index 398fbdd016f91045fd14ec727a65b6d1cf55dc0a..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/MapMetaData.msg
+++ /dev/null
@@ -1,13 +0,0 @@
-# This hold basic information about the characterists of the OccupancyGrid
-
-# The time at which the map was loaded
-time map_load_time
-# The map resolution [m/cell]
-float32 resolution
-# Map width [cells]
-uint32 width
-# Map height [cells]
-uint32 height
-# The origin of the map [m, m, rad].  This is the real-world pose of the
-# cell (0,0) in the map.
-geometry_msgs/Pose origin
\ No newline at end of file
diff --git a/message_generation/src/test/resources/nav_msgs/msg/OccupancyGrid.msg b/message_generation/src/test/resources/nav_msgs/msg/OccupancyGrid.msg
deleted file mode 100644
index f2e79bdad33b17af3236514343abe486e779522a..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/OccupancyGrid.msg
+++ /dev/null
@@ -1,11 +0,0 @@
-# This represents a 2-D grid map, in which each cell represents the probability of
-# occupancy.
-
-Header header 
-
-#MetaData for the map
-MapMetaData info
-
-# The map data, in row-major order, starting with (0,0).  Occupancy
-# probabilities are in the range [0,100].  Unknown is -1.
-int8[] data
diff --git a/message_generation/src/test/resources/nav_msgs/msg/Odometry.msg b/message_generation/src/test/resources/nav_msgs/msg/Odometry.msg
deleted file mode 100644
index 73578ed85765ca14b040dc888d9cb148530a95d3..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/Odometry.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-# This represents an estimate of a position and velocity in free space.  
-# The pose in this message should be specified in the coordinate frame given by header.frame_id.
-# The twist in this message should be specified in the coordinate frame given by the child_frame_id
-Header header
-string child_frame_id
-geometry_msgs/PoseWithCovariance pose
-geometry_msgs/TwistWithCovariance twist
diff --git a/message_generation/src/test/resources/nav_msgs/msg/Path.msg b/message_generation/src/test/resources/nav_msgs/msg/Path.msg
deleted file mode 100644
index 979cb7d368d4246445d43e62df9d9aa20939fbe1..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/msg/Path.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-#An array of poses that represents a Path for a robot to follow
-Header header
-geometry_msgs/PoseStamped[] poses
diff --git a/message_generation/src/test/resources/nav_msgs/srv/GetMap.srv b/message_generation/src/test/resources/nav_msgs/srv/GetMap.srv
deleted file mode 100644
index 6bd8e4a60a0f746dd500dbd550559f4735749208..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/srv/GetMap.srv
+++ /dev/null
@@ -1,3 +0,0 @@
-# Get the map as a nav_msgs/OccupancyGrid
----
-nav_msgs/OccupancyGrid map
diff --git a/message_generation/src/test/resources/nav_msgs/srv/GetPlan.srv b/message_generation/src/test/resources/nav_msgs/srv/GetPlan.srv
deleted file mode 100644
index f5c23edb78558e6fef8cda881c45c2bf3e94486a..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/nav_msgs/srv/GetPlan.srv
+++ /dev/null
@@ -1,13 +0,0 @@
-# Get a plan from the current position to the goal Pose 
-
-# The start pose for the plan
-geometry_msgs/PoseStamped start
-
-# The final pose of the goal position
-geometry_msgs/PoseStamped goal
-
-# If the goal is obstructed, how many meters the planner can 
-# relax the constraint in x and y before failing. 
-float32 tolerance
----
-nav_msgs/Path plan
diff --git a/message_generation/src/test/resources/std_msgs/msg/Bool.msg b/message_generation/src/test/resources/std_msgs/msg/Bool.msg
deleted file mode 100644
index f7cabb94fc04ac5f83ca8f219357b439f29d002f..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Bool.msg
+++ /dev/null
@@ -1 +0,0 @@
-bool data
\ No newline at end of file
diff --git a/message_generation/src/test/resources/std_msgs/msg/Byte.msg b/message_generation/src/test/resources/std_msgs/msg/Byte.msg
deleted file mode 100644
index d993b3455539598fdc5db3365a4534ed9f125b5d..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Byte.msg
+++ /dev/null
@@ -1 +0,0 @@
-byte data
diff --git a/message_generation/src/test/resources/std_msgs/msg/ByteMultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/ByteMultiArray.msg
deleted file mode 100644
index bb00bd348bc726b4bf52ae12c1fe740855447b95..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/ByteMultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-byte[]            data          # array of data
-
diff --git a/message_generation/src/test/resources/std_msgs/msg/Char.msg b/message_generation/src/test/resources/std_msgs/msg/Char.msg
deleted file mode 100644
index 39a1d46a97c419a2b8ab45b30c68758ed03b905b..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Char.msg
+++ /dev/null
@@ -1 +0,0 @@
-char data
\ No newline at end of file
diff --git a/message_generation/src/test/resources/std_msgs/msg/ColorRGBA.msg b/message_generation/src/test/resources/std_msgs/msg/ColorRGBA.msg
deleted file mode 100644
index 182dbc8349abec122d95436cb840906503f569f2..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/ColorRGBA.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-float32 r
-float32 g
-float32 b
-float32 a
diff --git a/message_generation/src/test/resources/std_msgs/msg/Duration.msg b/message_generation/src/test/resources/std_msgs/msg/Duration.msg
deleted file mode 100644
index f13931ec8a7937ca624ff91af7f861559b5fc3fe..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Duration.msg
+++ /dev/null
@@ -1 +0,0 @@
-duration data
diff --git a/message_generation/src/test/resources/std_msgs/msg/Empty.msg b/message_generation/src/test/resources/std_msgs/msg/Empty.msg
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/message_generation/src/test/resources/std_msgs/msg/Float32.msg b/message_generation/src/test/resources/std_msgs/msg/Float32.msg
deleted file mode 100644
index e89740534bd9c0344c18709de0c29667620295bd..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Float32.msg
+++ /dev/null
@@ -1 +0,0 @@
-float32 data
\ No newline at end of file
diff --git a/message_generation/src/test/resources/std_msgs/msg/Float32MultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/Float32MultiArray.msg
deleted file mode 100644
index 915830846dd023a111abd8ad2831d982b9c85a82..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Float32MultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-float32[]         data          # array of data
-
diff --git a/message_generation/src/test/resources/std_msgs/msg/Float64.msg b/message_generation/src/test/resources/std_msgs/msg/Float64.msg
deleted file mode 100644
index cd09d39b8caedf067b9548d62ecab3c73b6ecace..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Float64.msg
+++ /dev/null
@@ -1 +0,0 @@
-float64 data
\ No newline at end of file
diff --git a/message_generation/src/test/resources/std_msgs/msg/Float64MultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/Float64MultiArray.msg
deleted file mode 100644
index 0a13b928fd70d116defc17ec0acc09a6296b57ff..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Float64MultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-float64[]         data          # array of data
-
diff --git a/message_generation/src/test/resources/std_msgs/msg/Header.msg b/message_generation/src/test/resources/std_msgs/msg/Header.msg
deleted file mode 100644
index b2f34f6f1d15f22149dae16e5e6bbf190a89a0d8..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Header.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-# Standard metadata for higher-level stamped data types.
-# This is generally used to communicate timestamped data 
-# in a particular coordinate frame.
-# 
-# sequence ID: consecutively increasing ID 
-uint32 seq
-#Two-integer timestamp that is expressed as:
-# * stamp.secs: seconds (stamp_secs) since epoch
-# * stamp.nsecs: nanoseconds since stamp_secs
-# time-handling sugar is provided by the client library
-time stamp
-#Frame this data is associated with
-# 0: no frame
-# 1: global frame
-string frame_id
diff --git a/message_generation/src/test/resources/std_msgs/msg/Int16.msg b/message_generation/src/test/resources/std_msgs/msg/Int16.msg
deleted file mode 100644
index c4389faf706f189e64bc576af0f7788f06d16c86..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Int16.msg
+++ /dev/null
@@ -1 +0,0 @@
-int16 data
diff --git a/message_generation/src/test/resources/std_msgs/msg/Int16MultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/Int16MultiArray.msg
deleted file mode 100644
index d2ddea1d1d6a69a15cb17e434900a1afbadaac89..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Int16MultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-int16[]           data          # array of data
-
diff --git a/message_generation/src/test/resources/std_msgs/msg/Int32.msg b/message_generation/src/test/resources/std_msgs/msg/Int32.msg
deleted file mode 100644
index 0ecfe35f5f480f463e0b26e696c4f0e858aba06c..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Int32.msg
+++ /dev/null
@@ -1 +0,0 @@
-int32 data
\ No newline at end of file
diff --git a/message_generation/src/test/resources/std_msgs/msg/Int32MultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/Int32MultiArray.msg
deleted file mode 100644
index af60abda3a697bac5e596b23b04038414258188a..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Int32MultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-int32[]           data          # array of data
-
diff --git a/message_generation/src/test/resources/std_msgs/msg/Int64.msg b/message_generation/src/test/resources/std_msgs/msg/Int64.msg
deleted file mode 100644
index 6961e00f52989d8e03f54e0a0e0333ae470e6508..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Int64.msg
+++ /dev/null
@@ -1 +0,0 @@
-int64 data
\ No newline at end of file
diff --git a/message_generation/src/test/resources/std_msgs/msg/Int64MultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/Int64MultiArray.msg
deleted file mode 100644
index f4f35e171b316dacbb0eb3a80e20885977171ebd..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Int64MultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-int64[]           data          # array of data
-
diff --git a/message_generation/src/test/resources/std_msgs/msg/Int8.msg b/message_generation/src/test/resources/std_msgs/msg/Int8.msg
deleted file mode 100644
index 1e42e554feea25175f15af74433d802e86ed0180..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Int8.msg
+++ /dev/null
@@ -1 +0,0 @@
-int8 data
diff --git a/message_generation/src/test/resources/std_msgs/msg/Int8MultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/Int8MultiArray.msg
deleted file mode 100644
index a59a37259e5e97c8dbee0072f4e6c282d7fc8fd3..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Int8MultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-int8[]            data          # array of data
-
diff --git a/message_generation/src/test/resources/std_msgs/msg/MultiArrayDimension.msg b/message_generation/src/test/resources/std_msgs/msg/MultiArrayDimension.msg
deleted file mode 100644
index 08240462c4315969a5a8cde9292683c51865a5d3..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/MultiArrayDimension.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-string label   # label of given dimension
-uint32 size    # size of given dimension (in type units)
-uint32 stride  # stride of given dimension
\ No newline at end of file
diff --git a/message_generation/src/test/resources/std_msgs/msg/MultiArrayLayout.msg b/message_generation/src/test/resources/std_msgs/msg/MultiArrayLayout.msg
deleted file mode 100644
index 5437f8542af613c0058e380c27ab59cb5ebb7df0..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/MultiArrayLayout.msg
+++ /dev/null
@@ -1,26 +0,0 @@
-# The multiarray declares a generic multi-dimensional array of a
-# particular data type.  Dimensions are ordered from outer most
-# to inner most.
-
-MultiArrayDimension[] dim # Array of dimension properties
-uint32 data_offset        # padding bytes at front of data
-
-# Accessors should ALWAYS be written in terms of dimension stride
-# and specified outer-most dimension first.
-# 
-# multiarray(i,j,k) = data[data_offset + dim_stride[1]*i + dim_stride[2]*j + k]
-#
-# A standard, 3-channel 640x480 image with interleaved color channels
-# would be specified as:
-#
-# dim[0].label  = "height"
-# dim[0].size   = 480
-# dim[0].stride = 3*640*480 = 921600  (note dim[0] stride is just size of image)
-# dim[1].label  = "width"
-# dim[1].size   = 640
-# dim[1].stride = 3*640 = 1920
-# dim[2].label  = "channel"
-# dim[2].size   = 3
-# dim[2].stride = 3
-#
-# multiarray(i,j,k) refers to the ith row, jth column, and kth channel.
\ No newline at end of file
diff --git a/message_generation/src/test/resources/std_msgs/msg/String.msg b/message_generation/src/test/resources/std_msgs/msg/String.msg
deleted file mode 100644
index ae721739e8fa7035347d3fed3cca1b137e670c97..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/String.msg
+++ /dev/null
@@ -1 +0,0 @@
-string data
diff --git a/message_generation/src/test/resources/std_msgs/msg/Time.msg b/message_generation/src/test/resources/std_msgs/msg/Time.msg
deleted file mode 100644
index 7f8f721711fbbc620fa7f6b58a9f89d5667281be..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/Time.msg
+++ /dev/null
@@ -1 +0,0 @@
-time data
diff --git a/message_generation/src/test/resources/std_msgs/msg/UInt16.msg b/message_generation/src/test/resources/std_msgs/msg/UInt16.msg
deleted file mode 100644
index 87d0c44eb59dca29f419aaa77801b4fbc278f9f6..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/UInt16.msg
+++ /dev/null
@@ -1 +0,0 @@
-uint16 data
diff --git a/message_generation/src/test/resources/std_msgs/msg/UInt16MultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/UInt16MultiArray.msg
deleted file mode 100644
index f38970b656cf1160e292f9effc8f5d8c3281a12b..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/UInt16MultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-uint16[]            data        # array of data
-
diff --git a/message_generation/src/test/resources/std_msgs/msg/UInt32.msg b/message_generation/src/test/resources/std_msgs/msg/UInt32.msg
deleted file mode 100644
index b6c696b421e4a4c89c7f1420fbaa15af83913093..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/UInt32.msg
+++ /dev/null
@@ -1 +0,0 @@
-uint32 data
\ No newline at end of file
diff --git a/message_generation/src/test/resources/std_msgs/msg/UInt32MultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/UInt32MultiArray.msg
deleted file mode 100644
index b2bb0771f0208bc3c45210a918d689d5a24b53a7..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/UInt32MultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-uint32[]          data          # array of data
-
diff --git a/message_generation/src/test/resources/std_msgs/msg/UInt64.msg b/message_generation/src/test/resources/std_msgs/msg/UInt64.msg
deleted file mode 100644
index 2eb1afad37e320a366f7b0296fb207569a30db47..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/UInt64.msg
+++ /dev/null
@@ -1 +0,0 @@
-uint64 data
\ No newline at end of file
diff --git a/message_generation/src/test/resources/std_msgs/msg/UInt64MultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/UInt64MultiArray.msg
deleted file mode 100644
index 30d0cd92854159d4cc3fa5e996763cc08e9dcdf9..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/UInt64MultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-uint64[]          data          # array of data
-
diff --git a/message_generation/src/test/resources/std_msgs/msg/UInt8.msg b/message_generation/src/test/resources/std_msgs/msg/UInt8.msg
deleted file mode 100644
index 5eefd870db82c99cf7d62e7ccff1824c114bd462..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/UInt8.msg
+++ /dev/null
@@ -1 +0,0 @@
-uint8 data
diff --git a/message_generation/src/test/resources/std_msgs/msg/UInt8MultiArray.msg b/message_generation/src/test/resources/std_msgs/msg/UInt8MultiArray.msg
deleted file mode 100644
index 31f7d6a213995f216f4d124f1d6402852d1572b2..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_msgs/msg/UInt8MultiArray.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please look at the MultiArrayLayout message definition for
-# documentation on all multiarrays.
-
-MultiArrayLayout  layout        # specification of data layout
-uint8[]           data          # array of data
-
diff --git a/message_generation/src/test/resources/std_srvs/srv/Empty.srv b/message_generation/src/test/resources/std_srvs/srv/Empty.srv
deleted file mode 100644
index 73b314ff7c704c18889cf90fdc024716c634adb6..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/std_srvs/srv/Empty.srv
+++ /dev/null
@@ -1 +0,0 @@
----
\ No newline at end of file
diff --git a/message_generation/src/test/resources/test_msgs/msg/ArrayVal.msg b/message_generation/src/test/resources/test_msgs/msg/ArrayVal.msg
deleted file mode 100644
index 4a34dd1bb8c84ef12a33f1782a27acaaa8dc8812..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/ArrayVal.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-Val[] vals
-#Val[10] vals_fixed
diff --git a/message_generation/src/test/resources/test_msgs/msg/Composite.msg b/message_generation/src/test/resources/test_msgs/msg/Composite.msg
deleted file mode 100644
index 4629d3e56c7c03e55052196f34f3a5976024f524..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/Composite.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# composite message. required for testing import calculation in generators
-CompositeA a
-CompositeB b
diff --git a/message_generation/src/test/resources/test_msgs/msg/CompositeA.msg b/message_generation/src/test/resources/test_msgs/msg/CompositeA.msg
deleted file mode 100644
index 9f4fde2bf4c13dc86a95688e4b5254aaec186e2a..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/CompositeA.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# This represents an orientation in free space in quaternion form.
-
-float64 x
-float64 y
-float64 z
-float64 w
diff --git a/message_generation/src/test/resources/test_msgs/msg/CompositeB.msg b/message_generation/src/test/resources/test_msgs/msg/CompositeB.msg
deleted file mode 100644
index fb689bc8225e2c6f60b45c852c7f19da3dcd00cb..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/CompositeB.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-# copy of geometry_msgs/Point for testing
-float64 x
-float64 y
-float64 z
diff --git a/message_generation/src/test/resources/test_msgs/msg/EmbedTest.msg b/message_generation/src/test/resources/test_msgs/msg/EmbedTest.msg
deleted file mode 100644
index e1962cd4e10b88807c085907284686a85e1b9026..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/EmbedTest.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-std_msgs/String str1
-std_msgs/Int32 int1
-std_msgs/Int32[] ints
-Val val
-Val[] vals
-ArrayVal[] arrayval
diff --git a/message_generation/src/test/resources/test_msgs/msg/Floats.msg b/message_generation/src/test/resources/test_msgs/msg/Floats.msg
deleted file mode 100644
index 6bd8052d3121617bd05bb32247181ab8819791a1..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/Floats.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-# exact copy of rospy_tutorials/Floats, used for testing
-float32[] data
diff --git a/message_generation/src/test/resources/test_msgs/msg/HeaderHeaderVal.msg b/message_generation/src/test/resources/test_msgs/msg/HeaderHeaderVal.msg
deleted file mode 100644
index 6882d7ac4ae5e42bab89bdb212d21aba8dedf918..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/HeaderHeaderVal.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-Header header
-HeaderVal val
\ No newline at end of file
diff --git a/message_generation/src/test/resources/test_msgs/msg/HeaderVal.msg b/message_generation/src/test/resources/test_msgs/msg/HeaderVal.msg
deleted file mode 100644
index 91f99b2545dbf8b10e20be09e7cbbd0478531d12..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/HeaderVal.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-Header header
-string val
\ No newline at end of file
diff --git a/message_generation/src/test/resources/test_msgs/msg/PythonKeyword.msg b/message_generation/src/test/resources/test_msgs/msg/PythonKeyword.msg
deleted file mode 100644
index 0949ea888777ebf179376c7c044c8886c9eac1bd..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/PythonKeyword.msg
+++ /dev/null
@@ -1 +0,0 @@
-int32 yield
diff --git a/message_generation/src/test/resources/test_msgs/msg/TestArrays.msg b/message_generation/src/test/resources/test_msgs/msg/TestArrays.msg
deleted file mode 100644
index 2d7493fe41614d7fed5ba02067c030377780d85d..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/TestArrays.msg
+++ /dev/null
@@ -1,10 +0,0 @@
-# caller_id of most recent node to send this message
-string caller_id
-# caller_id of the original node to send this message
-string orig_caller_id
-
-int32[] int32_array
-float32[] float32_array
-time[] time_array
-TestString[] test_string_array
-# TODO: array of arrays
diff --git a/message_generation/src/test/resources/test_msgs/msg/TestConstants.msg b/message_generation/src/test/resources/test_msgs/msg/TestConstants.msg
deleted file mode 100644
index 344afc3840a05ca3247d780a54893fe263e73939..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/TestConstants.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-float32 A=-123.0
-float32 B=124.0
-float64 C=125.0
-int32 X=123
-int32 Y=-123
-uint32 Z=124
-string FOO=foo
-string SINGLEQUOTE='hi
-string DOUBLEQUOTE="hello" there
-string MULTIQUOTE="hello" 'goodbye'
-string EXAMPLE="#comments" are ignored, and leading and trailing whitespace removed
-string WHITESPACE= strip  
-string EMPTY= 
-bool TRUE=1
-bool FALSE=0
\ No newline at end of file
diff --git a/message_generation/src/test/resources/test_msgs/msg/TestFixedArray.msg b/message_generation/src/test/resources/test_msgs/msg/TestFixedArray.msg
deleted file mode 100644
index 005aa94af24fd1e3cfac5215cf76a6a6b9523999..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/TestFixedArray.msg
+++ /dev/null
@@ -1,16 +0,0 @@
-float32[1] f32_1
-float32[3] f32_3
-float64[1] f64_1
-float64[3] f64_3
-int8[1] i8_1
-int8[3] i8_3
-uint8[1] u8_1
-uint8[3] u8_3
-int32[1] i32_1
-int32[3] i32_3
-uint32[1] u32_1
-uint32[3] u32_3
-string[1] s_1
-string[3] s_3
-bool[1] b_1
-bool[3] b_3
\ No newline at end of file
diff --git a/message_generation/src/test/resources/test_msgs/msg/TestHeader.msg b/message_generation/src/test/resources/test_msgs/msg/TestHeader.msg
deleted file mode 100644
index 22897c3b85330325819e6e8fee8ab8198ba6fe00..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/TestHeader.msg
+++ /dev/null
@@ -1,8 +0,0 @@
-Header header
-
-# caller_id of most recent node to send this message
-string caller_id
-# caller_id of the original node to send this message
-string orig_caller_id
-
-byte auto_header # autoset header on response
diff --git a/message_generation/src/test/resources/test_msgs/msg/TestPrimitives.msg b/message_generation/src/test/resources/test_msgs/msg/TestPrimitives.msg
deleted file mode 100644
index 815dd5b0d18f9b94da8c8952c36cb0738d5d6438..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/TestPrimitives.msg
+++ /dev/null
@@ -1,21 +0,0 @@
-# Integration test message of all primitive types
-
-# caller_id of most recent node to send this message
-string caller_id
-# caller_id of the original node to send this message
-string orig_caller_id
-
-string str
-byte b
-int16 int16
-int32 int32
-int64 int64
-char c
-uint16 uint16
-uint32 uint32
-uint64 uint64
-float32 float32
-float64 float64
-time t
-duration d
-
diff --git a/message_generation/src/test/resources/test_msgs/msg/TestString.msg b/message_generation/src/test/resources/test_msgs/msg/TestString.msg
deleted file mode 100644
index 4ab04385050da20743d887191f80a17361d0f4c3..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/TestString.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Integration test message
-# caller_id of most recent node to send this message
-string caller_id
-# caller_id of the original node to send this message
-string orig_caller_id
-string data
diff --git a/message_generation/src/test/resources/test_msgs/msg/TransitiveImport.msg b/message_generation/src/test/resources/test_msgs/msg/TransitiveImport.msg
deleted file mode 100644
index bf33d172859640df342b6ea66d89d5cfed850537..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/TransitiveImport.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug #2133/2139: EmbedTest uses std_msgs, so TransitiveImport needs it as well
-EmbedTest data
\ No newline at end of file
diff --git a/message_generation/src/test/resources/test_msgs/msg/TransitiveMsg1.msg b/message_generation/src/test/resources/test_msgs/msg/TransitiveMsg1.msg
deleted file mode 100644
index f41ed0cf3ce5662220a8a4ce94d31e9edb521320..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/TransitiveMsg1.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-TransitiveMsg2 msg2
-
diff --git a/message_generation/src/test/resources/test_msgs/msg/TransitiveMsg2.msg b/message_generation/src/test/resources/test_msgs/msg/TransitiveMsg2.msg
deleted file mode 100644
index 0084c088e0f5036d60aedb2f93ccebcc78dd22a5..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/TransitiveMsg2.msg
+++ /dev/null
@@ -1 +0,0 @@
-test_msgs/Composite data
diff --git a/message_generation/src/test/resources/test_msgs/msg/Val.msg b/message_generation/src/test/resources/test_msgs/msg/Val.msg
deleted file mode 100644
index c11841ad234e1b31fc7dde9c26a5249b7181c02a..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/msg/Val.msg
+++ /dev/null
@@ -1 +0,0 @@
-string val
\ No newline at end of file
diff --git a/message_generation/src/test/resources/test_msgs/srv/AddTwoInts.srv b/message_generation/src/test/resources/test_msgs/srv/AddTwoInts.srv
deleted file mode 100644
index 3a68808ee591a3623cbf5e553eed28bac5233be8..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/srv/AddTwoInts.srv
+++ /dev/null
@@ -1,4 +0,0 @@
-int64 a
-int64 b
----
-int64 sum
diff --git a/message_generation/src/test/resources/test_msgs/srv/ConstantsMultiplex.srv b/message_generation/src/test/resources/test_msgs/srv/ConstantsMultiplex.srv
deleted file mode 100644
index b955445414b95f3c56ac4e676e2d20e350b6acb4..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/srv/ConstantsMultiplex.srv
+++ /dev/null
@@ -1,26 +0,0 @@
-byte BYTE_X=0
-byte BYTE_Y=15
-byte BYTE_Z=5
-int32 INT32_X=0
-int32 INT32_Y=-12345678
-int32 INT32_Z=12345678
-uint32 UINT32_X=0
-uint32 UINT32_Y=12345678
-uint32 UINT32_Z=1
-float32 FLOAT32_X=0.0
-float32 FLOAT32_Y=-3.14159
-float32 FLOAT32_Z=12345.78
-byte SELECT_X=1
-byte SELECT_Y=2
-byte SELECT_Z=3
-byte selection
----
-# test response constants as well
-byte CONFIRM_X=1
-byte CONFIRM_Y=2
-byte CONFIRM_Z=3
-byte select_confirm
-byte ret_byte
-int32 ret_int32
-uint32 ret_uint32
-float32 ret_float32
\ No newline at end of file
diff --git a/message_generation/src/test/resources/test_msgs/srv/EmptyReqSrv.srv b/message_generation/src/test/resources/test_msgs/srv/EmptyReqSrv.srv
deleted file mode 100644
index 1f2c1eb6ac0db364f9ad16172625c6002c52d06e..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/srv/EmptyReqSrv.srv
+++ /dev/null
@@ -1,2 +0,0 @@
----
-int32 fake_secret
diff --git a/message_generation/src/test/resources/test_msgs/srv/EmptyRespSrv.srv b/message_generation/src/test/resources/test_msgs/srv/EmptyRespSrv.srv
deleted file mode 100644
index 6ef29bc8d831056d98c78522e1393160490ff326..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/srv/EmptyRespSrv.srv
+++ /dev/null
@@ -1,2 +0,0 @@
-int32 fake_secret
----
diff --git a/message_generation/src/test/resources/test_msgs/srv/EmptySrv.srv b/message_generation/src/test/resources/test_msgs/srv/EmptySrv.srv
deleted file mode 100644
index ed97d539c095cf1413af30cc23dea272095b97dd..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/srv/EmptySrv.srv
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/message_generation/src/test/resources/test_msgs/srv/ListReturn.srv b/message_generation/src/test/resources/test_msgs/srv/ListReturn.srv
deleted file mode 100644
index 311e806433675ad02b272023067b9e9444dc7349..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/srv/ListReturn.srv
+++ /dev/null
@@ -1,7 +0,0 @@
-# test case for having single list return value
-int32 a
-int32 b
-int32 c
-int32 d
----
-int32[] abcd
diff --git a/message_generation/src/test/resources/test_msgs/srv/MultipleAddTwoInts.srv b/message_generation/src/test/resources/test_msgs/srv/MultipleAddTwoInts.srv
deleted file mode 100644
index 522a482621cf430cf3ed8318667ab6896ffee9ef..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/srv/MultipleAddTwoInts.srv
+++ /dev/null
@@ -1,8 +0,0 @@
-# test case for having multiple return values
-int32 a
-int32 b
-int32 c
-int32 d
----
-int32 ab
-int32 cd
\ No newline at end of file
diff --git a/message_generation/src/test/resources/test_msgs/srv/StringString.srv b/message_generation/src/test/resources/test_msgs/srv/StringString.srv
deleted file mode 100644
index a9242d416e849ba58184d8f030fef12fd5cc7a0b..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/srv/StringString.srv
+++ /dev/null
@@ -1,4 +0,0 @@
-std_msgs/String str
-Val str2
----
-std_msgs/String str
diff --git a/message_generation/src/test/resources/test_msgs/srv/TransitiveSrv.srv b/message_generation/src/test/resources/test_msgs/srv/TransitiveSrv.srv
deleted file mode 100644
index 09a03750a8042d51ac320d4ef6619e96a91db1b5..0000000000000000000000000000000000000000
--- a/message_generation/src/test/resources/test_msgs/srv/TransitiveSrv.srv
+++ /dev/null
@@ -1,4 +0,0 @@
-test_msgs/TransitiveMsg1 msg
----
-int32 a
-
diff --git a/package.xml b/package.xml
deleted file mode 100644
index 50316fd7d81ac2c912af4bc61b7326380547d30c..0000000000000000000000000000000000000000
--- a/package.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <name>rosjava_bootstrap</name>
-  <version>0.3.3</version>
-  <description>
-    Bootstrap utilities for rosjava builds.
-  </description>
-  <url>http://ros.org/wiki/rosjava_bootstrap</url>
-  <maintainer email="d.stonier@gmail.com">Daniel Stonier</maintainer>
-  <author>Daniel Stonier</author>
-  <author>Damon Kohler</author>
-  <license>Apache 2.0</license>
-  <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>rosjava_build_tools</build_depend>
-  <run_depend>rosjava_build_tools</run_depend>
-</package>
-