Skip to content

Commit

Permalink
update URLs pointing to www.bottlecaps.de
Browse files Browse the repository at this point in the history
  • Loading branch information
GuntherRademacher committed Jan 2, 2024
1 parent 179c1d2 commit cd7432f
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 14 deletions.
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
plugins {
id 'java'
id 'war'
id 'com.github.jk1.dependency-license-report' version '1.16'
id 'com.github.jk1.dependency-license-report' version '2.5'
id 'maven-publish'
id 'signing'
}
Expand All @@ -16,7 +16,7 @@ build.dependsOn 'distZip'
version = '2.1-SNAPSHOT'
group = 'de.bottlecaps.rr'
def buildTime = new Date()
def aceVersion = '1.15.2'
def aceVersion = '1.32.3'

def generatedSrc = "$buildDir/generated-src/main"

Expand All @@ -42,12 +42,12 @@ configurations {
dependencies {
ace "org.webjars.npm:ace-builds:$aceVersion"

compileOnly 'org.apache.tomcat:tomcat-servlet-api:8.5.87'
compileOnly 'org.apache.tomcat:tomcat-servlet-api:8.5.97'

implementation 'net.sf.saxon:Saxon-HE:12.0'
implementation 'org.xmlresolver:xmlresolver:4.6.0'
implementation 'net.sf.saxon:Saxon-HE:12.4'
implementation 'org.xmlresolver:xmlresolver:5.2.2'
implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
implementation 'org.apache.xmlgraphics:batik-all:1.16'
implementation 'org.apache.xmlgraphics:batik-all:1.17'
implementation 'xml-apis:xml-apis-ext:1.3.04'
implementation 'org.apache.xmlgraphics:xmlgraphics-commons:2.8'
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/de/bottlecaps/railroad/Railroad.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

public class Railroad
{
private static final String RR_URL = "https://bottlecaps.de/" + RailroadVersion.PROJECT_NAME;
private static final String COLOR_PATTERN = "#[0-9a-fA-F]{6}";
private static final String INTEGER_PATTERN = "[0-9]+";
private static final int DEFAULT_PORT = 8080;
Expand Down Expand Up @@ -264,7 +263,7 @@ public static void usage(PrintStream out, final String file)
out.println();
out.println(" version " + RailroadVersion.VERSION);
out.println(" released " + RailroadVersion.DATE);
out.println(" from " + RR_URL);
out.println(" from " + RailroadGenerator.RR_URL);
out.println();
out.println("Usage: java " + jar + file + " {OPTION}... GRAMMAR");
out.println(" or java " + jar + file + " -gui [-port:PORT]");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

public class RailroadGenerator
{
public static final String RR_URL = "https://bottlecaps.de/" + RailroadVersion.PROJECT_NAME;
public static final String RR_URL = "https://www.bottlecaps.de/" + RailroadVersion.PROJECT_NAME;

public enum TextFormat
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/bottlecaps/railroad/core/FontWidth.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
! (2) put the result, a comma-separated list of integers, in file
! Normal.java.compress
!
! (3) run 'Generate' of http://bottlecaps.de/rex on that file, without any
! (3) run 'Generate' of https://www.bottlecaps.de/rex on that file, without any
! command line options. This results in Normal.java
!
! (4) adapt package name in Normal.java manually
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ declare function d:rewrite-to-md($nodes as node()*, $img-format as xs:string, $i
$img-link,
" <sup>generated by [RR - Railroad Diagram Generator][RR]</sup>&#xA;",
"&#xA;",
"[RR]: http://bottlecaps.de/rr/ui"
"[RR]: https://www.bottlecaps.de/rr/ui"
)
else
(
Expand Down

6 comments on commit cd7432f

@mingodad
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The domain/web https://www.bottlecaps.de/rr/ui seems to be down for a while now.

@GuntherRademacher
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://bottlecaps.de (without the www) is down for the time being, but https://www.bottlecaps.de/rr/ui is up, however it is and will be IPv6-only in the future. You might want to check your connectivity using e.g. https://test-ipv6.com/.

@mingodad
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for reply !
It seems that I have no IPV6 capability somewhere between me and https://www.bottlecaps.de/rr/ui

@mingodad
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't we have a redirection page from the older domain/web/ipv4 explaining what's happening so the visitor can take some action ?

@mingodad
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've done a lot of work showing several projects/people about this project and how to use it and all point to https://www.bottlecaps.de/rr/ui and now they are all invalid.

See by yourself with this github search https://github.com/search?q=railroad&type=issues .

@GuntherRademacher
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are talking about a private server. It's connection was forced to go IPv6-only, but this does not mean invalid or down.

Currently the base domain is not usable. I am striving for getting it back to work. I can't tell whether or when this will happen, but when I succeed, it will be IPv6-only as well.

As far as I can see, the links that you have spread all use the www subdomain, so they are fine.

OK, it is somehow sad that the state of connectivity is incomplete even after 25 years of IPv6. But that's how it is.

Please sign in to comment.