Skip to content

Commit c040aaa

Browse files
committed
Fixes for basic Cloud Foundry deployment
1 parent a73872e commit c040aaa

6 files changed

Lines changed: 13 additions & 8 deletions

File tree

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ Build Status:
99

1010
[![Build Status](https://travis-ci.org/devnexus/devnexus-site.png?branch=master)](https://travis-ci.org/devnexus/devnexus-site)
1111

12+
#### Running on Cloud Foundry
13+
14+
https://github.com/cloudfoundry/java-buildpack/issues/174
15+
16+
cf set-env my_app JBP_CONFIG_OPEN_JDK_JRE ‘[memory_heuristics: {metaspace: 128}, memory_sizes: {metaspace: 96m..}]
17+
cf restage my_app
18+
1219
#### Running Postgres on Mac
1320

1421
You may run into issues such as the following:

src/main/java/com/devnexus/ting/core/applicationlistener/ContextRefreshedEventListener.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,14 @@ public class ContextRefreshedEventListener implements
4444
@Override
4545
public void onApplicationEvent(ContextRefreshedEvent event) {
4646

47-
if (environment.acceptsProfiles("demo")) {
47+
if (environment.acceptsProfiles("demo", "cloud")) {
4848
// From: http://forum.springsource.org/showthread.php?t=84312&page=2
4949
//configurer.toString();
5050
if (event.getApplicationContext().getParent() == null) {
51-
LOGGER.info("Setting up database...");
52-
systemSetupService.setupDatabase();
51+
if (!systemSetupService.isDatabaseSetup()) {
52+
LOGGER.info("Setting up database...");
53+
systemSetupService.setupDatabase();
54+
}
5355
}
5456
}
5557
}

src/main/java/com/devnexus/ting/web/config/CloudConfig.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.devnexus.ting.web.config;
22

3-
import javax.sql.DataSource;
4-
53
import org.springframework.cloud.Cloud;
64
import org.springframework.cloud.CloudFactory;
75
import org.springframework.cloud.service.ServiceInfo;

src/main/java/com/devnexus/ting/web/config/DefaultApplicationContextInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void initialize(ConfigurableApplicationContext applicationContext) {
4545
final CloudEnvironment env = new CloudEnvironment();
4646
if (env.getInstanceInfo() != null) {
4747
LOGGER.info("cloud API: " + env.getCloudApiUri());
48-
applicationContext.getEnvironment().setActiveProfiles("cloud");
48+
applicationContext.getEnvironment().setActiveProfiles("cloud", SpringContextMode.DemoContextConfiguration.getCode());
4949
}
5050
else {
5151
final String profile = System.getProperty("ting-spring-profile");

src/main/java/com/devnexus/ting/web/config/ServicesConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.context.annotation.Import;
2626
import org.springframework.context.annotation.ImportResource;
2727
import org.springframework.context.annotation.Profile;
28-
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
2928
import org.springframework.messaging.Message;
3029
import org.springframework.messaging.MessagingException;
3130
import org.springframework.messaging.core.MessagePostProcessor;

src/main/java/com/devnexus/ting/web/config/WebConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
6161
import org.springframework.web.servlet.view.xml.MarshallingView;
6262

63-
6463
import com.devnexus.ting.web.JaxbJacksonObjectMapper;
6564
import com.devnexus.ting.web.converter.StringToEvent;
6665
import com.devnexus.ting.web.converter.StringToPresentationType;

0 commit comments

Comments
 (0)