[GitHub] activemq-artemis pull request #839: ARTEMIS-793 Improvement to OSGi integrat...
Github user asfgit closed the pull request at: https://github.com/apache/activemq-artemis/pull/839 --- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] activemq-artemis pull request #839: ARTEMIS-793 Improvement to OSGi integrat...
Github user clebertsuconic commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/839#discussion_r83920395
--- Diff:
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/FileStorageConfiguration.java
---
@@ -29,7 +29,7 @@
@Override
public StoreType getStoreType() {
- return StoreType.DATABASE;
+ return StoreType.FILE;
--- End diff --
@mtaylor this was a bug, right?
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] activemq-artemis pull request #839: ARTEMIS-793 Improvement to OSGi integrat...
Github user clebertsuconic commented on a diff in the pull request: https://github.com/apache/activemq-artemis/pull/839#discussion_r83920218 --- Diff: artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTrackerCallBack.java --- @@ -25,4 +25,6 @@ void addFactory(ProtocolManagerFactory pmf); void removeFactory(ProtocolManagerFactory pmf); + + void setDataSourceDependency(boolean dataSourceDependency); --- End diff -- what about renaming this to: addDataSource(WhateverInformationForTheDatasource); the callback could then decide what to do. the best would be to have a class extending ProtocolTrackerCallback: ServerTrackerCallback extends ProtocolTrackerCallback And at the caller we would check an instanceof. Would that be possible with OSGI? BTW: thanks for rebasing... at least I can comment on these changes now. --- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] activemq-artemis pull request #839: ARTEMIS-793 Improvement to OSGi integrat...
Github user clebertsuconic commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/839#discussion_r83347252
--- Diff:
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/FileStorageConfiguration.java
---
@@ -29,7 +29,7 @@
@Override
public StoreType getStoreType() {
- return StoreType.DATABASE;
--- End diff --
nice catch!
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] activemq-artemis pull request #839: ARTEMIS-793 Improvement to OSGi integrat...
Github user clebertsuconic commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/839#discussion_r83230546
--- Diff:
artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java
---
@@ -1,223 +1,252 @@
-/*
- * 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.activemq.artemis.osgi;
-
-import java.io.File;
-import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.activemq.artemis.api.core.Interceptor;
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.core.config.FileDeploymentManager;
-import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
-import
org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.artemis.core.server.ActiveMQComponent;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import
org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
-import
org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory;
-import
org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.ConfigurationPolicy;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.util.tracker.ServiceTracker;
-
-@SuppressWarnings({"unchecked", "rawtypes"})
-@Component(configurationPid = "org.apache.activemq.artemis",
configurationPolicy = ConfigurationPolicy.REQUIRE)
-public class OsgiBroker {
-
- private String name;
- private String configurationUrl;
- private String rolePrincipalClass;
- private Map components;
- private Map> registrations;
- private ServiceTracker tracker;
-
- @Activate
- public void activate(ComponentContext cctx) throws Exception {
- final BundleContext context = cctx.getBundleContext();
- final Dictionary properties = cctx.getProperties();
- configurationUrl = getMandatory(properties, "config");
- name = getMandatory(properties, "name");
- rolePrincipalClass = (String) properties.get("rolePrincipalClass");
- String domain = getMandatory(properties, "domain");
- ActiveMQJAASSecurityManager security = new
ActiveMQJAASSecurityManager(domain);
- if (rolePrincipalClass != null) {
- security.setRolePrincipalClass(rolePrincipalClass);
- }
- String brokerInstance = null;
- String karafDataDir = System.getProperty("karaf.data");
- if (karafDataDir != null) {
- brokerInstance = karafDataDir + "/artemis/" + name;
- }
-
- // todo if we start to pullout more configs from the main config
then we
- // should pull out the configuration objects from factories if
available
- FileConfiguration configuration = new FileConfiguration();
- if (brokerInstance != null) {
- configuration.setBrokerInstance(new File(brokerInstance));
- }
- FileJMSConfiguration jmsConfiguration = new FileJMSConfiguration();
-
- FileDeploymentManager fileDeploymentManager = new
FileDeploymentManager(configurationUrl);
-
fileDeploymentManager.addDeployable(configuration).addDeployable(jmsConfiguration).readConfiguration();
-
- components = fileDeploymentManager.buildService(security,
ManagementFactory.getPlatformMBeanServer());
-
- final ActiveMQServer se
[GitHub] activemq-artemis pull request #839: ARTEMIS-793 Improvement to OSGi integrat...
GitHub user graben opened a pull request: https://github.com/apache/activemq-artemis/pull/839 ARTEMIS-793 Improvement to OSGi integration You can merge this pull request into a Git repository by running: $ git pull https://github.com/graben/activemq-artemis master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/activemq-artemis/pull/839.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #839 commit 021fa843cd2ccabb2be509df18ebb57c8ab260ed Author: Benjamin Graf Date: 2016-10-11T19:27:52Z ARTEMIS-793 Improvement to OSGi integration --- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
