You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2018/12/05 13:48:20 UTC
[sling-org-apache-sling-launchpad-startupmanager] branch master
created (now fd91516)
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-startupmanager.git.
at fd91516 Clean-up after import
This branch includes the following new commits:
new 916f034 startup manager bundle contribution
new fdf9e8d Implement missing launchpad services.
new a0728be Update StartUpHandlerImpl.java
new c19354d Register the StartupService once the framework is started
new 9a0985c Don't depend on the StartupHandler in StartupListenerTracker
new 9800b76 Support start-level based frameworks too.
new a9ee985 Allow to choose whether startup is startlevel-based.
new fd91516 Clean-up after import
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-launchpad-startupmanager] 03/08: Update
StartUpHandlerImpl.java
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-startupmanager.git
commit a0728be5da902df4792eb3479568548a2b3ba7c4
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Mon Nov 26 17:42:51 2018 +0100
Update StartUpHandlerImpl.java
---
.../org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java
index 8b75a52..fded5bf 100644
--- a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java
@@ -35,7 +35,7 @@ public class StartUpHandlerImpl implements StartupHandler
@Override
public StartupMode getMode()
{
- return StartupMode.RESTART;
+ return StartupMode.INSTALL;
}
@Override
[sling-org-apache-sling-launchpad-startupmanager] 07/08: Allow to
choose whether startup is startlevel-based.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-startupmanager.git
commit a9ee9856cb8b4659202470b741f998f9b7b7037c
Author: Tomek Rękawek <to...@apache.org>
AuthorDate: Thu Nov 29 19:34:41 2018 +0100
Allow to choose whether startup is startlevel-based.
---
.../apache/sling/launchpad/startupmanager/StartupListenerTracker.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
index c7eb9a3..bd33949 100644
--- a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
@@ -57,6 +57,7 @@ public class StartupListenerTracker implements FrameworkListener, BundleListener
StartupListenerTracker(final BundleContext bundleContext) {
this.bundleContext = bundleContext;
this.startupMode = StartupMode.INSTALL;
+ this.startLevelBased = Boolean.valueOf(bundleContext.getProperty("sling.launchpad.startlevel.based"));
startLevelServiceReference = bundleContext.getServiceReference(StartLevel.class);
if (startLevelServiceReference != null) {
@@ -107,7 +108,6 @@ public class StartupListenerTracker implements FrameworkListener, BundleListener
@Override
public void frameworkEvent(FrameworkEvent event) {
if (event.getType() == FrameworkEvent.STARTLEVEL_CHANGED && startLevelService != null) {
- startLevelBased = true;
int startLevel = startLevelService.getStartLevel();
if (startLevel >= TARGET_START_LEVEL) {
onFinished();
[sling-org-apache-sling-launchpad-startupmanager] 06/08: Support
start-level based frameworks too.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-startupmanager.git
commit 9800b760d9297f6a2c4195b5746b7c61885a8326
Author: Tomek Rękawek <to...@apache.org>
AuthorDate: Thu Nov 29 17:51:08 2018 +0100
Support start-level based frameworks too.
---
.../startupmanager/StartupListenerTracker.java | 58 +++++++++++++++++-----
1 file changed, 45 insertions(+), 13 deletions(-)
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
index eacaa09..c7eb9a3 100644
--- a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
@@ -26,6 +26,7 @@ import org.osgi.framework.BundleListener;
import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.startlevel.StartLevel;
import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
import org.slf4j.Logger;
@@ -37,17 +38,33 @@ public class StartupListenerTracker implements FrameworkListener, BundleListener
private static final Logger log = LoggerFactory.getLogger(StartupListenerTracker.class);
+ private static final int TARGET_START_LEVEL = 30;
+
private final StartupMode startupMode;
private final BundleContext bundleContext;
private final ServiceTracker<StartupListener, StartupListener> tracker;
+ private final ServiceReference<StartLevel> startLevelServiceReference;
+
+ private final StartLevel startLevelService;
+
private volatile boolean frameworkStarted;
+ private boolean startLevelBased;
+
StartupListenerTracker(final BundleContext bundleContext) {
this.bundleContext = bundleContext;
this.startupMode = StartupMode.INSTALL;
+
+ startLevelServiceReference = bundleContext.getServiceReference(StartLevel.class);
+ if (startLevelServiceReference != null) {
+ startLevelService = bundleContext.getService(startLevelServiceReference);
+ } else {
+ startLevelService = null;
+ }
+
tracker = new ServiceTracker<>(bundleContext, StartupListener.class,
new ServiceTrackerCustomizer<StartupListener, StartupListener>() {
@Override
@@ -82,24 +99,21 @@ public class StartupListenerTracker implements FrameworkListener, BundleListener
bundleContext.removeFrameworkListener(this);
bundleContext.removeBundleListener(this);
tracker.close();
+ if (startLevelServiceReference != null) {
+ bundleContext.ungetService(startLevelServiceReference);
+ }
}
@Override
public void frameworkEvent(FrameworkEvent event) {
- if (event.getType() == FrameworkEvent.STARTED) {
- frameworkStarted = true;
- log.info("Startup finished");
- for (StartupListener listener : tracker.getServices(new StartupListener[0])) {
- listener.startupFinished(startupMode);
+ if (event.getType() == FrameworkEvent.STARTLEVEL_CHANGED && startLevelService != null) {
+ startLevelBased = true;
+ int startLevel = startLevelService.getStartLevel();
+ if (startLevel >= TARGET_START_LEVEL) {
+ onFinished();
}
-
- StartupService startupService = new StartupService() {
- @Override
- public StartupMode getStartupMode() {
- return startupMode;
- }
- };
- bundleContext.registerService(StartupService.class, startupService, new Hashtable<String, Object>());
+ } else if (event.getType() == FrameworkEvent.STARTED && !startLevelBased) {
+ onFinished();
}
}
@@ -124,4 +138,22 @@ public class StartupListenerTracker implements FrameworkListener, BundleListener
}
}
}
+
+ private void onFinished() {
+ frameworkStarted = true;
+ log.info("Startup finished");
+ for (StartupListener listener : tracker.getServices(new StartupListener[0])) {
+ listener.startupFinished(startupMode);
+ }
+
+ StartupService startupService = new StartupService() {
+ @Override
+ public StartupMode getStartupMode() {
+ return startupMode;
+ }
+ };
+ bundleContext.registerService(StartupService.class, startupService, new Hashtable<String, Object>());
+ }
+
+
}
[sling-org-apache-sling-launchpad-startupmanager] 05/08: Don't
depend on the StartupHandler in StartupListenerTracker
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-startupmanager.git
commit 9a0985c3dadc98274a62e19b94beae0e1ae49fd6
Author: Tomek Rękawek <to...@apache.org>
AuthorDate: Thu Nov 29 12:39:08 2018 +0100
Don't depend on the StartupHandler in StartupListenerTracker
---
.../sling/launchpad/startupmanager/StartupListenerTracker.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
index c7d55de..eacaa09 100644
--- a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
@@ -16,7 +16,6 @@
*/
package org.apache.sling.launchpad.startupmanager;
-import org.apache.sling.launchpad.api.StartupHandler;
import org.apache.sling.launchpad.api.StartupListener;
import org.apache.sling.launchpad.api.StartupMode;
import org.apache.sling.launchpad.api.StartupService;
@@ -48,12 +47,7 @@ public class StartupListenerTracker implements FrameworkListener, BundleListener
StartupListenerTracker(final BundleContext bundleContext) {
this.bundleContext = bundleContext;
-
- final ServiceReference<StartupHandler> startupHandlerServiceReference = bundleContext.getServiceReference(StartupHandler.class);
- final StartupHandler startupHandler = bundleContext.getService(startupHandlerServiceReference);
- startupMode = startupHandler.getMode();
- bundleContext.ungetService(startupHandlerServiceReference);
-
+ this.startupMode = StartupMode.INSTALL;
tracker = new ServiceTracker<>(bundleContext, StartupListener.class,
new ServiceTrackerCustomizer<StartupListener, StartupListener>() {
@Override
@@ -71,7 +65,7 @@ public class StartupListenerTracker implements FrameworkListener, BundleListener
final StartupListener listener = bundleContext.getService(reference);
if (listener != null) {
try {
- listener.inform(startupHandler.getMode(), frameworkStarted);
+ listener.inform(startupMode, frameworkStarted);
} catch (final Throwable t) {
log.error("Error calling StartupListener {}", listener, t);
}
[sling-org-apache-sling-launchpad-startupmanager] 02/08: Implement
missing launchpad services.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-startupmanager.git
commit fdf9e8d0a9be3c567d95284e0b2506cd0c0a77e6
Author: Karl Pauls <kp...@adobe.com>
AuthorDate: Thu Nov 22 22:34:42 2018 +0100
Implement missing launchpad services.
---
.../sling/launchpad/startupmanager/Activator.java | 36 ++++---
.../LaunchpadContentProviderImpl.java | 111 +++++++++++++++++++++
.../startupmanager/StartUpHandlerImpl.java | 52 ++++++++++
3 files changed, 183 insertions(+), 16 deletions(-)
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java
index bddfc1a..5dae9ca 100644
--- a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java
@@ -18,6 +18,8 @@
*/
package org.apache.sling.launchpad.startupmanager;
+import org.apache.sling.launchpad.api.LaunchpadContentProvider;
+import org.apache.sling.launchpad.api.StartupHandler;
import org.apache.sling.launchpad.api.StartupListener;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -37,40 +39,30 @@ public class Activator implements BundleActivator {
private static final Logger log = LoggerFactory.getLogger(Activator.class);
- private ServiceRegistration<?> mbeanServerReg;
-
- private ServiceRegistration<StartupListener> mbeanStartupListenerReg;
-
private StartupListenerTracker startupListenerTracker;
@Override
public void start(final BundleContext bundleContext) {
startupListenerTracker = new StartupListenerTracker(bundleContext);
- mbeanServerReg = registerMBeanServer(bundleContext);
+ registerMBeanServer(bundleContext);
try {
- mbeanStartupListenerReg = bundleContext.registerService(StartupListener.class, new MBeanStartupListener(), new Hashtable<String, Object>());
+ registerMBeanStartupListener(bundleContext);
} catch (MalformedObjectNameException e) {
log.error("Can't instantiate MBeanStartupListener");
}
+ registerStartupHandler(bundleContext);
+ registerLaunchpadContentProvider(bundleContext);
}
@Override
public void stop(final BundleContext context) {
- if (mbeanStartupListenerReg != null) {
- mbeanStartupListenerReg.unregister();
- mbeanStartupListenerReg = null;
- }
- if (mbeanServerReg != null) {
- mbeanServerReg.unregister();
- mbeanServerReg = null;
- }
if (startupListenerTracker != null) {
startupListenerTracker.close();
startupListenerTracker = null;
}
}
- private ServiceRegistration<?> registerMBeanServer(final BundleContext bundleContext) {
+ private ServiceRegistration<MBeanServer> registerMBeanServer(final BundleContext bundleContext) {
// register the platform MBeanServer
MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
Hashtable<String, Object> mbeanProps = new Hashtable<String, Object>();
@@ -90,6 +82,18 @@ public class Activator implements BundleActivator {
} catch (Exception je) {
log.error("start: Cannot set service properties of Platform MBeanServer service, registering without", je);
}
- return bundleContext.registerService(MBeanServer.class.getName(), platformMBeanServer, mbeanProps);
+ return bundleContext.registerService(MBeanServer.class, platformMBeanServer, mbeanProps);
+ }
+
+ private ServiceRegistration<StartupHandler> registerStartupHandler(final BundleContext bundleContext) {
+ return bundleContext.registerService(StartupHandler.class, new StartUpHandlerImpl(bundleContext.getBundle(0)), null);
+ }
+
+ private ServiceRegistration<LaunchpadContentProvider> registerLaunchpadContentProvider(final BundleContext bundleContext) {
+ return bundleContext.registerService(LaunchpadContentProvider.class, new LaunchpadContentProviderImpl(bundleContext.getBundle(0)), null);
+ }
+
+ private ServiceRegistration<StartupListener> registerMBeanStartupListener(final BundleContext bundleContext) throws MalformedObjectNameException {
+ return bundleContext.registerService(StartupListener.class, new MBeanStartupListener(), null);
}
}
\ No newline at end of file
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/LaunchpadContentProviderImpl.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/LaunchpadContentProviderImpl.java
new file mode 100644
index 0000000..c76ae7f
--- /dev/null
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/LaunchpadContentProviderImpl.java
@@ -0,0 +1,111 @@
+/*
+ * 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.sling.launchpad.startupmanager;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.regex.Pattern;
+
+import org.apache.sling.launchpad.api.LaunchpadContentProvider;
+import org.osgi.framework.Bundle;
+
+public class LaunchpadContentProviderImpl implements LaunchpadContentProvider
+{
+ private final Bundle framework;
+
+ public LaunchpadContentProviderImpl(Bundle framework) {
+ this.framework = framework;
+ }
+
+ @Override
+ public Iterator<String> getChildren(String path) {
+ List<String> children;
+
+ // Guard against extra trailing slashes
+ if(path.endsWith("/") && path.length() > 1) {
+ path = path.substring(0, path.length()-1);
+ }
+
+ URL url = framework.getResource(path);
+ if (url != null) {
+ Pattern pathPattern = Pattern.compile("^" + path + "/[^/]+/?$");
+
+ children = new ArrayList<String>();
+ try {
+ URLConnection conn = url.openConnection();
+ if (conn instanceof JarURLConnection) {
+ JarFile jar = ((JarURLConnection) conn).getJarFile();
+ Enumeration<JarEntry> entries = jar.entries();
+ while (entries.hasMoreElements()) {
+ String entry = entries.nextElement().getName();
+ if (pathPattern.matcher(entry).matches()) {
+ children.add(entry);
+ }
+ }
+ }
+ } catch (IOException ioe) {
+ // ignore for now
+ }
+ } else {
+ children = Collections.emptyList();
+ }
+
+ return children.iterator();
+ }
+
+ @Override
+ public URL getResource(String path) {
+ // ensure path
+ if (path == null || path.length() == 0) {
+ return null;
+ }
+
+ // remove leading slash
+ if (path.charAt(0) == '/') {
+ path = path.substring(1);
+ }
+
+ return framework.getResource(path);
+ }
+
+ @Override
+ public InputStream getResourceAsStream(String path) {
+ URL res = this.getResource(path);
+ if (res != null) {
+ try {
+ return res.openStream();
+ } catch (IOException ioe) {
+ // ignore this one
+ }
+ }
+
+ // no resource
+ return null;
+ }
+}
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java
new file mode 100644
index 0000000..8b75a52
--- /dev/null
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sling.launchpad.startupmanager;
+
+import org.apache.sling.launchpad.api.StartupHandler;
+import org.apache.sling.launchpad.api.StartupMode;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.ServiceFactory;
+
+public class StartUpHandlerImpl implements StartupHandler
+{
+ private final Bundle framework;
+
+ public StartUpHandlerImpl(Bundle bundle)
+ {
+ framework = bundle;
+ }
+
+ @Override
+ public StartupMode getMode()
+ {
+ return StartupMode.RESTART;
+ }
+
+ @Override
+ public boolean isFinished()
+ {
+ return framework.getState() == Bundle.ACTIVE;
+ }
+
+ @Override
+ public void waitWithStartup(boolean b)
+ {
+ // Ignore
+ }
+}
[sling-org-apache-sling-launchpad-startupmanager] 08/08: Clean-up
after import
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-startupmanager.git
commit fd9151686745cc9e5bf94399d7ba20df1f788007
Author: Karl Pauls <kp...@adobe.com>
AuthorDate: Wed Dec 5 14:48:08 2018 +0100
Clean-up after import
---
startupmanager/CODE_OF_CONDUCT.md => CODE_OF_CONDUCT.md | 0
startupmanager/CONTRIBUTING.md => CONTRIBUTING.md | 0
startupmanager/LICENSE => LICENSE | 0
startupmanager/README.md => README.md | 0
startupmanager/pom.xml => pom.xml | 0
.../main/java/org/apache/sling/launchpad/startupmanager/Activator.java | 0
.../sling/launchpad/startupmanager/LaunchpadContentProviderImpl.java | 0
.../org/apache/sling/launchpad/startupmanager/MBeanStartupListener.java | 0
.../org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java | 0
.../org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java | 0
10 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/startupmanager/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
similarity index 100%
rename from startupmanager/CODE_OF_CONDUCT.md
rename to CODE_OF_CONDUCT.md
diff --git a/startupmanager/CONTRIBUTING.md b/CONTRIBUTING.md
similarity index 100%
rename from startupmanager/CONTRIBUTING.md
rename to CONTRIBUTING.md
diff --git a/startupmanager/LICENSE b/LICENSE
similarity index 100%
rename from startupmanager/LICENSE
rename to LICENSE
diff --git a/startupmanager/README.md b/README.md
similarity index 100%
rename from startupmanager/README.md
rename to README.md
diff --git a/startupmanager/pom.xml b/pom.xml
similarity index 100%
rename from startupmanager/pom.xml
rename to pom.xml
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java b/src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java
similarity index 100%
rename from startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java
rename to src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/LaunchpadContentProviderImpl.java b/src/main/java/org/apache/sling/launchpad/startupmanager/LaunchpadContentProviderImpl.java
similarity index 100%
rename from startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/LaunchpadContentProviderImpl.java
rename to src/main/java/org/apache/sling/launchpad/startupmanager/LaunchpadContentProviderImpl.java
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/MBeanStartupListener.java b/src/main/java/org/apache/sling/launchpad/startupmanager/MBeanStartupListener.java
similarity index 100%
rename from startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/MBeanStartupListener.java
rename to src/main/java/org/apache/sling/launchpad/startupmanager/MBeanStartupListener.java
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java b/src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java
similarity index 100%
rename from startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java
rename to src/main/java/org/apache/sling/launchpad/startupmanager/StartUpHandlerImpl.java
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java b/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
similarity index 100%
rename from startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
rename to src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
[sling-org-apache-sling-launchpad-startupmanager] 01/08: startup
manager bundle contribution
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-startupmanager.git
commit 916f034957164ed68c76f50b6eca97977ba33861
Author: Tomek Rękawek <to...@apache.org>
AuthorDate: Thu Nov 22 16:43:04 2018 +0100
startup manager bundle contribution
---
startupmanager/.gitignore | 17 ++
startupmanager/CODE_OF_CONDUCT.md | 22 +++
startupmanager/CONTRIBUTING.md | 24 +++
startupmanager/LICENSE | 202 +++++++++++++++++++++
startupmanager/README.md | 5 +
startupmanager/pom.xml | 78 ++++++++
.../sling/launchpad/startupmanager/Activator.java | 95 ++++++++++
.../startupmanager/MBeanStartupListener.java | 101 +++++++++++
.../startupmanager/StartupListenerTracker.java | 122 +++++++++++++
9 files changed, 666 insertions(+)
diff --git a/startupmanager/.gitignore b/startupmanager/.gitignore
new file mode 100644
index 0000000..5b783ed
--- /dev/null
+++ b/startupmanager/.gitignore
@@ -0,0 +1,17 @@
+/target
+.idea
+.classpath
+.metadata
+.project
+.settings
+.externalToolBuilders
+maven-eclipse.xml
+*.swp
+*.iml
+*.ipr
+*.iws
+*.bak
+.vlt
+.DS_Store
+jcr.log
+atlassian-ide-plugin.xml
diff --git a/startupmanager/CODE_OF_CONDUCT.md b/startupmanager/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..0fa18e5
--- /dev/null
+++ b/startupmanager/CODE_OF_CONDUCT.md
@@ -0,0 +1,22 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+Apache Software Foundation Code of Conduct
+====
+
+Being an Apache project, Apache Sling adheres to the Apache Software Foundation's [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html).
diff --git a/startupmanager/CONTRIBUTING.md b/startupmanager/CONTRIBUTING.md
new file mode 100644
index 0000000..ac82a1a
--- /dev/null
+++ b/startupmanager/CONTRIBUTING.md
@@ -0,0 +1,24 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+Contributing
+====
+
+Thanks for choosing to contribute!
+
+You will find all the necessary details about how you can do this at https://sling.apache.org/contributing.html.
diff --git a/startupmanager/LICENSE b/startupmanager/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/startupmanager/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
diff --git a/startupmanager/README.md b/startupmanager/README.md
new file mode 100644
index 0000000..64ed185
--- /dev/null
+++ b/startupmanager/README.md
@@ -0,0 +1,5 @@
+[<img src="http://sling.apache.org/res/logos/sling.png"/>](http://sling.apache.org)
+
+# Apache Sling Launchpad Startup Manager
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
diff --git a/startupmanager/pom.xml b/startupmanager/pom.xml
new file mode 100644
index 0000000..80e6d6b
--- /dev/null
+++ b/startupmanager/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>26</version>
+ <relativePath />
+ </parent>
+
+ <artifactId>org.apache.sling.launchpad.startupmanager</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Launchpad Startup Manager</name>
+ <description>This module manages the StartupListeners</description>
+
+ <properties>
+ <sling.java.version>7</sling.java.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Activator>
+ org.apache.sling.launchpad.startupmanager.Activator
+ </Bundle-Activator>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.api</artifactId>
+ <version>1.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java
new file mode 100644
index 0000000..bddfc1a
--- /dev/null
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/Activator.java
@@ -0,0 +1,95 @@
+/*
+ * 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.sling.launchpad.startupmanager;
+
+import org.apache.sling.launchpad.api.StartupListener;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import java.lang.management.ManagementFactory;
+import java.util.Hashtable;
+
+public class Activator implements BundleActivator {
+
+ private static final Logger log = LoggerFactory.getLogger(Activator.class);
+
+ private ServiceRegistration<?> mbeanServerReg;
+
+ private ServiceRegistration<StartupListener> mbeanStartupListenerReg;
+
+ private StartupListenerTracker startupListenerTracker;
+
+ @Override
+ public void start(final BundleContext bundleContext) {
+ startupListenerTracker = new StartupListenerTracker(bundleContext);
+ mbeanServerReg = registerMBeanServer(bundleContext);
+ try {
+ mbeanStartupListenerReg = bundleContext.registerService(StartupListener.class, new MBeanStartupListener(), new Hashtable<String, Object>());
+ } catch (MalformedObjectNameException e) {
+ log.error("Can't instantiate MBeanStartupListener");
+ }
+ }
+
+ @Override
+ public void stop(final BundleContext context) {
+ if (mbeanStartupListenerReg != null) {
+ mbeanStartupListenerReg.unregister();
+ mbeanStartupListenerReg = null;
+ }
+ if (mbeanServerReg != null) {
+ mbeanServerReg.unregister();
+ mbeanServerReg = null;
+ }
+ if (startupListenerTracker != null) {
+ startupListenerTracker.close();
+ startupListenerTracker = null;
+ }
+ }
+
+ private ServiceRegistration<?> registerMBeanServer(final BundleContext bundleContext) {
+ // register the platform MBeanServer
+ MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
+ Hashtable<String, Object> mbeanProps = new Hashtable<String, Object>();
+ try {
+ ObjectName beanName = ObjectName.getInstance("JMImplementation:type=MBeanServerDelegate");
+ AttributeList attrs = platformMBeanServer.getAttributes(beanName,
+ new String[] { "MBeanServerId", "SpecificationName",
+ "SpecificationVersion", "SpecificationVendor",
+ "ImplementationName", "ImplementationVersion",
+ "ImplementationVendor" });
+ for (Object object : attrs) {
+ Attribute attr = (Attribute) object;
+ if (attr.getValue() != null) {
+ mbeanProps.put(attr.getName(), attr.getValue().toString());
+ }
+ }
+ } catch (Exception je) {
+ log.error("start: Cannot set service properties of Platform MBeanServer service, registering without", je);
+ }
+ return bundleContext.registerService(MBeanServer.class.getName(), platformMBeanServer, mbeanProps);
+ }
+}
\ No newline at end of file
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/MBeanStartupListener.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/MBeanStartupListener.java
new file mode 100644
index 0000000..a2f6fc4
--- /dev/null
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/MBeanStartupListener.java
@@ -0,0 +1,101 @@
+/*
+ * 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.sling.launchpad.startupmanager;
+
+import java.lang.management.ManagementFactory;
+
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.sling.launchpad.api.StartupListener;
+import org.apache.sling.launchpad.api.StartupMode;
+
+/**
+ * The startup listener is listening for startup events.
+ *
+ * It notifies a JMX MBean when the startup is completed and about the
+ * progress.
+ */
+public class MBeanStartupListener
+ implements StartupListener {
+
+ /** The launcher mbean name. */
+ private static final String NAME_LAUNCHER = "org.apache.sling.launchpad:type=Launcher";
+
+ /** JMX Server. */
+ private final MBeanServer jmxServer;
+
+ /** Name of the launcher mbean. */
+ private final ObjectName launcherName;
+
+ /** Marker if the mbean is available. */
+ private boolean available;
+
+ /**
+ * Create a new MBean helper.
+ * @throws MalformedObjectNameException if the format of the object name does not correspond to a valid ObjectName.
+ */
+ public MBeanStartupListener() throws MalformedObjectNameException {
+ this.launcherName = new ObjectName(NAME_LAUNCHER);
+ this.jmxServer = ManagementFactory.getPlatformMBeanServer();
+ // we check for the launcher mbean
+ try {
+ this.jmxServer.getMBeanInfo(launcherName);
+ available = true;
+ } catch (final Exception ignore) {
+ available = false;
+ // ignore
+ }
+ }
+
+ /**
+ * @see org.apache.sling.launchpad.api.StartupListener#inform(org.apache.sling.launchpad.api.StartupMode, boolean)
+ */
+ @Override
+ public void inform(StartupMode mode, boolean finished) {
+ // nothing to do
+ }
+
+ /**
+ * @see org.apache.sling.launchpad.api.StartupListener#startupFinished(org.apache.sling.launchpad.api.StartupMode)
+ */
+ @Override
+ public void startupFinished(StartupMode mode) {
+ if ( this.available ) {
+ try {
+ this.jmxServer.invoke(launcherName, "startupFinished", null, null);
+ } catch (final Exception e) {
+ // we ignore this
+ }
+ }
+ }
+
+ /**
+ * @see org.apache.sling.launchpad.api.StartupListener#startupProgress(float)
+ */
+ @Override
+ public void startupProgress(float ratio) {
+ if ( this.available ) {
+ try {
+ this.jmxServer.invoke(launcherName, "startupProgress", new Object[]{ratio}, new String[]{Float.class.getName()});
+ } catch (final Exception e) {
+ // we ignore this
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
new file mode 100644
index 0000000..532acf6
--- /dev/null
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
@@ -0,0 +1,122 @@
+/*
+ * 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.sling.launchpad.startupmanager;
+
+import org.apache.sling.launchpad.api.StartupHandler;
+import org.apache.sling.launchpad.api.StartupListener;
+import org.apache.sling.launchpad.api.StartupMode;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
+import org.osgi.framework.FrameworkEvent;
+import org.osgi.framework.FrameworkListener;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class StartupListenerTracker implements FrameworkListener, BundleListener {
+
+ private static final Logger log = LoggerFactory.getLogger(StartupListenerTracker.class);
+
+ private final StartupMode startupMode;
+
+ private final BundleContext bundleContext;
+
+ private final ServiceTracker<StartupListener, StartupListener> tracker;
+
+ private volatile boolean frameworkStarted;
+
+ StartupListenerTracker(final BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+
+ final ServiceReference<StartupHandler> startupHandlerServiceReference = bundleContext.getServiceReference(StartupHandler.class);
+ final StartupHandler startupHandler = bundleContext.getService(startupHandlerServiceReference);
+ startupMode = startupHandler.getMode();
+ bundleContext.ungetService(startupHandlerServiceReference);
+
+ tracker = new ServiceTracker<>(bundleContext, StartupListener.class,
+ new ServiceTrackerCustomizer<StartupListener, StartupListener>() {
+ @Override
+ public void removedService(final ServiceReference<StartupListener> reference, final StartupListener service) {
+ bundleContext.ungetService(reference);
+ }
+
+ @Override
+ public void modifiedService(final ServiceReference<StartupListener> reference, final StartupListener service) {
+ // nothing to do
+ }
+
+ @Override
+ public StartupListener addingService(final ServiceReference<StartupListener> reference) {
+ final StartupListener listener = bundleContext.getService(reference);
+ if (listener != null) {
+ try {
+ listener.inform(startupHandler.getMode(), frameworkStarted);
+ } catch (final Throwable t) {
+ log.error("Error calling StartupListener {}", listener, t);
+ }
+ }
+ return listener;
+ }
+ });
+ tracker.open();
+ bundleContext.addFrameworkListener(this);
+ bundleContext.addBundleListener(this);
+ }
+
+ public void close() {
+ bundleContext.removeFrameworkListener(this);
+ bundleContext.removeBundleListener(this);
+ tracker.close();
+ }
+
+ @Override
+ public void frameworkEvent(FrameworkEvent event) {
+ if (event.getType() == FrameworkEvent.STARTED) {
+ frameworkStarted = true;
+ log.info("Startup finished");
+ for (StartupListener listener : tracker.getServices(new StartupListener[0])) {
+ listener.startupFinished(startupMode);
+ }
+ }
+ }
+
+ @Override
+ public void bundleChanged(BundleEvent event) {
+ if (event.getType() == BundleEvent.STARTED && !frameworkStarted) {
+ Bundle[] allBundles = bundleContext.getBundles();
+ int total = allBundles.length;
+ int started = 0;
+ for (Bundle b : allBundles) {
+ if (b.getState() == Bundle.ACTIVE) {
+ started++;
+ }
+ }
+ float ratio = 0;
+ if (total > 0) {
+ ratio = (float) started / total;
+ }
+ log.info("Startup progress: {}% (bundles {}/{})", new Object[] {(int) (ratio * 100), started, total});
+ for (StartupListener listener : tracker.getServices(new StartupListener[0])) {
+ listener.startupProgress(ratio);
+ }
+ }
+ }
+}
[sling-org-apache-sling-launchpad-startupmanager] 04/08: Register
the StartupService once the framework is started
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-startupmanager.git
commit c19354d4130d6118fcd1a9bddf3e40bdb029f13b
Author: Tomek Rękawek <to...@apache.org>
AuthorDate: Tue Nov 27 10:19:26 2018 +0100
Register the StartupService once the framework is started
---
.../launchpad/startupmanager/StartupListenerTracker.java | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
index 532acf6..c7d55de 100644
--- a/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
+++ b/startupmanager/src/main/java/org/apache/sling/launchpad/startupmanager/StartupListenerTracker.java
@@ -19,6 +19,7 @@ package org.apache.sling.launchpad.startupmanager;
import org.apache.sling.launchpad.api.StartupHandler;
import org.apache.sling.launchpad.api.StartupListener;
import org.apache.sling.launchpad.api.StartupMode;
+import org.apache.sling.launchpad.api.StartupService;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -31,6 +32,8 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Hashtable;
+
public class StartupListenerTracker implements FrameworkListener, BundleListener {
private static final Logger log = LoggerFactory.getLogger(StartupListenerTracker.class);
@@ -95,6 +98,14 @@ public class StartupListenerTracker implements FrameworkListener, BundleListener
for (StartupListener listener : tracker.getServices(new StartupListener[0])) {
listener.startupFinished(startupMode);
}
+
+ StartupService startupService = new StartupService() {
+ @Override
+ public StartupMode getStartupMode() {
+ return startupMode;
+ }
+ };
+ bundleContext.registerService(StartupService.class, startupService, new Hashtable<String, Object>());
}
}