diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index 99dfcd69b8..3da8e2058f 100644 --- a/CODE_OF_CONDUCT.adoc +++ b/CODE_OF_CONDUCT.adoc @@ -42,6 +42,6 @@ appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident. This Code of Conduct is adapted from the -http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available +https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at -http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] +https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 23e43558cb..29be52b5f3 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -25,7 +25,7 @@ Thanks for contributing Spring Roo. -These instructions are aimed at experienced developers looking to *develop Spring Roo itself*. If you are new to Spring Roo or would simply like to try a release that has already been built, tested and distributed by the core development team, we recommend that you visit the http://projects.spring.io/spring-roo/[Spring Roo Home Page] and download an official release. +These instructions are aimed at experienced developers looking to *develop Spring Roo itself*. If you are new to Spring Roo or would simply like to try a release that has already been built, tested and distributed by the core development team, we recommend that you visit the https://projects.spring.io/spring-roo/[Spring Roo Home Page] and download an official release. == Code of Conduct @@ -35,7 +35,7 @@ This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code === Search StackOverflow first; discuss if necessary -For general usage questions please ask on http://stackoverflow.com/[stackoverflow], tagged with http://stackoverflow.com/questions/tagged/spring-roo[spring-roo]. +For general usage questions please ask on https://stackoverflow.com/[stackoverflow], tagged with https://stackoverflow.com/questions/tagged/spring-roo[spring-roo]. === Search JIRA; create an issue if necessary @@ -50,8 +50,8 @@ If you have not previously done so, please sign the https://cla.pivotal.io/sign/ Roo uses GPG to automatically sign build outputs. If you haven't installed GPG, download and install it: -* Main site: http://www.gnupg.org/download/ -* Apple Mac option: http://macgpg.sourceforge.net/ +* Main site: https://www.gnupg.org/download/ +* Apple Mac option: https://macgpg.sourceforge.io/ Ensure you have a valid signature. Use _"gpg --list-secret-keys"_. @@ -145,11 +145,11 @@ NOTE: _If you're new to GPG: don't lose your private key! Backup the secring.gpg == Create a Fork -For contributors that want to write code, we encourage contributions through pull requests from http://help.github.com/forking/[forks of this repository]. +For contributors that want to write code, we encourage contributions through pull requests from https://help.github.com/forking/[forks of this repository]. NOTE: Developers with appropriate permissions may work through branches. -The commit messages must follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue add *"ROO-XXXX:"* (without the quotation marks) at the begining of the commit message (where XXXX is the issue number). +The commit messages must follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue add *"ROO-XXXX:"* (without the quotation marks) at the begining of the commit message (where XXXX is the issue number). == Code Conventions @@ -157,7 +157,7 @@ The commit messages must follow http://tbaggery.com/2008/04/19/a-note-about-git- ** The developers and contributors that uses STS or Eclipse should import the formatter settings via menu:Window[Properties > Java > Code Style > Formatter > Import], using the link:devel-resources/eclipse-java-code-style-formatter.xml[eclipse-java-code-style-formatter.xml] file from the _devel-resources_ folder. -** For the developers that build the project with the `./mvnw` command, the http://mvnrepository.com/artifact/com.googlecode.maven-java-formatter-plugin/maven-java-formatter-plugin[Maven Java Formatter plugin] has been included in the link:pom.xml[pom.xml] file to format the Java source files automatically using the link:devel-resources/eclipse-java-code-style-formatter.xml[eclipse-java-code-style-formatter.xml] file from the _devel-resources_ folder. +** For the developers that build the project with the `./mvnw` command, the https://mvnrepository.com/artifact/com.googlecode.maven-java-formatter-plugin/maven-java-formatter-plugin[Maven Java Formatter plugin] has been included in the link:pom.xml[pom.xml] file to format the Java source files automatically using the link:devel-resources/eclipse-java-code-style-formatter.xml[eclipse-java-code-style-formatter.xml] file from the _devel-resources_ folder. * Make sure all new _.java_ files to have the Javadoc class comment with the `@author` tag identifying you as well as a paragraph on what the class is for. @@ -167,7 +167,7 @@ The commit messages must follow http://tbaggery.com/2008/04/19/a-note-about-git- == Working with the Code -Spring Roo itself is a standard http://maven.apache.org/[Maven] project and therefore any _standard IDE_ can be used for development. *No extra plugins are needed*. +Spring Roo itself is a standard https://maven.apache.org/[Maven] project and therefore any _standard IDE_ can be used for development. *No extra plugins are needed*. The team use https://www.eclipse.org/[Eclipse] or https://spring.io/tools[STS] to develop Roo, just import the project branch as standard Maven project via menu:File[Import > Maven > Existing Maven Projects] into the Workspace. diff --git a/README.adoc b/README.adoc index 8c015ba709..c5b94e0483 100644 --- a/README.adoc +++ b/README.adoc @@ -45,34 +45,34 @@ This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code [[getting-started]] == Installation and Getting Started -The http://docs.spring.io/spring-roo/docs/2.0.x/reference/html/[reference documentation] includes detailed descriptions of all the features, detailed http://docs.spring.io/spring-roo/docs/2.0.x/reference/html/#getting-started-install-roo[installation instructions] as well as an extensive http://docs.spring.io/spring-roo/docs/2.0.x/reference/html/#using-spring-roo[user guide] for main use cases. +The https://docs.spring.io/spring-roo/docs/2.0.x/reference/html/[reference documentation] includes detailed descriptions of all the features, detailed https://docs.spring.io/spring-roo/docs/2.0.x/reference/html/#getting-started-install-roo[installation instructions] as well as an extensive https://docs.spring.io/spring-roo/docs/2.0.x/reference/html/#using-spring-roo[user guide] for main use cases. [[getting-support]] == Getting Support If you have any trouble using Spring Roo: -* Check the http://docs.spring.io/spring-roo/docs/2.0.x/reference/html/[reference documentation]. -* Spring Roo creates web applications based on Spring projects, take a look at the related Spring project reference documentation. In the http://spring.io[Spring] web-site you will find a lot of excellent reference documentation and getting started guides of the Spring projects. -* Ask a question in http://stackoverflow.com[stackoverflow] tagged with http://stackoverflow.com/questions/tagged/spring-roo[spring-roo]. +* Check the https://docs.spring.io/spring-roo/docs/2.0.x/reference/html/[reference documentation]. +* Spring Roo creates web applications based on Spring projects, take a look at the related Spring project reference documentation. In the https://spring.io[Spring] web-site you will find a lot of excellent reference documentation and getting started guides of the Spring projects. +* Ask a question in https://stackoverflow.com[stackoverflow] tagged with https://stackoverflow.com/questions/tagged/spring-roo[spring-roo]. -http://www.disid.com/#contact[Commercial support] is available too. +https://www.disid.com/#contact[Commercial support] is available too. [[contribute]] == Contribute Here are some ways for you to get involved in the community: -* Get involved with the Spring community by helping out on http://stackoverflow.com/questions/tagged/spring-roo[stackoverflow]. Join to debates and respond to questions. +* Get involved with the Spring community by helping out on https://stackoverflow.com/questions/tagged/spring-roo[stackoverflow]. Join to debates and respond to questions. * Report bugs and request new features via the https://jira.springsource.org/browse/ROO[Spring Roo JIRA]. Comment and vote on the ones that you are interested in. -* If you want to write code, you are welcome. Commit your pull requests from http://help.github.com/forking/[forks of this repository]. +* If you want to write code, you are welcome. Commit your pull requests from https://help.github.com/forking/[forks of this repository]. See the link:CONTRIBUTING.adoc[contributor guidelines] for details. [[build-the-source]] == Building from Source -The Spring Roo project uses a http://maven.apache.org/[Maven]-based build system. +The Spring Roo project uses a https://maven.apache.org/[Maven]-based build system. Spring Roo can be easily built with the https://github.com/takari/maven-wrapper[maven wrapper] from the root of the source tree and serves as a cross-platform, self-contained bootstrap mechanism for the build: @@ -86,7 +86,7 @@ See the link:CONTRIBUTING.adoc[contributor guidelines] for details. [[stay-in-touch]] == Staying in Touch -Follow https://twitter.com/springroo[@SpringRoo] and its team members on Twitter. In-depth articles can be found at http://blog.disid.com/[The DISID Blog], and releases are announced via http://spring.io/blog/[The Spring Blog]. +Follow https://twitter.com/springroo[@SpringRoo] and its team members on Twitter. In-depth articles can be found at https://blog.disid.com/[The DISID Blog], and releases are announced via https://spring.io/blog/[The Spring Blog]. [[acknowledgments]] == Acknowledgments diff --git a/RELEASING.adoc b/RELEASING.adoc index f2fe726cb4..ec81c17b19 100644 --- a/RELEASING.adoc +++ b/RELEASING.adoc @@ -77,7 +77,7 @@ git tag -a -m "ROO-XXXX: Release Spring Roo 4.5.6.RELEASE" 4.5.6.RELEASE cd $ROO_HOME mvn clean package -. Build the reference guide and deploy to the static staging server. You must be connected to the VPN for deployment to work. Note that http://projects.spring.io/spring-roo/ is updated bi-hourly from staging: +. Build the reference guide and deploy to the static staging server. You must be connected to the VPN for deployment to work. Note that https://projects.spring.io/spring-roo/ is updated bi-hourly from staging: + [source, shell] cd $ROO_HOME/deployment-support @@ -130,7 +130,7 @@ NOTE: _If any problems are detected before step 8, *simply fix*, push and start === Pre-notification testing -* Visit http://projects.spring.io/spring-roo/, click "Download!" +* Visit https://projects.spring.io/spring-roo/, click "Download!" * Ensure it unzips OK and the sha1sum matches the downloaded .sha * `rm -rf ~/.m2/repository/org/springframework/roo` * Use "roo script clinic.roo" to build a new Roo project @@ -142,8 +142,8 @@ Once the release is completed (ie all steps above) you'll typically: * Mark the version as "released" in JIRA (_Admin > JIRA Admin_...) * Publish a https://spring.io/blog/ entry explaining what's new -* Update http://en.wikipedia.org/wiki/Spring_Roo with the version -* Edit project page http://projects.spring.io/spring-roo/ +* Update https://en.wikipedia.org/wiki/Spring_Roo with the version +* Edit project page https://projects.spring.io/spring-roo/ * Tweet from @SpringRoo (NB: ensure #SpringRoo is in the message) * Tweet from your personal account * Email dev list diff --git a/addon-creator/src/main/java/org/springframework/roo/addon/creator/CreatorOperationsImpl.java b/addon-creator/src/main/java/org/springframework/roo/addon/creator/CreatorOperationsImpl.java index 8cf750dcb1..dc14259a69 100644 --- a/addon-creator/src/main/java/org/springframework/roo/addon/creator/CreatorOperationsImpl.java +++ b/addon-creator/src/main/java/org/springframework/roo/addon/creator/CreatorOperationsImpl.java @@ -559,7 +559,7 @@ private String generateManifestContent(JavaPackage topLevelPackage, String descr sb.append("Bnd-LastModified: 1427459113830\n"); sb.append("Build-Jdk: 1.7.0_60\n"); sb.append("Bundle-Description: " + description + "\n"); - sb.append("Bundle-License: http://www.gnu.org/licenses/gpl-3.0.html\n"); + sb.append("Bundle-License: https://www.gnu.org/licenses/gpl-3.0.html\n"); sb.append("Bundle-ManifestVersion: 2\n"); sb.append("Bundle-Name: " + projectName + " - Roo Addon Suite\n"); sb.append("Bundle-SymbolicName: " + topLevelPackage.getFullyQualifiedPackageName() diff --git a/addon-creator/src/main/resources/org/springframework/roo/addon/creator/advanced/assembly.xml-template b/addon-creator/src/main/resources/org/springframework/roo/addon/creator/advanced/assembly.xml-template index 940df77369..bc89af52cc 100644 --- a/addon-creator/src/main/resources/org/springframework/roo/addon/creator/advanced/assembly.xml-template +++ b/addon-creator/src/main/resources/org/springframework/roo/addon/creator/advanced/assembly.xml-template @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 https://maven.apache.org/xsd/assembly-1.1.2.xsd"> assembly zip diff --git a/addon-creator/src/main/resources/org/springframework/roo/addon/creator/i18n/assembly.xml-template b/addon-creator/src/main/resources/org/springframework/roo/addon/creator/i18n/assembly.xml-template index 8b85e1ae04..fafa0a0b92 100644 --- a/addon-creator/src/main/resources/org/springframework/roo/addon/creator/i18n/assembly.xml-template +++ b/addon-creator/src/main/resources/org/springframework/roo/addon/creator/i18n/assembly.xml-template @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 https://maven.apache.org/xsd/assembly-1.1.0.xsd"> zip diff --git a/addon-creator/src/main/resources/org/springframework/roo/addon/creator/resources/obr2html.xsl b/addon-creator/src/main/resources/org/springframework/roo/addon/creator/resources/obr2html.xsl index eefa65a59d..e4b7384ff6 100644 --- a/addon-creator/src/main/resources/org/springframework/roo/addon/creator/resources/obr2html.xsl +++ b/addon-creator/src/main/resources/org/springframework/roo/addon/creator/resources/obr2html.xsl @@ -84,7 +84,7 @@
-

