SLING-6390 - Remove metatype info for some HTL OSGi configurations
* removed metatype annotations; components can still be configured via
sling:OsgiConfig nodes or directly through the ConfigurationAdmin
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1774436 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java
index 7481d7b..47e23b4 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java
@@ -38,13 +38,8 @@
service = SightlyEngineConfiguration.class,
configurationPid = "org.apache.sling.scripting.sightly.impl.engine.SightlyEngineConfiguration"
)
-@Designate(ocd = SightlyEngineConfiguration.Configuration.class)
public class SightlyEngineConfiguration {
- @ObjectClassDefinition(
- name = "Apache Sling Scripting HTL Engine Configuration",
- description = "HTL Engine Configuration Options"
- )
@interface Configuration {
@AttributeDefinition(
diff --git a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
index b9345dc..9f91559 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
@@ -51,16 +51,8 @@
Constants.SERVICE_RANKING + ":Integer=90"
}
)
-@Designate(
- ocd = JavaUseProvider.Configuration.class
-)
public class JavaUseProvider implements UseProvider {
-
- @ObjectClassDefinition(
- name = "Apache Sling Scripting HTL Java Use Provider Configuration",
- description = "HTL Java Use Provider configuration options"
- )
@interface Configuration {
@AttributeDefinition(
diff --git a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/RenderUnitProvider.java b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/RenderUnitProvider.java
index 4f194fe..6d7db95 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/RenderUnitProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/RenderUnitProvider.java
@@ -60,15 +60,8 @@
Constants.SERVICE_RANKING + ":Integer=100"
}
)
-@Designate(
- ocd = RenderUnitProvider.Configuration.class
-)
public class RenderUnitProvider implements UseProvider {
- @ObjectClassDefinition(
- name = "Apache Sling Scripting HTL Render Unit Use Provider Configuration",
- description = "HTL Render Unit Use Provider configuration options"
- )
@interface Configuration {
@AttributeDefinition(
diff --git a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ResourceUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ResourceUseProvider.java
index 77057cc..ebbe8e7 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ResourceUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ResourceUseProvider.java
@@ -40,15 +40,8 @@
Constants.SERVICE_RANKING + ":Integer=-10"
}
)
-@Designate(
- ocd = ResourceUseProvider.Configuration.class
-)
public class ResourceUseProvider implements UseProvider {
- @ObjectClassDefinition(
- name = "Apache Sling Scripting HTL Resource Use Provider Configuration",
- description = "HTL Resource Use Provider configuration options"
- )
@interface Configuration {
@AttributeDefinition(
diff --git a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
index df59dbb..6db1667 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
@@ -55,16 +55,8 @@
Constants.SERVICE_RANKING + ":Integer=0"
}
)
-@Designate(
- ocd = ScriptUseProvider.Configuration.class
-)
public class ScriptUseProvider implements UseProvider {
-
- @ObjectClassDefinition(
- name = "Apache Sling Scripting HTL Script Use Provider Configuration",
- description = "HTL Script Use Provider configuration options"
- )
@interface Configuration {
@AttributeDefinition(
