Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #31 from habuma/master

Sync-up merge to extend token lifespan from 12 hours to 1 week.
  • Loading branch information...
commit 4250e20f1f89a2e8b8495db0290485a9e69a8b9a 2 parents 8bc27ed + 4f9ee20
@habuma habuma authored
View
1  src/main/java/com/springsource/greenhouse/config/security-oauth-provider.xml
@@ -61,6 +61,7 @@
<property name="tokenStore" ref="tokenStore" />
<property name="supportRefreshToken" value="true" />
<property name="clientDetailsService" ref="clientDetails"/>
+ <property name="accessTokenValiditySeconds" value="604800" /> <!-- 1 week -->
</bean>
</beans>
View
2  src/main/java/com/springsource/greenhouse/events/load/NFJSLoader.java
@@ -60,7 +60,7 @@ public void loadEventData(int showId) {
int utcOffset = (Integer) locationMap.get("utcOffset");
String locationAddress = locationMap.get("address1") + " " + locationMap.get("address2") + " " + locationMap.get("city") + ", " + locationMap.get("stateCode") + " " + locationMap.get("zip");
long eventId = loaderRepository.loadEvent(new EventData(MEMBER_GROUP_ID, name, null, abbreviation, firstDay, lastDay, timeZone, PROVIDER_ID, sourceId),
- new VenueData((String) locationMap.get("description"), (String) locationAddress, (Double) locationMap.get("latitude"), (Double) locationMap.get("longitude"), (String) locationMap.get("mapLink")));
+ new VenueData((String) locationMap.get("description"), (String) locationAddress, (Double) locationMap.get("latitude"), (Double) locationMap.get("longitude"), (String) locationMap.get("metroArea")));
loadTimeSlotData(showId, eventId, utcOffset);
loadLeaderData(showId);
loadEventSessionData(showId, eventId, abbreviation);
View
8 src/test/java/com/springsource/greenhouse/events/load/NFJSLoaderTest.java
@@ -69,7 +69,7 @@ public void loadOnce() {
assertRowCounts(1, 1, 85, 36, 112);
assertEventData("SpringOne 2GX", "America/Chicago", "2011-10-25 00:00:00.0", "2011-10-28 23:59:59.0", "S2GX");
- assertVenueData("Chicago Marriott Downtown Magnificent Mile", "540 North Michigan Avenue null Chicago, IL 60611", 41.8920052, -87.6247001, "http://maps.google.com/maps?q=540+North+Michigan+Avenue,+Chicago,+IL+60611&hl=en", 1L);
+ assertVenueData("Chicago Marriott Downtown Magnificent Mile", "540 North Michigan Avenue null Chicago, IL 60611", 41.8920052, -87.6247001, "Chicago, IL", 1L);
assertLeaderData("Craig Walls", "Craig Walls is the Spring Social Project Lead.", "http://blog.springsource.com/author/cwalls/", "habuma");
assertEventTimeSlotData(16L, 1L, "DINNER", "2011-10-26 18:30:00.0", "2011-10-26 19:30:00.0");
}
@@ -83,7 +83,7 @@ public void loadOnceThenUpdateWithSameData() {
loader.loadEventData(SHOW_ID);
assertRowCounts(1, 1, 85, 36, 112);
assertEventData("SpringOne 2GX", "America/Chicago", "2011-10-25 00:00:00.0", "2011-10-28 23:59:59.0", "S2GX");
- assertVenueData("Chicago Marriott Downtown Magnificent Mile", "540 North Michigan Avenue null Chicago, IL 60611", 41.8920052, -87.6247001, "http://maps.google.com/maps?q=540+North+Michigan+Avenue,+Chicago,+IL+60611&hl=en", 1L);
+ assertVenueData("Chicago Marriott Downtown Magnificent Mile", "540 North Michigan Avenue null Chicago, IL 60611", 41.8920052, -87.6247001, "Chicago, IL", 1L);
assertLeaderData("Craig Walls", "Craig Walls is the Spring Social Project Lead.", "http://blog.springsource.com/author/cwalls/", "habuma");
assertEventTimeSlotData(16L, 1L, "DINNER", "2011-10-26 18:30:00.0", "2011-10-26 19:30:00.0");
}
@@ -94,14 +94,14 @@ public void loadOnceThenUpdateNewData() {
loader.loadEventData(SHOW_ID);
assertRowCounts(1, 1, 85, 36, 112);
assertEventData("SpringOne 2GX", "America/Chicago", "2011-10-25 00:00:00.0", "2011-10-28 23:59:59.0", "S2GX");
- assertVenueData("Chicago Marriott Downtown Magnificent Mile", "540 North Michigan Avenue null Chicago, IL 60611", 41.8920052, -87.6247001, "http://maps.google.com/maps?q=540+North+Michigan+Avenue,+Chicago,+IL+60611&hl=en", 1L);
+ assertVenueData("Chicago Marriott Downtown Magnificent Mile", "540 North Michigan Avenue null Chicago, IL 60611", 41.8920052, -87.6247001, "Chicago, IL", 1L);
assertLeaderData("Craig Walls", "Craig Walls is the Spring Social Project Lead.", "http://blog.springsource.com/author/cwalls/", "habuma");
assertEventTimeSlotData(16L, 1L, "DINNER", "2011-10-26 18:30:00.0", "2011-10-26 19:30:00.0");
loader.loadEventData(SHOW_ID);
assertRowCounts(1, 1, 86, 37, 113);
assertEventData("SpringOne/2GX", "America/Boise", "2012-06-09 00:00:00.0", "2012-06-12 23:59:59.0", "SGX");
- assertVenueData("Pocatello Convention Center", "1234 South Arizona Drive null Pocatello, ID 83201", 41.8920052, -87.6247001, "http://maps.google.com/maps?q=1234+South+Arizona+Drive,+Pocatello,+ID+83201&hl=en", 1L);
+ assertVenueData("Pocatello Convention Center", "1234 South Arizona Drive null Pocatello, ID 83201", 41.8920052, -87.6247001, "Pocatello, ID", 1L);
assertLeaderData("Mr. Craig Walls", "Craig Walls is the Spring Social Project Lead and an avid collector of American Way magazines.", "http://blog.springsource.com/author/craigwalls/", "habumadude");
assertEventTimeSlotData(16L, 1L, "SUPPER", "2012-06-10 18:30:00.0", "2012-06-10 19:30:00.0");
}
Please sign in to comment.
Something went wrong with that request. Please try again.