Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share

Conflicts:
	display-client/project.properties

display-server/.classpath

@@ -7,41 +7,6 @@
		</attributes>
	</classpathentry>
	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/antlr4-annotations-4.2.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/antlr4-runtime-4.2.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/beetl-core-2.2.3.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/commons-codec-1.6.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/commons-collections-3.2.1.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/commons-lang-2.4.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/commons-lang3-3.4.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/commons-logging-1.1.3.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/dom4j-1.6.1.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/httpasyncclient-4.0.1.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/httpclient-4.3.2.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/httpcore-4.3.1.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/httpcore-nio-4.3.2.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/httpmime-4.3.2.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/ipu-basic-1.0.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/ipu-common-1.0.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/java_memcached-release_2.5.3.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/json-20131018.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/jsoup-1.7.2.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/junit-3.8.1.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/log4j-1.2.8.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/org.abego.treelayout.core-1.0.1.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/servlet-api-2.5.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/unirest-java-1.3.8.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/velocity-1.7.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/wade-apache.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/wade-cache.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/wade-common.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/wade-data.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/wade-database.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/wade-sqlite-jdbc.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/xml-apis-1.0.b2.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/ipu-server-web-1.0.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/commons-fileupload-1.3.1.jar"/>
	<classpathentry kind="lib" path="/ipu-server-lib/all/commons-io-2.2.jar"/>
	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
		<attributes>
			<attribute name="maven.pomderived" value="true"/>

ipu-alertdialog/.classpath

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

ipu-alertdialog/AndroidManifest.xml

@@ -5,8 +5,9 @@
    android:versionName="1.0" >
    <uses-sdk
        android:minSdkVersion="11"
        android:targetSdkVersion="21" />
        android:minSdkVersion="8"
        android:targetSdkVersion="22" />
 
</manifest>
 </manifest>
 

ipu-count-test/AndroidManifest.xml

@@ -4,8 +4,8 @@
    android:versionName="1.0" >
    <uses-sdk
        android:minSdkVersion="10"
        android:targetSdkVersion="15" />
        android:minSdkVersion="8"
        android:targetSdkVersion="22" />
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="android.permission.WRITE_CONTACTS" />

ipu-count-test/project.properties

@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
target=android-22
android.library=false

wade-mobile-common/AndroidManifest.xml

@@ -5,5 +5,5 @@
    <uses-sdk
        android:minSdkVersion="8"
        android:targetSdkVersion="15" />
        android:targetSdkVersion="22" />
</manifest>

wade-mobile-common/project.properties

@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
target=android-22
android.library=true

wade-mobile-lib/AndroidManifest.xml

@@ -5,7 +5,7 @@
    <uses-sdk
        android:minSdkVersion="8"
        android:targetSdkVersion="15" />
        android:targetSdkVersion="22" />
    <!-- <application
        android:allowBackup="true"

wade-mobile-lib/project.properties

@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
target=android-22
android.library=true