sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1480634 - in /sis/branches/JDK6: ./ 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/ma...
Date Thu, 09 May 2013 13:49:46 GMT
Author: desruisseaux
Date: Thu May  9 13:49:46 2013
New Revision: 1480634

URL: http://svn.apache.org/r1480634
Log:
Merge from the JDK7 branch.

Added:
    sis/branches/JDK6/core/sis-metadata/src/main/javadoc/
      - copied from r1480633, sis/branches/JDK7/core/sis-metadata/src/main/javadoc/
    sis/branches/JDK6/core/sis-referencing/src/main/javadoc/
      - copied from r1480633, sis/branches/JDK7/core/sis-referencing/src/main/javadoc/
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/PlatformDependent.java
      - copied unchanged from r1480633, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/PlatformDependent.java
    sis/branches/JDK6/core/src/
      - copied from r1480633, sis/branches/JDK7/core/src/
Removed:
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/PlatformDependentTest.java
Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/application/pom.xml
    sis/branches/JDK6/core/pom.xml
    sis/branches/JDK6/core/sis-build-helper/src/main/javadoc/stylesheet.css
    sis/branches/JDK6/core/sis-build-helper/src/site/resources/css/site.css
    sis/branches/JDK6/core/sis-utility/src/main/javadoc/stylesheet.css
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
    sis/branches/JDK6/pom.xml
    sis/branches/JDK6/storage/pom.xml

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1480606-1480633

Modified: sis/branches/JDK6/application/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/application/pom.xml?rev=1480634&r1=1480633&r2=1480634&view=diff
==============================================================================
--- sis/branches/JDK6/application/pom.xml (original)
+++ sis/branches/JDK6/application/pom.xml Thu May  9 13:49:46 2013
@@ -27,7 +27,7 @@
 
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>sis-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>0.3-jdk6-SNAPSHOT</version>
   </parent>
 

Modified: sis/branches/JDK6/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/pom.xml?rev=1480634&r1=1480633&r2=1480634&view=diff
==============================================================================
--- sis/branches/JDK6/core/pom.xml (original)
+++ sis/branches/JDK6/core/pom.xml Thu May  9 13:49:46 2013
@@ -27,7 +27,7 @@
 
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>sis-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>0.3-jdk6-SNAPSHOT</version>
   </parent>
 

Modified: sis/branches/JDK6/core/sis-build-helper/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/javadoc/stylesheet.css?rev=1480634&r1=1480633&r2=1480634&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/javadoc/stylesheet.css (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/javadoc/stylesheet.css Thu May  9 13:49:46
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/JDK6/core/sis-build-helper/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/site/resources/css/site.css?rev=1480634&r1=1480633&r2=1480634&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/site/resources/css/site.css (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/site/resources/css/site.css Thu May  9 13:49:46
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/JDK6/core/sis-utility/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/javadoc/stylesheet.css?rev=1480634&r1=1480633&r2=1480634&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/javadoc/stylesheet.css (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/javadoc/stylesheet.css Thu May  9 13:49:46
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/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java?rev=1480634&r1=1480633&r2=1480634&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
[UTF-8] Thu May  9 13:49:46 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/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1480634&r1=1480633&r2=1480634&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Thu May  9 13:49:46 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-jdk6-SNAPSHOT</version>
   <packaging>pom</packaging>
 

Modified: sis/branches/JDK6/storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/pom.xml?rev=1480634&r1=1480633&r2=1480634&view=diff
==============================================================================
--- sis/branches/JDK6/storage/pom.xml (original)
+++ sis/branches/JDK6/storage/pom.xml Thu May  9 13:49:46 2013
@@ -27,7 +27,7 @@
 
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>sis-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>0.3-jdk6-SNAPSHOT</version>
   </parent>
 



Mime
View raw message