Merge pull request #137 from rpmoore/config_file_rename

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

Author: shabtaisharon

ds3-sdk/build.gradle

@@ -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)

ds3-sdk/src/main/java/com/spectralogic/ds3client/serializer/XmlOutput.java

@@ -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();
@@ -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;
@@ -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 {