summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHao Kuang <Hao.Kuang@amdocs.com>2017-08-22 19:13:01 +0000
committerPatrick Brady <pb071s@att.com>2017-08-22 19:54:27 +0000
commit0ef2295e9ed460ca792fa5f38da29d97c96e8e37 (patch)
tree4dd925df75698e1fab51fa5851171848471acbc2
parentde52c6240a7c4b7e0cab5ea4718ac0f4608f2aa2 (diff)
Fix appc-command-exectuor bundle fails to start
Fix that appc-command-executor-core bundle fails to load in karaf Issue-Id: APPC-163 Change-Id: Ib3099a34e60ca59e7790ffe04f8a02869d995559 Signed-off-by: Hao Kuang <Hao.Kuang@amdocs.com>
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml9
-rw-r--r--appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml47
2 files changed, 51 insertions, 5 deletions
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml
index 0a5f0678c..fefff52ec 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml
@@ -25,14 +25,13 @@
<features name="appc-command-executor-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+
<feature name='appc-command-executor' description="application executor" version='${project.version}'>
- <bundle>mvn:org.openecomp.appc/execution-queue-management-lib/${project.version}</bundle>
+ <bundle>mvn:org.openecomp.appc/execution-queue-management-lib/${project.version}</bundle>
<bundle>mvn:org.openecomp.appc/appc-command-executor-api/${project.version}</bundle>
<bundle>mvn:org.openecomp.appc/appc-command-executor-core/${project.version}</bundle>
- <!--<bundle>mvn:org.apache.commons/commons-lang3/3.4</bundle>-->
</feature>
</features>
diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 000000000..9f8628458
--- /dev/null
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ============LICENSE_START=======================================================
+ ONAP : APPC
+ ================================================================================
+ Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ ================================================================================
+ Copyright (C) 2017 Amdocs
+ =============================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ ============LICENSE_END=========================================================
+ -->
+
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+
+ <bean id="ExecutionQueueUtilBean" class="org.openecomp.appc.executionqueue.helper.Util" scope="singleton"
+ init-method="init">
+ </bean>
+
+ <bean id="QueueManagerBean" class="org.openecomp.appc.executionqueue.impl.QueueManager" scope="singleton"
+ init-method="init" destroy-method="stop">
+ <property name="executionQueueUtil" ref="ExecutionQueueUtilBean"/>
+ </bean>
+
+ <bean id="ExecutionQueueServiceBean" class="org.openecomp.appc.executionqueue.impl.ExecutionQueueServiceImpl"
+ scope="singleton">
+ <property name="queueManager" ref="QueueManagerBean"/>
+ </bean>
+
+ <service id="ExecutionQueueService" interface="org.openecomp.appc.executionqueue.ExecutionQueueService"
+ ref="ExecutionQueueServiceBean"/>
+</blueprint>