diff options
18 files changed, 42 insertions, 34 deletions
diff --git a/appc-config/appc-config-adaptor/features/src/main/resources/features.xml b/appc-config/appc-config-adaptor/features/src/main/resources/features.xml index ff24b9db2..d14795bac 100644 --- a/appc-config/appc-config-adaptor/features/src/main/resources/features.xml +++ b/appc-config/appc-config-adaptor/features/src/main/resources/features.xml @@ -28,7 +28,7 @@ <feature name='appc-config-adaptor' description="Application Controller Config Adaptor" version='${project.version}'> - <feature version= '${sdnc.sli.version}'>sdnc-sli</feature> + <feature>sdnc-sli</feature> <bundle>wrap:mvn:com.jcraft/jsch/0.1.52</bundle> <bundle>wrap:mvn:org.jasypt/jasypt/1.9.2</bundle> <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle> diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java index 96cda9ca2..4bf0f33a4 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java +++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java @@ -39,7 +39,7 @@ public class CCAActivator implements BundleActivator { private static final String CCA_PROP_FILE_VAR = "SDNC_CCA_PROPERTIES"; - private static final String SDNC_CONFIG_DIR_VAR = "SDNC_CONFIG_DIR"; + private static final String SDNC_CONFIG_DIR_VAR = "APPC_CONFIG_DIR"; @SuppressWarnings("rawtypes") private ServiceRegistration registration = null; diff --git a/appc-config/appc-config-audit/features/src/main/resources/features.xml b/appc-config/appc-config-audit/features/src/main/resources/features.xml index c6d618efb..27d64e267 100644 --- a/appc-config/appc-config-audit/features/src/main/resources/features.xml +++ b/appc-config/appc-config-audit/features/src/main/resources/features.xml @@ -29,8 +29,8 @@ <feature name='appc-config-audit' description="Application Controller Config Audit" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> - <feature version='${sdnc.sli.version}'>sdnc-sli</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> + <feature>sdnc-sli</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle> <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle> @@ -40,6 +40,6 @@ <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle> <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle> <bundle>wrap:mvn:xmlunit/xmlunit/${xmlunit.version}</bundle> - <bundle>mvn:org.openecomp.appc/config-audit-provider/${project.version}</bundle> + <bundle>mvn:org.openecomp.appc/appc-config-audit-provider/${project.version}</bundle> </feature> </features> diff --git a/appc-config/appc-config-generator/features/src/main/resources/features.xml b/appc-config/appc-config-generator/features/src/main/resources/features.xml index ed0ff8008..3ce91a445 100644 --- a/appc-config/appc-config-generator/features/src/main/resources/features.xml +++ b/appc-config/appc-config-generator/features/src/main/resources/features.xml @@ -29,8 +29,8 @@ <feature name='appc-config-generator' description="Application Controller Config Generator" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> - <feature version='${sdnc.sli.version}'>sdnc-sli</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> + <feature>sdnc-sli</feature> <bundle>wrap:mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> @@ -44,6 +44,6 @@ <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle> <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle> <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle> - <bundle>mvn:org.openecomp.appc/config-generator-provider/${project.version}</bundle> + <bundle>mvn:org.openecomp.appc/appc-config-generator-provider/${project.version}</bundle> </feature> </features> diff --git a/appc-config/appc-config-params/features/src/main/resources/features.xml b/appc-config/appc-config-params/features/src/main/resources/features.xml index a12abedf0..8a852b3d7 100644 --- a/appc-config/appc-config-params/features/src/main/resources/features.xml +++ b/appc-config/appc-config-params/features/src/main/resources/features.xml @@ -33,8 +33,8 @@ <feature name='appc-config-params' description="Application Controller Config Params" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> - <feature version= '${sdnc.sli.version}'>sdnc-sli</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> + <feature>sdnc-sli</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> <bundle>mvn:commons-collections/commons-collections/${common.collections.version}</bundle> diff --git a/appc-config/appc-data-services/features/src/main/resources/features.xml b/appc-config/appc-data-services/features/src/main/resources/features.xml index 2f99eb3ad..a37150ab3 100644 --- a/appc-config/appc-data-services/features/src/main/resources/features.xml +++ b/appc-config/appc-data-services/features/src/main/resources/features.xml @@ -29,11 +29,11 @@ <feature name='appc-config-data-services' description="Application Controller Config Data Service" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> - <feature version="${sdnctl.dblib.version}">sdnc-dblib</feature> - <feature version="${sdnc.sli.version}">sdnc-sli</feature> - <feature version="${openecomp.sdnc.sql-resource.version}">sdnc-sql-resource</feature> + <feature>sdnc-dblib</feature> + <feature>sdnc-sli</feature> + <feature>sdnc-sql-resource</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> @@ -42,6 +42,6 @@ <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle> <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle> <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle> - <bundle>mvn:org.openecomp.appc/appc-data-services-provider/${project.version}</bundle> + <bundle>mvn:org.openecomp.appc/appc-config-data-services-provider/${project.version}</bundle> </feature> </features> diff --git a/appc-config/appc-data-services/provider/pom.xml b/appc-config/appc-data-services/provider/pom.xml index c4a442c1f..e00fa4c46 100644 --- a/appc-config/appc-data-services/provider/pom.xml +++ b/appc-config/appc-data-services/provider/pom.xml @@ -106,7 +106,7 @@ <configuration> <instructions> <Bundle-SymbolicName>appc-config-data-services</Bundle-SymbolicName> - <Bundle-Activator>org.openecomp.appc.config.data.services.AppcDataServiceActivator</Bundle-Activator> + <Bundle-Activator>org.openecomp.appc.data.services.AppcDataServiceActivator</Bundle-Activator> <Export-Package>org.openecomp.appc.data.services</Export-Package> <Import-Package>*</Import-Package> <DynamicImport-Package>*</DynamicImport-Package> diff --git a/appc-config/appc-encryption-tool/features/src/main/resources/features.xml b/appc-config/appc-encryption-tool/features/src/main/resources/features.xml index 6138f53c4..3e9a710f4 100644 --- a/appc-config/appc-encryption-tool/features/src/main/resources/features.xml +++ b/appc-config/appc-encryption-tool/features/src/main/resources/features.xml @@ -29,11 +29,11 @@ <feature name='appc-config-encryption-tool' description="Application Controller Encription Tool" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> - <feature version="${sdnctl.dblib.version}">sdnc-dblib</feature> - <feature version="${sdnctl.sli.version}">sdnc-sli</feature> - <feature version="${openecomp.sdnc.sql-resource.version}">sdnc-sql-resource</feature> + <feature>sdnc-dblib</feature> + <feature>sdnc-sli</feature> + <feature>sdnc-sql-resource</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> <bundle>mvn:org.apache.velocity/velocity/${velocity.version}</bundle> diff --git a/appc-config/appc-flow-controller/features/src/main/resources/features.xml b/appc-config/appc-flow-controller/features/src/main/resources/features.xml index ccbf2e1c4..4a16565fe 100644 --- a/appc-config/appc-flow-controller/features/src/main/resources/features.xml +++ b/appc-config/appc-flow-controller/features/src/main/resources/features.xml @@ -29,8 +29,8 @@ <feature name='appc-config-flow-controller' description="Application Controller Flow Executor" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> - <feature version= '${sdnc.sli.version}'>sdnc-sli</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> + <feature>sdnc-sli</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> <bundle>mvn:commons-collections/commons-collections/${common.collections.version}</bundle> @@ -38,6 +38,6 @@ <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle> <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle> <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle> - <bundle>mvn:org.openecomp.appc/appc-flow-controller-provider/${project.version}</bundle> + <bundle>mvn:org.openecomp.appc/appc-config-flow-controller-provider/${project.version}</bundle> </feature> </features> diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml index 206c2d521..606c47813 100644 --- a/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml +++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml @@ -32,7 +32,7 @@ <feature name='appc-dg-shared' description="appc-dg-shared" version='${project.version}'> <feature version='${project.version}'>appc-ssh-adapter</feature> <feature version='${project.version}'>appc-netconf-adapter</feature> - <feature version='${sdnctl.sli.version}'>sdnc-sli</feature> + <feature>sdnc-sli</feature> <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle> <bundle start-level="85" start="true">mvn:org.openecomp.appc/appc-dg-common/${project.version}</bundle> <bundle>mvn:org.openecomp.appc/appc-dg-ssh/${project.version}</bundle> diff --git a/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml b/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml index 676049150..6b6906e9d 100644 --- a/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml +++ b/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml @@ -31,11 +31,11 @@ <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> - <feature name='app-cntrl-artifact-handler' description="Application Controller Artifact Handler" + <feature name='appc-artifact-handler' description="Application Controller Artifact Handler" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> - <feature version='${sdnctl.sli.version}'>sdnc-sli</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> + <feature>sdnc-sli</feature> <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle> <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle> <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle> diff --git a/appc-inbound/appc-artifact-handler/installer/pom.xml b/appc-inbound/appc-artifact-handler/installer/pom.xml index 9af28bf6a..1a1a9800e 100755 --- a/appc-inbound/appc-artifact-handler/installer/pom.xml +++ b/appc-inbound/appc-artifact-handler/installer/pom.xml @@ -36,6 +36,14 @@ <groupId>org.openecomp.appc</groupId> <artifactId>appc-artifact-handler-provider</artifactId> </dependency> + + <dependency> + <groupId>org.openecomp.appc</groupId> + <artifactId>appc-artifact-handler-provider</artifactId> + <version>${project.version}</version> + <classifier>config</classifier> + <type>xml</type> + </dependency> </dependencies> diff --git a/appc-inbound/appc-artifact-handler/provider/pom.xml b/appc-inbound/appc-artifact-handler/provider/pom.xml index 35aea7e85..3452e4f18 100755 --- a/appc-inbound/appc-artifact-handler/provider/pom.xml +++ b/appc-inbound/appc-artifact-handler/provider/pom.xml @@ -105,7 +105,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <configuration> <artifacts> <artifact> - <file>${project.build.directory}/classes/initial/artifact-handler-provider.xml</file> + <file>${project.build.directory}/classes/initial/appc-artifact-handler-provider.xml</file> <type>xml</type> <classifier>config</classifier> </artifact> diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/artifact-handler-provider.xml b/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/appc-artifact-handler-provider.xml index 658cb3fd6..658cb3fd6 100644 --- a/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/artifact-handler-provider.xml +++ b/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/appc-artifact-handler-provider.xml diff --git a/appc-inbound/appc-design-services/features/src/main/resources/features.xml b/appc-inbound/appc-design-services/features/src/main/resources/features.xml index 315becfdb..5aa32be50 100644 --- a/appc-inbound/appc-design-services/features/src/main/resources/features.xml +++ b/appc-inbound/appc-design-services/features/src/main/resources/features.xml @@ -40,12 +40,12 @@ <bundle>mvn:org.openecomp.appc/appc-design-services-model/${project.version}</bundle> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version='${broker-mdsal.version}'>odl-mdsal-broker</feature> - <feature version='${sdnctl.sli.version}'>sdnc-sli</feature> + <feature version='${odl.mdsal.version}'>odl-mdsal-broker</feature> + <feature>sdnc-sli</feature> <bundle>mvn:org.openecomp.appc/appc-design-services-provider/${project.version}</bundle> <bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.3.0</bundle> - <feature version='${broker-mdsal.version}'>odl-restconf</feature> + <feature version='${odl.mdsal.version}'>odl-restconf</feature> </feature> diff --git a/appc-outbound/appc-aai-client/features/src/main/resources/features.xml b/appc-outbound/appc-aai-client/features/src/main/resources/features.xml index 3bc44e268..6d236efd7 100644 --- a/appc-outbound/appc-aai-client/features/src/main/resources/features.xml +++ b/appc-outbound/appc-aai-client/features/src/main/resources/features.xml @@ -34,7 +34,7 @@ <feature name='app-cntrl-aai-client' description="Application Controller AAI Client" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> <feature version="${sdnctl.sli.version}">sdnc-sli</feature> <feature version="${sdnc.aai.version}">sdnc-aai-service</feature> diff --git a/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml b/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml index e1582378f..1d84f0871 100644 --- a/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml +++ b/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml @@ -33,7 +33,7 @@ <feature name='app-cntrl-network-inventory' description="Application Controller Instar Client" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> <feature version= "${sdnctl.sli.version}">sdnc-sli</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> diff --git a/appc-sequence-generator/appc-sequence-generator-features/src/main/resources/features.xml b/appc-sequence-generator/appc-sequence-generator-features/src/main/resources/features.xml index 4a3e46938..34b65d9ec 100644 --- a/appc-sequence-generator/appc-sequence-generator-features/src/main/resources/features.xml +++ b/appc-sequence-generator/appc-sequence-generator-features/src/main/resources/features.xml @@ -29,7 +29,7 @@ <feature name='appc-sequence-generator' description="Appc Sequence Generator" version='${project.version}'> <!--<feature version="${odl.controller.mdsal.version}">odl-mdsal-broker</feature>--> - <!--<feature version="${sdnc.sli.version}">sdnc-sli</feature>--> + <!--<feature>sdnc-sli</feature>--> <bundle dependency="true">mvn:org.openecomp.appc/domain-model-lib/${project.version}</bundle> <bundle>mvn:org.openecomp.appc/appc-common/${project.version}</bundle> <bundle>mvn:org.openecomp.appc/appc-sequence-generator-model/${project.version}</bundle> |