Skip to content

Commit 42c65e7

Browse files
DaySDayS
committed
Merge branch 'develop' into dhleong-475_Add_Missing_Rest_Authentication
Conflicts: AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/DeleteProcessor.java
2 parents d1c95a8 + 9a6c878 commit 42c65e7

55 files changed

Lines changed: 1476 additions & 179 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AndroidAnnotations/androidannotations-api/build.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#
1616

1717
source.. = src/main/java/,\
18+
src/main/resources/,\
1819
src/test/java/,\
1920
src/main/eclipse/
2021
bin.includes = META-INF/,\

‎AndroidAnnotations/androidannotations-api/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
<target>1.6</target>
4444
</configuration>
4545
</plugin>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-resources-plugin</artifactId>
49+
</plugin>
4650
<plugin>
4751
<artifactId>maven-javadoc-plugin</artifactId>
4852
<executions>
@@ -66,6 +70,16 @@
6670
</executions>
6771
</plugin>
6872
</plugins>
73+
74+
<resources>
75+
<resource>
76+
<directory>src/main/resources</directory>
77+
<filtering>true</filtering>
78+
<includes>
79+
<include>**/*.properties</include>
80+
</includes>
81+
</resource>
82+
</resources>
6983
</build>
7084

7185
</project>

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EIntentService.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/**
2+
* Copyright (C) 2010-2013 eBusiness Information, Excilys Group
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed To in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
package org.androidannotations.annotations;
17+
18+
import java.lang.annotation.ElementType;
19+
import java.lang.annotation.Retention;
20+
import java.lang.annotation.RetentionPolicy;
21+
import java.lang.annotation.Target;
22+
23+
/**
24+
* Use this annotation to enhance an Android IntentService
25+
*/
26+
@Retention(RetentionPolicy.CLASS)
27+
@Target(ElementType.TYPE)
28+
public @interface EIntentService {
29+
}

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ServiceAction.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/**
2+
* Copyright (C) 2010-2013 eBusiness Information, Excilys Group
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed To in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
package org.androidannotations.annotations;
17+
18+
import java.lang.annotation.ElementType;
19+
import java.lang.annotation.Retention;
20+
import java.lang.annotation.RetentionPolicy;
21+
import java.lang.annotation.Target;
22+
23+
import android.app.IntentService;
24+
25+
/**
26+
* Should be used on a method that must respond to a specific action in an
27+
* enhanced {@link IntentService}. The method name will be used as action name
28+
* unless the {@link #value()} field is set.
29+
* <p/ >
30+
* The method signature (with attributes) will be a part of the IntentBuilder
31+
* generated for the {@link EIntentService}.
32+
*/
33+
@Retention(RetentionPolicy.CLASS)
34+
@Target(ElementType.METHOD)
35+
public @interface ServiceAction {
36+
37+
/**
38+
* Define the action's name. If this field isn't set the annotated method
39+
* name will be used.
40+
*/
41+
String value() default "";
42+
43+
}

‎AndroidAnnotations/androidannotations-api/src/main/resources/androidannotations-api.properties‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#
2+
# Copyright (C) 2010-2013 eBusiness Information, Excilys Group
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
# use this file except in compliance with the License. You may obtain a copy of
6+
# the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed To in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
# License for the specific language governing permissions and limitations under
14+
# the License.
15+
#
16+
17+
version=${project.version}

‎AndroidAnnotations/androidannotations/.settings/org.eclipse.core.resources.prefs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ eclipse.preferences.version=1
22
encoding//src/main/java=UTF-8
33
encoding//src/main/java/rebel.xml=UTF-8
44
encoding//src/main/resources=UTF-8
5+
encoding//src/main/resources/androidannotations.properties=utf-8
56
encoding//src/main/resources/rebel.xml=UTF-8
67
encoding//src/test/java=UTF-8
78
encoding//src/test/resources=UTF-8

‎AndroidAnnotations/androidannotations/pom.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,12 @@
7777
</execution>
7878
</executions>
7979
</plugin>
80+
<plugin>
81+
<groupId>org.apache.maven.plugins</groupId>
82+
<artifactId>maven-resources-plugin</artifactId>
83+
</plugin>
8084
</plugins>
85+
8186
<resources>
8287
<resource>
8388
<directory>src/main/resources</directory>
@@ -88,7 +93,14 @@
8893
<resource>
8994
<directory>src/main/java</directory>
9095
<includes>
91-
<include>org/androidannotations/api/**</include>
96+
<include>org/androidannotations/api/**</include>
97+
</includes>
98+
</resource>
99+
<resource>
100+
<directory>src/main/resources</directory>
101+
<filtering>true</filtering>
102+
<includes>
103+
<include>**/*.properties</include>
92104
</includes>
93105
</resource>
94106
</resources>

0 commit comments

Comments
 (0)