Author: desruisseaux
Date: Sun Feb 10 21:48:15 2013
New Revision: 1444619
URL: http://svn.apache.org/r1444619
Log:
Android experimental branch: declare the version number as 0.3-android-SNAPSHOT
and replace OSGi bundles by apklib.
Modified:
sis/branches/Android/pom.xml
sis/branches/Android/sis-app/pom.xml
sis/branches/Android/sis-build-helper/pom.xml
sis/branches/Android/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
sis/branches/Android/sis-metadata/pom.xml
sis/branches/Android/sis-referencing/pom.xml
sis/branches/Android/sis-utility/pom.xml
sis/branches/Android/sis-webapp/pom.xml
sis/branches/Android/src/main/docbook/book.entities
sis/branches/Android/src/site/apt/download.apt
sis/branches/Android/src/site/apt/index.apt
Modified: sis/branches/Android/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/Android/pom.xml?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
--- sis/branches/Android/pom.xml (original)
+++ sis/branches/Android/pom.xml Sun Feb 10 21:48:15 2013
@@ -39,7 +39,7 @@
============================================================== -->
<groupId>org.apache.sis</groupId>
<artifactId>sis-parent</artifactId>
- <version>0.3-geoapi3.0-SNAPSHOT</version>
+ <version>0.3-android-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache SIS</name>
@@ -355,16 +355,16 @@ Apache SIS is a toolkit for describing l
</executions>
</plugin>
- <!-- Package as OSGi bundle -->
+ <!-- Android packaging -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
+ <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+ <artifactId>android-maven-plugin</artifactId>
+ <version>3.5.0</version>
<extensions>true</extensions>
<configuration>
- <instructions>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- </instructions>
+ <sdk>
+ <platform>17</platform>
+ </sdk>
</configuration>
</plugin>
Modified: sis/branches/Android/sis-app/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/Android/sis-app/pom.xml?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
--- sis/branches/Android/sis-app/pom.xml (original)
+++ sis/branches/Android/sis-app/pom.xml Sun Feb 10 21:48:15 2013
@@ -28,11 +28,11 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>sis-parent</artifactId>
- <version>0.3-geoapi3.0-SNAPSHOT</version>
+ <version>0.3-android-SNAPSHOT</version>
</parent>
<artifactId>sis-app</artifactId>
- <packaging>bundle</packaging>
+ <packaging>apklib</packaging>
<name>Apache SIS app</name>
<url>http://incubator.apache.org/sis/</url>
Modified: sis/branches/Android/sis-build-helper/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/Android/sis-build-helper/pom.xml?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
--- sis/branches/Android/sis-build-helper/pom.xml (original)
+++ sis/branches/Android/sis-build-helper/pom.xml Sun Feb 10 21:48:15 2013
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>sis-parent</artifactId>
- <version>0.3-geoapi3.0-SNAPSHOT</version>
+ <version>0.3-android-SNAPSHOT</version>
</parent>
Modified:
sis/branches/Android/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
URL:
http://svn.apache.org/viewvc/sis/branches/Android/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
---
sis/branches/Android/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
(original)
+++
sis/branches/Android/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
Sun Feb 10 21:48:15 2013
@@ -36,7 +36,7 @@ public final class Module implements Tag
/**
* SIS version to be referenced by this taglet.
*/
- private static final String VERSION = "0.3-geoapi3.0-SNAPSHOT";
+ private static final String VERSION = "0.3-android-SNAPSHOT";
/**
* Register this taglet.
Modified: sis/branches/Android/sis-metadata/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/Android/sis-metadata/pom.xml?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
--- sis/branches/Android/sis-metadata/pom.xml (original)
+++ sis/branches/Android/sis-metadata/pom.xml Sun Feb 10 21:48:15 2013
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>sis-parent</artifactId>
- <version>0.3-geoapi3.0-SNAPSHOT</version>
+ <version>0.3-android-SNAPSHOT</version>
</parent>
@@ -36,7 +36,7 @@
Module Description
=========================================================== -->
<artifactId>sis-metadata</artifactId>
- <packaging>bundle</packaging>
+ <packaging>apklib</packaging>
<name>Apache SIS metadata</name>
<description>
<!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
Modified: sis/branches/Android/sis-referencing/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/Android/sis-referencing/pom.xml?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
--- sis/branches/Android/sis-referencing/pom.xml (original)
+++ sis/branches/Android/sis-referencing/pom.xml Sun Feb 10 21:48:15 2013
@@ -28,11 +28,11 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>sis-parent</artifactId>
- <version>0.3-geoapi3.0-SNAPSHOT</version>
+ <version>0.3-android-SNAPSHOT</version>
</parent>
<artifactId>sis-referencing</artifactId>
- <packaging>bundle</packaging>
+ <packaging>apklib</packaging>
<name>Apache SIS referencing</name>
<url>http://incubator.apache.org/sis/</url>
Modified: sis/branches/Android/sis-utility/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/Android/sis-utility/pom.xml?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
--- sis/branches/Android/sis-utility/pom.xml (original)
+++ sis/branches/Android/sis-utility/pom.xml Sun Feb 10 21:48:15 2013
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>sis-parent</artifactId>
- <version>0.3-geoapi3.0-SNAPSHOT</version>
+ <version>0.3-android-SNAPSHOT</version>
</parent>
@@ -36,7 +36,7 @@
Module Description
=========================================================== -->
<artifactId>sis-utility</artifactId>
- <packaging>bundle</packaging>
+ <packaging>apklib</packaging>
<name>Apache SIS utilities</name>
<description>
<!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
@@ -94,42 +94,6 @@ Miscellaneous utilities.
<!-- ===========================================================
- Build configuration
- =========================================================== -->
- <build>
- <plugins>
-
- <!-- Compile properties files into resources UTF files. -->
- <plugin>
- <groupId>org.apache.sis</groupId>
- <artifactId>sis-build-helper</artifactId>
- <version>${sis.plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>compile-resources</goal>
- <!-- The "collect-jars" goal declared in the JDK7 branch is
omitted
- in the JDK6 branch, because much more costly on JDK6
platforms. -->
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- Package as OSGi bundle -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Bundle-Activator>org.apache.sis.internal.util.OSGiActivator</Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
- <!-- ===========================================================
Dependencies
=========================================================== -->
<dependencies>
Modified: sis/branches/Android/sis-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/Android/sis-webapp/pom.xml?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
--- sis/branches/Android/sis-webapp/pom.xml (original)
+++ sis/branches/Android/sis-webapp/pom.xml Sun Feb 10 21:48:15 2013
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>sis-parent</artifactId>
- <version>0.3-geoapi3.0-SNAPSHOT</version>
+ <version>0.3-android-SNAPSHOT</version>
</parent>
<artifactId>sis-webapp</artifactId>
Modified: sis/branches/Android/src/main/docbook/book.entities
URL:
http://svn.apache.org/viewvc/sis/branches/Android/src/main/docbook/book.entities?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
--- sis/branches/Android/src/main/docbook/book.entities (original)
+++ sis/branches/Android/src/main/docbook/book.entities Sun Feb 10 21:48:15 2013
@@ -1,6 +1,6 @@
<!ENTITY geoapi-version "3.0.0">
<!ENTITY geoapi-release "3.0.0">
-<!ENTITY sis-release "0.3-geoapi3.0-SNAPSHOT">
+<!ENTITY sis-release "0.3-android-SNAPSHOT">
<!ENTITY gml-version "3.3">
<!ENTITY sis-javadoc "../apidocs">
<!ENTITY geoapi-javadoc "http://www.geoapi.org/3.0/javadoc";>
Modified: sis/branches/Android/src/site/apt/download.apt
URL:
http://svn.apache.org/viewvc/sis/branches/Android/src/site/apt/download.apt?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
--- sis/branches/Android/src/site/apt/download.apt (original)
+++ sis/branches/Android/src/site/apt/download.apt Sun Feb 10 21:48:15 2013
@@ -31,7 +31,7 @@ Downloading Apache SIS Binaries
+---------------------------------------------------------+
<properties>
- <sis.version>0.3-geoapi3.0-SNAPSHOT</sis.version>
+ <sis.version>0.3-android-SNAPSHOT</sis.version>
</properties>
<dependencies>
Modified: sis/branches/Android/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/sis/branches/Android/src/site/apt/index.apt?rev=1444619&r1=1444618&r2=1444619&view=diff
==============================================================================
--- sis/branches/Android/src/site/apt/index.apt (original)
+++ sis/branches/Android/src/site/apt/index.apt Sun Feb 10 21:48:15 2013
@@ -15,7 +15,7 @@ The Apache SIS⢠library
SIS requires a Java 6 Runtime Environment.
The latest release is <<<0.2-incubating>>>.
- The version under development is <<<0.3-geoapi3.0-SNAPSHOT>>>.
+ The version under development is <<<0.3-android-SNAPSHOT>>>.
* Documentation
