Skip to content

Commit

Permalink
added head method for HttpConnector. Add new exists() method to
Browse files Browse the repository at this point in the history 
XWikiRESTfulAPI.
Sync Daemon demonstratable.
  • Loading branch information
@sasinda
sasinda committed Aug 1, 2012
1 parent 522d7f7 commit 1682536
Show file tree
Hide file tree
Showing 76 changed files with 4,942 additions and 306 deletions.
159 changes: 106 additions & 53 deletions xwiki-android-client/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.xwiki.android.client"
android:versionCode="1"
android:versionName="1.0">
package="org.xwiki.android.client"
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk android:minSdkVersion="7" />
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
<uses-permission android:name="android.permission.READ_OWNER_DATA"></uses-permission>
<uses-permission android:name="android.permission.WRITE_OWNER_DATA"></uses-permission>
<!-- android:name="org.xwiki.android.context.XWikiApplicationContext" to extend application with our own application Context -->
<application android:icon="@drawable/icon" android:label="@string/app_name" android:name="org.xwiki.android.context.XWikiApplicationContext">
<activity android:name=".Main"
android:label="@string/app_name">

<uses-permission android:name="android.permission.INTERNET" >
</uses-permission>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
</uses-permission>
<uses-permission android:name="android.permission.READ_OWNER_DATA" >
</uses-permission>
<uses-permission android:name="android.permission.WRITE_OWNER_DATA" >
</uses-permission>
<!-- android:name="org.xwiki.android.context.XWikiApplicationContext" to extend application with our own application Context -->
<application
android:name="org.xwiki.android.context.XWikiApplicationContext"
android:icon="@drawable/icon"
android:label="@string/app_name" >
<activity
android:name=".Main"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".launcher.IconLaunchPad"
android:label="@string/app_name">
<activity
android:name=".launcher.IconLaunchPad"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>

<activity android:name=".nav.PageViewActivity"></activity>
<activity android:name=".nav.PageViewActivity" >
</activity>

<!-- launchable activities -->
<activity android:name=".blog.Blogger" android:label="Blog Application" android:icon="@drawable/blog">
<activity
android:name=".blog.Blogger"
android:icon="@drawable/blog"
android:label="Blog Application" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="xwiki.android.action.MAIN"/>
<action android:name="xwiki.android.action.BLOG"/>
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="xwiki.android.action.MAIN" />
<action android:name="xwiki.android.action.BLOG" />

<category android:name="xwiki.android.category.LAUNCHER" />
</intent-filter>
</activity>

<activity android:name=".nav.XwikiNavigator" android:icon="@drawable/navigator">
<activity
android:name=".nav.XwikiNavigator"
android:icon="@drawable/navigator" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="xwiki.android.action.MAIN"/>
<action android:name="xwiki.android.action.NAVIGATOR"/>
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="xwiki.android.action.MAIN" />
<action android:name="xwiki.android.action.NAVIGATOR" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".dev.ConfigurationActivity" android:icon="@drawable/devtools">
<activity
android:name=".dev.ConfigurationActivity"
android:icon="@drawable/devtools" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="xwiki.android.action.MAIN"/>
<action android:name="xwiki.android.action.CONFIGURATION"/>
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="xwiki.android.action.MAIN" />
<action android:name="xwiki.android.action.CONFIGURATION" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".dev.QuickTest" android:icon="@drawable/quicktest">
<activity
android:name=".dev.QuickTest"
android:icon="@drawable/quicktest" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="xwiki.android.action.MAIN"/>
<action android:name="xwiki.android.action.QuickTests"/>
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="xwiki.android.action.MAIN" />
<action android:name="xwiki.android.action.QuickTests" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<!-- sub activities
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- blog -->
<activity android:name=".blog.BlogPrefernces" android:label="Blog App Preferences"/>
<activity android:name=".blog.EditPostActivity" android:label="Blog App Preferences"/>
<activity android:name=".blog.LoadSavedPostsActivity" android:label="Blog App Preferences"/>

