You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/05/09 15:53:31 UTC
svn commit: r1480639 - in /sis/branches/Android: ./ application/ core/
core/sis-build-helper/src/main/javadoc/
core/sis-build-helper/src/site/resources/css/
core/sis-metadata/src/main/javadoc/ core/sis-referencing/src/main/javadoc/
core/sis-utility/src...
Author: desruisseaux
Date: Thu May 9 13:53:31 2013
New Revision: 1480639
URL: http://svn.apache.org/r1480639
Log:
Merge from trunk.
Added:
sis/branches/Android/core/sis-metadata/src/main/javadoc/
- copied from r1480638, sis/trunk/core/sis-metadata/src/main/javadoc/
sis/branches/Android/core/sis-referencing/src/main/javadoc/
- copied from r1480638, sis/trunk/core/sis-referencing/src/main/javadoc/
sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/test/PlatformDependent.java
- copied unchanged from r1480638, sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/PlatformDependent.java
sis/branches/Android/core/src/
- copied from r1480638, sis/trunk/core/src/
Removed:
sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/test/PlatformDependentTest.java
Modified:
sis/branches/Android/ (props changed)
sis/branches/Android/application/pom.xml
sis/branches/Android/core/pom.xml
sis/branches/Android/core/sis-build-helper/src/main/javadoc/stylesheet.css
sis/branches/Android/core/sis-build-helper/src/site/resources/css/site.css
sis/branches/Android/core/sis-utility/src/main/javadoc/stylesheet.css
sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
sis/branches/Android/pom.xml
sis/branches/Android/storage/pom.xml
Propchange: sis/branches/Android/
------------------------------------------------------------------------------
Merged /sis/trunk:r1480622-1480638
Merged /sis/branches/JDK7:r1480606-1480633
Merged /sis/branches/JDK6:r1480613-1480634
Modified: sis/branches/Android/application/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/pom.xml?rev=1480639&r1=1480638&r2=1480639&view=diff
==============================================================================
--- sis/branches/Android/application/pom.xml (original)
+++ sis/branches/Android/application/pom.xml Thu May 9 13:53:31 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
+ <artifactId>parent</artifactId>
<version>0.3-android-SNAPSHOT</version>
</parent>
Modified: sis/branches/Android/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/pom.xml?rev=1480639&r1=1480638&r2=1480639&view=diff
==============================================================================
--- sis/branches/Android/core/pom.xml (original)
+++ sis/branches/Android/core/pom.xml Thu May 9 13:53:31 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
+ <artifactId>parent</artifactId>
<version>0.3-android-SNAPSHOT</version>
</parent>
Modified: sis/branches/Android/core/sis-build-helper/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-build-helper/src/main/javadoc/stylesheet.css?rev=1480639&r1=1480638&r2=1480639&view=diff
==============================================================================
--- sis/branches/Android/core/sis-build-helper/src/main/javadoc/stylesheet.css (original)
+++ sis/branches/Android/core/sis-build-helper/src/main/javadoc/stylesheet.css Thu May 9 13:53:31 2013
@@ -1 +1 @@
-link ../../../../src/main/javadoc/stylesheet.css
\ No newline at end of file
+link ../../../../../src/main/javadoc/stylesheet.css
\ No newline at end of file
Modified: sis/branches/Android/core/sis-build-helper/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-build-helper/src/site/resources/css/site.css?rev=1480639&r1=1480638&r2=1480639&view=diff
==============================================================================
--- sis/branches/Android/core/sis-build-helper/src/site/resources/css/site.css (original)
+++ sis/branches/Android/core/sis-build-helper/src/site/resources/css/site.css Thu May 9 13:53:31 2013
@@ -16,14 +16,14 @@
*/
/*
- * Inherit all the styles from the root site.css,
+ * Inherit all the styles from the parent site.css,
* with only the URL to the images modified.
*/
@import url("../../css/site.css");
h2 {
- background: url(../../images/h2.png) repeat-x;
+ background: url(../../../images/h2.png) repeat-x;
}
#breadcrumbs {
- background: url(../../images/bar.png) repeat-x;
+ background: url(../../../images/bar.png) repeat-x;
}
Modified: sis/branches/Android/core/sis-utility/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-utility/src/main/javadoc/stylesheet.css?rev=1480639&r1=1480638&r2=1480639&view=diff
==============================================================================
--- sis/branches/Android/core/sis-utility/src/main/javadoc/stylesheet.css (original)
+++ sis/branches/Android/core/sis-utility/src/main/javadoc/stylesheet.css Thu May 9 13:53:31 2013
@@ -1 +1 @@
-link ../../../../src/main/javadoc/stylesheet.css
\ No newline at end of file
+link ../../../../../src/main/javadoc/stylesheet.css
\ No newline at end of file
Modified: sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java?rev=1480639&r1=1480638&r2=1480639&view=diff
==============================================================================
--- sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java [UTF-8] (original)
+++ sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java [UTF-8] Thu May 9 13:53:31 2013
@@ -25,7 +25,7 @@ import org.apache.sis.math.FunctionPrope
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.util.UnconvertibleObjectException;
-import org.apache.sis.test.PlatformDependentTest;
+import org.apache.sis.test.PlatformDependent;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
@@ -83,7 +83,7 @@ public final strictfp class PathConverte
* @throws URISyntaxException Should never happen.
*/
@Test
- @PlatformDependentTest
+ @PlatformDependent
public void testFile_URI() throws URISyntaxException {
assumeUnixRoot();
final ObjectConverter<File,URI> c = PathConverter.FileURI.INSTANCE;
@@ -97,7 +97,7 @@ public final strictfp class PathConverte
* @throws MalformedURLException Should never happen.
*/
@Test
- @PlatformDependentTest
+ @PlatformDependent
public void testFile_URL() throws MalformedURLException {
assumeUnixRoot();
final ObjectConverter<File,URL> c = PathConverter.FileURL.INSTANCE;
@@ -136,7 +136,7 @@ public final strictfp class PathConverte
* @throws URISyntaxException Should never happen.
*/
@Test
- @PlatformDependentTest
+ @PlatformDependent
public void testURI_File() throws URISyntaxException {
PathConverterTest.assumeUnixRoot();
final ObjectConverter<URI,File> c = PathConverter.URIFile.INSTANCE;
@@ -175,7 +175,7 @@ public final strictfp class PathConverte
* @throws MalformedURLException Should never happen.
*/
@Test
- @PlatformDependentTest
+ @PlatformDependent
public void testURL_File() throws MalformedURLException {
PathConverterTest.assumeUnixRoot();
final ObjectConverter<URL,File> c = PathConverter.URLFile.INSTANCE;
Modified: sis/branches/Android/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/pom.xml?rev=1480639&r1=1480638&r2=1480639&view=diff
==============================================================================
--- sis/branches/Android/pom.xml (original)
+++ sis/branches/Android/pom.xml Thu May 9 13:53:31 2013
@@ -38,7 +38,7 @@
elements are inherited from the parent Apache pom.xml.
============================================================== -->
<groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
+ <artifactId>parent</artifactId>
<version>0.3-android-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: sis/branches/Android/storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/storage/pom.xml?rev=1480639&r1=1480638&r2=1480639&view=diff
==============================================================================
--- sis/branches/Android/storage/pom.xml (original)
+++ sis/branches/Android/storage/pom.xml Thu May 9 13:53:31 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
+ <artifactId>parent</artifactId>
<version>0.3-android-SNAPSHOT</version>
</parent>