Author: desruisseaux
Date: Fri Jun 28 20:28:41 2013
New Revision: 1497911
URL: http://svn.apache.org/r1497911
Log:
SVN merge info, and post-merge fix.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/trunk:r1496982-1497864
Merged /sis/branches/JDK6:r1496996-1497869
Modified:
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java?rev=1497911&r1=1497910&r2=1497911&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
[UTF-8] Fri Jun 28 20:28:41 2013
@@ -75,10 +75,13 @@ public final class SourceRepositoryURL e
*/
@Override
public String toString(final Tag tag) {
- final StringBuilder url = new
StringBuilder("https://svn.apache.org/repos/asf/sis/branches/JDK7");
+ final StringBuilder url = new
StringBuilder("http://svn.apache.org/repos/asf/sis/branches/JDK7");
final String keyword = tag.text();
switch (keyword) {
- case "gmd-data":
url.append("/core/sis-metadata/src/test/resources/org/apache/sis/xml"); break;
+ case "gmd-data": {
+
url.append("/core/sis-metadata/src/test/resources/org/apache/sis/xml");
+ break;
+ }
default: {
ConfigurationImpl.getInstance().root.printWarning(tag.position(), "Unknown
keyword: " + keyword);
break;