Author: frm
Date: Thu Aug 25 09:44:18 2016
New Revision: 1757641
URL: http://svn.apache.org/viewvc?rev=1757641&view=rev
Log:
OAK-4702 - Fail loudly if an obsolete OSGi configuration is used
Added:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/osgi/
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreServiceDeprecationError.java
(with props)
Added:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreServiceDeprecationError.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreServiceDeprecationError.java?rev=1757641&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreServiceDeprecationError.java
(added)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreServiceDeprecationError.java
Thu Aug 25 09:44:18 2016
@@ -0,0 +1,53 @@
+/*
+ * 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.segment.osgi;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This component is activated when a configuration for the deprecated {@code
+ * SegmentNodeStoreService} from {@code oak-segment} is detected. When this
+ * component is activated, it prints a detailed error message describing the
+ * detected problem and hinting at a possible solution.
+ */
+@Component(
+ policy = ConfigurationPolicy.REQUIRE,
+ configurationPid =
"org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService"
+)
+public class SegmentNodeStoreServiceDeprecationError {
+
+ private static final Logger logger =
LoggerFactory.getLogger(SegmentNodeStoreServiceDeprecationError.class);
+
+ private static final String msg = "Deprecated configuration detected!\n\n"
+
+ " A configuration for
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService\n" +
+ " was detected. The oak-segment bundle used to contain this
component,\n" +
+ " but the bundle is now deprecated and should not be included in
your\n" +
+ " deployment. The oak-segment-tar bundle exposes an equivalent
and improved\n" +
+ " functionality but you need to rename your configuration to
target the\n" +
+ " new component using the PID
org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.\n";
+
+ @Activate
+ public void activate() {
+ logger.error(msg);
+ }
+
+}
Propchange:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreServiceDeprecationError.java
------------------------------------------------------------------------------
svn:eol-style = native
