Skip to content
This repository has been archived by the owner on Apr 5, 2019. It is now read-only.

URL Cleanup #45

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Greenhouse is a Java web application built for the Spring community that has two

$ cd greenhouse

3. The project uses [Maven](http://maven.apache.org/) to build:
3. The project uses [Maven](https://maven.apache.org/) to build:

$ mvn clean install

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public AwardedBadge createAwardedBadge(String badge, Account account, Action act
jdbcTemplate.update("insert into AwardedBadge (badge, awardTime, member, memberAction) values (?, ?, ?, ?)", badge, awardTime.toDate(), account.getId(), action.getId());
Long id = jdbcTemplate.queryForLong("call identity()");
// TODO dont hardcode
String imageUrl = "http://images.greenhouse.springsource.org/activity/icon-default-badge.png";
String imageUrl = "https://images.greenhouse.springsource.org/activity/icon-default-badge.png";
return new AwardedBadge(id, badge, awardTime, imageUrl, account, action);
}

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/springsource/greenhouse/config/test-data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ insert into Member (firstName, lastName, email, password, username, gender, birt
insert into Member (firstName, lastName, email, password, username, gender, birthdate) values ('David', 'Winterfeldt', '[email protected]', 'sanfran', 'dwinterfeldt', 'M', '1973-11-4');

-- Greenhouse for iPhone Tester
insert into App (name, slug, description, organization, website, apiKey, secret, callbackUrl) values ('Greenhouse for iPhone', 'greenhouse-for-iphone', 'Our slick mobile client for the Apple iPhone ', 'SpringSource', 'http://www.springsource.com', 'a08318eb478a1ee31f69a55276f3af64', '80e7f8f7ba724aae9103f297e5fb9bdf', 'x-com-springsource-greenhouse://oauth-response');
insert into App (name, slug, description, organization, website, apiKey, secret, callbackUrl) values ('Greenhouse for iPhone', 'greenhouse-for-iphone', 'Our slick mobile client for the Apple iPhone ', 'SpringSource', 'https://www.springsource.com', 'a08318eb478a1ee31f69a55276f3af64', '80e7f8f7ba724aae9103f297e5fb9bdf', 'x-com-springsource-greenhouse://oauth-response');
insert into AppDeveloper (app, member) values (1, 1);
insert into AppDeveloper (app, member) values (1, 2);
insert into AppDeveloper (app, member) values (1, 3);

-- Greenhouse for Android Tester
insert into App (name, slug, description, organization, website, apiKey, secret, callbackUrl) values ('Greenhouse for Android', 'greenhouse-for-android', 'Our slick mobile client for the Google Android ', 'SpringSource', 'http://www.springsource.com', 'e9fbccdae98d5696', '9fa283e1eca2d4e8', 'x-com-springsource-greenhouse://oauth-response');
insert into App (name, slug, description, organization, website, apiKey, secret, callbackUrl) values ('Greenhouse for Android', 'greenhouse-for-android', 'Our slick mobile client for the Google Android ', 'SpringSource', 'https://www.springsource.com', 'e9fbccdae98d5696', '9fa283e1eca2d4e8', 'x-com-springsource-greenhouse://oauth-response');
insert into AppDeveloper (app, member) values (2, 1);
insert into AppDeveloper (app, member) values (2, 2);
insert into AppDeveloper (app, member) values (2, 3);

-- Greenhouse Sample App Tester
insert into App (name, slug, description, organization, website, apiKey, secret, callbackUrl) values ('Greenhouse Sample App', 'greenhouse-sample-app', 'An application created for testing purposes ', 'SpringSource', 'http://www.springsource.com', 'testclient', 'testsecret', 'http://localhost:8080/ghsample');
insert into App (name, slug, description, organization, website, apiKey, secret, callbackUrl) values ('Greenhouse Sample App', 'greenhouse-sample-app', 'An application created for testing purposes ', 'SpringSource', 'https://www.springsource.com', 'testclient', 'testsecret', 'http://localhost:8080/ghsample');
insert into AppDeveloper (app, member) values (3, 2);

-- Test Upcoming Event Data: SpringOne 2GX 2012
Expand Down Expand Up @@ -322,7 +322,7 @@ insert into EventSessionLeader (event, session, leader) values (1, 32, 33);

insert into Leader (name) values ('Rob Woollenn');
insert into EventSession (event, id, title, timeSlot, description, hashtag, track, venue, room) values (1, 33, 'Inside the Force.com Cloud Platform', 12,
'To truly understand the sophistication and potential of the Force.com platform we are going to peek under the kimono in this session. Join salesforce.com principal architect, Rob Woollen, as he discusses the Force.com multi-tenant architecture implementation. You�ll learn the details of how the Force.com platform maintains high performance and scalability for over 80,000 customers and thousands of cloud applications.',
'To truly understand the sophistication and potential of the Force.com platform we are going to peek under the kimono in this session. Join salesforce.com principal architect, Rob Woollen, as he discusses the Force.com multi-tenant architecture implementation. You�ll learn the details of how the Force.com platform maintains high performance and scalability for over 80,000 customers and thousands of cloud applications.',
'#inforce', 'vmw', 1, 5);
insert into EventSessionLeader (event, session, leader) values (1, 33, 34);

Expand Down Expand Up @@ -371,7 +371,7 @@ insert into EventSessionLeader (event, session, leader) values (1, 39, 38);
insert into Leader (name) values ('Scott Andrews');
insert into Leader (name) values ('Jon Travis');
insert into EventSession (event, id, title, timeSlot, description, hashtag, track, venue, room) values (1, 40, 'Diagnosing Performance Issues with Spring Insight before it''s a Problem', 14,
'What if a user reports your application is slow? At that point, it�s too late. Runtime performance is more than an ops team�s concern. Continuous performance profiling is an important part of the agile developer�s bag of tools. Spring Insight enables developers to watch what their application is actually doing in real time and zero in on performance issues. Come to this session to learn about Spring Insight from its creators. Learn how to easily enhance the default instrumentation to gain even greater visibility into your application. ',
'What if a user reports your application is slow? At that point, it�s too late. Runtime performance is more than an ops team�s concern. Continuous performance profiling is an important part of the agile developer�s bag of tools. Spring Insight enables developers to watch what their application is actually doing in real time and zero in on performance issues. Come to this session to learn about Spring Insight from its creators. Learn how to easily enhance the default instrumentation to gain even greater visibility into your application. ',
'#insight', 'int', 1, 1);
insert into EventSessionLeader (event, session, leader, rank) values (1, 40, 39, 2);
insert into EventSessionLeader (event, session, leader, rank) values (1, 40, 40, 1);
Expand Down Expand Up @@ -888,6 +888,6 @@ insert into EventSessionLeader (event, session, leader) values (1, 115, 19);


insert into EventSession (event, id, title, timeSlot, description, hashtag, track, venue, room) values (1, 116, 'Grails + CouchDB', 35,
'"CouchDB is built of the Web. I�ve never seen software that so completely embraces the philosophies behind HTTP." Jacob Kaplan-Moss, Django Developer',
'"CouchDB is built of the Web. I�ve never seen software that so completely embraces the philosophies behind HTTP." Jacob Kaplan-Moss, Django Developer',
'#couchdb', 'grf', 1, 9);
insert into EventSessionLeader (event, session, leader) values (1, 116, 56);
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* If the Database is at version zero(), the current version of the database will be installed.
* If the Database is at a version less than the current version, the database will be upgraded from that version to the current version.
* If the Database is already at the current version, no migration will be performed.
* This migration model was adapted from the <a href="http://www.liquibase.org/tutorial-using-oracle">LiquiBase Oracle tutorial</a>.
* This migration model was adapted from the <a href="https://www.liquibase.org/tutorial-using-oracle">LiquiBase Oracle tutorial</a>.
* @author Keith Donald
*/
public class DatabaseUpgrader {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private String createSlug(String appName) {
private RowMapper<AppSummary> appSummaryMapper = new RowMapper<AppSummary>() {
public AppSummary mapRow(ResultSet rs, int rowNum) throws SQLException {
// TODO this is currently hardcoded
String iconUrl = "http://images.greenhouse.springsource.org/apps/icon-default-app.png";
String iconUrl = "https://images.greenhouse.springsource.org/apps/icon-default-app.png";
return new AppSummary(rs.getString("name"), iconUrl, rs.getString("description"), rs.getString("slug"));
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ View your member profile at:
$profileUrl$

Download Greenhouse for iPhone:
http://itunes.apple.com/us/app/greenhouse/id395862873
https://itunes.apple.com/us/app/greenhouse/id395862873
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private GeoLocation (String lat, String lon) {
public Double toLatitude () { return new Double(lat); }

public static GeoLocation getGeoLocation (String address) throws IOException {
BufferedReader in = new BufferedReader (new InputStreamReader (new URL ("http://maps.google.com/maps/geo?q="+URLEncoder.encode (address, ENCODING)+"&output=csv&key="+KEY).openStream ()));
BufferedReader in = new BufferedReader (new InputStreamReader (new URL ("https://maps.google.com/maps/geo?q="+URLEncoder.encode (address, ENCODING)+"&output=csv&key="+KEY).openStream ()));
String line;
GeoLocation location = null;
int statusCode = -1;
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/layouts/standard/footer.jsp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>

<a id="springsource" href="http://www.springsource.com">SpringSource</a>
<a id="springsource" href="https://www.springsource.com">SpringSource</a>
<p>Version 1.0.0 (Beta) - &copy; Copyright 2010-2012 SpringSource, a division of VMware</p>
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/views/groups/event.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
Grab the Greenhouse mobile client to follow this Event as it happens.
</p>
<div id="appIcons" style="padding: 0 0 20px 0 ;">
<a href="http://itunes.apple.com/us/app/greenhouse/id395862873"><img src="<c:url value="/resources/mobile/icon-apple-appstore.gif" />" /></a>
<a href="https://itunes.apple.com/us/app/greenhouse/id395862873"><img src="<c:url value="/resources/mobile/icon-apple-appstore.gif" />" /></a>
<a href="https://market.android.com/details?id=com.springsource.greenhouse"><img src="<c:url value="/resources/mobile/icon-android-marketplace.gif" />" /></a>
</div>
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/views/home/contentSignedIn.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
</p>
</div>
<div id="appIcons">
<a href="http://itunes.apple.com/us/app/greenhouse/id395862873"><img src="<c:url value="/resources/mobile/icon-apple-appstore.gif" />" /></a>
<a href="https://itunes.apple.com/us/app/greenhouse/id395862873"><img src="<c:url value="/resources/mobile/icon-apple-appstore.gif" />" /></a>
<a href="https://market.android.com/details?id=com.springsource.greenhouse"><img src="<c:url value="/resources/mobile/icon-android-marketplace.gif" />" /></a>
</div>
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/views/invite/facebook/invite.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<fb:serverfbml style="width: 625px;">
<script type="text/fbml">
<fb:fbml>
<fb:request-form action='<u:absoluteUrl value="/invite/facebook/request-form" />' method="POST" invite="true" type="Greenhouse" content="Join me in the Greenhouse! It's the best way to exchange ideas and information with other Spring application developers. <fb:req-choice url='http://greenhouse.springsource.org' label='Join the Greenhouse' />">
<fb:request-form action='<u:absoluteUrl value="/invite/facebook/request-form" />' method="POST" invite="true" type="Greenhouse" content="Join me in the Greenhouse! It's the best way to exchange ideas and information with other Spring application developers. <fb:req-choice url='https://greenhouse.springsource.org' label='Join the Greenhouse' />">
<fb:multi-friend-selector bypass="cancel" email_invite="false" import_external_friends="false" cols="4" showborder="false" actiontext="Invite your Facebook friends to join Greenhouse"></fb:multi-friend-selector>
</fb:request-form>
</fb:fbml>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/resources/jquery-cookie/1.0/jquery-cookie.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*
* Copyright (c) 2006 Klaus Hartl (stilbuero.de)
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
* https://www.opensource.org/licenses/mit-license.php
* https://www.gnu.org/licenses/gpl.html
*
*/

Expand Down
24 changes: 12 additions & 12 deletions src/main/webapp/resources/jquery/1.6/jquery.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* jQuery JavaScript Library v1.6.2
* http://jquery.com/
* https://jquery.com/
*
* Copyright 2011, John Resig
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
* https://jquery.org/license
*
* Includes Sizzle.js
* http://sizzlejs.com/
* https://sizzlejs.com/
* Copyright 2011, The Dojo Foundation
* Released under the MIT, BSD, and GPL Licenses.
*
Expand Down Expand Up @@ -562,7 +562,7 @@ jQuery.extend({
}

// Make sure the incoming data is actual JSON
// Logic borrowed from http://json.org/json2.js
// Logic borrowed from https://json.org/json2.js
if ( rvalidchars.test( data.replace( rvalidescape, "@" )
.replace( rvalidtokens, "]" )
.replace( rvalidbraces, "")) ) {
Expand Down Expand Up @@ -599,7 +599,7 @@ jQuery.extend({

// Evaluates a script in a global context
// Workarounds based on findings by Jim Driscoll
// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
// https://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
globalEval: function( data ) {
if ( data && rnotwhite.test( data ) ) {
// We use execScript on Internet Explorer
Expand Down Expand Up @@ -846,7 +846,7 @@ jQuery.extend({
},

// Use of jQuery.browser is frowned upon.
// More details: http://docs.jquery.com/Utilities/jQuery.browser
// More details: https://docs.jquery.com/Utilities/jQuery.browser
uaMatch: function( ua ) {
ua = ua.toLowerCase();

Expand Down Expand Up @@ -1370,7 +1370,7 @@ jQuery.support = (function() {
testElementParent.removeChild( testElement );

// Technique from Juriy Zaytsev
// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
// https://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
// We only care about the case where non-standard event systems
// are used, namely in IE. Short-circuiting here helps us to
// avoid an eval call (in setAttribute) which can cause CSP
Expand Down Expand Up @@ -1850,7 +1850,7 @@ jQuery.fn.extend({
});
},
// Based off of the plugin by Clint Helfers, with permission.
// http://blindsignals.com/index.php/2009/07/jquery-delay/
// http://blindsignals.com
delay: function( time, type ) {
time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
type = type || "fx";
Expand Down Expand Up @@ -2311,7 +2311,7 @@ jQuery.extend({
tabIndex: {
get: function( elem ) {
// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
// https://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
var attributeNode = elem.getAttributeNode("tabIndex");

return attributeNode && attributeNode.specified ?
Expand Down Expand Up @@ -3733,7 +3733,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
* Sizzle CSS Selector Engine
* Copyright 2011, The Dojo Foundation
* Released under the MIT, BSD, and GPL Licenses.
* More information: http://sizzlejs.com/
* More information: https://sizzlejs.com/
*/
(function(){

Expand Down Expand Up @@ -5375,7 +5375,7 @@ jQuery.each({
// The variable 'args' was introduced in
// https://github.com/jquery/jquery/commit/52a0238
// to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed.
// http://code.google.com/p/v8/issues/detail?id=1050
// https://code.google.com/p/v8/issues/detail?id=1050
args = slice.call(arguments);

if ( !runtil.test( name ) ) {
Expand Down Expand Up @@ -7879,7 +7879,7 @@ if ( jQuery.support.ajax ) {

// Firefox throws exceptions when accessing properties
// of an xhr when a network error occured
// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
// https://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
try {

// Was never called and is aborted or complete
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ public class WelcomeMailTransformerTest {
public void welcomeMail() {
WelcomeMailTransformer transformer = new WelcomeMailTransformer();

Account account = new Account(1L, "Roy", "Clarkson", "[email protected]", "rclarkson", "http://foo.com/bar.jpg", new UriTemplate("http://greenhouse.springsource.org/members/{id}"));
Account account = new Account(1L, "Roy", "Clarkson", "[email protected]", "rclarkson", "http://www.foo.com/", new UriTemplate("https://greenhouse.springsource.org/members/{id}"));
SimpleMailMessage welcomeMail = (SimpleMailMessage) transformer.welcomeMail(account);

assertEquals("[email protected]", welcomeMail.getTo()[0]);
assertEquals("Greenhouse <[email protected]>", welcomeMail.getFrom());
assertEquals("Welcome to the Greenhouse!", welcomeMail.getSubject());
String mailText = welcomeMail.getText();
assertTrue(mailText.contains("View your member profile at:" + NEWLINE + "http://greenhouse.springsource.org/members/rclarkson"));
assertTrue(mailText.contains("View your member profile at:" + NEWLINE + "https://greenhouse.springsource.org/members/rclarkson"));
}

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
insert into Member (firstName, lastName, email, password, username, gender, birthdate) values ('Craig', 'Walls', '[email protected]', 'password', 'habuma', 'M', '1977-12-01');
insert into Member (firstName, lastName, email, password, username, gender, birthdate) values ('Keith', 'Donald', '[email protected]', 'password', 'kdonald', 'M', '1977-12-01');
insert into Member (firstName, lastName, email, password, username, gender, birthdate) values ('Roy', 'Clarkson', '[email protected]', 'password', 'rclarkson', 'M', '1977-12-01');
insert into ServiceProvider (name, displayName, implementation, apiKey, secret, requestTokenUrl, authorizeUrl, accessTokenUrl) values ('twitter', 'Twitter', 'com.springsource.greenhouse.connect.providers.TwitterServiceProvider', '76926d574e7ff5dabb94b5df23b6add6', 'ea448a2cc81b84da29b3eeaf1e0242a1', 'http://www.twitter.com', 'http://www.twitter.com', 'http://www.twitter.com');
insert into ServiceProvider (name, displayName, implementation, apiKey, secret, requestTokenUrl, authorizeUrl, accessTokenUrl) values ('twitter', 'Twitter', 'com.springsource.greenhouse.connect.providers.TwitterServiceProvider', '76926d574e7ff5dabb94b5df23b6add6', 'ea448a2cc81b84da29b3eeaf1e0242a1', 'https://www.twitter.com', 'https://www.twitter.com', 'https://www.twitter.com');
insert into AccountConnection (member, accountId, provider, accessToken, secret) values (1, 'habuma', 'twitter', '8d4c8b1930b25c4ea1a923fb9c213f4d', '75ad6993ccabf71f0fd3314f8e2d5ed8');
insert into AccountConnection (member, accountId, provider, accessToken, secret) values (3, 'rclarkson', 'twitter', 'df007a91474c6fb314afce38943f2ae7', '4925a46855cf18a22e5cf0e41c6aff9f');
Loading