This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit ae011822394c288bf932bcccb3a43997495d4546 Author: Alex Heneveld <[email protected]> AuthorDate: Thu Oct 1 22:53:21 2020 +0100 add BeanWithType to blueprint.xml also put message in services files that services need to be declared in blueprint.xml also --- ...apache.brooklyn.core.plan.PlanToSpecTransformer | 4 ++++ ...ooklyn.core.typereg.BrooklynTypePlanTransformer | 4 ++++ ...rooklyn.api.internal.ApiObjectsFactoryInterface | 4 ++++ ...g.apache.brooklyn.api.location.LocationResolver | 4 ++++ ...apache.brooklyn.core.plan.PlanToSpecTransformer | 4 ++++ ...brooklyn.core.resolve.entity.EntitySpecResolver | 4 ++++ ...ooklyn.core.typereg.BrooklynTypePlanTransformer | 4 ++++ .../resources/OSGI-INF/blueprint/blueprint.xml | 7 +++++++ ...g.apache.brooklyn.api.location.LocationResolver | 4 ++++ ...g.apache.brooklyn.api.location.LocationResolver | 4 ++++ ...g.apache.brooklyn.api.location.LocationResolver | 4 ++++ ...brooklyn.core.resolve.entity.EntitySpecResolver | 4 ++++ .../META-INF/services/org.testng.ITestNGListener | 24 +++++++++++++++++++++- .../org.apache.brooklyn.util.osgi.SystemFramework | 4 ++++ 14 files changed, 78 insertions(+), 1 deletion(-) diff --git a/camp/camp-brooklyn/src/main/resources/META-INF/services/org.apache.brooklyn.core.plan.PlanToSpecTransformer b/camp/camp-brooklyn/src/main/resources/META-INF/services/org.apache.brooklyn.core.plan.PlanToSpecTransformer index e93291e..19a8401 100644 --- a/camp/camp-brooklyn/src/main/resources/META-INF/services/org.apache.brooklyn.core.plan.PlanToSpecTransformer +++ b/camp/camp-brooklyn/src/main/resources/META-INF/services/org.apache.brooklyn.core.plan.PlanToSpecTransformer @@ -16,4 +16,8 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.camp.brooklyn.spi.creation.CampToSpecTransformer diff --git a/camp/camp-brooklyn/src/main/resources/META-INF/services/org.apache.brooklyn.core.typereg.BrooklynTypePlanTransformer b/camp/camp-brooklyn/src/main/resources/META-INF/services/org.apache.brooklyn.core.typereg.BrooklynTypePlanTransformer index 0c6fab3..a58c5ae 100644 --- a/camp/camp-brooklyn/src/main/resources/META-INF/services/org.apache.brooklyn.core.typereg.BrooklynTypePlanTransformer +++ b/camp/camp-brooklyn/src/main/resources/META-INF/services/org.apache.brooklyn.core.typereg.BrooklynTypePlanTransformer @@ -16,4 +16,8 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.camp.brooklyn.spi.creation.CampTypePlanTransformer diff --git a/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.internal.ApiObjectsFactoryInterface b/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.internal.ApiObjectsFactoryInterface index 9cf9b5c..f634cf8 100644 --- a/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.internal.ApiObjectsFactoryInterface +++ b/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.internal.ApiObjectsFactoryInterface @@ -16,4 +16,8 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.core.internal.ApiObjectsFactoryImpl diff --git a/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver index 3412b27..f0ed682 100644 --- a/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver +++ b/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver @@ -16,6 +16,10 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.core.location.DefinedLocationByIdResolver org.apache.brooklyn.core.location.NamedLocationResolver org.apache.brooklyn.core.location.CatalogLocationResolver diff --git a/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.plan.PlanToSpecTransformer b/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.plan.PlanToSpecTransformer index f43cda5..d07770f 100644 --- a/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.plan.PlanToSpecTransformer +++ b/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.plan.PlanToSpecTransformer @@ -16,4 +16,8 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.core.catalog.internal.JavaCatalogToSpecTransformer diff --git a/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.resolve.entity.EntitySpecResolver b/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.resolve.entity.EntitySpecResolver index b3f8a51..6b2d6d4 100644 --- a/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.resolve.entity.EntitySpecResolver +++ b/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.resolve.entity.EntitySpecResolver @@ -16,5 +16,9 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.core.resolve.entity.CatalogEntitySpecResolver org.apache.brooklyn.core.resolve.entity.JavaEntitySpecResolver diff --git a/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.typereg.BrooklynTypePlanTransformer b/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.typereg.BrooklynTypePlanTransformer index 18cd999..6b0aa85 100644 --- a/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.typereg.BrooklynTypePlanTransformer +++ b/core/src/main/resources/META-INF/services/org.apache.brooklyn.core.typereg.BrooklynTypePlanTransformer @@ -16,5 +16,9 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.core.typereg.JavaClassNameTypePlanTransformer org.apache.brooklyn.core.resolve.jackson.BeanWithTypePlanTransformer diff --git a/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 8f0fea0..5726c9e 100644 --- a/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -42,6 +42,13 @@ limitations under the License. <service ref="containerFramework" interface="org.apache.brooklyn.util.osgi.SystemFramework" /> + + <bean id="beanWithTypePlanTransformer" scope="prototype" + class="org.apache.brooklyn.core.resolve.jackson.BeanWithTypePlanTransformer"/> + <service id="beanWithTypePlanTransformerService" ref="beanWithTypePlanTransformer" + interface="org.apache.brooklyn.core.typereg.BrooklynTypePlanTransformer" /> + + <bean id="javaClassNameTypePlanTransformer" scope="prototype" class="org.apache.brooklyn.core.typereg.JavaClassNameTypePlanTransformer"/> <service id="javaClassNameTypePlanTransformerService" ref="javaClassNameTypePlanTransformer" diff --git a/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver index 25d27bb..f3b9eb3 100644 --- a/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver +++ b/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver @@ -16,6 +16,10 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.container.location.docker.DockerLocationResolver org.apache.brooklyn.container.location.kubernetes.KubernetesLocationResolver org.apache.brooklyn.container.location.openshift.OpenShiftLocationResolver diff --git a/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver index cef522c..dded54a 100644 --- a/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver +++ b/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver @@ -16,5 +16,9 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.location.jclouds.JcloudsLocationResolver org.apache.brooklyn.location.jclouds.JcloudsByonLocationResolver diff --git a/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver index 5392b0e..55ca50e 100644 --- a/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver +++ b/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver @@ -16,4 +16,8 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.entity.machine.pool.ServerPoolLocationResolver diff --git a/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.core.resolve.entity.EntitySpecResolver b/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.core.resolve.entity.EntitySpecResolver index 9b45de1..d411d26 100644 --- a/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.core.resolve.entity.EntitySpecResolver +++ b/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.core.resolve.entity.EntitySpecResolver @@ -16,4 +16,8 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.entity.resolve.HardcodedCatalogEntitySpecResolver diff --git a/test-support/src/main/resources/META-INF/services/org.testng.ITestNGListener b/test-support/src/main/resources/META-INF/services/org.testng.ITestNGListener index 584861a..38d3010 100644 --- a/test-support/src/main/resources/META-INF/services/org.testng.ITestNGListener +++ b/test-support/src/main/resources/META-INF/services/org.testng.ITestNGListener @@ -1 +1,23 @@ -org.apache.brooklyn.test.DisableOnWindowsListener \ No newline at end of file +# +# 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. +# + +# (Tests are run outwith OSGi so unlike others this does not need +# added to OSGI-INF/blueprint/blueprint.xml ) + +org.apache.brooklyn.test.DisableOnWindowsListener diff --git a/utils/rt-felix/src/main/resources/META-INF/services/org.apache.brooklyn.util.osgi.SystemFramework b/utils/rt-felix/src/main/resources/META-INF/services/org.apache.brooklyn.util.osgi.SystemFramework index 8e0a94b..ee48a3a 100644 --- a/utils/rt-felix/src/main/resources/META-INF/services/org.apache.brooklyn.util.osgi.SystemFramework +++ b/utils/rt-felix/src/main/resources/META-INF/services/org.apache.brooklyn.util.osgi.SystemFramework @@ -16,4 +16,8 @@ # specific language governing permissions and limitations # under the License. # + +# Note: items added here should also be added to OSGI-INF/blueprint/blueprint.xml +# so that they are also available in OSGi + org.apache.brooklyn.rt.felix.EmbeddedFramework
