Merge branch 'develop'
diff --git a/weinre.server.android/.classpath b/weinre.server.android/.classpath
deleted file mode 100644
index 83591af..0000000
--- a/weinre.server.android/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="gen"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="lib" path="lib/weinre.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/weinre.server.android/.gitignore b/weinre.server.android/.gitignore
deleted file mode 100644
index c706b16..0000000
--- a/weinre.server.android/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-gen
-lib
diff --git a/weinre.server.android/.project b/weinre.server.android/.project
deleted file mode 100644
index 80556f1..0000000
--- a/weinre.server.android/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>weinre.server.android</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/weinre.server.android/AndroidManifest.xml b/weinre.server.android/AndroidManifest.xml
deleted file mode 100644
index c8f5931..0000000
--- a/weinre.server.android/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="weinre.server.android"
- android:versionCode="1"
- android:versionName="1.0">
- <application android:icon="@drawable/icon" android:label="@string/app_name">
- <activity android:name=".MainActivity"
- android:label="@string/app_name">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- </application>
-
-<uses-permission android:name="android.permission.INTERNET"></uses-permission>
-
-</manifest>
\ No newline at end of file
diff --git a/weinre.server.android/default.properties b/weinre.server.android/default.properties
deleted file mode 100644
index 2a08f25..0000000
--- a/weinre.server.android/default.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-9
-android.library=false
diff --git a/weinre.server.android/res/drawable-hdpi/icon.png b/weinre.server.android/res/drawable-hdpi/icon.png
deleted file mode 100644
index 659b52f..0000000
--- a/weinre.server.android/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/weinre.server.android/res/drawable-ldpi/icon.png b/weinre.server.android/res/drawable-ldpi/icon.png
deleted file mode 100644
index 8f0fcf5..0000000
--- a/weinre.server.android/res/drawable-ldpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/weinre.server.android/res/drawable-mdpi/icon.png b/weinre.server.android/res/drawable-mdpi/icon.png
deleted file mode 100644
index 12570ad..0000000
--- a/weinre.server.android/res/drawable-mdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/weinre.server.android/res/layout/main.xml b/weinre.server.android/res/layout/main.xml
deleted file mode 100644
index 2bebc74..0000000
--- a/weinre.server.android/res/layout/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- >
-<TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/running"
- />
-</LinearLayout>
diff --git a/weinre.server.android/res/values/strings.xml b/weinre.server.android/res/values/strings.xml
deleted file mode 100644
index 6362cf3..0000000
--- a/weinre.server.android/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="app_name">weinre server</string>
- <string name="running">weinre: 8080</string>
-</resources>
diff --git a/weinre.server.android/src/weinre/server/android/MainActivity.java b/weinre.server.android/src/weinre/server/android/MainActivity.java
deleted file mode 100644
index 26a7fe8..0000000
--- a/weinre.server.android/src/weinre/server/android/MainActivity.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package weinre.server.android;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import weinre.server.Main;
-import weinre.server.android.R;
-
-//---------------------------------------------------------------------------------
-public class MainActivity extends Activity {
-
- private Main main;
-
- //-----------------------------------------------------------------------------
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- setContentView(R.layout.main);
-
- //-------------------------------------------------------------------------
- main = new Main(new String[]{"--boundHost", "-all-", "--readTimeout", "30"});
-
- Runnable serverRunnable = new Runnable() {
- public void run() {
- main.httpServerStart();
- String[] hosts = Main.getSettings().getBoundHosts();
- System.out.println("Bound Hosts:");
- for (String host: hosts) {
- System.out.println(" " + host);
- }
- }
- };
-
- new Thread(serverRunnable, "main server thread").start();
- }
-
-}
\ No newline at end of file
diff --git a/weinre.server/weinre server - remote debug.launch b/weinre.server/weinre server - remote debug.launch
deleted file mode 100644
index e88ac8a..0000000
--- a/weinre.server/weinre server - remote debug.launch
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/weinre.server"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;weinre.build&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;weinre.doc&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;weinre.server&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;packageFragmentRoot handle=&quot;=weinre.server/\/weinre.build\/vendor\/cli\/commons-cli.jar&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;packageFragmentRoot handle=&quot;=weinre.server/\/weinre.build\/vendor\/jetty\/jetty.jar&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;packageFragmentRoot handle=&quot;=weinre.server/\/weinre.build\/vendor\/json4j\/json4j.jar&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;packageFragmentRoot handle=&quot;=weinre.server/\/weinre.build\/vendor\/jetty\/servlet-api.jar&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;weinre.server.android&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;weinre.web&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
-<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">
-<mapEntry key="hostname" value="localhost"/>
-<mapEntry key="port" value="8096"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="weinre.server"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>
-</launchConfiguration>
