* Extracting API jar as a separate module, not a classifier any more.…

… It doesn't have dependencies any more, appart from android in "provided" scope (we should aim to remove that in the end) * No more jarjaring: creating a jar with dependencies instead, used with an assembly bundle (two new modules) * Removing references to Android classes from the annotation processor * Adding missing license files
pyricau · Oct 25, 2012 · Oct 25, 2012 · Oct 25, 2012 · cbfd5f2e17b0663e68922a30c051054b9dd3bb01
commit cbfd5f2e17b0663e68922a30c051054b9dd3bb01
diff --git a/AndroidAnnotations/HOW-TO.txt b/AndroidAnnotations/HOW-TO.txt
diff --git a/AndroidAnnotations/LICENSE.txt b/AndroidAnnotations/LICENSE.txt
diff --git a/AndroidAnnotations/androidannotations-api/.gitignore b/AndroidAnnotations/androidannotations-api/.gitignore
@@ -0,0 +1,4 @@
+.classpath
+.project
+target/
+
diff --git a/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.core.resources.prefs b/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.jdt.core.prefs b/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.m2e.core.prefs b/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/AndroidAnnotations/androidannotations-api/pom.xml b/AndroidAnnotations/androidannotations-api/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>androidannotations-parent</artifactId>
+		<groupId>com.googlecode.androidannotations</groupId>
+		<version>2.7-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-api</artifactId>
+	<description>The API jar containing the annotations and the runtime helpers</description>
+	<name>AndroidAnnotations API</name>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>1.6_r2</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/...dannotations/annotations/AfterInject.java → ...dannotations/annotations/AfterInject.java b/...dannotations/annotations/AfterInject.java → ...dannotations/annotations/AfterInject.java
diff --git a/...otations/annotations/AfterTextChange.java → ...otations/annotations/AfterTextChange.java b/...otations/annotations/AfterTextChange.java → ...otations/annotations/AfterTextChange.java
diff --git a/...idannotations/annotations/AfterViews.java → ...idannotations/annotations/AfterViews.java b/...idannotations/annotations/AfterViews.java → ...idannotations/annotations/AfterViews.java
diff --git a/...e/androidannotations/annotations/App.java → ...e/androidannotations/annotations/App.java b/...e/androidannotations/annotations/App.java → ...e/androidannotations/annotations/App.java
diff --git a/...idannotations/annotations/Background.java → ...idannotations/annotations/Background.java b/...idannotations/annotations/Background.java → ...idannotations/annotations/Background.java
diff --git a/.../androidannotations/annotations/Bean.java → .../androidannotations/annotations/Bean.java b/.../androidannotations/annotations/Bean.java → .../androidannotations/annotations/Bean.java
diff --git a/...tations/annotations/BeforeTextChange.java → ...tations/annotations/BeforeTextChange.java b/...tations/annotations/BeforeTextChange.java → ...tations/annotations/BeforeTextChange.java
diff --git a/...androidannotations/annotations/Click.java → ...androidannotations/annotations/Click.java b/...androidannotations/annotations/Click.java → ...androidannotations/annotations/Click.java
diff --git a/...oidannotations/annotations/EActivity.java → ...oidannotations/annotations/EActivity.java b/...oidannotations/annotations/EActivity.java → ...oidannotations/annotations/EActivity.java
diff --git a/...annotations/annotations/EApplication.java → ...annotations/annotations/EApplication.java b/...annotations/annotations/EApplication.java → ...annotations/annotations/EApplication.java
diff --git a/...androidannotations/annotations/EBean.java → ...androidannotations/annotations/EBean.java b/...androidannotations/annotations/EBean.java → ...androidannotations/annotations/EBean.java
diff --git a/...oidannotations/annotations/EFragment.java → ...oidannotations/annotations/EFragment.java b/...oidannotations/annotations/EFragment.java → ...oidannotations/annotations/EFragment.java
diff --git a/...oidannotations/annotations/EProvider.java → ...oidannotations/annotations/EProvider.java b/...oidannotations/annotations/EProvider.java → ...oidannotations/annotations/EProvider.java
diff --git a/...oidannotations/annotations/EReceiver.java → ...oidannotations/annotations/EReceiver.java b/...oidannotations/annotations/EReceiver.java → ...oidannotations/annotations/EReceiver.java
diff --git a/...roidannotations/annotations/EService.java → ...roidannotations/annotations/EService.java b/...roidannotations/annotations/EService.java → ...roidannotations/annotations/EService.java
diff --git a/...androidannotations/annotations/EView.java → ...androidannotations/annotations/EView.java b/...androidannotations/annotations/EView.java → ...androidannotations/annotations/EView.java
diff --git a/...idannotations/annotations/EViewGroup.java → ...idannotations/annotations/EViewGroup.java b/...idannotations/annotations/EViewGroup.java → ...idannotations/annotations/EViewGroup.java
diff --git a/...androidannotations/annotations/Extra.java → ...androidannotations/annotations/Extra.java b/...androidannotations/annotations/Extra.java → ...androidannotations/annotations/Extra.java
diff --git a/...otations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentArg.java b/...otations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentArg.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (C) 2010-2012 eBusiness Information, Excilys Group
+ *
+ * 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 com.googlecode.androidannotations.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Use on fields in fragments. This String value field corresponds to the
+ * argument name.
+ * 
+ * When {@link FragmentArg} is used on fields in a Fragment, the fragment
+ * builder will hold dedicated methods for these arguments.
+ * 
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.FIELD)
+public @interface FragmentArg {
+
+	String value() default "";
+}
diff --git a/...annotations/annotations/FragmentById.java → ...annotations/annotations/FragmentById.java b/...annotations/annotations/FragmentById.java → ...annotations/annotations/FragmentById.java
diff --git a/...nnotations/annotations/FragmentByTag.java → ...nnotations/annotations/FragmentByTag.java b/...nnotations/annotations/FragmentByTag.java → ...nnotations/annotations/FragmentByTag.java
diff --git a/...roidannotations/annotations/FromHtml.java → ...roidannotations/annotations/FromHtml.java b/...roidannotations/annotations/FromHtml.java → ...roidannotations/annotations/FromHtml.java
diff --git a/...idannotations/annotations/Fullscreen.java → ...idannotations/annotations/Fullscreen.java b/...idannotations/annotations/Fullscreen.java → ...idannotations/annotations/Fullscreen.java
diff --git a/...dannotations/annotations/HttpsClient.java → ...dannotations/annotations/HttpsClient.java b/...dannotations/annotations/HttpsClient.java → ...dannotations/annotations/HttpsClient.java
diff --git a/...nnotations/annotations/InstanceState.java → ...nnotations/annotations/InstanceState.java b/...nnotations/annotations/InstanceState.java → ...nnotations/annotations/InstanceState.java
diff --git a/...oidannotations/annotations/ItemClick.java → ...oidannotations/annotations/ItemClick.java b/...oidannotations/annotations/ItemClick.java → ...oidannotations/annotations/ItemClick.java
diff --git a/...nnotations/annotations/ItemLongClick.java → ...nnotations/annotations/ItemLongClick.java b/...nnotations/annotations/ItemLongClick.java → ...nnotations/annotations/ItemLongClick.java
diff --git a/...idannotations/annotations/ItemSelect.java → ...idannotations/annotations/ItemSelect.java b/...idannotations/annotations/ItemSelect.java → ...idannotations/annotations/ItemSelect.java
diff --git a/...oidannotations/annotations/LongClick.java → ...oidannotations/annotations/LongClick.java b/...oidannotations/annotations/LongClick.java → ...oidannotations/annotations/LongClick.java
diff --git a/...droidannotations/annotations/NoTitle.java → ...droidannotations/annotations/NoTitle.java b/...droidannotations/annotations/NoTitle.java → ...droidannotations/annotations/NoTitle.java
diff --git a/...annotations/NonConfigurationInstance.java → ...annotations/NonConfigurationInstance.java b/...annotations/NonConfigurationInstance.java → ...annotations/NonConfigurationInstance.java
diff --git a/...tations/annotations/OnActivityResult.java → ...tations/annotations/OnActivityResult.java b/...tations/annotations/OnActivityResult.java → ...tations/annotations/OnActivityResult.java
diff --git a/...dannotations/annotations/OptionsItem.java → ...dannotations/annotations/OptionsItem.java b/...dannotations/annotations/OptionsItem.java → ...dannotations/annotations/OptionsItem.java
diff --git a/...dannotations/annotations/OptionsMenu.java → ...dannotations/annotations/OptionsMenu.java b/...dannotations/annotations/OptionsMenu.java → ...dannotations/annotations/OptionsMenu.java
diff --git a/...idannotations/annotations/OrmLiteDao.java → ...idannotations/annotations/OrmLiteDao.java b/...idannotations/annotations/OrmLiteDao.java → ...idannotations/annotations/OrmLiteDao.java
diff --git a/...androidannotations/annotations/ResId.java → ...androidannotations/annotations/ResId.java b/...androidannotations/annotations/ResId.java → ...androidannotations/annotations/ResId.java
diff --git a/...oidannotations/annotations/RoboGuice.java → ...oidannotations/annotations/RoboGuice.java b/...oidannotations/annotations/RoboGuice.java → ...oidannotations/annotations/RoboGuice.java
diff --git a/...dannotations/annotations/RootContext.java → ...dannotations/annotations/RootContext.java b/...dannotations/annotations/RootContext.java → ...dannotations/annotations/RootContext.java
diff --git a/...ns/annotations/SeekBarProgressChange.java → ...ns/annotations/SeekBarProgressChange.java b/...ns/annotations/SeekBarProgressChange.java → ...ns/annotations/SeekBarProgressChange.java
diff --git a/...ations/annotations/SeekBarTouchStart.java → ...ations/annotations/SeekBarTouchStart.java b/...ations/annotations/SeekBarTouchStart.java → ...ations/annotations/SeekBarTouchStart.java
diff --git a/...tations/annotations/SeekBarTouchStop.java → ...tations/annotations/SeekBarTouchStop.java b/...tations/annotations/SeekBarTouchStop.java → ...tations/annotations/SeekBarTouchStop.java
diff --git a/...nnotations/annotations/SystemService.java → ...nnotations/annotations/SystemService.java b/...nnotations/annotations/SystemService.java → ...nnotations/annotations/SystemService.java
diff --git a/...idannotations/annotations/TextChange.java → ...idannotations/annotations/TextChange.java b/...idannotations/annotations/TextChange.java → ...idannotations/annotations/TextChange.java
diff --git a/...androidannotations/annotations/Touch.java → ...androidannotations/annotations/Touch.java b/...androidannotations/annotations/Touch.java → ...androidannotations/annotations/Touch.java
diff --git a/...androidannotations/annotations/Trace.java → ...androidannotations/annotations/Trace.java b/...androidannotations/annotations/Trace.java → ...androidannotations/annotations/Trace.java
diff --git a/...nnotations/annotations/Transactional.java → ...nnotations/annotations/Transactional.java b/...nnotations/annotations/Transactional.java → ...nnotations/annotations/Transactional.java
diff --git a/...roidannotations/annotations/UiThread.java → ...roidannotations/annotations/UiThread.java b/...roidannotations/annotations/UiThread.java → ...roidannotations/annotations/UiThread.java
diff --git a/...roidannotations/annotations/ViewById.java → ...roidannotations/annotations/ViewById.java b/...roidannotations/annotations/ViewById.java → ...roidannotations/annotations/ViewById.java
diff --git a/...tations/annotations/res/AnimationRes.java → ...tations/annotations/res/AnimationRes.java b/...tations/annotations/res/AnimationRes.java → ...tations/annotations/res/AnimationRes.java
diff --git a/...notations/annotations/res/BooleanRes.java → ...notations/annotations/res/BooleanRes.java b/...notations/annotations/res/BooleanRes.java → ...notations/annotations/res/BooleanRes.java
diff --git a/...annotations/annotations/res/ColorRes.java → ...annotations/annotations/res/ColorRes.java b/...annotations/annotations/res/ColorRes.java → ...annotations/annotations/res/ColorRes.java
diff --git a/...ns/annotations/res/ColorStateListRes.java → ...ns/annotations/res/ColorStateListRes.java b/...ns/annotations/res/ColorStateListRes.java → ...ns/annotations/res/ColorStateListRes.java
diff --git a/...otations/res/DimensionPixelOffsetRes.java → ...otations/res/DimensionPixelOffsetRes.java b/...otations/res/DimensionPixelOffsetRes.java → ...otations/res/DimensionPixelOffsetRes.java
diff --git a/...nnotations/res/DimensionPixelSizeRes.java → ...nnotations/res/DimensionPixelSizeRes.java b/...nnotations/res/DimensionPixelSizeRes.java → ...nnotations/res/DimensionPixelSizeRes.java
diff --git a/...tations/annotations/res/DimensionRes.java → ...tations/annotations/res/DimensionRes.java b/...tations/annotations/res/DimensionRes.java → ...tations/annotations/res/DimensionRes.java
diff --git a/...otations/annotations/res/DrawableRes.java → ...otations/annotations/res/DrawableRes.java b/...otations/annotations/res/DrawableRes.java → ...otations/annotations/res/DrawableRes.java
diff --git a/...dannotations/annotations/res/HtmlRes.java → ...dannotations/annotations/res/HtmlRes.java b/...dannotations/annotations/res/HtmlRes.java → ...dannotations/annotations/res/HtmlRes.java
diff --git a/...otations/annotations/res/IntArrayRes.java → ...otations/annotations/res/IntArrayRes.java b/...otations/annotations/res/IntArrayRes.java → ...otations/annotations/res/IntArrayRes.java
diff --git a/...notations/annotations/res/IntegerRes.java → ...notations/annotations/res/IntegerRes.java b/...notations/annotations/res/IntegerRes.java → ...notations/annotations/res/IntegerRes.java
diff --git a/...nnotations/annotations/res/LayoutRes.java → ...nnotations/annotations/res/LayoutRes.java b/...nnotations/annotations/res/LayoutRes.java → ...nnotations/annotations/res/LayoutRes.java
diff --git a/...annotations/annotations/res/MovieRes.java → ...annotations/annotations/res/MovieRes.java b/...annotations/annotations/res/MovieRes.java → ...annotations/annotations/res/MovieRes.java
diff --git a/...tions/annotations/res/StringArrayRes.java → ...tions/annotations/res/StringArrayRes.java b/...tions/annotations/res/StringArrayRes.java → ...tions/annotations/res/StringArrayRes.java
diff --git a/...nnotations/annotations/res/StringRes.java → ...nnotations/annotations/res/StringRes.java b/...nnotations/annotations/res/StringRes.java → ...nnotations/annotations/res/StringRes.java
diff --git a/...tations/annotations/res/TextArrayRes.java → ...tations/annotations/res/TextArrayRes.java b/...tations/annotations/res/TextArrayRes.java → ...tations/annotations/res/TextArrayRes.java
diff --git a/...dannotations/annotations/res/TextRes.java → ...dannotations/annotations/res/TextRes.java b/...dannotations/annotations/res/TextRes.java → ...dannotations/annotations/res/TextRes.java
diff --git a/...dannotations/annotations/rest/Accept.java → ...dannotations/annotations/rest/Accept.java b/...dannotations/annotations/rest/Accept.java → ...dannotations/annotations/rest/Accept.java
diff --git a/...dannotations/annotations/rest/Delete.java → ...dannotations/annotations/rest/Delete.java b/...dannotations/annotations/rest/Delete.java → ...dannotations/annotations/rest/Delete.java
diff --git a/...roidannotations/annotations/rest/Get.java → ...roidannotations/annotations/rest/Get.java b/...roidannotations/annotations/rest/Get.java → ...roidannotations/annotations/rest/Get.java
diff --git a/...oidannotations/annotations/rest/Head.java → ...oidannotations/annotations/rest/Head.java b/...oidannotations/annotations/rest/Head.java → ...oidannotations/annotations/rest/Head.java
diff --git a/...annotations/annotations/rest/Options.java → ...annotations/annotations/rest/Options.java b/...annotations/annotations/rest/Options.java → ...annotations/annotations/rest/Options.java
diff --git a/...oidannotations/annotations/rest/Post.java → ...oidannotations/annotations/rest/Post.java b/...oidannotations/annotations/rest/Post.java → ...oidannotations/annotations/rest/Post.java
diff --git a/...roidannotations/annotations/rest/Put.java → ...roidannotations/annotations/rest/Put.java b/...roidannotations/annotations/rest/Put.java → ...roidannotations/annotations/rest/Put.java
diff --git a/...oidannotations/annotations/rest/Rest.java → ...oidannotations/annotations/rest/Rest.java b/...oidannotations/annotations/rest/Rest.java → ...oidannotations/annotations/rest/Rest.java
diff --git a/...tations/annotations/rest/RestService.java → ...tations/annotations/rest/RestService.java b/...tations/annotations/rest/RestService.java → ...tations/annotations/rest/RestService.java
diff --git a/...ons/sharedpreferences/DefaultBoolean.java → ...ons/sharedpreferences/DefaultBoolean.java b/...ons/sharedpreferences/DefaultBoolean.java → ...ons/sharedpreferences/DefaultBoolean.java
diff --git a/...tions/sharedpreferences/DefaultFloat.java → ...tions/sharedpreferences/DefaultFloat.java b/...tions/sharedpreferences/DefaultFloat.java → ...tions/sharedpreferences/DefaultFloat.java
diff --git a/...tations/sharedpreferences/DefaultInt.java → ...tations/sharedpreferences/DefaultInt.java b/...tations/sharedpreferences/DefaultInt.java → ...tations/sharedpreferences/DefaultInt.java
diff --git a/...ations/sharedpreferences/DefaultLong.java → ...ations/sharedpreferences/DefaultLong.java b/...ations/sharedpreferences/DefaultLong.java → ...ations/sharedpreferences/DefaultLong.java
diff --git a/...ions/sharedpreferences/DefaultString.java → ...ions/sharedpreferences/DefaultString.java b/...ions/sharedpreferences/DefaultString.java → ...ions/sharedpreferences/DefaultString.java
diff --git a/...s/annotations/sharedpreferences/Pref.java → ...s/annotations/sharedpreferences/Pref.java b/...s/annotations/sharedpreferences/Pref.java → ...s/annotations/sharedpreferences/Pref.java
diff --git a/...tations/sharedpreferences/SharedPref.java → ...tations/sharedpreferences/SharedPref.java b/...tations/sharedpreferences/SharedPref.java → ...tations/sharedpreferences/SharedPref.java
diff --git a/...idannotations/api/BackgroundExecutor.java → ...idannotations/api/BackgroundExecutor.java b/...idannotations/api/BackgroundExecutor.java → ...idannotations/api/BackgroundExecutor.java
diff --git a/...glecode/androidannotations/api/Scope.java → ...glecode/androidannotations/api/Scope.java b/...glecode/androidannotations/api/Scope.java → ...glecode/androidannotations/api/Scope.java
diff --git a/...roidannotations/api/SdkVersionHelper.java → ...roidannotations/api/SdkVersionHelper.java b/...roidannotations/api/SdkVersionHelper.java → ...roidannotations/api/SdkVersionHelper.java
diff --git a/...ndroidannotations/api/rest/MediaType.java → ...ndroidannotations/api/rest/MediaType.java b/...ndroidannotations/api/rest/MediaType.java → ...ndroidannotations/api/rest/MediaType.java
diff --git a/...dpreferences/AbstractPrefEditorField.java → ...dpreferences/AbstractPrefEditorField.java b/...dpreferences/AbstractPrefEditorField.java → ...dpreferences/AbstractPrefEditorField.java
diff --git a/.../sharedpreferences/AbstractPrefField.java → .../sharedpreferences/AbstractPrefField.java b/.../sharedpreferences/AbstractPrefField.java → .../sharedpreferences/AbstractPrefField.java
diff --git a/...edpreferences/BooleanPrefEditorField.java → ...edpreferences/BooleanPrefEditorField.java b/...edpreferences/BooleanPrefEditorField.java → ...edpreferences/BooleanPrefEditorField.java
diff --git a/...i/sharedpreferences/BooleanPrefField.java → ...i/sharedpreferences/BooleanPrefField.java b/...i/sharedpreferences/BooleanPrefField.java → ...i/sharedpreferences/BooleanPrefField.java
diff --git a/...s/api/sharedpreferences/EditorHelper.java → ...s/api/sharedpreferences/EditorHelper.java b/...s/api/sharedpreferences/EditorHelper.java → ...s/api/sharedpreferences/EditorHelper.java
diff --git a/...aredpreferences/FloatPrefEditorField.java → ...aredpreferences/FloatPrefEditorField.java b/...aredpreferences/FloatPrefEditorField.java → ...aredpreferences/FloatPrefEditorField.java
diff --git a/...api/sharedpreferences/FloatPrefField.java → ...api/sharedpreferences/FloatPrefField.java b/...api/sharedpreferences/FloatPrefField.java → ...api/sharedpreferences/FloatPrefField.java
diff --git a/...sharedpreferences/IntPrefEditorField.java → ...sharedpreferences/IntPrefEditorField.java b/...sharedpreferences/IntPrefEditorField.java → ...sharedpreferences/IntPrefEditorField.java
diff --git a/...s/api/sharedpreferences/IntPrefField.java → ...s/api/sharedpreferences/IntPrefField.java b/...s/api/sharedpreferences/IntPrefField.java → ...s/api/sharedpreferences/IntPrefField.java
diff --git a/...haredpreferences/LongPrefEditorField.java → ...haredpreferences/LongPrefEditorField.java b/...haredpreferences/LongPrefEditorField.java → ...haredpreferences/LongPrefEditorField.java
diff --git a/.../api/sharedpreferences/LongPrefField.java → .../api/sharedpreferences/LongPrefField.java b/.../api/sharedpreferences/LongPrefField.java → .../api/sharedpreferences/LongPrefField.java
diff --git a/...dpreferences/SharedPreferencesCompat.java → ...dpreferences/SharedPreferencesCompat.java b/...dpreferences/SharedPreferencesCompat.java → ...dpreferences/SharedPreferencesCompat.java
diff --git a/...dpreferences/SharedPreferencesHelper.java → ...dpreferences/SharedPreferencesHelper.java b/...dpreferences/SharedPreferencesHelper.java → ...dpreferences/SharedPreferencesHelper.java
diff --git a/...redpreferences/StringPrefEditorField.java → ...redpreferences/StringPrefEditorField.java b/...redpreferences/StringPrefEditorField.java → ...redpreferences/StringPrefEditorField.java
diff --git a/...pi/sharedpreferences/StringPrefField.java → ...pi/sharedpreferences/StringPrefField.java b/...pi/sharedpreferences/StringPrefField.java → ...pi/sharedpreferences/StringPrefField.java
diff --git a/AndroidAnnotations/androidannotations-bundle/pom.xml b/AndroidAnnotations/androidannotations-bundle/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>androidannotations-parent</artifactId>
+		<groupId>com.googlecode.androidannotations</groupId>
+		<version>2.7-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-bundle</artifactId>
+	<description>Project generating the standalone AndroidAnnotations Zip</description>
+	<name>AndroidAnnotations Bundle</name>
+	<packaging>pom</packaging>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>com.googlecode.androidannotations</groupId>
+			<artifactId>androidannotations-with-codemodel</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.googlecode.androidannotations</groupId>
+			<artifactId>androidannotations-api</artifactId>
+			<classifier>javadoc</classifier>
+		</dependency>
+		<dependency>
+			<groupId>com.googlecode.androidannotations</groupId>
+			<artifactId>androidannotations-api</artifactId>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>com.googlecode.androidannotations</groupId>
+			<artifactId>androidannotations</artifactId>
+			<classifier>javadoc</classifier>
+		</dependency>
+		<dependency>
+			<groupId>com.googlecode.androidannotations</groupId>
+			<artifactId>androidannotations</artifactId>
+			<classifier>sources</classifier>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/main/assembly/bundle.xml</descriptor>
+					</descriptors>	
+					<finalName>${project.build.finalName}</finalName>
+					<appendAssemblyId>false</appendAssemblyId>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-bundle/src/main/assembly/bundle.xml b/AndroidAnnotations/androidannotations-bundle/src/main/assembly/bundle.xml
@@ -0,0 +1,78 @@
+<!--
+
+    Copyright (C) 2010-2012 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>androidannotations-bundle</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<dependencySets>
+	    <dependencySet>
+	    	<useProjectArtifact>false</useProjectArtifact>
+	        <includes>
+	            <include>com.googlecode.androidannotations:androidannotations-api</include>
+	        </includes>
+	        <excludes>
+	        	<exclude>com.googlecode.androidannotations:androidannotations-api:*:javadoc</exclude>
+	        	<exclude>com.googlecode.androidannotations:androidannotations-api:*:sources</exclude>
+	        </excludes>
+	    </dependencySet>
+	    <dependencySet>
+	    	<useProjectArtifact>false</useProjectArtifact>
+	        <includes>
+	            <include>com.googlecode.androidannotations:androidannotations-with-codemodel</include>
+	        </includes>
+	        <outputFileNameMapping>androidannotations-${artifact.version}.jar</outputFileNameMapping>
+	    </dependencySet>
+		<dependencySet>
+			<useProjectArtifact>false</useProjectArtifact>
+			<outputDirectory>javadoc</outputDirectory>
+	        <includes>
+	            <include>com.googlecode.androidannotations:androidannotations-api:*:javadoc</include>
+	            <include>com.googlecode.androidannotations:androidannotations:*:javadoc</include>
+	        </includes>
+		</dependencySet>
+		<dependencySet>
+			<useProjectArtifact>false</useProjectArtifact>
+			<outputDirectory>sources</outputDirectory>
+	        <includes>
+	            <include>com.googlecode.androidannotations:androidannotations-api:*:sources</include>
+	            <include>com.googlecode.androidannotations:androidannotations:*:sources</include>
+	        </includes>
+		</dependencySet>
+	</dependencySets>
+	<fileSets>
+		<fileSet>
+			<directory>${project.basedir}/../../</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>LICENSE.txt</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/../src/etc</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>LICENSE.txt</include>
+				<include>HOW-TO.txt</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+</assembly>
diff --git a/AndroidAnnotations/androidannotations-with-codemodel/pom.xml b/AndroidAnnotations/androidannotations-with-codemodel/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>androidannotations-parent</artifactId>
+		<groupId>com.googlecode.androidannotations</groupId>
+		<version>2.7-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-with-codemodel</artifactId>
+	<description>Project generating the annotation processing jar with CodeModel dependency included</description>
+	<name>AndroidAnnotations With CodeModel</name>
+	<packaging>pom</packaging>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>com.googlecode.androidannotations</groupId>
+			<artifactId>androidannotations</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/main/assembly/jar-with-codemodel.xml</descriptor>
+					</descriptors>	
+					<finalName>${project.build.finalName}</finalName>
+					<appendAssemblyId>false</appendAssemblyId>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/...oidAnnotations/androidannotations-with-codemodel/src/main/assembly/jar-with-codemodel.xml b/...oidAnnotations/androidannotations-with-codemodel/src/main/assembly/jar-with-codemodel.xml
@@ -0,0 +1,39 @@
+<!--
+
+    Copyright (C) 2010-2012 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>jar-with-codemodel</id>
+	<formats>
+		<format>jar</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<dependencySets>
+		<dependencySet>
+			<unpack>true</unpack>
+			<outputDirectory>/</outputDirectory>
+			<useProjectArtifact>false</useProjectArtifact>
+			<includes>
+				<include>com.sun.codemodel:codemodel</include>
+				<include>com.googlecode.androidannotations:androidannotations</include>
+				<include>com.googlecode.androidannotations:androidannotations-api</include>
+			</includes>
+		</dependencySet>	
+	</dependencySets>
+</assembly>