Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EC97F200BEF for ; Wed, 4 Jan 2017 14:07:35 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EB5A3160B3A; Wed, 4 Jan 2017 13:07:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3FB41160B39 for ; Wed, 4 Jan 2017 14:07:35 +0100 (CET) Received: (qmail 95988 invoked by uid 500); 4 Jan 2017 13:07:34 -0000 Mailing-List: contact dev-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list dev@brooklyn.apache.org Received: (qmail 95972 invoked by uid 99); 4 Jan 2017 13:07:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2017 13:07:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08EB4DF9E5; Wed, 4 Jan 2017 13:07:34 +0000 (UTC) From: neykov To: dev@brooklyn.apache.org Reply-To: dev@brooklyn.apache.org References: In-Reply-To: Subject: [GitHub] brooklyn-server pull request #492: Allow a user to add or override deseriali... Content-Type: text/plain Message-Id: <20170104130734.08EB4DF9E5@git1-us-west.apache.org> Date: Wed, 4 Jan 2017 13:07:34 +0000 (UTC) archived-at: Wed, 04 Jan 2017 13:07:36 -0000 Github user neykov commented on a diff in the pull request: https://github.com/apache/brooklyn-server/pull/492#discussion_r94579177 --- Diff: core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiConfigLoader.java --- @@ -0,0 +1,131 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ +package org.apache.brooklyn.core.mgmt.persist; + +import java.io.IOException; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; + +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.osgi.framework.Constants; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.service.cm.Configuration; +import org.osgi.service.cm.ConfigurationAdmin; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + +/** + * Loads the class-renames from the OSGi configuration file: {@code org.apache.brooklyn.classrename.cfg}. + * + * Only public for OSGi instantiation - treat as an internal class, which may change in + * future releases. + * + * See http://stackoverflow.com/questions/18844987/creating-a-blueprint-bean-from-an-inner-class: + * we unfortunately need to include {@code !org.apache.brooklyn.core.mgmt.persist.DeserializingClassRenamesProvider} + * in the Import-Package, as the mvn plugin gets confused due to the use of this inner class + * within the blueprint.xml. + * + * @see {@link #KARAF_DESERIALIZING_CLASS_RENAMES_PROPERTIES} + */ +public class OsgiConfigLoader implements ConfigLoader { --- End diff -- Can this be moved to `karaf-init`, along with the `org.osgi.compendium` dependency? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---