Skip to content

Changing the file that is used to store the config information so tha… #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2015
Merged

Changing the file that is used to store the config information so tha… #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ds3-sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ task genConfigProperties << {
def productionBuild = System.getenv('productionBuild')
if (productionBuild == null) { productionBuild = 'false' }

File configFile = new File(sourceSets.main.output.resourcesDir, "/config.properties")
File configFile = new File(sourceSets.main.output.resourcesDir, "/ds3_sdk.properties")
Path configPath = sourceSets.main.output.resourcesDir.toPath()
if (!Files.exists(configPath)) {
Files.createDirectories(configPath)
Expand Down
9 changes: 5 additions & 4 deletions ds3-sdk/src/main/java/com/spectralogic/ds3client/serializer/XmlOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public class XmlOutput {
private static final JacksonXmlModule module;
private static final XmlMapper mapper;
static private final Logger LOG = LoggerFactory.getLogger(XmlOutput.class);
public static final String PRODUCTION_BUILD = "productionBuild";

static {
module = new JacksonXmlModule();
Expand All @@ -52,7 +53,7 @@ public class XmlOutput {
}

protected static boolean isProductionBuild() {
String productionBuild = System.getenv("productionBuild");
String productionBuild = System.getenv(PRODUCTION_BUILD);
if (productionBuild != null) {
if (productionBuild.equals("true")) {
return true;
Expand All @@ -61,15 +62,15 @@ protected static boolean isProductionBuild() {
}

final Properties props = new Properties();
final InputStream input = XmlOutput.class.getClassLoader().getResourceAsStream("config.properties");
final InputStream input = XmlOutput.class.getClassLoader().getResourceAsStream("ds3_sdk.properties");
if (input == null) {
LOG.error("Could not find property file.");
}
else {
try {
props.load(input);
productionBuild = (String) props.get("productionBuild");
if (productionBuild.equals("true")) {
productionBuild = (String) props.get(PRODUCTION_BUILD);
if (productionBuild != null && productionBuild.equals("true")) {
return true;
}
else {
Expand Down