<!-- activities from UI comp lib -->
<activity android:name="org.xwiki.android.components.login.LoginActivity"></activity>
<activity android:name="org.xwiki.android.components.objectnavigator.ObjectNavigatorActivity"></activity>
<activity android:name="org.xwiki.android.components.navigator.XWikiNavigatorActivity"></activity>
<activity android:name="org.xwiki.android.components.pageviewer.XWikiPageViewerActivity"></activity>
<activity android:name="org.xwiki.android.components.listnavigator.XWikiListNavigatorActivity"></activity>
<activity android:name="org.xwiki.android.components.commenteditor.CommentEditorActivity"></activity>
<activity android:name="org.xwiki.android.components.attachments.AttachmentActivity"></activity>
<activity android:name="org.xwiki.android.components.search.SearchActivity"></activity>
<activity android:name="org.xwiki.android.components.search.SearchResultsActivity"></activity>
<activity android:name="org.xwiki.android.components.objecteditor.ObjectEditorActivity"></activity>
<activity android:name="org.xwiki.android.components.classviewer.ClassListActivity"></activity>
<activity android:name="org.xwiki.android.components.classviewer.ClassViewerActivity"></activity>
<!--
sub activities
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
<!-- blog -->
<activity
android:name=".blog.BlogPrefernces"
android:label="Blog App Preferences" />
<activity
android:name=".blog.EditPostActivity"
android:label="Blog App Preferences" />
<activity
android:name=".blog.LoadSavedPostsActivity"
android:label="Blog App Preferences" />

<!-- activities from UI comp lib -->
<activity android:name="org.xwiki.android.components.login.LoginActivity" >
</activity>
<activity android:name="org.xwiki.android.components.objectnavigator.ObjectNavigatorActivity" >
</activity>
<activity android:name="org.xwiki.android.components.navigator.XWikiNavigatorActivity" >
</activity>
<activity android:name="org.xwiki.android.components.pageviewer.XWikiPageViewerActivity" >
</activity>
<activity android:name="org.xwiki.android.components.listnavigator.XWikiListNavigatorActivity" >
</activity>
<activity android:name="org.xwiki.android.components.commenteditor.CommentEditorActivity" >
</activity>
<activity android:name="org.xwiki.android.components.attachments.AttachmentActivity" >
</activity>
<activity android:name="org.xwiki.android.components.search.SearchActivity" >
</activity>
<activity android:name="org.xwiki.android.components.search.SearchResultsActivity" >
</activity>
<activity android:name="org.xwiki.android.components.objecteditor.ObjectEditorActivity" >
</activity>
<activity android:name="org.xwiki.android.components.classviewer.ClassListActivity" >
</activity>
<activity android:name="org.xwiki.android.components.classviewer.ClassViewerActivity" >
</activity>


<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Services
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->

<service android:name="org.xwiki.android.svcbg.SyncDaemon"></service>

</application>

</manifest>
47 changes: 47 additions & 0 deletions xwiki-android-client/res/layout/blog_loadsaved_list.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="fill_vertical"
android:orientation="vertical" >

<ScrollView
android:id="@+id/scrollView1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="0.90" >

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="0.90"
android:orientation="vertical" >

<ListView
android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="444dp"
android:drawSelectorOnTop="true" >
</ListView>
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<Button
android:id="@+id/btnLoad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.57"
android:text="Load" />

<Button
android:id="@+id/btnDel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Delete" />
</LinearLayout>

</LinearLayout>
Expand Down
23 changes: 23 additions & 0 deletions xwiki-android-client/res/layout/blog_retreive_dialog.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<EditText
android:id="@+id/blg_ret_et_pageName"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:ems="10"
android:text="demoPage" >

<requestFocus />
</EditText>
<Button
android:id="@+id/blg_ret_btn_ok"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="OK" />

</LinearLayout>
Expand Down
4 changes: 2 additions & 2 deletions xwiki-android-client/res/layout/blogeditor.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Load" />
<Button
android:id="@+id/button1"
android:id="@+id/btnMore"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.19"
Expand Down
6 changes: 6 additions & 0 deletions xwiki-android-client/res/menu/blog_editor_more.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:id="@+id/miSyncDaemon" android:titleCondensed="Sync" android:title="Sync Out Using Sync Daemon"></item>


</menu>
2 changes: 1 addition & 1 deletion xwiki-android-client/src/org/xwiki/android/client/blog/Blogger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.xwiki.android.components.login.LoginActivity;
import org.xwiki.android.rest.ral.RaoException;
import org.xwiki.android.rest.reference.DocumentReference;
import org.xwiki.android.svc.blog.BlogDocument;
import org.xwiki.android.svcx.blog.BlogDocument;
import org.xwiki.android.svc.xmodel.DocumentRemoteSvcCallbacks;
import org.xwiki.android.svc.xmodel.DocumentSvc;
import org.xwiki.android.svc.xmodel.DocumentSvcImpl;
Expand Down
Loading

0 comments on commit 1682536

Please sign in to comment.