Author: chetanm
Date: Fri Nov 27 11:37:10 2015
New Revision: 1716847
URL: http://svn.apache.org/viewvc?rev=1716847&view=rev
Log:
OAK-3687 - Oak standalone application example based on Spring Boot
Enable integration with Spring Actuator metric support
Added:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/MetricsSupport.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RepositoryInitializer.java
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/static/index.html
Modified: jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/pom.xml?rev=1716847&r1=1716846&r2=1716847&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/standalone/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/standalone/pom.xml Fri Nov 27 11:37:10
2015
@@ -85,6 +85,12 @@
<version>1.11</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>3.1.0</version>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>javax.jcr</groupId>
Added:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/MetricsSupport.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/MetricsSupport.java?rev=1716847&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/MetricsSupport.java
(added)
+++
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/MetricsSupport.java
Fri Nov 27 11:37:10 2015
@@ -0,0 +1,43 @@
+/*
+ * 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.jackrabbit.oak.standalone;
+
+import com.codahale.metrics.MetricRegistry;
+import org.apache.felix.connect.launch.PojoServiceRegistry;
+import org.osgi.framework.ServiceReference;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnClass(MetricRegistry.class)
+public class MetricsSupport {
+
+ @Autowired
+ private PojoServiceRegistry serviceRegistry;
+
+ @Bean
+ public MetricRegistry getMetricsRegistry(){
+ ServiceReference<?> metricRegistry =
+
serviceRegistry.getServiceReference(MetricRegistry.class.getName());
+ return (MetricRegistry) serviceRegistry.getService(metricRegistry);
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/MetricsSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RepositoryInitializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RepositoryInitializer.java?rev=1716847&r1=1716846&r2=1716847&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RepositoryInitializer.java
(original)
+++
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RepositoryInitializer.java
Fri Nov 27 11:37:10 2015
@@ -34,8 +34,10 @@ import javax.servlet.ServletContext;
import com.google.common.collect.Maps;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.felix.connect.launch.PojoServiceRegistry;
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory;
+import org.apache.jackrabbit.oak.run.osgi.ServiceRegistryProvider;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
@@ -80,6 +82,11 @@ public class RepositoryInitializer {
return repository;
}
+ @Bean
+ public PojoServiceRegistry getServiceRegistry(){
+ return ((ServiceRegistryProvider) repository).getServiceRegistry();
+ }
+
private void initRepository() throws IOException, RepositoryException {
File repoHomeDir = new File(repoHome);
FileUtils.forceMkdir(repoHomeDir);
Modified:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/static/index.html
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/static/index.html?rev=1716847&r1=1716846&r2=1716847&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/static/index.html
(original)
+++
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/static/index.html
Fri Nov 27 11:37:10 2015
@@ -12,6 +12,7 @@
<li><a href="/osgi/system/console">System Console</a></li>
<li><a href="/osgi/system/console/sc">Script Console</a></li>
<li><a href="/repository/default">Webdav</a></li>
+ <li><a href="/metrics">Metrics</a></li>
</ul>
</article>
</body>