@@ -115,8 +115,8 @@ Spring Roo © 2015

- Spring Roo | - Marketplace + Spring Roo | + Marketplace

diff --git a/addon-creator/src/main/resources/org/springframework/roo/addon/creator/resources/style.css b/addon-creator/src/main/resources/org/springframework/roo/addon/creator/resources/style.css index 3363fea56d..58f5368c88 100644 --- a/addon-creator/src/main/resources/org/springframework/roo/addon/creator/resources/style.css +++ b/addon-creator/src/main/resources/org/springframework/roo/addon/creator/resources/style.css @@ -1,9 +1,9 @@ -@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,700); -@import url(http://fonts.googleapis.com/css?family=Merriweather:400,300,400italic,700); +@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,700); +@import url(https://fonts.googleapis.com/css?family=Merriweather:400,300,400italic,700); /** custom font **/ -@import url(http://fonts.googleapis.com/css?family=Montserrat:700,400); -@import url(http://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic); +@import url(https://fonts.googleapis.com/css?family=Montserrat:700,400); +@import url(https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic); @import url( home.css); @import url( projects.css.css); diff --git a/addon-creator/src/main/resources/org/springframework/roo/addon/creator/simple/assembly.xml-template b/addon-creator/src/main/resources/org/springframework/roo/addon/creator/simple/assembly.xml-template index 940df77369..bc89af52cc 100644 --- a/addon-creator/src/main/resources/org/springframework/roo/addon/creator/simple/assembly.xml-template +++ b/addon-creator/src/main/resources/org/springframework/roo/addon/creator/simple/assembly.xml-template @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 https://maven.apache.org/xsd/assembly-1.1.2.xsd"> assembly zip diff --git a/addon-dbre/addon/src/main/java/org/springframework/roo/addon/dbre/addon/model/DatabaseXmlUtils.java b/addon-dbre/addon/src/main/java/org/springframework/roo/addon/dbre/addon/model/DatabaseXmlUtils.java index 57c5997c81..b46d27ac34 100644 --- a/addon-dbre/addon/src/main/java/org/springframework/roo/addon/dbre/addon/model/DatabaseXmlUtils.java +++ b/addon-dbre/addon/src/main/java/org/springframework/roo/addon/dbre/addon/model/DatabaseXmlUtils.java @@ -185,7 +185,7 @@ public static Document getDatabaseDocument(final Database database) { document.appendChild(databaseElement); // ROO-2355: transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, - // "http://db.apache.org/torque/dtd/database_3_3.dtd"); + // "https://db.apache.org/torque/dtd/database_3_3.dtd"); return document; } diff --git a/addon-jpa/addon/src/test/java/org/springframework/roo/addon/jpa/addon/JpaOperationsImplTest.java b/addon-jpa/addon/src/test/java/org/springframework/roo/addon/jpa/addon/JpaOperationsImplTest.java index 12e92bdb30..30edc9d2f7 100644 --- a/addon-jpa/addon/src/test/java/org/springframework/roo/addon/jpa/addon/JpaOperationsImplTest.java +++ b/addon-jpa/addon/src/test/java/org/springframework/roo/addon/jpa/addon/JpaOperationsImplTest.java @@ -76,7 +76,7 @@ public class JpaOperationsImplTest { + "\n"; private static final String EXPECTED_PERSISTENCE_XML_FOR_H2_IN_MEMORY_AND_HIBERNATE = "\n" - + "\n" + + "\n" + "\n" + " org.hibernate.jpa.HibernatePersistenceProvider\n" + " \n" diff --git a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/DocumentEmbeddedProvider.java b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/DocumentEmbeddedProvider.java index 7cd48ef6c7..c908255213 100644 --- a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/DocumentEmbeddedProvider.java +++ b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/DocumentEmbeddedProvider.java @@ -37,14 +37,14 @@ public String toString() { public boolean embed(final String url, final String viewName) { if (url.contains("slideshare.net")) { // Expected format - // http://www.slideshare.net/schmidtstefan/spring-one2-gx-slides-stefan-schmidt + // https://www.slideshare.net/schmidtstefan/spring-one2-gx-slides-stefan-schmidt final Map options = new HashMap(); options.put("provider", DocumentProvider.SLIDESHARE.name()); options.put("id", url); return install(viewName, options); } else if (url.contains("scribd.com")) { // Expected format - // http://www.scribd.com/doc/27766735/Introduction-to-SpringRoo + // https://www.scribd.com/doc/27766735/Introduction-to-SpringRoo final String[] split = url.split("/"); if (split.length > 4) { final Map options = new HashMap(); @@ -55,7 +55,7 @@ public boolean embed(final String url, final String viewName) { return false; } else if (url.contains("docs.google.") && url.contains("present")) { // Expected format - // http://docs.google.com/present/view?id=dd8rf8t9_31c9f2fcgd&revision=_latest&start=0&theme=blank&authkey=CLj5iZwJ&cwj=true + // https://docs.google.com/present/view?id=dd8rf8t9_31c9f2fcgd&revision=_latest&start=0&theme=blank&authkey=CLj5iZwJ&cwj=true final String qStart = url.substring(url.indexOf("id=") + 3); final Map options = new HashMap(); options.put("provider", DocumentProvider.GOOGLE_PRESENTATION.name()); @@ -68,7 +68,7 @@ public boolean embed(final String url, final String viewName) { private String getSlideShareId(final String url) { final String json = - sendHttpGetRequest("http://oohembed.com/oohembed/?url=" + url.replace(":", "%3A")); + sendHttpGetRequest("https://api.embed.ly/1/oembed?url=" + url.replace(":", "%3A")); if (json != null) { final String subDoc = json.substring(json.indexOf("doc=") + 4); return subDoc.substring(0, subDoc.indexOf("&") == -1 ? subDoc.length() : subDoc.indexOf("&")); diff --git a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/FinanceEmbeddedProvider.java b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/FinanceEmbeddedProvider.java index 5d54d5fad1..7cec464515 100644 --- a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/FinanceEmbeddedProvider.java +++ b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/FinanceEmbeddedProvider.java @@ -19,7 +19,7 @@ public class FinanceEmbeddedProvider extends AbstractEmbeddedProvider { // TODO : disabled due to ROO-2562 public boolean embed(final String url, final String viewName) { // if (url.contains("wikinvest.com")) { - // // Expected format http://www.wikinvest.com/wiki/Vmw + // // Expected format https://www.wikinvest.com/wiki/Vmw // Map options = new HashMap(); // options.put("provider", "FINANCES"); // options.put("stockSymbol", url.substring(url.indexOf("wiki/") + 5)); diff --git a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/MapEmbeddedProvider.java b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/MapEmbeddedProvider.java index 5761688f53..7408076e71 100644 --- a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/MapEmbeddedProvider.java +++ b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/MapEmbeddedProvider.java @@ -26,7 +26,7 @@ public class MapEmbeddedProvider extends AbstractEmbeddedProvider { public boolean embed(final String url, final String viewName) { if (url.contains("maps.google")) { // Expected format - // http://maps.google.com/maps?q=sydney,+Australia&.. the q= param + // https://maps.google.com/maps?q=sydney,+Australia&.. the q= param // needs to be present final String qStart = url.substring(url.indexOf("q=") + 2); diff --git a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/MicrobloggingEmbeddedProvider.java b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/MicrobloggingEmbeddedProvider.java index 56321e01e0..1ecceeb24d 100644 --- a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/MicrobloggingEmbeddedProvider.java +++ b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/MicrobloggingEmbeddedProvider.java @@ -24,7 +24,7 @@ public class MicrobloggingEmbeddedProvider extends AbstractEmbeddedProvider { public boolean embed(final String url, final String viewName) { - // Expected format http://twitter.com/#search?q=@SpringRoo + // Expected format https://twitter.com/#search?q=@SpringRoo if (url.contains("twitter.com")) { final Map options = new HashMap(); options.put("provider", "TWITTER"); diff --git a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/PhotoEmbeddedProvider.java b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/PhotoEmbeddedProvider.java index 0284d13cdf..ab1936c4fb 100644 --- a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/PhotoEmbeddedProvider.java +++ b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/PhotoEmbeddedProvider.java @@ -35,7 +35,7 @@ public String toString() { } public boolean embed(final String url, final String viewName) { - // Expected http://picasaweb.google.com.au/stsmedia/SydneyByNight + // Expected https://picasaweb.google.com.au/stsmedia/SydneyByNight if (url.contains("picasaweb.google.")) { final String[] split = url.split("/"); if (split.length > 4) { @@ -61,7 +61,7 @@ public boolean embed(final String url, final String viewName) { } private String getPicasaId(final String url) { - final String json = sendHttpGetRequest("http://api.embed.ly/v1/api/oembed?url=" + url); + final String json = sendHttpGetRequest("https://api.embed.ly/v1/api/oembed?url=" + url); if (json != null) { final String subDoc = json.substring(json.indexOf("albumid%2F") + 10); return subDoc.substring(0, subDoc.indexOf("%") == 1 ? subDoc.length() : subDoc.indexOf("%")); diff --git a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/VideoEmbeddedProvider.java b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/VideoEmbeddedProvider.java index 14f972f51f..04d3620e12 100644 --- a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/VideoEmbeddedProvider.java +++ b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/VideoEmbeddedProvider.java @@ -39,33 +39,33 @@ public String toString() { public boolean embed(final String url, final String viewName) { if (url.contains("youtube.com")) { - // Expected format: http://www.youtube.com/watch?v=Gb1Z0lfl52I + // Expected format: https://www.youtube.com/watch?v=Gb1Z0lfl52I final Map options = new HashMap(); options.put("provider", VideoProvider.YOUTUBE.name()); options.put("id", url.substring(url.indexOf("v=") + 2)); return install(viewName, options); } else if (url.contains("video.google.")) { // Expected format: - // http://video.google.com/videoplay?docid=1753096859715615067# + // https://video.google.com/videoplay?docid=1753096859715615067# final Map options = new HashMap(); options.put("provider", VideoProvider.GOOGLE_VIDEO.name()); options.put("id", url.substring(url.indexOf("docid=") + 6)); return install(viewName, options); } else if (url.contains("vimeo.com")) { - // Expected format http://vimeo.com/11262623 + // Expected format https://vimeo.com/11262623 final Map options = new HashMap(); options.put("provider", VideoProvider.VIMEO.name()); options.put("id", url.substring(url.indexOf("vimeo.com/") + 10)); return install(viewName, options); } else if (url.contains("viddler.com")) { // Expected format - // http://www.viddler.com/explore/failblog/videos/715/ + // https://www.viddler.com/explore/failblog/videos/715/ final Map options = new HashMap(); options.put("provider", VideoProvider.VIDDLER.name()); options.put("id", getViddlerId(url)); return install(viewName, options); } else if (url.contains("screenr.com")) { - // Expected format http://screenr.com/GlR + // Expected format https://screenr.com/GlR final String[] split = url.split("/"); if (split.length > 3) { final Map options = new HashMap(); @@ -80,7 +80,7 @@ public boolean embed(final String url, final String viewName) { private String getViddlerId(final String url) { final String xml = - sendHttpGetRequest("http://lab.viddler.com/services/oembed/?url=" + url + sendHttpGetRequest("https://tools.viddler.com/services/oembed/?url=" + url + "&type=simple&format=xml"); if (xml != null) { try { diff --git a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/VideoStreamEmbeddedProvider.java b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/VideoStreamEmbeddedProvider.java index 56a4b9994e..74ba035d9f 100644 --- a/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/VideoStreamEmbeddedProvider.java +++ b/addon-web-mvc-embedded/src/main/java/org/springframework/roo/addon/web/mvc/embedded/provider/VideoStreamEmbeddedProvider.java @@ -36,7 +36,7 @@ public String toString() { public boolean embed(final String url, final String viewName) { if (url.contains("ustream.tv")) { - // Expected format http://www.ustream.tv/flash/live/1/4424524 + // Expected format https://www.ustream.tv/flash/live/1/4424524 final String[] split = url.split("/"); if (split.length > 6) { final Map options = new HashMap(); @@ -46,7 +46,7 @@ public boolean embed(final String url, final String viewName) { } return false; } else if (url.contains("livestream.com")) { - // Expected format http://www.livestream.com/wkrg_oil_spill + // Expected format https://www.livestream.com/wkrg_oil_spill final String[] split = url.split("/"); if (split.length > 3) { final Map options = new HashMap(); diff --git a/addon-web-mvc-embedded/src/main/resources/org/springframework/roo/addon/web/mvc/embedded/provider/tags/document.tagx b/addon-web-mvc-embedded/src/main/resources/org/springframework/roo/addon/web/mvc/embedded/provider/tags/document.tagx index 1c5e114798..03f98593ac 100644 --- a/addon-web-mvc-embedded/src/main/resources/org/springframework/roo/addon/web/mvc/embedded/provider/tags/document.tagx +++ b/addon-web-mvc-embedded/src/main/resources/org/springframework/roo/addon/web/mvc/embedded/provider/tags/document.tagx @@ -9,7 +9,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/addon-web-mvc-embedded/src/main/resources/org/springframework/roo/addon/web/mvc/embedded/provider/tags/finances.tagx b/addon-web-mvc-embedded/src/main/resources/org/springframework/roo/addon/web/mvc/embedded/provider/tags/finances.tagx index 1634e7e7ee..0b6e2e670c 100644 --- a/addon-web-mvc-embedded/src/main/resources/org/springframework/roo/addon/web/mvc/embedded/provider/tags/finances.tagx +++ b/addon-web-mvc-embedded/src/main/resources/org/springframework/roo/addon/web/mvc/embedded/provider/tags/finances.tagx @@ -9,11 +9,11 @@ ${stockSymbol} - +
+ + - + diff --git a/addon-web-mvc-jsp/src/main/resources/org/springframework/roo/addon/web/mvc/jsp/tiles/footer.jspx b/addon-web-mvc-jsp/src/main/resources/org/springframework/roo/addon/web/mvc/jsp/tiles/footer.jspx index 289b267c1d..80b965a20e 100644 --- a/addon-web-mvc-jsp/src/main/resources/org/springframework/roo/addon/web/mvc/jsp/tiles/footer.jspx +++ b/addon-web-mvc-jsp/src/main/resources/org/springframework/roo/addon/web/mvc/jsp/tiles/footer.jspx @@ -28,7 +28,7 @@ - + ${fn:escapeXml(sponsored)} diff --git a/addon-web-mvc-jsp/src/main/resources/org/springframework/roo/addon/web/mvc/jsp/tiles/tiles-config_2_1.dtd b/addon-web-mvc-jsp/src/main/resources/org/springframework/roo/addon/web/mvc/jsp/tiles/tiles-config_2_1.dtd index 9ef5147a46..69951ae72e 100644 --- a/addon-web-mvc-jsp/src/main/resources/org/springframework/roo/addon/web/mvc/jsp/tiles/tiles-config_2_1.dtd +++ b/addon-web-mvc-jsp/src/main/resources/org/springframework/roo/addon/web/mvc/jsp/tiles/tiles-config_2_1.dtd @@ -23,7 +23,7 @@ @hidden $Id$ @title DTD for the Tiles Definition File, Version 2.1 -@doctype tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd" +@doctype tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "https://tiles.apache.org/dtds/tiles-config_2_1.dtd" @root tiles-definitions --> diff --git a/addon-web-mvc-thymeleaf/addon/src/main/java/org/springframework/roo/addon/web/mvc/thymeleaf/addon/ThymeleafMVCViewResponseService.java b/addon-web-mvc-thymeleaf/addon/src/main/java/org/springframework/roo/addon/web/mvc/thymeleaf/addon/ThymeleafMVCViewResponseService.java index 1634cd6d28..059a028920 100644 --- a/addon-web-mvc-thymeleaf/addon/src/main/java/org/springframework/roo/addon/web/mvc/thymeleaf/addon/ThymeleafMVCViewResponseService.java +++ b/addon-web-mvc-thymeleaf/addon/src/main/java/org/springframework/roo/addon/web/mvc/thymeleaf/addon/ThymeleafMVCViewResponseService.java @@ -483,7 +483,7 @@ private void addThymeleafDependencies(Pom module) { // ROO-3813: Use Thymeleaf 3.0 instead of the provided version by Spring IO // More info about Thymelead 3.0 using Spring Boot here - // http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-use-thymeleaf-3 + // https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-use-thymeleaf-3 getProjectOperations().addProperty("", new Property("thymeleaf.version", "3.0.0.RELEASE")); getProjectOperations().addProperty("", new Property("thymeleaf-layout-dialect.version", "2.0.0")); diff --git a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/static/css/theme.css b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/static/css/theme.css index 02722dd20c..4f82f5ee04 100644 --- a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/static/css/theme.css +++ b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/static/css/theme.css @@ -1,14 +1,14 @@ @import url("https://fonts.googleapis.com/css?family=Roboto:400,500"); /*! * bootswatch v3.3.6 - * Homepage: http://bootswatch.com + * Homepage: https://bootswatch.com * Copyright 2012-2015 Thomas Park * Licensed under MIT * Based on Bootstrap * Sandstone theme */ /*! - * Bootstrap v3.3.6 (http://getbootstrap.com) + * Bootstrap v3.3.6 (https://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ diff --git a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/static/js/moment-defaults.js b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/static/js/moment-defaults.js index e8f4cf963a..7842878b42 100644 --- a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/static/js/moment-defaults.js +++ b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/static/js/moment-defaults.js @@ -5,9 +5,9 @@ /** * Convert Java's SimpleDateFormat to momentJS formatDate. Takes a Java * pattern - * (http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html) + * (https://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html) * and turns it into the expected momentJS formatDate - * (http://momentjs.com/docs/#/parsing/string-format/). + * (https://momentjs.com/docs/#/parsing/string-format/). * * @param pattern * SimpleDateFormat pattern diff --git a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/create.ftl b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/create.ftl index 73a4fabf65..a28f2f5318 100644 --- a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/create.ftl +++ b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/create.ftl @@ -203,15 +203,15 @@ diff --git a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/createDetailComposition.ftl b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/createDetailComposition.ftl index 5f02ec0b30..e994011d50 100644 --- a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/createDetailComposition.ftl +++ b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/createDetailComposition.ftl @@ -174,15 +174,15 @@ diff --git a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/edit.ftl b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/edit.ftl index c082d5e0c8..2a789c206c 100644 --- a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/edit.ftl +++ b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/edit.ftl @@ -211,15 +211,15 @@ diff --git a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/editDetailComposition.ftl b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/editDetailComposition.ftl index 1b4c98ae70..6d57a106e3 100644 --- a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/editDetailComposition.ftl +++ b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/editDetailComposition.ftl @@ -181,15 +181,15 @@ diff --git a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/finderForm.ftl b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/finderForm.ftl index b756256cc5..d96a81cce8 100644 --- a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/finderForm.ftl +++ b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/finderForm.ftl @@ -152,15 +152,15 @@ diff --git a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/fragments/footer.ftl b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/fragments/footer.ftl index 5a2417a491..14054c8f52 100644 --- a/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/fragments/footer.ftl +++ b/addon-web-mvc-thymeleaf/addon/src/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/fragments/footer.ftl @@ -18,7 +18,7 @@
-

Doc

+

Doc

If you are looking for Reference Documentation you can get it here.
@@ -73,7 +73,7 @@
-

Project Page

+

Project Page

All the info about Spring Roo development.
@@ -88,7 +88,7 @@
-

Support

+

Support

If you have any question about the project, you can check it.
@@ -119,7 +119,7 @@