Move cps files to root dir

Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

diff --git a/cps/Dockerfile b/Dockerfile
similarity index 100%
rename from cps/Dockerfile
rename to Dockerfile

diff --git a/cps/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from cps/LICENSE.txt
rename to LICENSE.txt

diff --git a/README.md b/README.md
index d1bf49d..d5f0c66 100644 (file)
--- a/README.md
+++ b/README.md
@@ -29,6 +29,5 @@ java -DDB_HOST=localhost -DDB_USERNAME=cps -DDB_PASSWORD=cps -jar cps-rest/targe
 ```
 
 * Browse
-  * [Swagger UI](http://localhost:8080/swagger-ui/index.html)
-  * OpenAPI Specification in [JSON](http://localhost:8080/api/cps/openapi.json)
-   or [YAML](http://localhost:8080/api/cps/openapi.yaml) format
+  * [Swagger UI](http://localhost:8080/api/cps/swagger-ui/index.html)
+  * [Api Documentation](http://localhost:8080/api/cps/v3/api-docs)

diff --git a/cps/cps-bom/pom.xml b/cps-bom/pom.xml
similarity index 100%
rename from cps/cps-bom/pom.xml
rename to cps-bom/pom.xml

diff --git a/cps/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
similarity index 100%
rename from cps/cps-dependencies/pom.xml
rename to cps-dependencies/pom.xml

diff --git a/cps/cps-parent/pom.xml b/cps-parent/pom.xml
similarity index 100%
rename from cps/cps-parent/pom.xml
rename to cps-parent/pom.xml

diff --git a/cps/cps-rest/docs/api/swagger/openapi.yml b/cps-rest/docs/api/swagger/openapi.yml
similarity index 100%
rename from cps/cps-rest/docs/api/swagger/openapi.yml
rename to cps-rest/docs/api/swagger/openapi.yml

diff --git a/cps/cps-rest/pom.xml b/cps-rest/pom.xml
similarity index 100%
rename from cps/cps-rest/pom.xml
rename to cps-rest/pom.xml

diff --git a/cps/cps-rest/src/main/java/org/onap/cps/Application.java b/cps-rest/src/main/java/org/onap/cps/Application.java
similarity index 100%
rename from cps/cps-rest/src/main/java/org/onap/cps/Application.java
rename to cps-rest/src/main/java/org/onap/cps/Application.java

diff --git a/cps/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java
similarity index 100%
rename from cps/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java
rename to cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java

diff --git a/cps/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
similarity index 100%
rename from cps/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
rename to cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java

diff --git a/cps/cps-rest/src/main/java/org/onap/cps/rest/exceptions/ErrorMessage.java b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/ErrorMessage.java
similarity index 100%
rename from cps/cps-rest/src/main/java/org/onap/cps/rest/exceptions/ErrorMessage.java
rename to cps-rest/src/main/java/org/onap/cps/rest/exceptions/ErrorMessage.java

diff --git a/cps/cps-rest/src/main/java/org/onap/cps/swagger/config/SpringFoxConfig.java b/cps-rest/src/main/java/org/onap/cps/swagger/config/SpringFoxConfig.java
similarity index 100%
rename from cps/cps-rest/src/main/java/org/onap/cps/swagger/config/SpringFoxConfig.java
rename to cps-rest/src/main/java/org/onap/cps/swagger/config/SpringFoxConfig.java

diff --git a/cps/cps-rest/src/main/resources/application.yml b/cps-rest/src/main/resources/application.yml
similarity index 100%
rename from cps/cps-rest/src/main/resources/application.yml
rename to cps-rest/src/main/resources/application.yml

diff --git a/cps/cps-rest/src/main/resources/logback-spring.xml b/cps-rest/src/main/resources/logback-spring.xml
similarity index 100%
rename from cps/cps-rest/src/main/resources/logback-spring.xml
rename to cps-rest/src/main/resources/logback-spring.xml

diff --git a/cps/cps-rest/src/main/resources/openapi-configuration.json b/cps-rest/src/main/resources/openapi-configuration.json
similarity index 100%
rename from cps/cps-rest/src/main/resources/openapi-configuration.json
rename to cps-rest/src/main/resources/openapi-configuration.json

diff --git a/cps/cps-ri/lombok.config b/cps-ri/lombok.config
similarity index 100%
rename from cps/cps-ri/lombok.config
rename to cps-ri/lombok.config

diff --git a/cps/cps-ri/pom.xml b/cps-ri/pom.xml
similarity index 100%
rename from cps/cps-ri/pom.xml
rename to cps-ri/pom.xml

diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java
similarity index 100%
rename from cps/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java
rename to cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java

diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java
similarity index 100%
rename from cps/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java
rename to cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java

diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/JsonDataEntity.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/JsonDataEntity.java
similarity index 100%
rename from cps/cps-ri/src/main/java/org/onap/cps/spi/entities/JsonDataEntity.java
rename to cps-ri/src/main/java/org/onap/cps/spi/entities/JsonDataEntity.java

diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/ModuleEntity.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/ModuleEntity.java
similarity index 100%
rename from cps/cps-ri/src/main/java/org/onap/cps/spi/entities/ModuleEntity.java
rename to cps-ri/src/main/java/org/onap/cps/spi/entities/ModuleEntity.java

diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistencyServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistencyServiceImpl.java
similarity index 100%
rename from cps/cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistencyServiceImpl.java
rename to cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistencyServiceImpl.java

diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java
similarity index 100%
rename from cps/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java
rename to cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java

diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java
similarity index 100%
rename from cps/cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java
rename to cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java

diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java
similarity index 100%
rename from cps/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java
rename to cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java

diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java
similarity index 100%
rename from cps/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java
rename to cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java

diff --git a/cps/cps-ri/src/main/resources/hibernate.properties b/cps-ri/src/main/resources/hibernate.properties
similarity index 100%
rename from cps/cps-ri/src/main/resources/hibernate.properties
rename to cps-ri/src/main/resources/hibernate.properties

diff --git a/cps/cps-ri/src/main/resources/logback-spring.xml b/cps-ri/src/main/resources/logback-spring.xml
similarity index 100%
rename from cps/cps-ri/src/main/resources/logback-spring.xml
rename to cps-ri/src/main/resources/logback-spring.xml

diff --git a/cps/cps-ri/src/main/resources/schema.sql b/cps-ri/src/main/resources/schema.sql
similarity index 100%
rename from cps/cps-ri/src/main/resources/schema.sql
rename to cps-ri/src/main/resources/schema.sql

diff --git a/cps/cps-service/pom.xml b/cps-service/pom.xml
similarity index 100%
rename from cps/cps-service/pom.xml
rename to cps-service/pom.xml

diff --git a/cps/cps-service/src/main/java/org/onap/cps/api/CpService.java b/cps-service/src/main/java/org/onap/cps/api/CpService.java
similarity index 100%
rename from cps/cps-service/src/main/java/org/onap/cps/api/CpService.java
rename to cps-service/src/main/java/org/onap/cps/api/CpService.java

diff --git a/cps/cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java
similarity index 100%
rename from cps/cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java
rename to cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java

diff --git a/cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsException.java b/cps-service/src/main/java/org/onap/cps/exceptions/CpsException.java
similarity index 100%
rename from cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsException.java
rename to cps-service/src/main/java/org/onap/cps/exceptions/CpsException.java

diff --git a/cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsNotFoundException.java b/cps-service/src/main/java/org/onap/cps/exceptions/CpsNotFoundException.java
similarity index 100%
rename from cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsNotFoundException.java
rename to cps-service/src/main/java/org/onap/cps/exceptions/CpsNotFoundException.java

diff --git a/cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsValidationException.java b/cps-service/src/main/java/org/onap/cps/exceptions/CpsValidationException.java
similarity index 100%
rename from cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsValidationException.java
rename to cps-service/src/main/java/org/onap/cps/exceptions/CpsValidationException.java

diff --git a/cps/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java b/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java
similarity index 100%
rename from cps/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java
rename to cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java

diff --git a/cps/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java b/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java
similarity index 100%
rename from cps/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java
rename to cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java

diff --git a/cps/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
similarity index 100%
rename from cps/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
rename to cps-service/src/main/java/org/onap/cps/utils/YangUtils.java

diff --git a/cps/cps-service/src/main/resources/logback-spring.xml b/cps-service/src/main/resources/logback-spring.xml
similarity index 100%
rename from cps/cps-service/src/main/resources/logback-spring.xml
rename to cps-service/src/main/resources/logback-spring.xml

diff --git a/cps/cps-service/src/test/groovy/org/onap/cps/api/impl/CpServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpServiceImplSpec.groovy
similarity index 100%
rename from cps/cps-service/src/test/groovy/org/onap/cps/api/impl/CpServiceImplSpec.groovy
rename to cps-service/src/test/groovy/org/onap/cps/api/impl/CpServiceImplSpec.groovy

diff --git a/cps/cps-service/src/test/groovy/org/onap/cps/utils/YangUtilsSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/YangUtilsSpec.groovy
similarity index 100%
rename from cps/cps-service/src/test/groovy/org/onap/cps/utils/YangUtilsSpec.groovy
rename to cps-service/src/test/groovy/org/onap/cps/utils/YangUtilsSpec.groovy

diff --git a/cps/cps-service/src/test/java/org/onap/cps/TestUtils.java b/cps-service/src/test/java/org/onap/cps/TestUtils.java
similarity index 100%
rename from cps/cps-service/src/test/java/org/onap/cps/TestUtils.java
rename to cps-service/src/test/java/org/onap/cps/TestUtils.java

diff --git a/cps/cps-service/src/test/resources/bookstore.json b/cps-service/src/test/resources/bookstore.json
similarity index 100%
rename from cps/cps-service/src/test/resources/bookstore.json
rename to cps-service/src/test/resources/bookstore.json

diff --git a/cps/cps-service/src/test/resources/bookstore.yang b/cps-service/src/test/resources/bookstore.yang
similarity index 100%
rename from cps/cps-service/src/test/resources/bookstore.yang
rename to cps-service/src/test/resources/bookstore.yang

diff --git a/cps/cps-service/src/test/resources/invalid.yang b/cps-service/src/test/resources/invalid.yang
similarity index 100%
rename from cps/cps-service/src/test/resources/invalid.yang
rename to cps-service/src/test/resources/invalid.yang

diff --git a/cps/cps-service/src/test/resources/someOtherFile.txt b/cps-service/src/test/resources/someOtherFile.txt
similarity index 100%
rename from cps/cps-service/src/test/resources/someOtherFile.txt
rename to cps-service/src/test/resources/someOtherFile.txt

diff --git a/cps/README.md b/cps/README.md
deleted file mode 100644 (file)
index d5f0c66..0000000
--- a/cps/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Configuration Persistence Service
-
-This folder contains all files for
-[Configuration Persistence Service](https://wiki.onap.org/pages/viewpage.action?pageId=81406119).
-
-The code here is related to CPS POC, then it must be kept self contained in this cps folder to prevent any impact on
-current ccsdk components and to be ready to be moved in its own repo once CPS becomes a standalone project.
-
-
-## Running Locally
-
-* Run a postgres container instance and create `cpsdb' database:
-
-```
-CREATE USER cps WITH PASSWORD 'cps';
-CREATE DATABASE cpsdb OWNER cps;
-```
-
-* Build (from cps root folder)
-
-```bash
-mvn clean package
-```
-
-* Run (from cps root folder)
-
-```bash
-java -DDB_HOST=localhost -DDB_USERNAME=cps -DDB_PASSWORD=cps -jar cps-rest/target/cps-rest-0.0.1-SNAPSHOT.jar
-```
-
-* Browse
-  * [Swagger UI](http://localhost:8080/api/cps/swagger-ui/index.html)
-  * [Api Documentation](http://localhost:8080/api/cps/v3/api-docs)

diff --git a/cps/pom.xml b/pom.xml
similarity index 100%
rename from cps/pom.xml
rename to pom.xml

diff --git a/cps/version.properties b/version.properties
similarity index 100%
rename from cps/version.properties
rename to version.properties