diff --git a/rosjava_bootstrap/src/main/java/org/ros/CommandLineVariables.java b/rosjava/src/main/java/org/ros/CommandLineVariables.java similarity index 100% rename from rosjava_bootstrap/src/main/java/org/ros/CommandLineVariables.java rename to rosjava/src/main/java/org/ros/CommandLineVariables.java diff --git a/rosjava_bootstrap/src/main/java/org/ros/EnvironmentVariables.java b/rosjava/src/main/java/org/ros/EnvironmentVariables.java similarity index 100% rename from rosjava_bootstrap/src/main/java/org/ros/EnvironmentVariables.java rename to rosjava/src/main/java/org/ros/EnvironmentVariables.java diff --git a/rosjava_bootstrap/src/main/java/org/ros/Parameters.java b/rosjava/src/main/java/org/ros/Parameters.java similarity index 100% rename from rosjava_bootstrap/src/main/java/org/ros/Parameters.java rename to rosjava/src/main/java/org/ros/Parameters.java diff --git a/rosjava_bootstrap/src/main/java/org/ros/Topics.java b/rosjava/src/main/java/org/ros/Topics.java similarity index 100% rename from rosjava_bootstrap/src/main/java/org/ros/Topics.java rename to rosjava/src/main/java/org/ros/Topics.java diff --git a/rosjava_bootstrap/src/main/java/org/ros/exception/RosException.java b/rosjava/src/main/java/org/ros/exception/RosException.java similarity index 100% rename from rosjava_bootstrap/src/main/java/org/ros/exception/RosException.java rename to rosjava/src/main/java/org/ros/exception/RosException.java diff --git a/rosjava_bootstrap/src/main/java/org/ros/exception/RosRuntimeException.java b/rosjava/src/main/java/org/ros/exception/RosRuntimeException.java similarity index 100% rename from rosjava_bootstrap/src/main/java/org/ros/exception/RosRuntimeException.java rename to rosjava/src/main/java/org/ros/exception/RosRuntimeException.java diff --git a/rosjava_bootstrap/src/main/java/org/ros/namespace/GraphName.java b/rosjava/src/main/java/org/ros/namespace/GraphName.java similarity index 100% rename from rosjava_bootstrap/src/main/java/org/ros/namespace/GraphName.java rename to rosjava/src/main/java/org/ros/namespace/GraphName.java diff --git a/rosjava_bootstrap/src/test/java/org/ros/namespace/GraphNameTest.java b/rosjava/src/test/java/org/ros/namespace/GraphNameTest.java similarity index 100% rename from rosjava_bootstrap/src/test/java/org/ros/namespace/GraphNameTest.java rename to rosjava/src/test/java/org/ros/namespace/GraphNameTest.java diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties deleted file mode 100644 index 43b13728c23a72cc10a1b94319131aad0d85f970..0000000000000000000000000000000000000000 --- a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties +++ /dev/null @@ -1 +0,0 @@ -#Tue Feb 28 09:35:28 CET 2012 diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock deleted file mode 100644 index 40fdece9d24d300eb3ed6177f4a7a7952db584cd..0000000000000000000000000000000000000000 --- a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/cache.properties.lock +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileHashes.bin b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileHashes.bin deleted file mode 100644 index 1994afe634093031c7eee19d5ae56e50ca79e98d..0000000000000000000000000000000000000000 Binary files a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileHashes.bin and /dev/null differ diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileSnapshots.bin b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileSnapshots.bin deleted file mode 100644 index d34d774e01d0e8476255bb899da007becd88a639..0000000000000000000000000000000000000000 Binary files a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/fileSnapshots.bin and /dev/null differ diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin deleted file mode 100644 index 2a9b50a5d93b31a99e11c241f1288227368843e6..0000000000000000000000000000000000000000 Binary files a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/outputFileStates.bin and /dev/null differ diff --git a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin b/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin deleted file mode 100644 index a085d070669f9f4f7764e101f259919305a7a8b3..0000000000000000000000000000000000000000 Binary files a/rosjava_bootstrap/.gradle/1.0-milestone-8a/taskArtifacts/taskArtifacts.bin and /dev/null differ diff --git a/rosjava_bootstrap/.pydevproject b/rosjava_bootstrap/.pydevproject deleted file mode 100644 index bfca96d8b1348c485e11782e6ed5484de9ec8394..0000000000000000000000000000000000000000 --- a/rosjava_bootstrap/.pydevproject +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?eclipse-pydev version="1.0"?> - -<pydev_project> -<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> -<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> -<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> -<path>/rosjava_bootstrap/src/main/python</path> -</pydev_pathproperty> -</pydev_project> diff --git a/rosjava_bootstrap/build.gradle b/rosjava_bootstrap/build.gradle deleted file mode 100644 index 804459d21894dbbaa5f67d53f99d95bf4976d5d7..0000000000000000000000000000000000000000 --- a/rosjava_bootstrap/build.gradle +++ /dev/null @@ -1,33 +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. - */ - -dependencies { - compile 'org.apache.commons:com.springsource.org.apache.commons.codec:1.3.0' - compile 'org.apache.commons:com.springsource.org.apache.commons.lang:2.4.0' - compile 'org.apache.commons:com.springsource.org.apache.commons.io:1.4.0' - compile 'commons-pool:commons-pool:1.6' - compile 'com.google.guava:guava:12.0' - compile 'io.netty:netty:3.5.2.Final' - testCompile 'junit:junit:4.8.2' -} - -jar { - manifest { - version = '0.0.0-SNAPSHOT' - symbolicName = 'org.ros.rosjava_bootstrap' - } -} - diff --git a/rosjava_bootstrap/src/main/java/org/ros/exception/package-info.java b/rosjava_bootstrap/src/main/java/org/ros/exception/package-info.java deleted file mode 100644 index 895f12d64b4a735ce0f1408acd94f5f2876c0e88..0000000000000000000000000000000000000000 --- a/rosjava_bootstrap/src/main/java/org/ros/exception/package-info.java +++ /dev/null @@ -1,20 +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. - */ - -/** - * Provides the classes for representing common rosjava exceptions. - */ -package org.ros.exception; \ No newline at end of file diff --git a/rosjava_bootstrap/src/main/java/org/ros/package-info.java b/rosjava_bootstrap/src/main/java/org/ros/package-info.java deleted file mode 100644 index 14a719a824b531976ce64a91e1cb87ec3e5196b0..0000000000000000000000000000000000000000 --- a/rosjava_bootstrap/src/main/java/org/ros/package-info.java +++ /dev/null @@ -1,22 +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. - */ - -/** - * Provides the classes that are core to ROS development in Java. - * - * @see <a href="http://docs.rosjava.googlecode.com/hg/rosjava_core/html/index.html">rosjava_core documentation</a> - */ -package org.ros; \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f6287ece6b180af6944d37b269629279352fca28..81c74cd0203499f90bb0fe7bfc8552dfd55366a4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,8 +14,7 @@ * the License. */ -include 'rosjava_bootstrap', 'rosjava_messages', 'apache_xmlrpc_common', - 'apache_xmlrpc_client', 'apache_xmlrpc_server', 'rosjava', - 'rosjava_geometry', 'rosjava_tutorial_pubsub', +include 'apache_xmlrpc_common', 'apache_xmlrpc_client', 'apache_xmlrpc_server', + 'rosjava', 'rosjava_geometry', 'rosjava_tutorial_pubsub', 'rosjava_tutorial_services', 'rosjava_tutorial_right_hand_rule', 'rosjava_benchmarks', 'rosjava_test', 'docs'