Skip to content
This repository has been archived by the owner on Oct 28, 2022. It is now read-only.

Commit

Permalink
Merge pull request #119 from spring-operator/polish-urls-remaining-ma…
Browse files Browse the repository at this point in the history
…ster

URL Cleanup
  • Loading branch information
jcagarcia committed Jun 5, 2019
2 parents 79ecd58 + b96d189 commit 684fba4
Show file tree
Hide file tree
Showing 72 changed files with 271 additions and 271 deletions.
4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.adoc
Expand Up @@ -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/]
16 changes: 8 additions & 8 deletions CONTRIBUTING.adoc
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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"_.

Expand Down Expand Up @@ -145,19 +145,19 @@ 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

* Use the Spring Roo project https://github.com/google/styleguide[code format conventions].

** 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.

Expand All @@ -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.

Expand Down
18 changes: 9 additions & 9 deletions README.adoc
Expand Up @@ -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:

Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions RELEASING.adoc
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Expand Up @@ -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()
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 https://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>assembly</id>
<formats>
<format>zip</format>
Expand Down
Expand Up @@ -2,7 +2,7 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 https://maven.apache.org/xsd/assembly-1.1.0.xsd">
<formats>
<format>zip</format>
</formats>
Expand Down
Expand Up @@ -84,7 +84,7 @@

<div class="inner">
<div class="container">
<a class="brand light" href="http://projects.spring.io/spring-roo" role="banner" itemprop="url">
<a class="brand light" href="https://projects.spring.io/spring-roo" role="banner" itemprop="url">
<img itemprop="logo" src="https://projects.spring.io/spring-roo/img/project-icon-large.png" alt="Spring Roo Logo" />
</a>
<h2 class="light" itemprop="description">
Expand Down Expand Up @@ -115,8 +115,8 @@
Spring Roo © 2015
</p>
<p class="rss-subscribe text-center">
<a data-original-title="Spring Roo Project Page" href="http://projects.spring.io/spring-roo/" target="_blank" data-toggle="tooltip" title="">Spring Roo</a> |
<a data-original-title="Spring Roo MarketPlace" href="http://projects.spring.io/spring-roo/marketplace" target="_blank" data-toggle="tooltip" title="">Marketplace</a>
<a data-original-title="Spring Roo Project Page" href="https://projects.spring.io/spring-roo/" target="_blank" data-toggle="tooltip" title="">Spring Roo</a> |
<a data-original-title="Spring Roo MarketPlace" href="https://projects.spring.io/spring-roo/marketplace" target="_blank" data-toggle="tooltip" title="">Marketplace</a>
</p>
</div>
</div>
Expand Down
@@ -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);
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 https://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>assembly</id>
<formats>
<format>zip</format>
Expand Down
Expand Up @@ -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;
}
Expand Down
Expand Up @@ -76,7 +76,7 @@ public class JpaOperationsImplTest {
+ "</beans>\n";
private static final String EXPECTED_PERSISTENCE_XML_FOR_H2_IN_MEMORY_AND_HIBERNATE =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ "<persistence xmlns=\"http://java.sun.com/xml/ns/persistence\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" version=\"2.0\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd\">\n"
+ "<persistence xmlns=\"http://java.sun.com/xml/ns/persistence\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" version=\"2.0\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd\">\n"
+ "<persistence-unit name=\"myPersistenceUnit\" transaction-type=\"RESOURCE_LOCAL\">\n"
+ " <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>\n"
+ " <properties>\n"
Expand Down
Expand Up @@ -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<String, String> options = new HashMap<String, String>();
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<String, String> options = new HashMap<String, String>();
Expand All @@ -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<String, String> options = new HashMap<String, String>();
options.put("provider", DocumentProvider.GOOGLE_PRESENTATION.name());
Expand All @@ -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("&"));
Expand Down
Expand Up @@ -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<String, String> options = new HashMap<String, String>();
// options.put("provider", "FINANCES");
// options.put("stockSymbol", url.substring(url.indexOf("wiki/") + 5));
Expand Down

0 comments on commit 684fba4

Please sign in to comment.