This closes #278
diff --git a/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java b/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
index e7bf04d..dd65a44 100644
--- a/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
+++ b/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
@@ -27,6 +27,16 @@
import java.util.Map;
import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+
import org.apache.brooklyn.api.mgmt.EntityManager;
import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.api.objs.BrooklynObject;
@@ -35,18 +45,9 @@
import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
import org.apache.brooklyn.util.collections.MutableSet;
import org.apache.brooklyn.util.exceptions.Exceptions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.google.common.annotations.Beta;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-
-/** Defines a spec for creating a {@link BrooklynObject}.
+/**
+ * Defines a spec for creating a {@link BrooklynObject}.
* <p>
* In addition to the contract defined by the code,
* subclasses should provide a public static <code>create(Class)</code>
@@ -54,7 +55,8 @@
* <p>
* The spec is then passed to type-specific methods,
* e.g. {@link EntityManager#createEntity(org.apache.brooklyn.api.entity.EntitySpec)}
- * to create a managed instance of the target type. */
+ * to create a managed instance of the target type.
+ */
public abstract class AbstractBrooklynObjectSpec<T,SpecT extends AbstractBrooklynObjectSpec<T,SpecT>> implements Serializable {
private static final long serialVersionUID = 3010955277740333030L;
@@ -134,7 +136,7 @@
Iterables.addAll(this.tags, tagsToReplace);
return self();
}
-
+
// TODO which semantics are correct? replace has been the behaviour;
// add breaks tests and adds unwanted parameters,
// but replacing will cause some desired parameters to be lost.
@@ -153,17 +155,20 @@
@Beta
public SpecT parametersAdd(List<? extends SpecParameter<?>> parameters) {
// parameters follows immutable pattern, unlike the other fields
- Builder<SpecParameter<?>> result = ImmutableList.<SpecParameter<?>>builder();
- if (this.parameters!=null)
- result.addAll(this.parameters);
- result.addAll( checkNotNull(parameters, "parameters") );
- this.parameters = result.build();
+ Set<SpecParameter<?>> params = MutableSet.<SpecParameter<?>>copyOf(parameters);
+ Set<SpecParameter<?>> current = MutableSet.<SpecParameter<?>>copyOf(this.parameters);
+ current.removeAll(params);
+
+ this.parameters = ImmutableList.<SpecParameter<?>>builder()
+ .addAll(params)
+ .addAll(current)
+ .build();
return self();
}
/** replaces parameters with the given */
@Beta
public SpecT parametersReplace(List<? extends SpecParameter<?>> parameters) {
- this.parameters = ImmutableList.copyOf( checkNotNull(parameters, "parameters") );
+ this.parameters = ImmutableList.copyOf(checkNotNull(parameters, "parameters"));
return self();
}
@@ -302,12 +307,12 @@
}
public <V> SpecT removeConfig(ConfigKey<V> key) {
- config.remove( checkNotNull(key, "key") );
+ config.remove(checkNotNull(key, "key"));
return self();
}
public <V> SpecT removeFlag(String key) {
- flags.remove( checkNotNull(key, "key") );
+ flags.remove(checkNotNull(key, "key"));
return self();
}
@@ -323,7 +328,7 @@
public Map<String, ?> getFlags() {
return Collections.unmodifiableMap(flags);
}
-
+
/**
* @return Read-only configuration values
*/
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
index 4913cb1..fd2a69b 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
@@ -21,6 +21,9 @@
import java.util.List;
import java.util.Map;
+import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableList;
+
import org.apache.brooklyn.api.entity.EntityInitializer;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.mgmt.ManagementContext;
@@ -39,9 +42,6 @@
import org.apache.brooklyn.util.core.config.ConfigBag;
import org.apache.brooklyn.util.guava.Maybe;
-import com.google.common.annotations.Beta;
-import com.google.common.collect.ImmutableList;
-
/**
* Pattern for resolving "decorations" on service specs / entity specs, such as policies, enrichers, etc.
* @since 0.7.0
@@ -181,20 +181,14 @@
public static class SpecParameterResolver extends BrooklynEntityDecorationResolver<SpecParameter<?>> {
protected SpecParameterResolver(BrooklynYamlTypeInstantiator.Factory instantiator) { super(instantiator); }
- @Override protected String getDecorationKind() { return "Spec Parameter initializer"; }
+
+ @Override
+ protected String getDecorationKind() { return "Spec Parameter initializer"; }
@Override
public void decorate(EntitySpec<?> entitySpec, ConfigBag attrs) {
List<? extends SpecParameter<?>> explicitParams = buildListOfTheseDecorationsFromEntityAttributes(attrs);
- // TODO see discussion at EntitySpec.parameters;
- // maybe we should instead inherit always, or
- // inherit except where it is set as config and then add the new explicit ones
- if (!explicitParams.isEmpty()) {
- entitySpec.parameters(explicitParams);
- }
- if (entitySpec.getParameters().isEmpty()) {
- entitySpec.parameters(BasicSpecParameter.fromSpec(instantiator.loader.getManagementContext(), entitySpec));
- }
+ BasicSpecParameter.addParameters(entitySpec, explicitParams, instantiator.loader);
}
@Override
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
index 8c9bf63..b2ec074 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
@@ -26,6 +26,11 @@
import java.util.Map.Entry;
import java.util.Set;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.internal.AbstractBrooklynObjectSpec;
@@ -56,17 +61,11 @@
import org.apache.brooklyn.util.stream.Streams;
import org.apache.brooklyn.util.yaml.Yamls;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
/** package-private; as {@link RegisteredType} becomes standard hopefully we can remove this */
class CampInternalUtils {
static EntitySpec<? extends Application> createWrapperApp(AssemblyTemplate template, BrooklynClassLoadingContext loader) {
- BrooklynComponentTemplateResolver resolver = BrooklynComponentTemplateResolver.Factory.newInstance(
- loader, buildWrapperAppTemplate(template));
+ BrooklynComponentTemplateResolver resolver = BrooklynComponentTemplateResolver.Factory.newInstance(loader, buildWrapperAppTemplate(template));
EntitySpec<Application> wrapperSpec = resolver.resolveSpec(ImmutableSet.<String>of());
resetSpecIfTemplateHasNoExplicitParameters(template, wrapperSpec);
// caller always sets WRAPPER_APP config; should we do it here?
@@ -171,7 +170,7 @@
}
String type = (String) checkNotNull(Yamls.getMultinameAttribute(itemMap, "location_type", "locationType", "type"), "location type");
- Map<String, Object> brooklynConfig = (Map<String, Object>) itemMap.get("brooklyn.config");
+ Map<String, Object> brooklynConfig = (Map<String, Object>) itemMap.get(BrooklynCampReservedKeys.BROOKLYN_CONFIG);
if (brooklynConfig==null) brooklynConfig = MutableMap.of();
LocationSpec<?> locationSpec = resolveLocationSpec(type, brooklynConfig, loader);
List<?> explicitParams = (List<?>) itemMap.get(BrooklynCampReservedKeys.BROOKLYN_PARAMETERS);
@@ -181,9 +180,9 @@
private static void initParameters(List<?> explicitParams, AbstractBrooklynObjectSpec<?, ?> spec, BrooklynClassLoadingContext loader) {
if (explicitParams != null) {
- spec.parameters(BasicSpecParameter.fromConfigList(explicitParams, loader));
+ BasicSpecParameter.addParameters(spec, BasicSpecParameter.fromConfigList(explicitParams, loader), loader);
} else {
- spec.parameters(BasicSpecParameter.fromSpec(loader.getManagementContext(), spec));
+ BasicSpecParameter.addParameters(spec, ImmutableList.<SpecParameter<?>>of(), loader);
}
}
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java
index 72c427f..36422c9 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java
@@ -20,6 +20,10 @@
import java.util.Map;
+import org.testng.Assert;
+
+import com.google.common.base.Preconditions;
+
import org.apache.brooklyn.api.effector.Effector;
import org.apache.brooklyn.api.entity.EntityInitializer;
import org.apache.brooklyn.api.sensor.AttributeSensor;
@@ -28,9 +32,7 @@
import org.apache.brooklyn.core.entity.EntityInternal;
import org.apache.brooklyn.core.sensor.Sensors;
import org.apache.brooklyn.util.core.config.ConfigBag;
-import org.testng.Assert;
-
-import com.google.common.base.Preconditions;
+import org.apache.brooklyn.util.text.Strings;
public class TestSensorAndEffectorInitializer implements EntityInitializer {
@@ -47,7 +49,7 @@
@Override
public String call(ConfigBag parameters) {
Object name = parameters.getStringKey("name");
- entity().sensors().set(Sensors.newStringSensor(SENSOR_LAST_HELLO), ""+name);
+ entity().sensors().set(Sensors.newStringSensor(SENSOR_LAST_HELLO), Strings.toString(name));
return helloWord()+" "+name;
}
}).build();
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java
index e738b9b..63a16d3 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java
@@ -69,7 +69,7 @@
" type: integer");
EntitySpec<?> item = mgmt().getTypeRegistry().createSpec(mgmt().getTypeRegistry().get(itemId), null, EntitySpec.class);
List<SpecParameter<?>> inputs = item.getParameters();
- assertEquals(inputs.size(), 3);
+ assertEquals(inputs.size(), 6);
SpecParameter<?> firstInput = inputs.get(0);
assertEquals(firstInput.getLabel(), "simple");
assertEquals(firstInput.isPinned(), true);
@@ -107,7 +107,7 @@
" type: " + OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_ENTITY);
AbstractBrooklynObjectSpec<?,?> spec = createSpec(itemId);
List<SpecParameter<?>> inputs = spec.getParameters();
- assertEquals(inputs.size(), 1);
+ assertEquals(inputs.size(), 4);
SpecParameter<?> firstInput = inputs.get(0);
assertEquals(firstInput.getLabel(), "simple");
assertTrue(firstInput.isPinned());
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java
index d563395..3d46058 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java
@@ -18,13 +18,24 @@
*/
package org.apache.brooklyn.camp.brooklyn.catalog;
+import static org.apache.brooklyn.core.objs.SpecParameterPredicates.labelEqualTo;
+import static org.apache.brooklyn.core.objs.SpecParameterPredicates.nameEqualTo;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.assertTrue;
import java.util.Iterator;
import java.util.List;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Predicates;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+
import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.Entity;
@@ -37,8 +48,10 @@
import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigKeys;
+import org.apache.brooklyn.core.config.ConfigPredicates;
import org.apache.brooklyn.core.entity.AbstractApplication;
import org.apache.brooklyn.core.entity.AbstractEntity;
+import org.apache.brooklyn.core.entity.EntityPredicates;
import org.apache.brooklyn.core.location.AbstractLocation;
import org.apache.brooklyn.core.mgmt.EntityManagementUtils;
import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
@@ -46,13 +59,7 @@
import org.apache.brooklyn.core.policy.AbstractPolicy;
import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.entity.stock.BasicApplication;
-import org.testng.SkipException;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
+import org.apache.brooklyn.entity.stock.BasicStartable;
public class SpecParameterUnwrappingTest extends AbstractYamlTest {
private static final String SYMBOLIC_NAME = "my.catalog.app.id.load";
@@ -101,7 +108,7 @@
SpecParameter<String> SIMPLE_PARAM = new BasicSpecParameter<>("simple", true, SIMPLE_CONFIG);
CatalogItem<?, ?> item = catalog.getCatalogItem(SYMBOLIC_NAME, TEST_VERSION);
AbstractBrooklynObjectSpec<?,?> spec = createSpec(item);
- assertEquals(ImmutableSet.copyOf(spec.getParameters()), ImmutableList.of(SIMPLE_PARAM));
+ assertTrue(Iterables.tryFind(spec.getParameters(), Predicates.<SpecParameter<?>>equalTo(SIMPLE_PARAM)).isPresent());
}
@Test(dataProvider = "brooklynTypes")
@@ -134,18 +141,13 @@
CatalogItem<?, ?> item = catalog.getCatalogItem(SYMBOLIC_NAME, TEST_VERSION);
AbstractBrooklynObjectSpec<?,?> spec = createSpec(item);
- List<SpecParameter<?>> inputs = spec.getParameters();
- assertEquals(inputs.size(), 1);
- SpecParameter<?> firstInput = inputs.get(0);
- assertEquals(firstInput.getLabel(), "simple");
+ List<SpecParameter<?>> params = spec.getParameters();
+ assertEquals(params.size(), 4);
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
}
@Test(dataProvider="brooklynTypes")
- public void testDepentantCatalogsInheritParameters(Class<? extends BrooklynObject> type) {
- if (type == ConfigLocationForTest.class) {
- //TODO
- throw new SkipException("Locations don't inherit parameters, should migrate to the type registry first");
- }
+ public void testDependantCatalogsInheritParameters(Class<? extends BrooklynObject> type) {
addCatalogItems(
"brooklyn.catalog:",
" version: " + TEST_VERSION,
@@ -158,18 +160,28 @@
" - simple",
" - id: " + SYMBOLIC_NAME,
" item:",
- " type: paramItem:" + TEST_VERSION);
+ " type: paramItem");
CatalogItem<?, ?> item = catalog.getCatalogItem(SYMBOLIC_NAME, TEST_VERSION);
AbstractBrooklynObjectSpec<?,?> spec = createSpec(item);
- List<SpecParameter<?>> inputs = spec.getParameters();
- assertEquals(inputs.size(), 1);
- SpecParameter<?> firstInput = inputs.get(0);
- assertEquals(firstInput.getLabel(), "simple");
+ List<SpecParameter<?>> params = spec.getParameters();
+ switch (type.getSimpleName()) {
+ case "ConfigEntityForTest":
+ assertEquals(params.size(), 3);
+ break;
+ case "ConfigPolicyForTest":
+ assertEquals(params.size(), 2);
+ break;
+ case "ConfigLocationForTest":
+ assertEquals(params.size(), 7);
+ break;
+ }
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
+ assertTrue(Iterables.tryFind(params, labelEqualTo("simple")).isPresent());
}
@Test(dataProvider="brooklynTypes")
- public void testDepentantCatalogsOverrideParameters(Class<? extends BrooklynObject> type) {
+ public void testDependantCatalogsExtendsParameters(Class<? extends BrooklynObject> type) {
addCatalogItems(
"brooklyn.catalog:",
" version: " + TEST_VERSION,
@@ -182,17 +194,148 @@
" - simple",
" - id: " + SYMBOLIC_NAME,
" item:",
- // Don't set explicit version, not supported by locations
" type: paramItem",
" brooklyn.parameters:",
" - override");
CatalogItem<?, ?> item = catalog.getCatalogItem(SYMBOLIC_NAME, TEST_VERSION);
AbstractBrooklynObjectSpec<?,?> spec = createSpec(item);
- List<SpecParameter<?>> inputs = spec.getParameters();
- assertEquals(inputs.size(), 1);
- SpecParameter<?> firstInput = inputs.get(0);
- assertEquals(firstInput.getLabel(), "override");
+ List<SpecParameter<?>> params = spec.getParameters();
+ switch (type.getSimpleName()) {
+ case "ConfigEntityForTest":
+ assertEquals(params.size(), 4);
+ break;
+ case "ConfigPolicyForTest":
+ assertEquals(params.size(), 3);
+ break;
+ case "ConfigLocationForTest":
+ assertEquals(params.size(), 8);
+ break;
+ }
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
+ assertTrue(Iterables.tryFind(params, nameEqualTo("override")).isPresent());
+ }
+
+ @Test(dataProvider="brooklynTypes")
+ public void testDependantCatalogMergesParameters(Class<? extends BrooklynObject> type) {
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " version: " + TEST_VERSION,
+ " items:",
+ " - id: paramItem",
+ " item:",
+ " type: " + type.getName(),
+ " brooklyn.parameters:",
+ " - name: simple",
+ " label: simple",
+ " - id: " + SYMBOLIC_NAME,
+ " item:",
+ " type: paramItem",
+ " brooklyn.parameters:",
+ " - name: simple",
+ " label: override");
+
+ CatalogItem<?, ?> item = catalog.getCatalogItem(SYMBOLIC_NAME, TEST_VERSION);
+ AbstractBrooklynObjectSpec<?,?> spec = createSpec(item);
+ List<SpecParameter<?>> params = spec.getParameters();
+ switch (type.getSimpleName()) {
+ case "ConfigEntityForTest":
+ assertEquals(params.size(), 4);
+ break;
+ case "ConfigPolicyForTest":
+ assertEquals(params.size(), 3);
+ break;
+ case "ConfigLocationForTest":
+ assertEquals(params.size(), 8);
+ break;
+ }
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
+ assertTrue(Iterables.tryFind(params, labelEqualTo("override")).isPresent());
+ }
+
+ @Test
+ public void testDependantCatalogConfigOverridesParameters() {
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " version: " + TEST_VERSION,
+ " items:",
+ " - id: paramItem",
+ " item:",
+ " type: " + ConfigEntityForTest.class.getName(),
+ " brooklyn.parameters:",
+ " - name: simple",
+ " default: biscuits",
+ " brooklyn.config:",
+ " simple: value",
+ " - id: " + SYMBOLIC_NAME,
+ " item:",
+ " type: paramItem",
+ " brooklyn.parameters:",
+ " - name: simple",
+ " default: rabbits");
+
+ CatalogItem<?, ?> item = catalog.getCatalogItem(SYMBOLIC_NAME, TEST_VERSION);
+ AbstractBrooklynObjectSpec<?,?> spec = createSpec(item);
+ List<SpecParameter<?>> params = spec.getParameters();
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
+ Optional<ConfigKey<?>> config = Iterables.tryFind(spec.getConfig().keySet(), ConfigPredicates.nameEqualTo("simple"));
+ assertTrue(config.isPresent());
+ Object value = spec.getConfig().get(config.get());
+ assertEquals(value, "value");
+ }
+
+ @Test
+ public void testCatalogConfigOverridesParameters() {
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " version: " + TEST_VERSION,
+ " items:",
+ " - id: " + SYMBOLIC_NAME,
+ " item:",
+ " type: " + ConfigEntityForTest.class.getName(),
+ " brooklyn.parameters:",
+ " - name: simple",
+ " default: biscuits",
+ " brooklyn.config:",
+ " simple: value");
+
+ CatalogItem<?, ?> item = catalog.getCatalogItem(SYMBOLIC_NAME, TEST_VERSION);
+ AbstractBrooklynObjectSpec<?,?> spec = createSpec(item);
+ List<SpecParameter<?>> params = spec.getParameters();
+ assertEquals(params.size(), 3);
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
+ Optional<ConfigKey<?>> config = Iterables.tryFind(spec.getConfig().keySet(), ConfigPredicates.nameEqualTo("simple"));
+ assertTrue(config.isPresent());
+ Object value = spec.getConfig().get(config.get());
+ assertEquals(value, "value");
+ }
+
+ @Test
+ public void testDependantCatalogConfigReplacesParameters() {
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " version: " + TEST_VERSION,
+ " items:",
+ " - id: paramItem",
+ " item:",
+ " type: " + ConfigEntityForTest.class.getName(),
+ " brooklyn.config:",
+ " simple: value",
+ " - id: " + SYMBOLIC_NAME,
+ " item:",
+ " type: paramItem",
+ " brooklyn.parameters:",
+ " - name: simple",
+ " default: rabbits");
+
+ CatalogItem<?, ?> item = catalog.getCatalogItem(SYMBOLIC_NAME, TEST_VERSION);
+ AbstractBrooklynObjectSpec<?,?> spec = createSpec(item);
+ List<SpecParameter<?>> params = spec.getParameters();
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
+ Optional<ConfigKey<?>> config = Iterables.tryFind(spec.getConfig().keySet(), ConfigPredicates.nameEqualTo("simple"));
+ assertTrue(config.isPresent());
+ Object value = spec.getConfig().get(config.get());
+ assertEquals(value, "value");
}
@Test
@@ -213,8 +356,10 @@
@SuppressWarnings({ "rawtypes", "unchecked"})
EntitySpec<?> parentSpec = (EntitySpec<?>) catalog.createSpec((CatalogItem)item);
EntitySpec<?> spec = parentSpec.getChildren().get(0);
- SpecParameter<?> firstInput = spec.getParameters().get(0);
- assertEquals(firstInput.getLabel(), "simple");
+ List<SpecParameter<?>> params = spec.getParameters();
+ assertEquals(params.size(), 3);
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
+ assertTrue(Iterables.tryFind(params, labelEqualTo("simple")).isPresent());
}
@Test
@@ -233,9 +378,9 @@
"services:",
"- type: " + ver(SYMBOLIC_NAME));
List<SpecParameter<?>> params = spec.getParameters();
- assertEquals(params.size(), 1);
- SpecParameter<?> firstInput = params.get(0);
- assertEquals(firstInput.getLabel(), "simple");
+ assertEquals(params.size(), 4);
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
+ assertTrue(Iterables.tryFind(params, labelEqualTo("simple")).isPresent());
}
@@ -255,9 +400,9 @@
"services:",
"- type: " + ver(SYMBOLIC_NAME));
List<SpecParameter<?>> params = spec.getParameters();
- assertEquals(params.size(), 1);
- SpecParameter<?> firstInput = params.get(0);
- assertEquals(firstInput.getLabel(), "simple");
+ assertEquals(params.size(), 4);
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
+ assertTrue(Iterables.tryFind(params, labelEqualTo("simple")).isPresent());
}
@Test
@@ -277,9 +422,9 @@
"services:",
"- type: " + ver(SYMBOLIC_NAME));
List<SpecParameter<?>> params = spec.getParameters();
- assertEquals(params.size(), 1);
- SpecParameter<?> firstInput = params.get(0);
- assertEquals(firstInput.getLabel(), "simple");
+ assertEquals(params.size(), 4);
+ assertTrue(Iterables.tryFind(params, nameEqualTo("simple")).isPresent());
+ assertTrue(Iterables.tryFind(params, labelEqualTo("simple")).isPresent());
}
@Test
@@ -352,6 +497,69 @@
assertFalse(childIter.hasNext());
}
+ private static final ConfigKey<Integer> NUM = ConfigKeys.newIntegerConfigKey("num");
+
+ @Test
+ public void testParameterDefaultsUsedInConfig() throws Exception {
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " version: " + TEST_VERSION,
+ " items:",
+ " - id: " + ConfigEntityForTest.class.getSimpleName() + "WithParams",
+ " itemType: entity",
+ " item:",
+ " type: " + ConfigEntityForTest.class.getName(),
+ " brooklyn.parameters:",
+ " - name: num",
+ " type: integer",
+ " default: 1234",
+ " brooklyn.children:",
+ " - type: " + BasicStartable.class.getName(),
+ " name: s",
+ " brooklyn.config:",
+ " test: $brooklyn:parent().config(\"num\")",
+ " - id: " + SYMBOLIC_NAME,
+ " itemType: entity",
+ " item:",
+ " type: " + BasicApplication.class.getName(),
+ " brooklyn.children:",
+ " - type: " + ConfigEntityForTest.class.getSimpleName() + "WithParams",
+ " name: a",
+ " - type: " + ConfigEntityForTest.class.getSimpleName() + "WithParams",
+ " name: b",
+ " brooklyn.config:",
+ " num: 5678",
+ " - type: " + ConfigEntityForTest.class.getSimpleName() + "WithParams",
+ " name: c",
+ " brooklyn.config:",
+ " test: $brooklyn:config(\"num\")");
+
+ CatalogItem<?, ?> item = catalog.getCatalogItem(ConfigEntityForTest.class.getSimpleName() + "WithParams", TEST_VERSION);
+ AbstractBrooklynObjectSpec<?,?> spec = createSpec(item);
+ List<SpecParameter<?>> params = spec.getParameters();
+ assertEquals(params.size(), 3);
+ assertTrue(Iterables.tryFind(params, nameEqualTo("num")).isPresent());
+
+ Application app = (Application) createAndStartApplication(
+ "services:",
+ " - type: " + ver(SYMBOLIC_NAME));
+
+ Optional<Entity> s = Iterables.tryFind(mgmt().getEntityManager().getEntitiesInApplication(app), EntityPredicates.displayNameEqualTo("s"));
+ assertTrue(s.isPresent());
+ assertEquals(s.get().config().get(ConfigKeys.newIntegerConfigKey("test")).intValue(), 1234);
+
+ Iterable<Entity> children = app.getChildren();
+ Optional<Entity> a = Iterables.tryFind(children, EntityPredicates.displayNameEqualTo("a"));
+ assertTrue(a.isPresent());
+ assertEquals(a.get().config().get(NUM).intValue(), 1234);
+ Optional<Entity> b = Iterables.tryFind(children, EntityPredicates.displayNameEqualTo("b"));
+ assertTrue(b.isPresent());
+ assertEquals(b.get().config().get(NUM).intValue(), 5678);
+ Optional<Entity> c = Iterables.tryFind(children, EntityPredicates.displayNameEqualTo("c"));
+ assertTrue(c.isPresent());
+ assertEquals(c.get().config().get(ConfigKeys.newIntegerConfigKey("test")).intValue(), 1234);
+ }
+
@Test
public void testAppRootParameters() throws Exception {
EntitySpec<? extends Application> spec = createAppSpec(
@@ -360,7 +568,7 @@
"services:",
"- type: " + BasicApplication.class.getName());
List<SpecParameter<?>> inputs = spec.getParameters();
- assertEquals(inputs.size(), 1);
+ assertEquals(inputs.size(), 4);
SpecParameter<?> firstInput = inputs.get(0);
assertEquals(firstInput.getLabel(), "simple");
}
@@ -373,7 +581,7 @@
" brooklyn.parameters:",
" - simple");
List<SpecParameter<?>> inputs = spec.getParameters();
- assertEquals(inputs.size(), 1);
+ assertEquals(inputs.size(), 4);
SpecParameter<?> firstInput = inputs.get(0);
assertEquals(firstInput.getLabel(), "simple");
}
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java b/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
index d89c8cb..e525fc6 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
@@ -26,6 +26,16 @@
import java.util.List;
import java.util.Map;
+import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
+import com.google.common.base.Objects;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.reflect.TypeToken;
+
import org.apache.brooklyn.api.catalog.CatalogConfig;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntitySpec;
@@ -48,16 +58,6 @@
import org.apache.brooklyn.util.text.StringPredicates;
import org.apache.brooklyn.util.time.Duration;
-import com.google.common.annotations.Beta;
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.reflect.TypeToken;
-
public class BasicSpecParameter<T> implements SpecParameter<T>{
private static final long serialVersionUID = -4728186276307619778L;
@@ -130,9 +130,7 @@
if (getClass() != obj.getClass())
return false;
BasicSpecParameter<?> other = (BasicSpecParameter<?>) obj;
- return Objects.equal(label, other.label) &&
- pinned == other.pinned &&
- Objects.equal(configKey, other.configKey);
+ return Objects.equal(configKey, other.configKey);
}
@Override
@@ -384,5 +382,20 @@
}
}
+ /**
+ * Adds the given list of {@link SpecParameter parameters} to the provided
+ * {@link AbstractBrooklynObjectSpec spec} or generates a list from the
+ * spec if the provided list is empty.
+ *
+ * @see EntitySpec#parameters(List)
+ */
+ public static void addParameters(AbstractBrooklynObjectSpec<?, ?> spec, List<? extends SpecParameter<?>> explicitParams, BrooklynClassLoadingContext loader) {
+ if (spec.getParameters().isEmpty()) {
+ spec.parametersAdd(BasicSpecParameter.fromSpec(loader.getManagementContext(), spec));
+ }
+ if (explicitParams.size() > 0) {
+ spec.parametersAdd(explicitParams);
+ }
+ }
}
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/SpecParameterPredicates.java b/core/src/main/java/org/apache/brooklyn/core/objs/SpecParameterPredicates.java
new file mode 100644
index 0000000..1eb934c
--- /dev/null
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/SpecParameterPredicates.java
@@ -0,0 +1,110 @@
+/*
+ * 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.brooklyn.core.objs;
+
+import com.google.common.base.Predicate;
+
+import org.apache.brooklyn.api.objs.SpecParameter;
+import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.util.text.Strings;
+
+public class SpecParameterPredicates {
+
+ /**
+ * Returns true if the {@link SpecParameter parameter name} is the same as
+ * that on the specified paramater.
+ */
+ public static Predicate<SpecParameter<?>> sameName(final SpecParameter<?> param) {
+ return new SameName(param);
+ }
+
+ /** @see #sameName(SpecParameter) */
+ protected static class SameName implements Predicate<SpecParameter<?>> {
+ private final SpecParameter<?> param;
+
+ public SameName(SpecParameter<?> param) {
+ this.param = param;
+ }
+
+ @Override
+ public boolean apply(SpecParameter<?> input) {
+ return input.getConfigKey().getName().equals(param.getConfigKey().getName());
+ }
+
+ @Override
+ public String toString() {
+ return String.format("sameName(%s)",Strings.toString(param));
+ }
+ }
+
+ /**
+ * Returns true if the {@link SpecParameter#getLabel() label} is the same as
+ * the specified string.
+ */
+ public static Predicate<SpecParameter<?>> labelEqualTo(final String label) {
+ return new LabelEqualTo(label);
+ }
+
+ /** @see #labelEqualTo(String) */
+ protected static class LabelEqualTo implements Predicate<SpecParameter<?>> {
+ private final String label;
+
+ public LabelEqualTo(String label) {
+ this.label = label;
+ }
+
+ @Override
+ public boolean apply(SpecParameter<?> input) {
+ return input.getLabel().equals(label);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("labelEqualTo(%s)",Strings.toString(label));
+ }
+ }
+
+ /**
+ * Returns true if the {@link ConfigKey#getName() config key name} is the same
+ * as the specified string.
+ */
+ public static Predicate<SpecParameter<?>> nameEqualTo(final String name) {
+ return new NameEqualTo(name);
+ }
+
+ /** @see #nameEqualTo(String) */
+ protected static class NameEqualTo implements Predicate<SpecParameter<?>> {
+ private final String name;
+
+ public NameEqualTo(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean apply(SpecParameter<?> input) {
+ return input.getConfigKey().getName().equals(name);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("nameEqualTo(%s)",Strings.toString(name));
+ }
+ }
+
+}
diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml
deleted file mode 100755
index 16f1509..0000000
--- a/karaf/apache-brooklyn/pom.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>apache-brooklyn</artifactId>
- <packaging>karaf-assembly</packaging>
- <name>Brooklyn Karaf Distro</name>
-
- <parent>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-karaf</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>framework</artifactId>
- <version>${karaf.version}</version>
- <type>kar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>standard</artifactId>
- <classifier>features</classifier>
- <version>${karaf.version}</version>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>enterprise</artifactId>
- <classifier>features</classifier>
- <version>${karaf.version}</version>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-features</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/filtered-resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>**/*.bom</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
- <extensions>true</extensions>
- <configuration>
- <bootFeatures>
- <bootFeature>aries-blueprint</bootFeature>
- <bootFeature>bundle</bootFeature>
- <bootFeature>config</bootFeature>
- <bootFeature>deployer</bootFeature>
- <bootFeature>diagnostic</bootFeature>
- <bootFeature>feature</bootFeature>
- <bootFeature>instance</bootFeature>
- <bootFeature>jaas</bootFeature>
- <bootFeature>kar</bootFeature>
- <bootFeature>log</bootFeature>
- <bootFeature>management</bootFeature>
- <bootFeature>package</bootFeature>
- <bootFeature>service</bootFeature>
- <bootFeature>shell</bootFeature>
- <bootFeature>shell-compat</bootFeature>
- <bootFeature>ssh</bootFeature>
- <bootFeature>system</bootFeature>
- <bootFeature>wrap</bootFeature>
- <!-- brooklyn features -->
- <bootFeature>brooklyn-osgi-launcher</bootFeature>
- <bootFeature>brooklyn-jsgui</bootFeature>
- <bootFeature>brooklyn-rest-resources</bootFeature>
- <bootFeature>brooklyn-commands</bootFeature>
- </bootFeatures>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/karaf/apache-brooklyn/src/main/filtered-resources/etc/branding.properties b/karaf/apache-brooklyn/src/main/filtered-resources/etc/branding.properties
deleted file mode 100755
index da2d564..0000000
--- a/karaf/apache-brooklyn/src/main/filtered-resources/etc/branding.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-welcome = \
-\u001B[33m\u001B[0m\n\
-\u001B[33m _ _ _ \u001B[0m\n\
-\u001B[33m | |__ _ __ ___ ___ | | _| |_ _ _ __ (R) \u001B[0m\n\
-\u001B[33m | '_ \\| '__/ _ \\ / _ \\| |/ / | | | | '_ \\ \u001B[0m\n\
-\u001B[33m | |_) | | | (_) | (_) | <| | |_| | | | | \u001B[0m\n\
-\u001B[33m |_.__/|_| \\___/ \\___/|_|\\_\\_|\\__, |_| |_| \u001B[0m\n\
-\u001B[33m |___/ \u001B[0m\n\
-\u001B[33m \u001B[0m\n\
-\u001B[33m http://brooklyn.apache.org \u001B[0m\n\
-\u001B[33m (version ${project.version})\u001B[0m\n\
-\u001B[33m\u001B[0m\n\
-\u001B[33mHit '\u001B[1m<tab>\u001B[0m' for a list of available commands\u001B[0m\n\
-\u001B[33mand '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\u001B[0m\n\
-\u001B[33mHit '\u001B[1m<ctrl-d>\u001B[0m' or '\u001B[1mosgi:shutdown\u001B[0m' to shutdown\u001B[0m\n\
-\u001B[33m\u001B[0m\n\
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/custom.properties b/karaf/apache-brooklyn/src/main/resources/etc/custom.properties
deleted file mode 100644
index 7da5c63..0000000
--- a/karaf/apache-brooklyn/src/main/resources/etc/custom.properties
+++ /dev/null
@@ -1,120 +0,0 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-#
-# You can place any customized configuration here.
-# All the values specified here will override the default value.
-#
-
-# Brooklyn used to bundle Apache Felix, so force felix
-karaf.framework=felix
-
-# brooklyn used 4.4.0 at the time of osgification, which differs from karaf's bundled felix version
-#karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/${felix.framework.version}
-
-#karaf.systemBundlesStartLevel=50
-#
-#org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,!com.sun.xml.messaging.saaj.*,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*,org.apache.xalan.processor,org.apache.xpath.jaxp,org.apache.xml.dtm.ref,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom
-#
-#org.osgi.framework.system.packages.extra = \
-# org.apache.karaf.branding, \
-# com.sun.org.apache.xalan.internal.xsltc.trax, \
-# com.sun.org.apache.xerces.internal.dom, \
-# com.sun.org.apache.xerces.internal.jaxp, \
-# com.sun.org.apache.xerces.internal.xni, \
-# com.sun.jndi.ldap, \
-# org.apache.xalan.extensions; version="2.7.1", \
-# org.apache.xalan.xsltc.compiler; version="2.7.1", \
-# org.apache.xalan.xsltc.cmdline.getopt; version="2.7.1", \
-# org.apache.xalan.xsltc.util; version="2.7.1", \
-# org.apache.xalan.transformer; version="2.7.1", \
-# org.apache.xalan.xsltc.trax; version="2.7.1", \
-# org.apache.xalan.processor; version="2.7.1", \
-# org.apache.xalan.lib; version="2.7.1", \
-# org.apache.xalan.trace; version="2.7.1", \
-# org.apache.xalan.xsltc.compiler.util; version="2.7.1", \
-# org.apache.xalan.templates; version="2.7.1", \
-# org.apache.xalan.xsltc; version="2.7.1", \
-# org.apache.xalan.xsltc.runtime; version="2.7.1", \
-# org.apache.xalan; version="2.7.1", \
-# org.apache.xalan.xslt; version="2.7.1", \
-# org.apache.xalan.lib.sql; version="2.7.1", \
-# org.apache.xalan.xsltc.runtime.output; version="2.7.1", \
-# org.apache.xalan.xsltc.dom; version="2.7.1", \
-# org.apache.xalan.client; version="2.7.1", \
-# org.apache.xalan.xsltc.cmdline; version="2.7.1", \
-# org.apache.xalan.serialize; version="2.7.1", \
-# org.apache.xalan.res; version="2.7.1", \
-# org.apache.xml.dtm.ref; version="2.7.1", \
-# org.apache.xml.dtm; version="2.7.1", \
-# org.apache.xml.dtm.ref.sax2dtm; version="2.7.1", \
-# org.apache.xml.dtm.ref.dom2dtm; version="2.7.1", \
-# org.apache.xml.res; version="2.7.1", \
-# org.apache.xml.serializer.dom3; version="2.7.1", \
-# org.apache.xml.serializer; version="2.7.1", \
-# org.apache.xml.serializer.utils; version="2.7.1", \
-# org.apache.xml.utils.res; version="2.7.1", \
-# org.apache.xml.utils; version="2.7.1", \
-# org.apache.xpath.functions; version="2.7.1", \
-# org.apache.xpath.jaxp; version="2.7.1", \
-# org.apache.xpath.patterns; version="2.7.1", \
-# org.apache.xpath.objects; version="2.7.1", \
-# org.apache.xpath.res; version="2.7.1", \
-# org.apache.xpath; version="2.7.1", \
-# org.apache.xpath.axes; version="2.7.1", \
-# org.apache.xpath.compiler; version="2.7.1", \
-# org.apache.xpath.operations; version="2.7.1", \
-# org.apache.xpath.domapi; version="2.7.1", \
-# org.apache.html.dom; version="2.11.0", \
-# org.apache.wml.dom; version="2.11.0", \
-# org.apache.wml; version="2.11.0", \
-# org.apache.xerces.parsers; version="2.11.0", \
-# org.apache.xerces.impl.dtd.models; version="2.11.0", \
-# org.apache.xerces.xni.parser; version="2.11.0", \
-# org.apache.xerces.impl.dv.xs; version="2.11.0", \
-# org.apache.xerces.impl.xs.traversers; version="2.11.0", \
-# org.apache.xerces.util; version="2.11.0", \
-# org.apache.xerces.impl.dtd; version="2.11.0", \
-# org.apache.xerces.jaxp.validation; version="2.11.0", \
-# org.apache.xerces.dom3.as; version="2.11.0", \
-# org.apache.xerces.impl.dv; version="2.11.0", \
-# org.apache.xerces.jaxp; version="2.11.0", \
-# org.apache.xerces.jaxp.datatype; version="2.11.0", \
-# org.apache.xerces.impl.xpath.regex; version="2.11.0", \
-# org.apache.xerces.xni; version="2.11.0", \
-# org.apache.xerces.impl.msg; version="2.11.0", \
-# org.apache.xerces.impl.dv.util; version="2.11.0", \
-# org.apache.xerces.impl.xs.util; version="2.11.0", \
-# org.apache.xerces.dom; version="2.11.0", \
-# org.apache.xerces.dom.events; version="2.11.0", \
-# org.apache.xerces.impl.xs.opti; version="2.11.0", \
-# org.apache.xerces.impl; version="2.11.0", \
-# org.apache.xerces.xs; version="2.11.0", \
-# org.apache.xerces.impl.io; version="2.11.0", \
-# org.apache.xerces.xpointer; version="2.11.0", \
-# org.apache.xerces.impl.dv.dtd; version="2.11.0", \
-# org.apache.xerces.xinclude; version="2.11.0", \
-# org.apache.xerces.impl.xpath; version="2.11.0", \
-# org.apache.xerces.xs.datatypes; version="2.11.0", \
-# org.apache.xerces.impl.xs.identity; version="2.11.0", \
-# org.apache.xerces.impl.xs.models; version="2.11.0", \
-# org.apache.xerces.xni.grammars; version="2.11.0", \
-# org.apache.xerces.impl.xs; version="2.11.0", \
-# org.apache.xerces.impl.validation; version="2.11.0", \
-# org.apache.xml.serialize; version="2.11.0"
\ No newline at end of file
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom b/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom
deleted file mode 100644
index e1cfe99..0000000
--- a/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom
+++ /dev/null
@@ -1,370 +0,0 @@
-
-# this catalog bom is an illustration supplying a few useful sample items
-# and templates to get started using Brooklyn
-
-brooklyn.catalog:
- version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION
- items:
- - brooklyn.libraries:
- - name: org.apache.brooklyn.karaf-init
- version: "0.10.0.SNAPSHOT" # BROOKLYN_VERSION
- include: classpath://catalog-classes.bom
-
- - id: server
- itemType: entity
- description: |
- Provision a server, with customizable provisioning.properties and credentials installed,
- but no other special software process or scripts executed.
- item:
- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess
- name: Server
-
- - id: vanilla-bash-server
- itemType: entity
- description: |
- Provision a server, with customizable provisioning.properties and credentials installed,
- but no other special software process or scripts executed.
- The script should be supplied in "launch.command" as per docs on
- org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess.
- item:
- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
- name: Server with Launch Script (bash)
-
- - id: load-balancer
- itemType: entity
- description: |
- Create a load balancer which will point at members in the group entity
- referred to by the config key "serverPool".
- The sensor advertising the port can be configured with the "member.sensor.portNumber" config key,
- defaulting to `http.port`; all member entities which have published "service.up" will then be picked up.
- item:
- type: org.apache.brooklyn.entity.proxy.nginx.NginxController
- name: Load Balancer (nginx)
-
- - id: cluster
- itemType: entity
- description: |
- Create a cluster of entities, resizable, with starting size "initialSize",
- and using a spec supplied in the "memberSpec" key.
- item:
- type: org.apache.brooklyn.entity.group.DynamicCluster
-
- - id: 1-server-template
- itemType: template
- name: "Template 1: Server"
- description: |
- Sample YAML to provision a server in a cloud with illustrative VM properties
- item:
- name: Server (Brooklyn Example)
-
- # this basic example shows how Brooklyn can provision a single raw VM
- # in the cloud or location of your choice
-
- services:
- - type: server
- name: My VM
-
- # location can be e.g. `softlayer` or `jclouds:openstack-nova:https://9.9.9.9:9999/v2.0/`,
- # or `localhost` or `byon:(hosts="10.9.1.1,10.9.1.2,produser2@10.9.2.{10,11,20-29}")`
- location:
- jclouds:aws-ec2:
- # edit these to use your credential (or delete if credentials specified in brooklyn.properties)
- identity: <REPLACE>
- credential: <REPLACE>
-
- region: eu-central-1
-
- # we want Ubuntu, with a lot of RAM
- osFamily: ubuntu
- minRam: 8gb
-
- # set up this user and password (default is to authorize a public key)
- user: sample
- password: s4mpl3
-
- - id: 2-bash-web-server-template
- itemType: template
- name: "Template 2: Bash Web Server"
- description: |
- Sample YAML building on Template 1,
- adding bash commands to launch a Python-based web server
- on port 8020
- item:
- name: Python Web Server (Brooklyn Example)
-
- # this example builds on the previous one,
- # adding some scripts to initialize the VM
-
- services:
- - type: vanilla-bash-server
- name: My Bash Web Server VM
- brooklyn.config:
- install.command: |
- # install python if not present
- which python || \
- { sudo apt-get update && sudo apt-get install python ; } || \
- { sudo yum update && sudo yum install python ; } || \
- { echo WARNING: cannot install python && exit 1 ; }
-
- customize.command: |
- # create the web page to serve
- cat > index.html << EOF
-
- Hello world.
- <p>
- I am ${ENTITY_INFO}, ${MESSAGE:-a Brooklyn sample}.
- <p>
- Created at: `date`
- <p>
- I am running at ${HOSTNAME}, with on-box IP configuration:
- <pre>
- `ifconfig | grep inet`
- </pre>
-
- EOF
-
- launch.command: |
- # launch in background (ensuring no streams open), and record PID to file
- nohup python -m SimpleHTTPServer ${PORT:-8020} < /dev/null > output.txt 2>&1 &
- echo $! > ${PID_FILE:-pid.txt}
- sleep 5
- ps -p `cat ${PID_FILE:-pid.txt}`
- if [ $? -ne 0 ] ; then
- cat output.txt
- echo WARNING: python web server not running
- exit 1
- fi
-
- shell.env:
- HOSTNAME: $brooklyn:attributeWhenReady("host.name")
- PORT: $brooklyn:config("my.app.port")
- ENTITY_INFO: $brooklyn:component("this", "")
- MESSAGE: $brooklyn:config("my.message")
-
- # custom
- my.app.port: 8020
- my.message: "good to meet you"
-
- brooklyn.enrichers:
- # publish the URL as a sensor; the GUI will pick this up (main.uri)
- - type: org.apache.brooklyn.enricher.stock.Transformer
- brooklyn.config:
- uniqueTag: url-generator
- enricher.sourceSensor: host.subnet.hostname
- # use the definition from Attributes class, as it has a RendererHint so GUI makes it a link
- enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
- enricher.targetValue:
- $brooklyn:formatString:
- - "http://%s:%s/"
- - $brooklyn:attributeWhenReady("host.subnet.hostname")
- - $brooklyn:config("my.app.port")
-
- location:
- jclouds:aws-ec2:
- region: eu-central-1
- # edit these (or delete if credentials specified in brooklyn.properties)
- identity: <REPLACE>
- credential: <REPLACE>
-
- - id: 3-bash-web-and-riak-template
- itemType: template
- name: "Template 3: Bash Web Server and Scaling Riak Cluster"
- description: |
- Sample YAML building on Template 2,
- composing that blueprint with a Riak cluster and injecting the URL
- item:
- name: Bash Web Server and Riak Cluster (Brooklyn Example)
-
- # this example *references* the previous one,
- # combining it with a stock blueprint for a Riak cluster,
- # and shows how a sensor from the latter can be injected
-
- services:
-
- # reference template 2, overriding message to point at riak
- - type: 2-bash-web-server-template
- brooklyn.config:
- my.message: $brooklyn:formatString("connected to Riak at %s",
- $brooklyn:entity("riak-cluster").attributeWhenReady("main.uri"))
- # and clear the location defined there so it is taken from this template
- locations: []
-
- # use the off-the-shelf Riak cluster
- - type: org.apache.brooklyn.entity.nosql.riak.RiakCluster
- id: riak-cluster
- initialSize: 3
- # and add a policy to scale based on ops per minute
- brooklyn.policies:
- - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
- brooklyn.config:
- metric: riak.node.ops.1m.perNode
- # more than 100 ops per second (6k/min) scales out, less than 50 scales back
- # up to a max of 8 riak nodes here (can be changed in GUI / REST API afterwards)
- metricLowerBound: 3000
- metricUpperBound: 6000
- minPoolSize: 3
- maxPoolSize: 8
- resizeUpStabilizationDelay: 30s
- resizeDownStabilizationDelay: 5m
-
- location:
- jclouds:aws-ec2:
- region: eu-central-1
- # edit these (or delete if credentials specified in brooklyn.properties)
- identity: <REPLACE>
- credential: <REPLACE>
-
- - id: 4-resilient-bash-web-cluster-template
- itemType: template
- name: "Template 4: Resilient Load-Balanced Bash Web Cluster with Sensors"
- description: |
- Sample YAML to provision a cluster of the bash/python web server nodes,
- with sensors configured, and a load balancer pointing at them,
- and resilience policies for node replacement and scaling
- item:
- name: Resilient Load-Balanced Bash Web Cluster (Brooklyn Example)
-
- # this final example shows some of the advanced functionality:
- # defining custom sensors, and a cluster with a "spec",
- # policies for resilience and scaling based on that sensor,
- # and wiring a load balancer in front of the cluster
-
- # combining this with the riak cluster in the previous example
- # is left as a suggested exercise for the user
-
- services:
-
- # define a cluster of the web nodes
- - type: cluster
- name: Cluster of Bash Web Nodes
- id: my-web-cluster
- brooklyn.config:
- initialSize: 1
- memberSpec:
- $brooklyn:entitySpec:
- # template 2 is used as the spec for items in this cluster
- # with a new message overwriting the previous,
- # and a lot of sensors defined
- type: 2-bash-web-server-template
- name: My Bash Web Server VM with Sensors
- # and clear the location defined there so it is taken from this template
- locations: []
-
- brooklyn.config:
- my.message: "part of the cluster"
-
- brooklyn.initializers:
- # make a simple request-count sensor, by counting the number of 200 responses in output.txt
- - type: org.apache.brooklyn.core.sensor.ssh.SshCommandSensor
- brooklyn.config:
- name: reqs.count
- targetType: int
- period: 5s
- command: "cat output.txt | grep HTTP | grep 200 | wc | awk '{print $1}'"
- # and publish the port as a sensor so the load-balancer can pick it up
- - type: org.apache.brooklyn.core.sensor.StaticSensor
- brooklyn.config:
- name: app.port
- targetType: int
- static.value: $brooklyn:config("my.app.port")
-
- brooklyn.enrichers:
- # derive reqs.per_sec from reqs.count
- - type: org.apache.brooklyn.enricher.stock.YamlTimeWeightedDeltaEnricher
- brooklyn.config:
- enricher.sourceSensor: reqs.count
- enricher.targetSensor: reqs.per_sec
- enricher.delta.period: 1s
- # and take an average over 30s for reqs.per_sec into reqs.per_sec.windowed_30s
- - type: org.apache.brooklyn.enricher.stock.YamlRollingTimeWindowMeanEnricher
- brooklyn.config:
- enricher.sourceSensor: reqs.per_sec
- enricher.targetSensor: reqs.per_sec.windowed_30s
- enricher.window.duration: 30s
-
- # emit failure sensor if a failure connecting to the service is sustained for 30s
- - type: org.apache.brooklyn.policy.ha.ServiceFailureDetector
- brooklyn.config:
- entityFailed.stabilizationDelay: 30s
-
- brooklyn.policies:
- # restart if a failure is detected (with a max of one restart in 2m, sensor will propagate otherwise)
- - type: org.apache.brooklyn.policy.ha.ServiceRestarter
- brooklyn.config:
- failOnRecurringFailuresInThisDuration: 2m
-
- # back at the cluster, create a total per-sec and some per-node average
- brooklyn.enrichers:
- - type: org.apache.brooklyn.enricher.stock.Aggregator
- brooklyn.config:
- enricher.sourceSensor: reqs.per_sec
- enricher.targetSensor: reqs.per_sec
- transformation: sum
- - type: org.apache.brooklyn.enricher.stock.Aggregator
- brooklyn.config:
- enricher.sourceSensor: reqs.per_sec
- enricher.targetSensor: reqs.per_sec.per_node
- transformation: average
- - type: org.apache.brooklyn.enricher.stock.Aggregator
- brooklyn.config:
- enricher.sourceSensor: reqs.per_sec.windowed_30s
- enricher.targetSensor: reqs.per_sec.windowed_30s.per_node
- transformation: average
-
- brooklyn.policies:
- # resilience: if a per-node restart policy fails,
- # just throw that node away and create a new one
- - type: org.apache.brooklyn.policy.ha.ServiceReplacer
-
- # and scale based on reqs/sec
- - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
- brooklyn.config:
- # scale based on reqs/sec (though in a real-world situation,
- # reqs.per_sec.windowed_30s.per_node might be a better choice)
- metric: reqs.per_sec.per_node
-
- # really low numbers, so you can trigger a scale-out just by hitting reload a lot
- metricUpperBound: 3
- metricLowerBound: 1
-
- # sustain 3 reqs/sec for 2s and it will scale out
- resizeUpStabilizationDelay: 2s
- # only scale down when sustained for 1m
- resizeDownStabilizationDelay: 1m
-
- maxPoolSize: 10
-
- # and add a load-balancer pointing at the cluster
- - type: load-balancer
- id: load-bal
- brooklyn.config:
- # point this load balancer at the cluster, specifying port to forward to
- loadbalancer.serverpool: $brooklyn:entity("my-web-cluster")
- member.sensor.portNumber: app.port
- # disable sticky sessions to allow easy validation of balancing via browser refresh
- nginx.sticky: false
-
- brooklyn.enrichers:
- # publish a few useful info sensors and KPI's to the root of the app
- - type: org.apache.brooklyn.enricher.stock.Propagator
- brooklyn.config:
- uniqueTag: propagate-load-balancer-url
- producer: $brooklyn:entity("load-bal")
- propagating:
- - main.uri
- - type: org.apache.brooklyn.enricher.stock.Propagator
- brooklyn.config:
- uniqueTag: propagate-reqs-per-sec
- producer: $brooklyn:entity("my-web-cluster")
- propagating:
- - reqs.per_sec
- - reqs.per_sec.windowed_30s.per_node
-
- location:
- jclouds:aws-ec2:
- # edit these (or delete if credentials specified in brooklyn.properties)
- identity: <REPLACE>
- credential: <REPLACE>
-
- region: eu-central-1
- minRam: 2gb
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.core.catalog.bomscanner.cfg b/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.core.catalog.bomscanner.cfg
deleted file mode 100644
index 242dfd6..0000000
--- a/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.core.catalog.bomscanner.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-# CSV Whitelist of regular expressions to match bundle symbolic id if bundle is to be permitted to add
-# applications (templates) to the catalog
-whiteList=.*
-
-# CSV Blacklist of regular expressions to match bundle symbolic id to prevent selected whitelisted bundles
-# adding applications (templates) to the catalog
-blackList=
-
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.osgilauncher.cfg b/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.osgilauncher.cfg
deleted file mode 100644
index 24a619a..0000000
--- a/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.osgilauncher.cfg
+++ /dev/null
@@ -1,65 +0,0 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-# This file temporarily contains boot settings for brooklyn karaf launcher,
-# matching some of the command-line options of the previous brooklyn-cli launcher
-# (those used during the initialization sequence)
-#
-# Most of these will migrate to a permanent cfg file, once the components themselves get refactored
-# and the configuration options are agreed upon
-
-# Location of the global brooklyn.properties file
-#globalBrooklynPropertiesFile=~/.brooklyn/brooklyn.properties
-
-# Location of the local brooklyn.properties file, normally specified at the cli. Overrides properties from the global set.
-#localBrooklynPropertiesFile=
-
-
-# Ignore catalog subsystem failures during startup (default is to continue, so errors can be viewed via the API)
-#ignoreCatalogErrors=true
-
-# Ignore persistence/HA subsystem failures during startup (default is to continue, so errors can be viewed via the API)
-#ignorePersistenceErrors=true
-
-# The high availability mode. Possible values are:
-# - DISABLED: management node works in isolation - will not cooperate with any other standby/master nodes in management plane;
-# - AUTO: will look for other management nodes, and will allocate itself as standby or master based on other nodes' states;
-# - MASTER: will startup as master - if there is already a master then fails immediately;
-# - STANDBY: will start up as lukewarm standby with no state - if there is not already a master then fails immediately,
-# and if there is a master which subsequently fails, this node can promote itself;
-# - HOT_STANDBY: will start up as hot standby in read-only mode - if there is not already a master then fails immediately,
-# and if there is a master which subseuqently fails, this node can promote itself;
-# - HOT_BACKUP: will start up as hot backup in read-only mode - no master is required, and this node will not become a master
-#highAvailabilityMode=DISABLED
-
-# The persistence mode. Possible values are:
-# - DISABLED: will not read or persist any state;
-# - AUTO: will rebind to any existing state, or start up fresh if no state;
-# - REBIND: will rebind to the existing state, or fail if no state available;
-# - CLEAN: will start up fresh (removing any existing state)
-#persistMode=DISABLED
-
-# The directory to read/write persisted state (or container name if using an object store)
-#persistenceDir=
-
-# The location spec for an object store to read/write persisted state
-#persistenceLocation=
-
-# Periodic read-only rebind
-#persistPeriod=1s
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg
deleted file mode 100755
index acd2aea..0000000
--- a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg
+++ /dev/null
@@ -1,95 +0,0 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-# Root logger
-log4j.rootLogger=INFO, out, debugFile, osgi:VmLogAppender
-log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %-5.5p %3.3X{bundle.id} %-30.30c{2} [%-16.16t] %m%n
-
-# Info file appender
-log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} %-5.5p %3.3X{bundle.id} %-30.30c{2} [%-16.16t] %m%n
-log4j.appender.out.file=${karaf.home}/log/brooklyn.info.log
-log4j.appender.out.Threshold=INFO
-log4j.appender.out.append=true
-log4j.appender.out.maxFileSize=100MB
-log4j.appender.out.maxBackupIndex=10
-
-# Debug file appender
-log4j.appender.debugFile=org.apache.log4j.RollingFileAppender
-log4j.appender.debugFile.layout=org.apache.log4j.PatternLayout
-log4j.appender.debugFile.layout.ConversionPattern=%d{ABSOLUTE} %-5.5p %3.3X{bundle.id} %-30.30c{2} [%-16.16t] %m%n
-log4j.appender.debugFile.file=${karaf.home}/log/brooklyn.debug.log
-log4j.appender.debugFile.append=true
-log4j.appender.debugFile.maxFileSize=100MB
-log4j.appender.debugFile.maxBackupIndex=10
-
-# Sift appender
-log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
-log4j.appender.sift.key=bundle.name
-log4j.appender.sift.default=brooklyn
-log4j.appender.sift.appender=org.apache.log4j.FileAppender
-log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
-log4j.appender.sift.appender.layout.ConversionPattern=%d{ABSOLUTE} %-5.5p %3.3X{bundle.id} %-30.30c{2} [%-16.16t] %m%n
-log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
-log4j.appender.sift.appender.append=true
-
-
-# Logger configuration
-
-# The following properties turn on quite verbose DEBUG logging for Brooklyn-relevant loggers
-log4j.logger.brooklyn=DEBUG
-log4j.logger.org.apache.brooklyn=DEBUG
-log4j.logger.org.jclouds=DEBUG
-log4j.logger.jclouds=DEBUG
-io.cloudsoft.winrm4j.winrm.WinRmTool=DEBUG
-
-# If you're just going to have a few debug categories these are recommended;
-# comment out the loggers above and leave these as-is
-log4.logger.brooklyn.SSH=DEBUG
-log4.logger.brooklyn.location.basic.jclouds=DEBUG
-log4.logger.brooklyn.util.internal.ssh=DEBUG
-log4.logger.org.apache.brooklyn.SSH=DEBUG
-log4.logger.org.apache.brooklyn.location.basic.jclouds=DEBUG
-log4.logger.org.apache.brooklyn.util.internal.ssh=DEBUG
-
-# a bit noisy at INFO, but still, poss interesting
-log4j.logger.org.reflections.Reflections=INFO
-log4j.logger.com.sun.jersey.server.impl.application=INFO
-log4j.logger.org.apache.whirr.service.ComputeCache=INFO
-log4j.logger.jclouds.ssh=INFO
-log4j.logger.org.apache.http.impl.client=INFO
-log4j.logger.javax.management.remote=INFO
-
-# some loggers are very noisy however, exclude them
-log4j.logger.org.apache.cxf=WARN
-log4j.logger.net.schmizz=WARN
-log4j.logger.org.eclipse.jetty=WARN
-log4j.logger.org.mongodb.driver=WARN
-
-# Wordnik logs errors in a few places which aren't errors at all; ignore them altogether
-# (Turn them back on if you need to see how API-doc gets generated, and also
-# see https://github.com/wordnik/swagger-core/issues/58)
-log4j.logger.com.wordnik.swagger=OFF
-
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.url.mvn.repositories.cfg b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.url.mvn.repositories.cfg
deleted file mode 100644
index b7bc8c9..0000000
--- a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.url.mvn.repositories.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-org.ops4j.pax.url.mvn.repositories=+http://repo1.maven.org/maven2
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.web.cfg b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.web.cfg
deleted file mode 100644
index 39947eb..0000000
--- a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.web.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-# TODO use the PortService - ${port:8081,8200}
-org.osgi.service.http.port=8081
-
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/system.properties b/karaf/apache-brooklyn/src/main/resources/etc/system.properties
deleted file mode 100644
index a95f167..0000000
--- a/karaf/apache-brooklyn/src/main/resources/etc/system.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-#
-# The properties defined in this file will be made available through system
-# properties at the very beginning of the Karaf's boot process.
-#
-
-
-# Log level when the pax-logging service is not available
-# This level will only be used while the pax-logging service bundle
-# is not fully available.
-# To change log levels, please refer to the org.ops4j.pax.logging.cfg file
-# instead.
-org.ops4j.pax.logging.DefaultServiceLog.level = ERROR
-
-#
-# Name of this Karaf instance.
-#
-karaf.name = brooklyn
-
-#
-# Default repository where bundles will be loaded from before using
-# other Maven repositories. For the full Maven configuration, see
-# the org.ops4j.pax.url.mvn.cfg file.
-#
-karaf.default.repository = system
-
-#
-# Location of a shell script that will be run when starting a shell
-# session. This script can be used to create aliases and define
-# additional commands.
-#
-karaf.shell.init.script = ${karaf.etc}/shell.init.script
-
-#
-# Sets the maximum size of the shell command history. If not set,
-# defaults to 500 entries. Setting to 0 will disable history.
-#
-# karaf.shell.history.maxSize = 0
-
-#
-# Deletes the entire karaf.data directory at every start
-#
-karaf.clean.all = false
-
-#
-# Deletes the karaf.data/cache directory at every start
-#
-karaf.clean.cache = false
-
-#
-# Roles to use when logging into a local Karaf console.
-#
-# The syntax is the following:
-# [classname:]principal
-# where classname is the class name of the principal object
-# (defaults to org.apache.karaf.jaas.modules.RolePrincipal)
-# and principal is the name of the principal of that class
-# (defaults to instance).
-#
-karaf.local.roles = admin,manager,viewer,systembundles
-
-#
-# Set this empty property to avoid errors when validating xml documents.
-#
-xml.catalog.files =
-
-#
-# Suppress the bell in the console when hitting backspace too many times
-# for example
-#
-jline.nobell = true
-
-#
-# ServiceMix specs options
-#
-org.apache.servicemix.specs.debug = false
-org.apache.servicemix.specs.timeout = 0
-
-#
-# Settings for the OSGi 4.3 Weaving
-# By default, we will not weave any classes. Change this setting to include classes
-# that you application needs to have woven.
-#
-org.apache.aries.proxy.weaving.enabled = none
-# Classes not to weave - Aries default + Xerces which is known to have issues.
-org.apache.aries.proxy.weaving.disabled = org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.*
-
-#
-# By default, only Karaf shell commands are secured, but additional services can be
-# secured by expanding this filter
-#
-karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
-
-#
-# Security properties
-#
-# To enable OSGi security, uncomment the properties below,
-# install the framework-security feature and restart.
-#
-#java.security.policy=${karaf.etc}/all.policy
-#org.osgi.framework.security=osgi
-#org.osgi.framework.trust.repositories=${karaf.etc}/trustStore.ks
-
-#
-# HA/Lock configuration
-#
-# Karaf uses a lock mechanism to know which instance is the master (HA)
-# The lock can be on the filesystem (default) or on a database.
-#
-# See http://karaf.apache.org/manual/latest/users-guide/failover.html for details.
-#
-# Even using a single instance, Karaf creates the lock file
-# You can specify the location of the lock file using the
-# karaf.lock.dir=/path/to/the/directory/containing/the/lock
-#
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index c4eefc5..8bc7e62 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -279,59 +279,6 @@
<feature>brooklyn-software-winrm</feature>
</feature>
- <feature name="brooklyn-software-network" version="${project.version}" description="Brooklyn Network Software Entities">
- <bundle>mvn:org.apache.brooklyn/brooklyn-software-network/${project.version}</bundle>
- <feature>brooklyn-software-base</feature>
- </feature>
-
- <feature name="brooklyn-software-cm" version="${project.version}" description="Configuration Management modules">
- <bundle>mvn:org.apache.brooklyn/brooklyn-software-cm-salt/${project.version}</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-software-cm-ansible/${project.version}</bundle>
- </feature>
-
- <feature name="brooklyn-software-osgi" version="${project.version}" description="Brooklyn OSGi Software Entities">
- <bundle>mvn:org.apache.brooklyn/brooklyn-software-osgi/${project.version}</bundle>
- <feature>brooklyn-core</feature>
- <feature>brooklyn-api</feature>
- <feature>brooklyn-software-base</feature>
- <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
- </feature>
-
- <feature name="brooklyn-software-database" version="${project.version}" description="Brooklyn Database Software Entities">
- <bundle>mvn:org.apache.brooklyn/brooklyn-software-database/${project.version}</bundle>
- <feature>brooklyn-core</feature>
- <feature>brooklyn-api</feature>
- <feature>brooklyn-software-base</feature>
- <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
- </feature>
-
- <feature name="brooklyn-software-webapp" version="${project.version}" description="Brooklyn Web App Software Entities">
- <bundle>mvn:org.apache.brooklyn/brooklyn-software-webapp/${project.version}</bundle>
- <feature>brooklyn-software-base</feature>
- <bundle dependency="true">wrap:mvn:org.hibernate/jtidy/${jtidy.version}</bundle>
- </feature>
-
- <feature name="brooklyn-software-messaging" version="${project.version}" description="Brooklyn Messaging Software Entities">
- <bundle>mvn:org.apache.brooklyn/brooklyn-software-messaging/${project.version}</bundle>
- <feature>brooklyn-software-base</feature>
- </feature>
-
- <feature name="brooklyn-software-nosql" version="${project.version}" description="Brooklyn NoSQL Data Store Software Entities">
- <bundle>mvn:org.apache.brooklyn/brooklyn-software-nosql/${project.version}</bundle>
- <feature>brooklyn-software-base</feature>
- <feature>brooklyn-software-database</feature>
- <feature>brooklyn-software-webapp</feature>
- <bundle dependency="true">mvn:org.mongodb/mongo-java-driver/3.0.3</bundle>
- </feature>
-
- <feature name="brooklyn-software-monitoring" version="${project.version}" description="Brooklyn Monitoring Software Entities">
- <bundle>mvn:org.apache.brooklyn/brooklyn-software-monitoring/${project.version}</bundle>
- <feature>brooklyn-core</feature>
- <feature>brooklyn-api</feature>
- <feature>brooklyn-software-base</feature>
- <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
- </feature>
-
<feature name="brooklyn-test-framework" version="${project.version}" description="Brooklyn Test Framework" >
<bundle>mvn:org.apache.brooklyn/brooklyn-test-framework/${project.version}</bundle>
</feature>
@@ -343,19 +290,6 @@
<feature>brooklyn-test-framework</feature>
</feature>
- <!-- TODO Not including this in the init features; need to move this to brooklyn-dist first! -->
- <!-- TODO Don't load all bundles out of the box in the long run. Let users cherry pick what they need. -->
- <feature name="brooklyn-library-all" version="${project.version}" description="Brooklyn All Library Entities">
- <feature>brooklyn-software-network</feature>
- <feature>brooklyn-software-cm</feature>
- <feature>brooklyn-software-osgi</feature>
- <feature>brooklyn-software-database</feature>
- <feature>brooklyn-software-webapp</feature>
- <feature>brooklyn-software-messaging</feature>
- <feature>brooklyn-software-nosql</feature>
- <feature>brooklyn-software-monitoring</feature>
- </feature>
-
<feature name="brooklyn-osgi-launcher" version="${project.version}" description="Brooklyn init">
<feature>brooklyn-core</feature>
<feature>brooklyn-server-software-all</feature>
diff --git a/karaf/init/src/main/resources/catalog-classes.bom b/karaf/init/src/main/resources/catalog-classes.bom
index 950cb62..4ae1190 100644
--- a/karaf/init/src/main/resources/catalog-classes.bom
+++ b/karaf/init/src/main/resources/catalog-classes.bom
@@ -162,385 +162,6 @@
name: Server Pool
description: Creates a pre-allocated server pool, which other applications can deploy to
- # org.apache.brooklyn.software-webapp
- - itemType: entity
- items:
- - id: org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppService
- iconUrl: classpath:///nodejs-logo.png
- item:
- type: org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppService
- name: Node.JS Application
- - id: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
- iconUrl: classpath:///jboss-logo.png
- item:
- type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
- name: JBoss Application Server 7
- description: AS7 - an open source Java application server from JBoss
- - id: org.apache.brooklyn.entity.proxy.nginx.UrlMapping
- item:
- type: org.apache.brooklyn.entity.proxy.nginx.UrlMapping
- - id: org.apache.brooklyn.entity.webapp.DynamicWebAppFabric
- item:
- type: org.apache.brooklyn.entity.webapp.DynamicWebAppFabric
- - id: org.apache.brooklyn.entity.proxy.nginx.NginxController
- iconUrl: classpath:///nginx-logo.jpeg
- item:
- type: org.apache.brooklyn.entity.proxy.nginx.NginxController
- name: Nginx Server
- description: A single Nginx server. Provides HTTP and reverse proxy services
- - id: org.apache.brooklyn.entity.webapp.jboss.JBoss6Server
- iconUrl: classpath:///jboss-logo.png
- item:
- type: org.apache.brooklyn.entity.webapp.jboss.JBoss6Server
- name: JBoss Application Server 6
- description: AS6 - an open source Java application server from JBoss
- - id: org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server
- iconUrl: classpath:///tomcat-logo.png
- item:
- type: org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server
- name: Tomcat 8 Server
- - id: org.apache.brooklyn.entity.proxy.LoadBalancerCluster
- item:
- type: org.apache.brooklyn.entity.proxy.LoadBalancerCluster
- - id: org.apache.brooklyn.entity.webapp.jetty.Jetty6Server
- iconUrl: classpath:///jetty-logo.png
- item:
- type: org.apache.brooklyn.entity.webapp.jetty.Jetty6Server
- name: Jetty6 Server
- description: Old version (v6 @ Mortbay) of the popular Jetty webapp container
- - id: org.apache.brooklyn.entity.webapp.DynamicWebAppCluster
- item:
- type: org.apache.brooklyn.entity.webapp.DynamicWebAppCluster
- name: Dynamic Web-app Cluster
- description: A cluster of web-apps, which can be dynamically re-sized; this does not include a load-balancer
- - id: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer
- iconUrl: classpath:///tomcat-logo.png
- item:
- type: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer
- name: Tomcat 7 Server
- - id: org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService
- iconUrl: classpath:///geoscaling-logo.gif
- item:
- type: org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService
- - id: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
- item:
- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
- name: Controlled Dynamic Web-app Cluster
- description: A cluster of load-balanced web-apps, which can be dynamically re-sized
-
- # org.apache.brooklyn.software-osgi
- - itemType: entity
- items:
- - id: org.apache.brooklyn.entity.osgi.karaf.KarafContainer
- iconUrl: classpath:///karaf-logo.png
- item:
- type: org.apache.brooklyn.entity.osgi.karaf.KarafContainer
- name: Karaf
- description: Apache Karaf is a small OSGi based runtime which provides a lightweight container onto which various components and applications can be deployed.
-
- # org.apache.brooklyn.software-nosql
- - itemType: entity
- items:
- - id: org.apache.brooklyn.entity.nosql.redis.RedisStore
- iconUrl: classpath:///redis-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.redis.RedisStore
- name: Redis Server
- description: Redis is an open-source, networked, in-memory, key-value data store with optional durability
- - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBRouterCluster
- iconUrl: classpath:///mongodb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBRouterCluster
- - id: org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter
- iconUrl: classpath:///cassandra-logo.jpeg
- item:
- type: org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter
- name: Apache Cassandra Datacenter Cluster
- description: Cassandra is a highly scalable, eventually
- - id: org.apache.brooklyn.entity.nosql.solr.SolrServer
- iconUrl: classpath:///solr-logo.jpeg
- item:
- type: org.apache.brooklyn.entity.nosql.solr.SolrServer
- name: Apache Solr Node
- description: Solr is the popular, blazing fast open source enterprise search
- - id: org.apache.brooklyn.entity.nosql.couchdb.CouchDBNode
- iconUrl: classpath:///couchdb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.couchdb.CouchDBNode
- name: CouchDB Node
- - id: org.apache.brooklyn.entity.nosql.redis.RedisShard
- iconUrl: classpath:///redis-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.redis.RedisShard
- - id: org.apache.brooklyn.entity.nosql.redis.RedisCluster
- iconUrl: classpath:///redis-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.redis.RedisCluster
- name: Redis Cluster
- description: Redis is an open-source, networked, in-memory, key-value data store with optional durability
- - id: org.apache.brooklyn.entity.nosql.hazelcast.HazelcastCluster
- iconUrl: classpath:///hazelcast-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.hazelcast.HazelcastCluster
- name: Hazelcast Cluster
- description: Hazelcast is a clustering and highly scalable data distribution platform for Java.
- - id: org.apache.brooklyn.entity.nosql.couchdb.CouchDBCluster
- iconUrl: classpath:///couchdb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.couchdb.CouchDBCluster
- - id: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseNode
- iconUrl: classpath:///couchbase-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseNode
- name: CouchBase Node
- description: Couchbase Server is an open source, distributed (shared-nothing architecture)
- - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment
- iconUrl: classpath:///mongodb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment
- name: MongoDB Sharded Deployment
- - id: org.apache.brooklyn.entity.nosql.cassandra.CassandraNode
- iconUrl: classpath:///cassandra-logo.jpeg
- item:
- type: org.apache.brooklyn.entity.nosql.cassandra.CassandraNode
- name: Apache Cassandra Node
- description: Cassandra is a highly scalable, eventually
- - id: org.apache.brooklyn.entity.nosql.riak.RiakNode
- iconUrl: classpath:///org/apache/brooklyn/entity/nosql/riak/riak.png
- item:
- type: org.apache.brooklyn.entity.nosql.riak.RiakNode
- name: Riak Node
- description: Riak is a distributed NoSQL key-value data store that offers
- - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBConfigServerCluster
- iconUrl: classpath:///mongodb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBConfigServerCluster
- - id: org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer
- iconUrl: classpath:///mongodb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer
- name: MongoDB Server
- - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBRouter
- iconUrl: classpath:///mongodb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBRouter
- name: MongoDB Router
- - id: org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet
- iconUrl: classpath:///mongodb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet
- - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardCluster
- iconUrl: classpath:///mongodb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardCluster
- - id: org.apache.brooklyn.entity.nosql.mongodb.MongoDBClient
- iconUrl: classpath:///mongodb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.mongodb.MongoDBClient
- - id: org.apache.brooklyn.entity.nosql.elasticsearch.ElasticSearchNode
- item:
- type: org.apache.brooklyn.entity.nosql.elasticsearch.ElasticSearchNode
- name: Elastic Search Node
- description: Elasticsearch is an open-source search server based on Lucene.
- - id: org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric
- iconUrl: classpath:///cassandra-logo.jpeg
- item:
- type: org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric
- name: Apache Cassandra Database Fabric
- description: Cassandra is a highly scalable, eventually
- - id: org.apache.brooklyn.entity.nosql.elasticsearch.ElasticSearchCluster
- item:
- type: org.apache.brooklyn.entity.nosql.elasticsearch.ElasticSearchCluster
- name: Elastic Search Cluster
- description: Elasticsearch is an open-source search server based on Lucene.
- - id: org.apache.brooklyn.entity.nosql.cassandra.CassandraCluster
- iconUrl: classpath:///cassandra-logo.jpeg
- item:
- type: org.apache.brooklyn.entity.nosql.cassandra.CassandraCluster
- - id: org.apache.brooklyn.entity.nosql.redis.RedisSlave
- iconUrl: classpath:///redis-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.redis.RedisSlave
- - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBConfigServer
- iconUrl: classpath:///mongodb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBConfigServer
- - id: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseCluster
- iconUrl: classpath:///couchbase-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseCluster
- name: CouchBase Cluster
- description: Couchbase is an open source, distributed (shared-nothing architecture)
- - id: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseSyncGateway
- iconUrl: classpath:///couchbase-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseSyncGateway
- - id: org.apache.brooklyn.entity.nosql.hazelcast.HazelcastNode
- iconUrl: classpath:///hazelcast-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.hazelcast.HazelcastNode
- name: Hazelcast Node
- description: Hazelcast is a clustering and highly scalable data distribution platform for Java.
- - id: org.apache.brooklyn.entity.nosql.riak.RiakCluster
- iconUrl: classpath:///org/apache/brooklyn/entity/nosql/riak/riak.png
- item:
- type: org.apache.brooklyn.entity.nosql.riak.RiakCluster
- name: Riak Cluster
- description: Riak is a distributed NoSQL key-value data store that offers
- - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.CoLocatedMongoDBRouter
- iconUrl: classpath:///mongodb-logo.png
- item:
- type: org.apache.brooklyn.entity.nosql.mongodb.sharding.CoLocatedMongoDBRouter
-
- # org.apache.brooklyn.software-network
- - itemType: entity
- items:
- - id: org.apache.brooklyn.entity.network.bind.BindDnsServer
- description: BIND is an Internet Domain Name Server.
- item:
- type: org.apache.brooklyn.entity.network.bind.BindDnsServer
- name: BIND
-
- # org.apache.brooklyn.software-monitoring
- - itemType: entity
- items:
- - id: org.apache.brooklyn.entity.monitoring.monit.MonitNode
- iconUrl: classpath:///monit-logo.png
- item:
- type: org.apache.brooklyn.entity.monitoring.monit.MonitNode
- name: Monit Node
- description: Monit is a free open source utility for managing and monitoring, processes, programs, files, directories and filesystems on a UNIX system
-
- # org.apache.brooklyn.software-messaging
- - itemType: entity
- items:
- - id: org.apache.brooklyn.entity.messaging.activemq.ActiveMQBroker
- iconUrl: classpath:///activemq-logo.png
- item:
- type: org.apache.brooklyn.entity.messaging.activemq.ActiveMQBroker
- name: ActiveMQ Broker
- description: ActiveMQ is an open source message broker which fully implements the Java Message Service 1.1 (JMS)
- - id: org.apache.brooklyn.entity.messaging.qpid.QpidBroker
- iconUrl: classpath:///qpid-logo.jpeg
- item:
- type: org.apache.brooklyn.entity.messaging.qpid.QpidBroker
- name: Qpid Broker
- description: Apache Qpid is an open-source messaging system, implementing the Advanced Message Queuing Protocol (AMQP)
- - id: org.apache.brooklyn.entity.messaging.storm.Storm
- iconUrl: classpath:///apache-storm-logo.png
- item:
- type: org.apache.brooklyn.entity.messaging.storm.Storm
- name: Storm Node
- description: Apache Storm is a distributed realtime computation system.
- - id: org.apache.brooklyn.entity.messaging.kafka.KafkaCluster
- iconUrl: classpath:///kafka-logo.png
- item:
- type: org.apache.brooklyn.entity.messaging.kafka.KafkaCluster
- name: Kafka
- description: Apache Kafka is a distributed publish-subscribe messaging system
- - id: org.apache.brooklyn.entity.messaging.activemq.ActiveMQQueue
- iconUrl: classpath:///activemq-logo.png
- item:
- type: org.apache.brooklyn.entity.messaging.activemq.ActiveMQQueue
- - id: org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble
- iconUrl: classpath:///zookeeper_logo.gif
- item:
- type: org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble
- name: ZooKeeper ensemble
- description: A cluster of ZooKeeper servers.
- - id: org.apache.brooklyn.entity.messaging.kafka.KafkaZooKeeper
- iconUrl: classpath:///zookeeper_logo.gif
- item:
- type: org.apache.brooklyn.entity.messaging.kafka.KafkaZooKeeper
- - id: org.apache.brooklyn.entity.messaging.activemq.ActiveMQTopic
- iconUrl: classpath:///activemq-logo.png
- item:
- type: org.apache.brooklyn.entity.messaging.activemq.ActiveMQTopic
- - id: org.apache.brooklyn.entity.messaging.qpid.QpidQueue
- iconUrl: classpath:///qpid-logo.jpeg
- item:
- type: org.apache.brooklyn.entity.messaging.qpid.QpidQueue
- - id: org.apache.brooklyn.entity.zookeeper.ZooKeeperNode
- iconUrl: classpath:///zookeeper_logo.gif
- item:
- type: org.apache.brooklyn.entity.zookeeper.ZooKeeperNode
- name: ZooKeeper Node
- description: Apache ZooKeeper is a server which enables
- - id: org.apache.brooklyn.entity.messaging.rabbit.RabbitBroker
- iconUrl: classpath:///RabbitMQLogo.png
- item:
- type: org.apache.brooklyn.entity.messaging.rabbit.RabbitBroker
- name: RabbitMQ Broker
- description: RabbitMQ is an open source message broker software (i.e. message-oriented middleware) that implements the Advanced Message Queuing Protocol (AMQP) standard
- - id: org.apache.brooklyn.entity.messaging.kafka.KafkaBroker
- iconUrl: classpath:///kafka-logo.png
- item:
- type: org.apache.brooklyn.entity.messaging.kafka.KafkaBroker
- - id: org.apache.brooklyn.entity.messaging.qpid.QpidTopic
- iconUrl: classpath:///qpid-logo.jpeg
- item:
- type: org.apache.brooklyn.entity.messaging.qpid.QpidTopic
- - id: org.apache.brooklyn.entity.messaging.storm.StormDeployment
- iconUrl: classpath:///apache-storm-logo.png
- item:
- type: org.apache.brooklyn.entity.messaging.storm.StormDeployment
- name: Storm Deployment
- description: A Storm cluster. Apache Storm is a distributed realtime computation system.
-
- # org.apache.brooklyn.software-database
- - itemType: entity
- items:
- - id: org.apache.brooklyn.entity.database.crate.CrateNode
- iconUrl: classpath:///crate-logo.png
- item:
- type: org.apache.brooklyn.entity.database.crate.CrateNode
- - id: org.apache.brooklyn.entity.database.mysql.MySqlNode
- iconUrl: classpath:///mysql-logo-110x57.png
- item:
- type: org.apache.brooklyn.entity.database.mysql.MySqlNode
- name: MySql Node
- description: MySql is an open source relational database management system (RDBMS)
- - id: org.apache.brooklyn.entity.database.mysql.MySqlCluster
- iconUrl: classpath:///mysql-logo-110x57.png
- item:
- type: org.apache.brooklyn.entity.database.mysql.MySqlCluster
- name: MySql Master-Slave cluster
- description: Sets up a cluster of MySQL nodes using master-slave relation and binary logging
- - id: org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode
- iconUrl: classpath:///postgresql-logo-200px.png
- item:
- type: org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode
- name: PostgreSQL Node
- description: PostgreSQL is an object-relational database management system (ORDBMS)
- - id: org.apache.brooklyn.entity.database.rubyrep.RubyRepNode
- item:
- type: org.apache.brooklyn.entity.database.rubyrep.RubyRepNode
- - id: org.apache.brooklyn.entity.database.mariadb.MariaDbNode
- iconUrl: classpath:///mariadb-logo-180x119.png
- item:
- type: org.apache.brooklyn.entity.database.mariadb.MariaDbNode
- name: MariaDB Node
- description: MariaDB is an open source relational database management system (RDBMS)
-
- # org.apache.brooklyn.software-cm-salt
- - itemType: entity
- items:
- - id: org.apache.brooklyn.entity.cm.salt.SaltEntity
- iconUrl: classpath:///saltstack-logo.png
- item:
- type: org.apache.brooklyn.entity.cm.salt.SaltEntity
- name: SaltEntity
- description: Software managed by Salt CM
-
- # org.apache.brooklyn.software-cm-ansible
- - itemType: entity
- items:
- - id: org.apache.brooklyn.entity.cm.ansible.AnsibleEntity
- iconUrl: classpath:///ansible-logo.png
- item:
- type: org.apache.brooklyn.entity.cm.ansible.AnsibleEntity
- name: AnsibleEntity
- description: Software managed by Ansible CM
# org.apache.brooklyn.test-framework
- itemType: entity
diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml
deleted file mode 100644
index a733f6b..0000000
--- a/karaf/itest/pom.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>brooklyn-itest</artifactId>
- <name>Brooklyn Karaf pax-exam itest</name>
-
- <parent>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-karaf</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <properties>
- <includedTestGroups />
- <excludedTestGroups>org.apache.brooklyn.test.IntegrationTest</excludedTestGroups>
- </properties>
-
- <dependencies>
- <!-- Pax Exam Dependencies -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-invoker-junit</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Karaf Container -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-karaf</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-inject</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-extender-service</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Preferred link because it does not require an mvn url handler implicitely. -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-assembly</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version> <!-- TODO: version property? -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${org.osgi.core.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${org.osgi.compendium.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- framework to test with -->
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>standard</artifactId>
- <version>${karaf.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.core</artifactId>
- <version>${karaf.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.system</groupId>
- <artifactId>org.apache.karaf.system.core</artifactId>
- <version>${karaf.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <version>${karaf.version}</version>
- <type>zip</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.dev</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- project deps -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-features</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-brooklyn</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo-jta_1.1_spec.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-rest-resources</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-rest-resources</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-utils-common</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.tinybundles</groupId>
- <artifactId>tinybundles</artifactId>
- <version>${tinybundles.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>depends-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>generate-depends-file</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <groups>${includedTestGroups}</groups>
- <excludedGroups>${excludedTestGroups}</excludedGroups>
- <systemPropertyVariables>
- <org.ops4j.pax.url.mvn.localRepository>${settings.localRepository}</org.ops4j.pax.url.mvn.localRepository>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>Integration</id>
- <properties>
- <includedTestGroups>org.apache.brooklyn.test.IntegrationTest</includedTestGroups>
- <excludedTestGroups />
- </properties>
- </profile>
- </profiles>
-</project>
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
deleted file mode 100644
index 14ec1d2..0000000
--- a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.brooklyn;
-
-import static org.apache.brooklyn.KarafTestUtils.defaultOptionsWith;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import javax.inject.Inject;
-
-import org.apache.karaf.features.BootFinished;
-import org.apache.karaf.features.FeaturesService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.util.Filter;
-import org.osgi.framework.BundleContext;
-
-/**
- * Tests the apache-brooklyn karaf runtime assembly.
- *
- * Keeping it a non-integration test so we have at least a basic OSGi sanity check. (takes 14 sec)
- */
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AssemblyTest {
-
- @Inject
- private BundleContext bc;
-
- @Inject
- @Filter(timeout = 120000)
- protected FeaturesService featuresService;
-
- /**
- * To make sure the tests run only when the boot features are fully
- * installed
- */
- @Inject
- @Filter(timeout = 120000)
- BootFinished bootFinished;
-
- @Configuration
- public static Option[] configuration() throws Exception {
- return defaultOptionsWith(
- // Uncomment this for remote debugging the tests on port 5005
- // KarafDistributionOption.debugConfiguration()
- );
- }
-
- @Test
- public void shouldHaveBundleContext() {
- assertNotNull(bc);
- }
-
- @Test
- public void checkEventFeature() throws Exception {
- assertTrue(featuresService.isInstalled(featuresService.getFeature("eventadmin")));
- }
-
- @Test
- public void checkBrooklynCoreFeature() throws Exception {
- featuresService.installFeature("brooklyn-core");
- assertTrue(featuresService.isInstalled(featuresService.getFeature("brooklyn-core")));
- }
-
-}
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/KarafTestUtils.java b/karaf/itest/src/test/java/org/apache/brooklyn/KarafTestUtils.java
deleted file mode 100644
index d8920ef..0000000
--- a/karaf/itest/src/test/java/org/apache/brooklyn/KarafTestUtils.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.brooklyn;
-
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.MavenUtils.asInProject;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-
-import java.io.File;
-
-import org.apache.brooklyn.util.text.Identifiers;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-
-import com.google.common.collect.ObjectArrays;
-
-public class KarafTestUtils {
- public static final Option[] DEFAULT_OPTIONS = {
- karafDistributionConfiguration()
- .frameworkUrl(brooklynKarafDist())
- .unpackDirectory(new File("target/paxexam/unpack/"))
- .useDeployFolder(false),
- configureConsole().ignoreLocalConsole(),
- logLevel(LogLevel.INFO),
- features(karafStandardFeaturesRepository(), "eventadmin"),
- junitBundles(),
- editConfigurationFilePut("etc/org.apache.brooklyn.osgilauncher.cfg", "persistMode", "AUTO"),
- editConfigurationFilePut("etc/org.apache.brooklyn.osgilauncher.cfg", "persistenceDir", new File("target/paxexam/persistence/" + Identifiers.makeRandomId(6) + "/").getAbsolutePath()),
- };
-
- public static MavenUrlReference karafStandardFeaturesRepository() {
- return maven()
- .groupId("org.apache.karaf.features")
- .artifactId("standard")
- .type("xml")
- .classifier("features")
- .version(asInProject());
- }
-
-
- public static MavenArtifactUrlReference brooklynKarafDist() {
- return maven()
- .groupId("org.apache.brooklyn")
- .artifactId("apache-brooklyn")
- .type("zip")
- .version(asInProject());
- }
-
- public static Option[] defaultOptionsWith(Option... options) {
- return ObjectArrays.concat(DEFAULT_OPTIONS, options, Option.class);
- }
-
- public static MavenUrlReference brooklynFeaturesRepository() {
- return maven()
- .groupId("org.apache.brooklyn")
- .artifactId("brooklyn-features")
- .type("xml")
- .classifier("features")
- .versionAsInProject();
- }
-}
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogBomScannerTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogBomScannerTest.java
deleted file mode 100644
index 39f959c..0000000
--- a/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogBomScannerTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * 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.brooklyn.core.catalog.internal;
-
-import org.apache.brooklyn.api.catalog.CatalogItem;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.core.BrooklynVersion;
-import org.apache.brooklyn.test.Asserts;
-import org.apache.brooklyn.test.IntegrationTest;
-import org.apache.brooklyn.util.collections.MutableMap;
-import org.apache.brooklyn.util.time.Duration;
-import org.apache.karaf.features.BootFinished;
-import org.apache.karaf.features.FeaturesService;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
-import org.ops4j.pax.exam.util.Filter;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-
-import java.util.Dictionary;
-
-import static org.apache.brooklyn.KarafTestUtils.defaultOptionsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
-public class CatalogBomScannerTest {
-
- private static final Logger LOG = LoggerFactory.getLogger(CatalogBomScannerTest.class);
- public static final String KARAF_INIT_BLUEPRINT_BOMSCANNER_PID = "org.apache.brooklyn.core.catalog.bomscanner";
-
- @Inject
- @Filter(timeout = 120000)
- protected FeaturesService featuresService;
-
- @Inject
- @Filter(timeout = 120000)
- protected ConfigurationAdmin configAdmin;
-
- @Inject
- @Filter(timeout = 120000)
- protected ManagementContext managementContext;
-
- /**
- * To make sure the tests run only when the boot features are fully
- * installed
- */
- @Inject
- @Filter(timeout = 120000)
- BootFinished bootFinished;
-
-
- @Configuration
- public static Option[] configuration() throws Exception {
- return defaultOptionsWith(
- // Uncomment this for remote debugging the tests on port 5005
-// , KarafDistributionOption.debugConfiguration()
- );
- }
-
- @Test
- @Category(IntegrationTest.class)
- public void shouldFindWebAppCatalogExampleOnlyAfterItsFeatureIsInstalled() throws Exception {
-
- final CatalogItem<?, ?> catalogItem = managementContext.getCatalog()
- .getCatalogItem("load-balancer", BrooklynVersion.get()); // from brooklyn-software-webapp
- assertNull(catalogItem);
-
- featuresService.installFeature("brooklyn-software-webapp", BrooklynVersion.get());
-
- Asserts.succeedsEventually(MutableMap.of("timeout", Duration.TEN_SECONDS), new Runnable() {
- @Override
- public void run() {
- final CatalogItem<?, ?> lb = managementContext.getCatalog()
- .getCatalogItem("load-balancer", BrooklynVersion.get());
- assertNotNull(lb);
- }
- });
- }
-
- @Test
- @Category(IntegrationTest.class)
- public void shouldNotFindNoSqlCatalogExampleIfItIsBlacklisted() throws Exception {
-
- // verify no NoSQL entities are loaded yet
- final String riakTemplate = "bash-web-and-riak-template"; // from brooklyn-software-nosql
- CatalogItem<?, ?> catalogItem = getCatalogItem(riakTemplate);
- assertNull(catalogItem);
-
- final String redisStore = "org.apache.brooklyn.entity.nosql.redis.RedisStore"; // ditto
- catalogItem = getCatalogItem(redisStore);
- assertNull(catalogItem);
-
- // blacklist the org.apache.brooklyn.software-nosql bundle
- final org.osgi.service.cm.Configuration bomScannerConfig =
- configAdmin.getConfiguration(KARAF_INIT_BLUEPRINT_BOMSCANNER_PID);
- final Dictionary<String, Object> bomProps = bomScannerConfig.getProperties();
- assertEquals(".*", bomProps.get("whiteList"));
- assertEquals("", bomProps.get("blackList"));
-
- bomProps.put("blackList", ".*nosql.*");
- bomScannerConfig.update(bomProps);
-
- // install the NoSQL feature
- featuresService.installFeature("brooklyn-software-nosql", BrooklynVersion.get());
-
- // verify that the non-template entity org.apache.brooklyn.entity.nosql.redis.RedisStore gets added to catalog
- verifyCatalogItemEventually(redisStore, true);
-
- // verify that the template application hasn't made it into the catalog (because it's blacklisted)
- catalogItem = getCatalogItem(riakTemplate);
- assertNull(catalogItem);
-
- // For completeness let's uninstall the bundle, un-blacklist nosql, and install again
- featuresService.uninstallFeature("brooklyn-software-nosql", BrooklynVersion.get());
-
- // verify it's gone away
- verifyCatalogItemEventually(redisStore, false);
-
- // un-blacklist nosql
- bomProps.put("blackList", "");
- bomScannerConfig.update(bomProps);
-
- // install it again
- featuresService.installFeature("brooklyn-software-nosql", BrooklynVersion.get());
-
- // now the application should make it into the catalog
- verifyCatalogItemEventually(redisStore, true);
-
- }
-
- private void verifyCatalogItemEventually(final String redisStore, final boolean isItThere) {
- Asserts.succeedsEventually(MutableMap.of("timeout", Duration.TEN_SECONDS), new Runnable() {
- @Override
- public void run() {
- final CatalogItem<?, ?> redis = getCatalogItem(redisStore);
- assertEquals(null != redis, isItThere);
- }
- });
- }
-
- private CatalogItem<?, ?> getCatalogItem(String itemName) {
- return managementContext.getCatalog().getCatalogItem(itemName, BrooklynVersion.get());
- }
-
-}
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/DefaultBomLoadTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/DefaultBomLoadTest.java
deleted file mode 100644
index 31d500e..0000000
--- a/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/DefaultBomLoadTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.brooklyn.core.catalog.internal;
-
-
-import org.apache.brooklyn.api.catalog.CatalogItem;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.core.BrooklynVersion;
-import org.apache.brooklyn.test.IntegrationTest;
-import org.apache.karaf.features.BootFinished;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
-import org.ops4j.pax.exam.util.Filter;
-
-import javax.inject.Inject;
-
-import static org.apache.brooklyn.KarafTestUtils.defaultOptionsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
-@Category(IntegrationTest.class)
-public class DefaultBomLoadTest {
-
- /**
- * To make sure the tests run only when the boot features are fully installed
- */
- @Inject
- @Filter(timeout = 120000)
- BootFinished bootFinished;
-
- @Inject
- @Filter(timeout = 120000)
- protected ManagementContext managementContext;
-
-
- @Configuration
- public static Option[] configuration() throws Exception {
- return defaultOptionsWith(
- // Uncomment this for remote debugging the tests on port 5005
-// , KarafDistributionOption.debugConfiguration()
- );
- }
-
-
- @Test
- @Category(IntegrationTest.class)
- public void shouldHaveLoadedDefaultCatalogBom() throws Exception {
- final CatalogItem<?, ?> catalogItem = managementContext.getCatalog()
- .getCatalogItem("server-template", BrooklynVersion.get()); // from brooklyn-software-base catalog.bom
- assertNotNull(catalogItem);
- assertEquals("Template: Server", catalogItem.getDisplayName());
- }
-}
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherTest.java
deleted file mode 100644
index b825112..0000000
--- a/karaf/itest/src/test/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.brooklyn.launcher.osgi;
-
-import static org.apache.brooklyn.KarafTestUtils.defaultOptionsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
-
-import java.io.IOException;
-
-import javax.inject.Inject;
-
-import org.apache.brooklyn.KarafTestUtils;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.test.Asserts;
-import org.apache.brooklyn.test.IntegrationTest;
-import org.apache.karaf.features.BootFinished;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.util.Filter;
-import org.osgi.service.cm.ConfigurationAdmin;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-@Category(IntegrationTest.class)
-public class OsgiLauncherTest {
-
- private static final String TEST_VALUE_RUNTIME = "test.value";
- private static final String TEST_KEY_RUNTIME = "test.key";
- private static final String TEST_VALUE_IN_CFG = "test.cfg";
- private static final String TEST_KEY_IN_CFG = "test.key.in.cfg";
-
- @Inject
- @Filter(timeout = 120000)
- protected ManagementContext mgmt;
-
- @Inject
- @Filter(timeout = 120000)
- protected ConfigurationAdmin configAdmin;
-
- /**
- * To make sure the tests run only when the boot features are fully
- * installed
- */
- @Inject
- @Filter(timeout = 120000)
- BootFinished bootFinished;
-
- @Configuration
- public static Option[] configuration() throws Exception {
- return defaultOptionsWith(
- editConfigurationFilePut("etc/org.apache.brooklyn.osgilauncher.cfg", "globalBrooklynPropertiesFile", ""),
- editConfigurationFilePut("etc/org.apache.brooklyn.osgilauncher.cfg", "localBrooklynPropertiesFile", ""),
- editConfigurationFilePut("etc/brooklyn.cfg", TEST_KEY_IN_CFG, TEST_VALUE_IN_CFG),
- features(KarafTestUtils.brooklynFeaturesRepository(), "brooklyn-osgi-launcher")
- // Uncomment this for remote debugging the tests on port 5005
- // ,KarafDistributionOption.debugConfiguration()
- );
- }
-
- @Test
- public void testConfig() throws IOException {
- assertFalse(mgmt.getConfig().getAllConfig().containsKey(TEST_KEY_RUNTIME));
- org.osgi.service.cm.Configuration config = configAdmin.getConfiguration("brooklyn", null);
- assertEquals(config.getProperties().get(TEST_KEY_IN_CFG), TEST_VALUE_IN_CFG);
- config.getProperties().put(TEST_KEY_RUNTIME, TEST_VALUE_RUNTIME);
- config.update();
- Asserts.succeedsEventually(new Runnable() {
- @Override
- public void run() {
- assertEquals(TEST_VALUE_RUNTIME, mgmt.getConfig().getFirst(TEST_KEY_RUNTIME));
- }
- });
- }
-}
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java
deleted file mode 100644
index f182f98..0000000
--- a/karaf/itest/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.brooklyn.rest;
-
-import static org.apache.brooklyn.KarafTestUtils.defaultOptionsWith;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
-
-import java.util.concurrent.Callable;
-
-import org.apache.brooklyn.KarafTestUtils;
-import org.apache.brooklyn.entity.brooklynnode.BrooklynNode;
-import org.apache.brooklyn.test.Asserts;
-import org.apache.brooklyn.util.http.HttpAsserts;
-import org.apache.brooklyn.util.http.HttpTool;
-import org.apache.http.HttpStatus;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-@Ignore // TODO: re-enable after brooklyn is properly initialized within the OSGI environment
-public class BrooklynRestApiLauncherTest {
-
- private static final String HTTP_PORT = "9998";
- private static final String ROOT_URL = "http://localhost:" + HTTP_PORT;
-
- @Configuration
- public static Option[] configuration() throws Exception {
- return defaultOptionsWith(
- editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", HTTP_PORT),
- features(KarafTestUtils.brooklynFeaturesRepository(), "brooklyn-software-base")
- // Uncomment this for remote debugging the tests on port 5005
- // ,KarafDistributionOption.debugConfiguration()
- );
- }
-
- @Test
- public void testStart() throws Exception {
- ensureBrooklynStarted();
-
- final String testUrl = ROOT_URL + "/v1/catalog/entities";
- int code = Asserts.succeedsEventually(new Callable<Integer>() {
- @Override
- public Integer call() throws Exception {
- int code = HttpTool.getHttpStatusCode(testUrl);
- if (code == HttpStatus.SC_FORBIDDEN) {
- throw new RuntimeException("Retry request");
- } else {
- return code;
- }
- }
- });
- HttpAsserts.assertHealthyStatusCode(code);
- HttpAsserts.assertContentContainsText(testUrl, BrooklynNode.class.getSimpleName());
- }
-
- private void ensureBrooklynStarted() {
- final String upUrl = ROOT_URL + "/v1/server/up";
- HttpAsserts.assertContentEventuallyMatches(upUrl, "true");
- }
-}
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java b/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
deleted file mode 100644
index ca9ac0e..0000000
--- a/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.brooklyn.security;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.brooklyn.rest.security.provider.AbstractSecurityProvider;
-import org.apache.brooklyn.rest.security.provider.SecurityProvider;
-
-public class CustomSecurityProvider extends AbstractSecurityProvider implements SecurityProvider {
-
- @Override
- public boolean authenticate(HttpSession session, String user, String password) {
- return "custom".equals(user);
- }
-
-}
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProviderTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProviderTest.java
deleted file mode 100644
index 3856c80..0000000
--- a/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProviderTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * 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.brooklyn.security;
-
-import static org.apache.brooklyn.KarafTestUtils.defaultOptionsWith;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertEquals;
-import static org.ops4j.pax.exam.CoreOptions.streamBundle;
-
-import java.io.IOException;
-
-import javax.inject.Inject;
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.FailedLoginException;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-
-import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.core.internal.BrooklynProperties;
-import org.apache.brooklyn.rest.BrooklynWebConfig;
-import org.apache.brooklyn.rest.security.jaas.BrooklynLoginModule;
-import org.apache.brooklyn.test.Asserts;
-import org.apache.brooklyn.test.IntegrationTest;
-import org.apache.karaf.features.BootFinished;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.util.Filter;
-import org.ops4j.pax.tinybundles.core.TinyBundles;
-import org.osgi.framework.Constants;
-
-import com.google.common.collect.ImmutableSet;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-@Category(IntegrationTest.class)
-public class CustomSecurityProviderTest {
- private static final String WEBCONSOLE_REALM = "webconsole";
-
- /**
- * To make sure the tests run only when the boot features are fully
- * installed
- */
- @Inject
- @Filter(timeout = 120000)
- BootFinished bootFinished;
-
- @Inject
- @Filter(timeout = 120000)
- ManagementContext managementContext;
-
- @Configuration
- public static Option[] configuration() throws Exception {
- return defaultOptionsWith(
- streamBundle(TinyBundles.bundle()
- .add(CustomSecurityProvider.class)
- .add("OSGI-INF/blueprint/security.xml", CustomSecurityProviderTest.class.getResource("/custom-security-bp.xml"))
- .set(Constants.BUNDLE_MANIFESTVERSION, "2") // defaults to 1 which doesn't work
- .set(Constants.BUNDLE_SYMBOLICNAME, "org.apache.brooklyn.test.security")
- .set(Constants.BUNDLE_VERSION, "1.0.0")
- .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
- .set(Constants.EXPORT_PACKAGE, CustomSecurityProvider.class.getPackage().getName())
- .build())
- // Uncomment this for remote debugging the tests on port 5005
- // ,KarafDistributionOption.debugConfiguration()
- );
- }
-
- @Before
- public void setUp() {
- // Works only before initializing the security provider (i.e. before first use)
- // TODO Dirty hack to inject the needed properties. Improve once managementContext is configurable.
- // Alternatively re-register a test managementContext service (how?)
- BrooklynProperties brooklynProperties = (BrooklynProperties)managementContext.getConfig();
- brooklynProperties.put(BrooklynWebConfig.SECURITY_PROVIDER_CLASSNAME.getName(), CustomSecurityProvider.class.getCanonicalName());
- }
-
- @Test(expected = FailedLoginException.class)
- public void checkLoginFails() throws LoginException {
- assertRealmRegisteredEventually(WEBCONSOLE_REALM);
- doLogin("invalid", "auth");
- }
-
- @Test
- public void checkLoginSucceeds() throws LoginException {
- assertRealmRegisteredEventually(WEBCONSOLE_REALM);
- String user = "custom";
- LoginContext lc = doLogin(user, "password");
- Subject subject = lc.getSubject();
- assertNotNull(subject);
- assertEquals(subject.getPrincipals(), ImmutableSet.of(
- new BrooklynLoginModule.UserPrincipal(user),
- new BrooklynLoginModule.RolePrincipal("users")));
- }
-
- private LoginContext doLogin(final String username, final String password) throws LoginException {
- assertRealmRegisteredEventually(WEBCONSOLE_REALM);
- LoginContext lc = new LoginContext(WEBCONSOLE_REALM, new CallbackHandler() {
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- Callback callback = callbacks[i];
- if (callback instanceof PasswordCallback) {
- PasswordCallback passwordCallback = (PasswordCallback)callback;
- passwordCallback.setPassword(password.toCharArray());
- } else if (callback instanceof NameCallback) {
- NameCallback nameCallback = (NameCallback)callback;
- nameCallback.setName(username);
- }
- }
- }
- });
- lc.login();
- return lc;
- }
-
- private void assertRealmRegisteredEventually(final String userPassRealm) {
- // Need to wait a bit for the realm to get registered, any OSGi way to do this?
- Asserts.succeedsEventually(new Runnable() {
- @Override
- public void run() {
- javax.security.auth.login.Configuration initialConfig = javax.security.auth.login.Configuration.getConfiguration();
- AppConfigurationEntry[] realm = initialConfig.getAppConfigurationEntry(userPassRealm);
- assertNotNull(realm);
- }
- });
- }
-
-}
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/security/StockSecurityProviderTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/security/StockSecurityProviderTest.java
deleted file mode 100644
index 8ef5ceb..0000000
--- a/karaf/itest/src/test/java/org/apache/brooklyn/security/StockSecurityProviderTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * 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.brooklyn.security;
-
-import static org.apache.brooklyn.KarafTestUtils.defaultOptionsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-import java.util.concurrent.Callable;
-
-import javax.inject.Inject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.FailedLoginException;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-
-import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.core.internal.BrooklynProperties;
-import org.apache.brooklyn.rest.BrooklynWebConfig;
-import org.apache.brooklyn.rest.security.provider.ExplicitUsersSecurityProvider;
-import org.apache.brooklyn.test.Asserts;
-import org.apache.brooklyn.test.IntegrationTest;
-import org.apache.http.HttpStatus;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.karaf.features.BootFinished;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.util.Filter;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-@Category(IntegrationTest.class)
-public class StockSecurityProviderTest {
-
- private static final String WEBCONSOLE_REALM = "webconsole";
- private static final String USER = "admin";
- private static final String PASSWORD = "password";
-
- /**
- * To make sure the tests run only when the boot features are fully
- * installed
- */
- @Inject
- @Filter(timeout = 120000)
- BootFinished bootFinished;
-
- @Inject
- @Filter(timeout = 120000)
- ManagementContext managementContext;
-
- @Configuration
- public static Option[] configuration() throws Exception {
- return defaultOptionsWith(
- // Uncomment this for remote debugging the tests on port 5005
- // KarafDistributionOption.debugConfiguration()
- );
- }
-
- @Before
- public void setUp() {
- //Works only before initializing the security provider (i.e. before first use)
- addUser(USER, PASSWORD);
- }
-
- @Test(expected = FailedLoginException.class)
- public void checkLoginFails() throws LoginException {
- doLogin("invalid", "auth");
- }
-
- @Test
- public void checkLoginSucceeds() throws LoginException {
- LoginContext lc = doLogin(USER, PASSWORD);
- assertNotNull(lc.getSubject());
- }
-
- @Test
- public void checkRestSecurityFails() throws IOException {
- checkRestSecurity(null, null, HttpStatus.SC_UNAUTHORIZED);
- }
-
- @Test
- public void checkRestSecuritySucceeds() throws IOException {
- checkRestSecurity(USER, PASSWORD, HttpStatus.SC_OK);
- }
-
- private void checkRestSecurity(String username, String password, final int code) throws IOException {
- CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
- if (username != null && password != null) {
- credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password));
- }
- try(CloseableHttpClient client =
- HttpClientBuilder.create().setDefaultCredentialsProvider(credentialsProvider).build()) {
- Asserts.succeedsEventually(new Callable<Void>() {
- @Override
- public Void call() throws Exception {
- assertResponseEquals(client, code);
- return null;
- }
- });
- }
- }
-
- private void assertResponseEquals(CloseableHttpClient httpclient, int code) throws IOException, ClientProtocolException {
- // TODO get this dynamically (from CXF service?)
- // TODO port is static, should make it dynamic
- HttpGet httpGet = new HttpGet("http://localhost:8081/v1/server/ha/state");
- try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
- assertEquals(code, response.getStatusLine().getStatusCode());
- }
- }
-
-
- private void addUser(String username, String password) {
- // TODO Dirty hack to inject the needed properties. Improve once managementContext is configurable.
- // Alternatively re-register a test managementContext service (how?)
- BrooklynProperties brooklynProperties = (BrooklynProperties)managementContext.getConfig();
- brooklynProperties.put(BrooklynWebConfig.SECURITY_PROVIDER_CLASSNAME.getName(), ExplicitUsersSecurityProvider.class.getCanonicalName());
- brooklynProperties.put(BrooklynWebConfig.USERS.getName(), username);
- brooklynProperties.put(BrooklynWebConfig.PASSWORD_FOR_USER(username), password);
- }
-
- private LoginContext doLogin(final String username, final String password) throws LoginException {
- assertRealmRegisteredEventually(WEBCONSOLE_REALM);
- LoginContext lc = new LoginContext(WEBCONSOLE_REALM, new CallbackHandler() {
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- Callback callback = callbacks[i];
- if (callback instanceof PasswordCallback) {
- PasswordCallback passwordCallback = (PasswordCallback)callback;
- passwordCallback.setPassword(password.toCharArray());
- } else if (callback instanceof NameCallback) {
- NameCallback nameCallback = (NameCallback)callback;
- nameCallback.setName(username);
- }
- }
- }
- });
- lc.login();
- return lc;
- }
-
- private void assertRealmRegisteredEventually(final String userPassRealm) {
- // Need to wait a bit for the realm to get registered, any OSGi way to do this?
- Asserts.succeedsEventually(new Runnable() {
- @Override
- public void run() {
- javax.security.auth.login.Configuration initialConfig = javax.security.auth.login.Configuration.getConfiguration();
- AppConfigurationEntry[] realm = initialConfig.getAppConfigurationEntry(userPassRealm);
- assertNotNull(realm);
- }
- });
- }
-
-}
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/test/IntegrationTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/test/IntegrationTest.java
deleted file mode 100644
index 9f5fb43..0000000
--- a/karaf/itest/src/test/java/org/apache/brooklyn/test/IntegrationTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.brooklyn.test;
-
-/**
- * Used by junit for grouping tests
- */
-public class IntegrationTest {
-
-}
diff --git a/karaf/itest/src/test/resources/custom-security-bp.xml b/karaf/itest/src/test/resources/custom-security-bp.xml
deleted file mode 100644
index ace4454..0000000
--- a/karaf/itest/src/test/resources/custom-security-bp.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2015 The Apache Software Foundation.
-
-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.
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
- xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"
- xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"
- xmlns:cxf="http://cxf.apache.org/blueprint/core"
- xmlns:jaas="http://karaf.apache.org/xmlns/jaas/v1.0.0"
- xsi:schemaLocation="
- http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
- http://cxf.apache.org/blueprint/jaxws http://cxf.apache.org/schemas/blueprint/jaxws.xsd
- http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd
- http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
- http://karaf.apache.org/xmlns/jaas/v1.0.0 http://karaf.apache.org/xmlns/jaas/v1.0.0
- ">
-
- <jaas:config name="webconsole" rank="1">
- <jaas:module className="org.apache.brooklyn.rest.security.jaas.BrooklynLoginModule"
- flags="required">
- brooklyn.webconsole.security.provider.symbolicName=org.apache.brooklyn.test.security
- brooklyn.webconsole.security.provider.version=1.0.0
- brooklyn.webconsole.security.provider.role=users
- </jaas:module>
- </jaas:config>
-</blueprint>
diff --git a/karaf/itest/src/test/resources/exam.properties b/karaf/itest/src/test/resources/exam.properties
deleted file mode 100644
index d516df6..0000000
--- a/karaf/itest/src/test/resources/exam.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-pax.exam.logging = none
-pax.exam.service.timeout = 5000
diff --git a/karaf/itest/src/test/resources/logback.xml b/karaf/itest/src/test/resources/logback.xml
deleted file mode 100644
index 7c08bb7..0000000
--- a/karaf/itest/src/test/resources/logback.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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.
--->
-<configuration>
-
- <!-- log to System.out on console -->
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <!-- log to file test.log -->
- <appender name="TEST_LOG" class="ch.qos.logback.core.FileAppender">
- <file>test.log</file>
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="TEST_LOG" />
- </root>
- <logger name="org.ops4j.pax.exam" level="INFO" />
-
-</configuration>
\ No newline at end of file
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 256d868..4574bf2 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -34,7 +34,7 @@
<properties>
- <org.osgi.compendium.version>5.0.0</org.osgi.compendium.version>
+ <org.osgi.compendium.version>5.0.0</org.osgi.compendium.version> <!-- duplicate in brooklyn-dist/dist-karaf/pom.xml -->
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
@@ -57,8 +57,6 @@
<module>jetty-config</module>
<module>features</module>
<module>commands</module>
- <module>apache-brooklyn</module>
- <module>itest</module>
</modules>
<dependencyManagement>
