diff options
Diffstat (limited to 'appc-config')
11 files changed, 18 insertions, 215 deletions
diff --git a/appc-config/appc-config-adaptor/provider/pom.xml b/appc-config/appc-config-adaptor/provider/pom.xml index 11583124a..651dcf89a 100644 --- a/appc-config/appc-config-adaptor/provider/pom.xml +++ b/appc-config/appc-config-adaptor/provider/pom.xml @@ -70,22 +70,6 @@ <scope>test</scope> </dependency> - <!-- - this comes from brocade parent (app-cntrl) , not sure about opendaylight (onap) - value was <slf4j.version>1.7.2</slf4j.version> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> - </dependency> - --> - <dependency> <groupId>com.att.eelf</groupId> <artifactId>eelf-core</artifactId> @@ -140,43 +124,6 @@ <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation> </configuration> </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> diff --git a/appc-config/appc-config-adaptor/provider/src/main/resources/audit-request.xml b/appc-config/appc-config-adaptor/provider/src/main/resources/audit-request.xml index a5d0237ae..6ac9242aa 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/resources/audit-request.xml +++ b/appc-config/appc-config-adaptor/provider/src/main/resources/audit-request.xml @@ -18,8 +18,8 @@ ============LICENSE_END========================================================= --> -<NetworkAudit xmlns="http://lpp.att.com/configuration/configure/schema/v1" - xmlns:q2="http://lpp.att.com/configuration/configure/schema/v1"> +<NetworkAudit xmlns="http://onap.org/appc/lpp/configuration/configure/schema/v1" + xmlns:q2="http://onap.org/appc/lpp/configuration/configure/schema/v1"> <q2:Requester>APP-C</q2:Requester> <q2:RequesterPrefix>APP</q2:RequesterPrefix> <q2:RequestId>${request-id}</q2:RequestId> diff --git a/appc-config/appc-config-adaptor/provider/src/main/resources/config-request.xml b/appc-config/appc-config-adaptor/provider/src/main/resources/config-request.xml index d77d039b5..e0b8f2708 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/resources/config-request.xml +++ b/appc-config/appc-config-adaptor/provider/src/main/resources/config-request.xml @@ -19,7 +19,7 @@ --> <NetworkConfiguration - xmlns="http://lpp.att.com/configuration/configure/schema/v1" xmlns:q2="http://lpp.att.com/configuration/configure/schema/v1"> + xmlns="http://onap.org/appc/lpp/configuration/configure/schema/v1" xmlns:q2="http://onap.org/appc/lpp/configuration/configure/schema/v1"> <q2:Requester>APP-C</q2:Requester> <q2:RequesterPrefix>APP</q2:RequesterPrefix> <q2:RequestId>${request-id}</q2:RequestId> diff --git a/appc-config/appc-config-audit/provider/pom.xml b/appc-config/appc-config-audit/provider/pom.xml index 2329f99b7..caac1a3a5 100644 --- a/appc-config/appc-config-audit/provider/pom.xml +++ b/appc-config/appc-config-audit/provider/pom.xml @@ -106,41 +106,5 @@ </plugin> </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml index 8d9f562cc..910ac6d85 100644 --- a/appc-config/appc-config-generator/provider/pom.xml +++ b/appc-config/appc-config-generator/provider/pom.xml @@ -121,41 +121,5 @@ </plugin> </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java index 4698c8134..322e1a6c5 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java @@ -31,6 +31,6 @@ public class Constants { public static final String DEVICE_AUTHENTICATION = "DEVICE_AUTHENTICATION"; public static final String SCHEMA_SDNCTL = "SDNCTL"; - public static final String APPC_CONFIG_DIR = "/opt/app/bvc/properties"; + public static final String APPC_CONFIG_DIR = "/opt/onap/appc/data/properties"; } diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java index 94b346c1a..a39f0d2e4 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java @@ -62,7 +62,7 @@ public class DbServiceUtil { public static DBResourceManager initDbLibService() throws Exception { props = new Properties(); - File file = new File("/opt/app/bvc/properties/dblib.properties"); + File file = new File("/opt/onap/appc/data/properties/dblib.properties"); URL propURL = file.toURI().toURL(); props.load(propURL.openStream()); diff --git a/appc-config/appc-data-services/provider/pom.xml b/appc-config/appc-data-services/provider/pom.xml index 85064d009..801ab7d6b 100644 --- a/appc-config/appc-data-services/provider/pom.xml +++ b/appc-config/appc-data-services/provider/pom.xml @@ -140,41 +140,5 @@ </configuration> </plugin> </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java index d1be5e6c0..87d1c97c0 100644 --- a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java +++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java @@ -63,7 +63,7 @@ public class DbServiceUtil public static DBResourceManager initDbLibService() throws Exception { props = new Properties(); - File file = new File("/opt/app/bvc/properties/dblib.properties"); + File file = new File("/opt/onap/appc/data/properties/dblib.properties"); URL propURL = file.toURI().toURL(); props.load(propURL.openStream()); jdbcDataSource = new DBResourceManager(props); diff --git a/appc-config/appc-encryption-tool/provider/src/test/resources/svclogic.properties b/appc-config/appc-encryption-tool/provider/src/test/resources/svclogic.properties index ba3e9b820..2c12c32e1 100644 --- a/appc-config/appc-encryption-tool/provider/src/test/resources/svclogic.properties +++ b/appc-config/appc-encryption-tool/provider/src/test/resources/svclogic.properties @@ -18,16 +18,16 @@ # ============LICENSE_END========================================================= ### -com.att.sdnctl.sli.dbtype= -com.att.sdnctl.sli.jdbc.hosts= -com.att.sdnctl.sli.jdbc.url= -com.att.sdnctl.sli.jdbc.database= -com.att.sdnctl.sli.jdbc.user= -com.att.sdnctl.sli.jdbc.password= -com.att.sdnctl.sli.jdbc.connection.name= +org.onap.ccsdk.sli.dbtype= +org.onap.ccsdk.sli.jdbc.hosts= +org.onap.ccsdk.sli.jdbc.url= +org.onap.ccsdk.sli.jdbc.database= +org.onap.ccsdk.sli.jdbc.user= +org.onap.ccsdk.sli.jdbc.password= +org.onap.ccsdk.sli.jdbc.connection.name= -com.att.sdnctl.sli.jdbc.connection.timeout= -com.att.sdnctl.sli.jdbc.request.timeout= -com.att.sdnctl.sli.jdbc.limit.init= -com.att.sdnctl.sli.jdbc.limit.min= -com.att.sdnctl.sli.jdbc.limit.max= +org.onap.ccsdk.sli.jdbc.connection.timeout= +org.onap.ccsdk.sli.jdbc.request.timeout= +org.onap.ccsdk.sli.jdbc.limit.init= +org.onap.ccsdk.sli.jdbc.limit.min= +org.onap.ccsdk.sli.jdbc.limit.max= diff --git a/appc-config/appc-flow-controller/provider/pom.xml b/appc-config/appc-flow-controller/provider/pom.xml index 5912d36f0..807b52b5b 100644 --- a/appc-config/appc-flow-controller/provider/pom.xml +++ b/appc-config/appc-flow-controller/provider/pom.xml @@ -143,41 +143,5 @@ </configuration> </plugin> </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> |