Make aai-resources runnable locally via mvn spring-boot:run

- make some property files ignorable

Issue-ID: AAI-3779
Change-Id: I79cf4c6f989f96d304b35c466221e957b94d3e81
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/README.md b/README.md
index 941a734..0dce1c5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ AAI can be compiled easily with a `mvn clean install -DskipTests`. Integration t
 ## Starting AAI
 In a local development environment run:
 ``` bash
-mvn -N -P runAjsc
+mvn spring-boot:run
 ```
 You have to be in the `aai-resources` folder for that to work!
 

diff --git a/aai-resources/src/main/java/org/onap/aai/TenantIsolation/DataImportTasks.java b/aai-resources/src/main/java/org/onap/aai/TenantIsolation/DataImportTasks.java
index e32d404..098b715 100644 (file)
--- a/aai-resources/src/main/java/org/onap/aai/TenantIsolation/DataImportTasks.java
+++ b/aai-resources/src/main/java/org/onap/aai/TenantIsolation/DataImportTasks.java
@@ -53,7 +53,7 @@ import org.springframework.stereotype.Component;
  *
  */
 @Component
-@PropertySource("file:${server.local.startpath}/etc/appprops/datatoolscrons.properties")
+@PropertySource(value="file:${server.local.startpath}/etc/appprops/datatoolscrons.properties", ignoreResourceNotFound=true)
 public class DataImportTasks {
 
     private static final Logger LOGGER;

diff --git a/aai-resources/src/main/java/org/onap/aai/service/RetiredService.java b/aai-resources/src/main/java/org/onap/aai/service/RetiredService.java
index 506a097..94b1be1 100644 (file)
--- a/aai-resources/src/main/java/org/onap/aai/service/RetiredService.java
+++ b/aai-resources/src/main/java/org/onap/aai/service/RetiredService.java
@@ -33,7 +33,7 @@ import org.springframework.stereotype.Service;
 
 @Service
 @PropertySource("classpath:retired.properties")
-@PropertySource(value = "file:${server.local.startpath}/retired.properties")
+@PropertySource(value = "file:${server.local.startpath}/retired.properties", ignoreResourceNotFound=true)
 public class RetiredService {
 
     private String retiredPatterns;

diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties
index 0389406..3f0e625 100644 (file)
--- a/aai-resources/src/main/resources/application.properties
+++ b/aai-resources/src/main/resources/application.properties
@@ -36,9 +36,9 @@ server.tomcat.max-idle-time=60000
 
 # If you get an application startup failure that the port is already taken
 # If thats not it, please check if the key-store file path makes sense
-server.local.startpath=aai-resources/src/main/resources/
-server.basic.auth.location=${server.local.startpath}etc/auth/realm.properties
-server.certs.location=${server.local.startpath}etc/auth/
+server.local.startpath=src/main/resources
+server.basic.auth.location=${server.local.startpath}/etc/auth/realm.properties
+server.certs.location=${server.local.startpath}/etc/auth/
 #server.keystore.name=keystore.jks
 server.keystore.name=aai_keystore
 server.truststore.name=aai_keystore

diff --git a/aai-resources/src/main/resources/etc/appprops/janusgraph-realtime.properties b/aai-resources/src/main/resources/etc/appprops/janusgraph-realtime.properties
index 3f00b55..f0ec0ac 100644 (file)
--- a/aai-resources/src/main/resources/etc/appprops/janusgraph-realtime.properties
+++ b/aai-resources/src/main/resources/etc/appprops/janusgraph-realtime.properties
@@ -16,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
+gremlin.graph=org.janusgraph.core.JanusGraphFactory
 
 query.fast-property=true
 query.smart-limit=false
@@ -25,8 +26,7 @@ storage.hostname=localhost
 
 #schema.default=none
 storage.lock.wait-time=300
-storage.hbase.table=aaigraph-dev1.dev
-storage.hbase.ext.zookeeper.znode.parent=/hbase-unsecure
+
 # Setting db-cache to false ensure the fastest propagation of changes across servers
 cache.db-cache = false