You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:51:11 UTC
[29/51] [abbrv] [partial] brooklyn-server git commit: move subdir
from incubator up a level as it is promoted to its own repo (first
non-incubator commit!)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/TestAppAssemblyInstantiator.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/TestAppAssemblyInstantiator.java b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/TestAppAssemblyInstantiator.java
deleted file mode 100644
index 91dfb0e..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/TestAppAssemblyInstantiator.java
+++ /dev/null
@@ -1,96 +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.camp.brooklyn.test.lite;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.brooklyn.api.entity.Application;
-import org.apache.brooklyn.api.entity.EntitySpec;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.api.mgmt.classloading.BrooklynClassLoadingContext;
-import org.apache.brooklyn.camp.CampPlatform;
-import org.apache.brooklyn.camp.brooklyn.api.AssemblyTemplateSpecInstantiator;
-import org.apache.brooklyn.camp.spi.AbstractResource;
-import org.apache.brooklyn.camp.spi.Assembly;
-import org.apache.brooklyn.camp.spi.AssemblyTemplate;
-import org.apache.brooklyn.camp.spi.PlatformComponentTemplate;
-import org.apache.brooklyn.camp.spi.collection.ResolvableLink;
-import org.apache.brooklyn.camp.spi.instantiate.BasicAssemblyTemplateInstantiator;
-import org.apache.brooklyn.core.mgmt.HasBrooklynManagementContext;
-import org.apache.brooklyn.core.test.entity.TestApplication;
-import org.apache.brooklyn.core.test.entity.TestEntity;
-import org.apache.brooklyn.util.collections.MutableMap;
-import org.apache.brooklyn.util.collections.MutableSet;
-import org.apache.brooklyn.util.core.config.ConfigBag;
-
-import com.google.common.collect.ImmutableList;
-
-/** simple illustrative instantiator which always makes a {@link TestApplication}, populated with {@link TestEntity} children,
- * all setting {@link TestEntity#CONF_NAME} for the name in the plan and in the service specs
- * <p>
- * the "real" instantiator for brooklyn is in brooklyn-camp project, not visible here, so let's have something we can test */
-public class TestAppAssemblyInstantiator extends BasicAssemblyTemplateInstantiator implements AssemblyTemplateSpecInstantiator {
-
- @Override
- public Assembly instantiate(AssemblyTemplate template, CampPlatform platform) {
- if (!(platform instanceof HasBrooklynManagementContext)) {
- throw new IllegalStateException("Instantiator can only be used with CAMP platforms with a Brooklyn management context");
- }
- ManagementContext mgmt = ((HasBrooklynManagementContext)platform).getBrooklynManagementContext();
-
- TestApplication app = (TestApplication) mgmt.getEntityManager().createEntity( createApplicationSpec(template, platform, null, MutableSet.<String>of()) );
-
- return new TestAppAssembly(app);
- }
-
- @Override
- public EntitySpec<? extends Application> createApplicationSpec(AssemblyTemplate template, CampPlatform platform,
- BrooklynClassLoadingContext loader, Set<String> encounteredCatalogTypes) {
- EntitySpec<TestApplication> app = EntitySpec.create(TestApplication.class)
- .configure(TestEntity.CONF_NAME, template.getName())
- .configure(TestEntity.CONF_MAP_THING, MutableMap.of("type", template.getType(), "desc", template.getDescription()));
- applyBrooklynConfig(template, app);
-
- for (ResolvableLink<PlatformComponentTemplate> t: template.getPlatformComponentTemplates().links()) {
- EntitySpec<TestEntity> spec = EntitySpec.create(TestEntity.class)
- .configure(TestEntity.CONF_NAME, t.getName())
- .configure(TestEntity.CONF_MAP_THING, MutableMap.of("type", t.resolve().getType(), "desc", t.resolve().getDescription()));
- applyBrooklynConfig(t.resolve(), app);
- app.child(spec);
- }
-
- return app;
- }
-
- @SuppressWarnings("rawtypes")
- private void applyBrooklynConfig(AbstractResource template, EntitySpec<TestApplication> app) {
- Object bc = template.getCustomAttributes().get("brooklyn.config");
- if (bc instanceof Map)
- app.configure(ConfigBag.newInstance().putAll((Map)bc).getAllConfigAsConfigKeyMap());
- }
-
- @Override
- public List<EntitySpec<?>> createServiceSpecs(AssemblyTemplate template, CampPlatform platform, BrooklynClassLoadingContext itemLoader, Set<String> encounteredCatalogTypes) {
- EntitySpec<?> createApplicationSpec = createApplicationSpec(template, platform, itemLoader, encounteredCatalogTypes);
- return ImmutableList.<EntitySpec<?>>of(createApplicationSpec);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/EmptySoftwareProcessWithPassword.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/EmptySoftwareProcessWithPassword.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/EmptySoftwareProcessWithPassword.yaml
deleted file mode 100644
index abb301d..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/EmptySoftwareProcessWithPassword.yaml
+++ /dev/null
@@ -1,36 +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.
-#
-
-name: example-with-CreatePasswordSensor
-description: |
- Creates an emptyService and then attaches a password to it
-origin: https://github.com/apache/incubator-brooklyn
-location: localhost
-services:
-- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess
- brooklyn.initializers:
- - type: org.apache.brooklyn.core.sensor.password.CreatePasswordSensor
- brooklyn.config:
- name: test.password.1
- password.length: 15
- - type: org.apache.brooklyn.core.sensor.password.CreatePasswordSensor
- brooklyn.config:
- name: test.password.2
- password.chars: abc
-
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/META-INF/services/org.apache.brooklyn.camp.brooklyn.spi.creation.service.ServiceTypeResolver
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/META-INF/services/org.apache.brooklyn.camp.brooklyn.spi.creation.service.ServiceTypeResolver b/brooklyn-server/camp/camp-brooklyn/src/test/resources/META-INF/services/org.apache.brooklyn.camp.brooklyn.spi.creation.service.ServiceTypeResolver
deleted file mode 100644
index 3bba7fb..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/META-INF/services/org.apache.brooklyn.camp.brooklyn.spi.creation.service.ServiceTypeResolver
+++ /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.
-#
-org.apache.brooklyn.camp.brooklyn.spi.creation.service.TestServiceTypeResolver
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/example-with-function.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/example-with-function.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/example-with-function.yaml
deleted file mode 100644
index 918db2b..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/example-with-function.yaml
+++ /dev/null
@@ -1,34 +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.
-#
-name: example-with-function
-description: |
- Tests a variety of simple functional expressions
-origin: https://github.com/apache/incubator-brooklyn
-location: localhost
-services:
-- serviceType: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
- brooklyn.config:
- # test the various ways to use literals, either a function
- literalValue1: '$brooklyn:literal("$brooklyn: is a fun place")'
- literalValue2: "$brooklyn:literal(\"$brooklyn: is a fun place\")"
- literalValue3: >
- $brooklyn:literal("$brooklyn: is a fun place")
- literalValue4: "$brooklyn:formatString(\"%s: is a fun place\", \"$brooklyn\")"
- # function whose value is used as a key
- $brooklyn:literal("$brooklyn:1"): key to the city
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-function-2.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-function-2.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-function-2.yaml
deleted file mode 100644
index 1f02444..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-function-2.yaml
+++ /dev/null
@@ -1,41 +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.
-#
-name: java-cluster-db-example
-location: localhost
-services:
-- serviceType: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
- name: My Web
- brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0-M2/brooklyn-example-hello-world-sql-webapp-0.6.0-M2.war
- http.port: 9280+
- proxy.http.port: 9210+
- java.sysprops:
- brooklyn.example.db.url:
- # alternate syntax
- $brooklyn:formatString:
- - jdbc:%s%s?user=%s\&password=%s
- - $brooklyn:component("db").attributeWhenReady("datastore.url")
- - visitors
- - brooklyn
- - br00k11n
-- serviceType: org.apache.brooklyn.entity.database.mysql.MySqlNode
- name: My DB
- id: db
- brooklyn.config:
- datastore.creation.script.url: classpath://visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-function.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-function.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-function.yaml
deleted file mode 100644
index 0f15729..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-function.yaml
+++ /dev/null
@@ -1,36 +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.
-#
-name: java-cluster-db-example
-services:
-- serviceType: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
- name: My Web
- location: localhost
- brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.7.0-M1/brooklyn-example-hello-world-sql-webapp-0.7.0-M1.war
- http.port: 9280+
- proxy.http.port: 9210+
- java.sysprops:
- brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",
- component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n")
-- serviceType: org.apache.brooklyn.entity.database.mysql.MySqlNode
- id: db
- name: My DB
- location: localhost
- brooklyn.config:
- datastore.creation.script.url: classpath://visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/mysql-chef.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/mysql-chef.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/mysql-chef.yaml
deleted file mode 100644
index 36fdeb2..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/mysql-chef.yaml
+++ /dev/null
@@ -1,49 +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.
-#
-name: chef-mysql-sample
-services:
-- type: chef:mysql
- id: db
-
- cookbook_urls:
- # only needed for chef solo; URL can be local to brooklyn, or github, etc...
- mysql: https://github.com/opscode-cookbooks/mysql/archive/v4.0.12.tar.gz
- openssl: https://github.com/opscode-cookbooks/openssl/archive/v1.1.0.tar.gz
- build-essential: https://github.com/opscode-cookbooks/build-essential/archive/v1.4.4.tar.gz
- # NB: this also supports new style community url links, assuming TGZ and directory name,
- # (eg https://community.opscode.com/cookbooks/mysql/download) but github versioned links
- # are recommended because they point to a specific released version and explicit archive type
-
- launch_run_list: [ "mysql::server" ]
- launch_attributes:
- mysql:
- # these attrs are required by the mysql cookbook under node['mysql']
- server_root_password: $brooklyn:component("db").config("mysql.password")
- server_repl_password: $brooklyn:component("db").config("mysql.password")
- server_debian_password: $brooklyn:component("db").config("mysql.password")
- # many others are attrs are supported by the cookbook and can be passed here...
-
- # how to determine if the process is running and how to kill it
- # (supported options are `service_name` and `pid_file`; normally you should just pick one.
- # here we use the pid_file because the service_name varies, mysql on centos, mysqld on ubuntu!)
- #service_name: mysqld
- pid_file: /var/run/mysqld/mysqld.pid
-
-brooklyn.config:
- mysql.password: p4ssw0rd
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entities-osgi-catalog-scan.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entities-osgi-catalog-scan.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entities-osgi-catalog-scan.yaml
deleted file mode 100644
index 1a79465..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entities-osgi-catalog-scan.yaml
+++ /dev/null
@@ -1,32 +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.
-#
-
-# test case which demonstrates osgi bundles can be scanned, *if* expand classpath is true
-
-brooklyn.catalog:
- items:
- - scanJavaAnnotations: true
- version: 2.0.test_java
- libraries:
- - classpath:/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar
- - classpath:/brooklyn/osgi/brooklyn-test-osgi-entities.jar
- - item:
- id: more-entity
- type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
- version: 2.0.test
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-called-v1-osgi-catalog.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-called-v1-osgi-catalog.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-called-v1-osgi-catalog.yaml
deleted file mode 100644
index 20e56eb..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-called-v1-osgi-catalog.yaml
+++ /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.
-#
-services:
-- type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
-
-brooklyn.catalog:
- id: more-entity-v1
- version: 1.0
- # see OsgiTestResources
- libraries:
- - classpath:/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-osgi-catalog.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-osgi-catalog.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-osgi-catalog.yaml
deleted file mode 100644
index 6a3ecd6..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-osgi-catalog.yaml
+++ /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.
-#
-services:
-- type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
-
-brooklyn.catalog:
- id: more-entity
- version: 1.0
- # see OsgiTestResources
- libraries:
- - classpath:/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-with-policy-osgi-catalog.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-with-policy-osgi-catalog.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-with-policy-osgi-catalog.yaml
deleted file mode 100644
index 2de00d8..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-with-policy-osgi-catalog.yaml
+++ /dev/null
@@ -1,29 +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.
-#
-services:
-- type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
- brooklyn.policies:
- - type: simple-policy:1.0
-
-brooklyn.catalog:
- id: more-entity
- version: 1.0
- # see OsgiTestResources
- libraries:
- - classpath:/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v2-osgi-catalog.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v2-osgi-catalog.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v2-osgi-catalog.yaml
deleted file mode 100644
index 8033d03..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v2-osgi-catalog.yaml
+++ /dev/null
@@ -1,28 +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.
-#
-services:
-- type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
-
-brooklyn.catalog:
- id: more-entity
- version: 1.0
- # see OsgiTestResources
- libraries:
- - classpath:/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar
- - classpath:/brooklyn/osgi/brooklyn-test-osgi-entities.jar
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-policies-osgi-catalog-scan.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-policies-osgi-catalog-scan.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-policies-osgi-catalog-scan.yaml
deleted file mode 100644
index 02002e3..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-policies-osgi-catalog-scan.yaml
+++ /dev/null
@@ -1,32 +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.
-#
-
-# test case which demonstrates osgi bundles can be scanned, *if* expand classpath is true
-
-brooklyn.catalog:
- items:
- - scanJavaAnnotations: true
- version: 2.0.test_java
- libraries:
- - classpath:/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar
- - classpath:/brooklyn/osgi/brooklyn-test-osgi-entities.jar
- - item:
- id: more-policy
- type: org.apache.brooklyn.test.osgi.entities.more.MorePolicy
- version: 2.0.test
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/simple-policy-osgi-catalog.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/simple-policy-osgi-catalog.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/simple-policy-osgi-catalog.yaml
deleted file mode 100644
index 01a5db7..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/simple-policy-osgi-catalog.yaml
+++ /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.
-#
-brooklyn.policies:
-- type: org.apache.brooklyn.test.osgi.entities.SimplePolicy
-
-brooklyn.catalog:
- id: simple-policy
- version: 1.0
- # see OsgiTestResources
- libraries:
- - classpath:/brooklyn/osgi/brooklyn-test-osgi-entities.jar
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoArg.bat
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoArg.bat b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoArg.bat
deleted file mode 100644
index dd77ba6..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoArg.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-REM Licensed to the Apache Software Foundation (ASF) under one
-REM or more contributor license agreements. See the NOTICE file
-REM distributed with this work for additional information
-REM regarding copyright ownership. The ASF licenses this file
-REM to you under the Apache License, Version 2.0 (the
-REM "License"); you may not use this file except in compliance
-REM with the License. You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing,
-REM software distributed under the License is distributed on an
-REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-REM KIND, either express or implied. See the License for the
-REM specific language governing permissions and limitations
-REM under the License.
-
-@ECHO OFF
-echo %1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoFreemarkerMyarg.bat
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoFreemarkerMyarg.bat b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoFreemarkerMyarg.bat
deleted file mode 100644
index 33f7b7e..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoFreemarkerMyarg.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-REM Licensed to the Apache Software Foundation (ASF) under one
-REM or more contributor license agreements. See the NOTICE file
-REM distributed with this work for additional information
-REM regarding copyright ownership. The ASF licenses this file
-REM to you under the Apache License, Version 2.0 (the
-REM "License"); you may not use this file except in compliance
-REM with the License. You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing,
-REM software distributed under the License is distributed on an
-REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-REM KIND, either express or implied. See the License for the
-REM specific language governing permissions and limitations
-REM under the License.
-
-echo ${config['myarg']}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoFreemarkerMyarg.ps1
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoFreemarkerMyarg.ps1 b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoFreemarkerMyarg.ps1
deleted file mode 100644
index c2535ea..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoFreemarkerMyarg.ps1
+++ /dev/null
@@ -1,18 +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.
-
-Write-Host ${config['myarg']}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoMyArg.ps1
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoMyArg.ps1 b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoMyArg.ps1
deleted file mode 100644
index 3a2d33d..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/echoMyArg.ps1
+++ /dev/null
@@ -1,22 +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.
-
-param(
- [string]$myarg
-)
-
-Write-Host $myarg
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit0.bat
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit0.bat b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit0.bat
deleted file mode 100644
index 2a926b6..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit0.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-REM Licensed to the Apache Software Foundation (ASF) under one
-REM or more contributor license agreements. See the NOTICE file
-REM distributed with this work for additional information
-REM regarding copyright ownership. The ASF licenses this file
-REM to you under the Apache License, Version 2.0 (the
-REM "License"); you may not use this file except in compliance
-REM with the License. You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing,
-REM software distributed under the License is distributed on an
-REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-REM KIND, either express or implied. See the License for the
-REM specific language governing permissions and limitations
-REM under the License.
-
-EXIT /B 0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit0.ps1
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit0.ps1 b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit0.ps1
deleted file mode 100644
index fe0e1f1..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit0.ps1
+++ /dev/null
@@ -1,18 +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.
-
-exit 0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit1.bat
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit1.bat b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit1.bat
deleted file mode 100644
index f8b79b9..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit1.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-REM Licensed to the Apache Software Foundation (ASF) under one
-REM or more contributor license agreements. See the NOTICE file
-REM distributed with this work for additional information
-REM regarding copyright ownership. The ASF licenses this file
-REM to you under the Apache License, Version 2.0 (the
-REM "License"); you may not use this file except in compliance
-REM with the License. You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing,
-REM software distributed under the License is distributed on an
-REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-REM KIND, either express or implied. See the License for the
-REM specific language governing permissions and limitations
-REM under the License.
-
-EXIT /B 1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit1.ps1
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit1.ps1 b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit1.ps1
deleted file mode 100644
index a7fc049..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit1.ps1
+++ /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.
-
-Write-Host single line file gives exit code 0 from PyWinRM
-exit 1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/test/lite/test-app-service-blueprint.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/test/lite/test-app-service-blueprint.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/test/lite/test-app-service-blueprint.yaml
deleted file mode 100644
index c0bb607..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/org/apache/brooklyn/camp/brooklyn/test/lite/test-app-service-blueprint.yaml
+++ /dev/null
@@ -1,38 +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.
-#
-name: sample
-description: Tomcat sample JSP and servlet application.
-origin: http://www.oracle.com/nCAMP/Hand
-services:
- -
- type: io.camp.mock:AppServer
- name: Hello WAR
- wars:
- /: hello.war
- controller.spec:
- port: 80
-
-brooklyn.catalog:
- name: catalog-name
- type: io.camp.mock.MyApplication
- version: 0.9
- libraries:
- - name: org.apache.brooklyn.test.resources.osgi.brooklyn-test-osgi-entities
- version: 0.1.0
- url: classpath:/brooklyn/osgi/brooklyn-test-osgi-entities.jar
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/osgi-catalog.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/osgi-catalog.xml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/osgi-catalog.xml
deleted file mode 100644
index 0586f3b..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/osgi-catalog.xml
+++ /dev/null
@@ -1,29 +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.
--->
-
-<catalog>
- <name>OSGi catalogue</name>
- <template name="Osgi App" type="org.apache.brooklyn.test.osgi.entities.SimpleApplication">
- <symbolicName>OsgiApp</symbolicName>
- <libraries>
- <bundle>${osgi-entities-path}</bundle>
- </libraries>
- </template>
-</catalog>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/postgresql-chef.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/postgresql-chef.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/postgresql-chef.yaml
deleted file mode 100644
index 4c6694e..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/postgresql-chef.yaml
+++ /dev/null
@@ -1,38 +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.
-#
-name: postgresql-chef
-location: localhost
-services:
-- type: ChefComponent
- pid.file: /var/run/postgresql/*.pid
- service: postgresql
- chef:
- converge:
- - postgresql::server
- attributes:
- postgresql:
- config:
- port: 5432
- listen_addresses: *
- pg_hba:
- - type: host
- db: all
- user: all
- addr: 0.0.0.0/0
- method: md5
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/same-server-entity-test.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/same-server-entity-test.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/same-server-entity-test.yaml
deleted file mode 100644
index 9e9a768..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/same-server-entity-test.yaml
+++ /dev/null
@@ -1,28 +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.
-#
-name: SameServerEntityYamlTest
-location: localhost
-services:
-- serviceType: org.apache.brooklyn.entity.software.base.SameServerEntity
- name: Entities
- brooklyn.children:
- - serviceType: org.apache.brooklyn.entity.stock.BasicEntity
- name: a
- - serviceType: org.apache.brooklyn.entity.stock.BasicEntity
- name: b
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/simple-catalog.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/simple-catalog.xml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/simple-catalog.xml
deleted file mode 100644
index 8b73ffa..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/simple-catalog.xml
+++ /dev/null
@@ -1,47 +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.
--->
-
-<catalog>
- <name>Simple catalogue</name>
- <template name="Basic App" type="org.apache.brooklyn.entity.stock.BasicApplication" />
- <template name="Basic App" type="org.apache.brooklyn.entity.stock.BasicApplication" version="2.0" />
- <template name="Basic App" type="org.apache.brooklyn.entity.stock.BasicApplication">
- <symbolicName>BasicApp</symbolicName>
- </template>
- <template name="Basic App" type="org.apache.brooklyn.entity.stock.BasicApplication" version="2.0">
- <symbolicName>BasicApp</symbolicName>
- </template>
- <template name="Custom App" type="org.apache.brooklyn.entity.stock.BasicApplication">
- <symbolicName>org.apache.brooklyn.camp.brooklyn.catalog.TestBasicApp</symbolicName>
- <!-- Tests that "java:" prefix won't load an old-style catalog item with the same id -->
- </template>
- <template name="Osgi App" type="org.apache.brooklyn.test.osgi.entities.SimpleApplication">
- <symbolicName>OsgiApp</symbolicName>
- <libraries>
- <bundle>${osgi-entities-path}</bundle>
- </libraries>
- </template>
- <catalog>
- <template name="Simple App" type="org.apache.brooklyn.test.osgi.entities.SimpleApplication" />
- <classpath>
- <entry>${osgi-entities-path}</entry>
- </classpath>
- </catalog>
-</catalog>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-enricher.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-enricher.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-enricher.yaml
deleted file mode 100644
index 6760410..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-enricher.yaml
+++ /dev/null
@@ -1,37 +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.
-#
-name: test-app-with-enricher
-description: TestEntity with Enricher at application-level using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
-services:
-- type: org.apache.brooklyn.entity.stock.BasicEntity
- id: be1
- name: testentity
- brooklyn.config:
- serviceLiteralValue1: Foo
- serviceLiteralValue2: Bar
-brooklyn.enrichers:
-- type: org.apache.brooklyn.core.test.policy.TestEnricher
- brooklyn.config:
- test.targetEntity: $brooklyn:component("be1")
- test.targetEntity.from.flag: $brooklyn:component("be1")
- enricherLiteralValue1: Hello
- enricherLiteralValue2: World
- test.confName: Name from YAML
- test.confFromFunction: "$brooklyn:formatString(\"%s: is a fun place\", \"$brooklyn\")"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-policy.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-policy.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-policy.yaml
deleted file mode 100644
index 2ac75ee..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-policy.yaml
+++ /dev/null
@@ -1,34 +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.
-#
-name: test-app-with-policy
-description: TestEntity with Policy at application-level using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
-services:
-- serviceType: org.apache.brooklyn.entity.stock.BasicEntity
- name: testentity
- brooklyn.config:
- serviceLiteralValue1: Foo
- serviceLiteralValue2: Bar
-brooklyn.policies:
-- policyType: org.apache.brooklyn.core.test.policy.TestPolicy
- brooklyn.config:
- policyLiteralValue1: Hello
- policyLiteralValue2: World
- test.confName: Name from YAML
- test.confFromFunction: "$brooklyn:formatString(\"%s: is a fun place\", \"$brooklyn\")"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-cluster-with-member-spec.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-cluster-with-member-spec.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-cluster-with-member-spec.yaml
deleted file mode 100644
index 69bace1..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-cluster-with-member-spec.yaml
+++ /dev/null
@@ -1,32 +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.
-#
-name: test-app-with-enricher
-description: Cluster of TestEntitys with member spec
-origin: https://github.com/apache/incubator-brooklyn
-location: localhost
-services:
-- type: org.apache.brooklyn.entity.group.DynamicCluster
- id: test-entity-cluster
- name: TestEntityCluster
- initialSize: 2
- memberSpec:
- $brooklyn:entitySpec:
- type: org.apache.brooklyn.core.test.entity.TestEntity
- brooklyn.config:
- test.confName: yamlTest
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-basic-template.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-basic-template.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-basic-template.yaml
deleted file mode 100644
index 7ace993..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-basic-template.yaml
+++ /dev/null
@@ -1,24 +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.
-#
-name: test-entity-basic-template
-description: TestEntity with templated brooklyn.config and additional config (such as services)
-origin: https://github.com/apache/incubator-brooklyn
-services:
-- type: org.apache.brooklyn.core.test.entity.TestEntity
- name: testentity
-# should have nothing below here as the test appends things underneath
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-reference-map-template.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-reference-map-template.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-reference-map-template.yaml
deleted file mode 100644
index c6f7b4d..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-reference-map-template.yaml
+++ /dev/null
@@ -1,28 +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.
-#
-name: test-entity-reference-map-template
-description: TestEntity with templated brooklyn.config and additional config (such as services)
-origin: https://github.com/apache/incubator-brooklyn
-services:
-- serviceType: org.apache.brooklyn.entity.stock.BasicEntity
- id: one
-- serviceType: org.apache.brooklyn.entity.stock.BasicEntity
- id: two
-- serviceType: org.apache.brooklyn.core.test.entity.TestEntity
- name: testentity
-# should have nothing below here as the test appends things underneath
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-enricher.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-enricher.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-enricher.yaml
deleted file mode 100644
index 6b1061e..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-enricher.yaml
+++ /dev/null
@@ -1,36 +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.
-#
-name: test-entity-with-enricher
-description: TestEntity with Enricher at entity-level using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
-services:
-- serviceType: org.apache.brooklyn.entity.stock.BasicEntity
- name: testentity
- foo: bar
- brooklyn.config:
- serviceLiteralValue1: Foo
- serviceLiteralValue2: Bar
- brooklyn.enrichers:
- - enricherType: org.apache.brooklyn.core.test.policy.TestEnricher
- brooklyn.config:
- enricherLiteralValue1: Hello
- enricherLiteralValue2: World
- test.confName: Name from YAML
- test.confFromFunction: "$brooklyn:formatString(\"%s: is a fun place\", \"$brooklyn\")"
- test.attributeSensor: $brooklyn:sensor("org.apache.brooklyn.core.test.entity.TestEntity", "test.name")
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-init-config.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-init-config.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-init-config.yaml
deleted file mode 100644
index 006350d..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-init-config.yaml
+++ /dev/null
@@ -1,31 +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.
-#
-name: test-entity-with-init-config
-description: Creates a TestEntityWithInitConfig entity that references a 2nd test entity during its init()
-origin: https://github.com/apache/incubator-brooklyn
-services:
-- serviceType: org.apache.brooklyn.core.test.entity.TestEntity
- id: te1
- name: testentity
- brooklyn.config:
- test.name: Name of the test entity
-- serviceType: org.apache.brooklyn.camp.brooklyn.TestEntityWithInitConfig
- name: testentity with init config
- brooklyn.config:
- test.entity: $brooklyn:component("te1") # This entity will be accessed in TestEntityWithInitConfig.init()
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-policy.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-policy.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-policy.yaml
deleted file mode 100644
index b93f521..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-entity-with-policy.yaml
+++ /dev/null
@@ -1,36 +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.
-#
-name: test-entity-with-policy
-description: TestEntity with Policy at entity-level using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
-services:
-- serviceType: org.apache.brooklyn.entity.stock.BasicEntity
- name: testentity
- foo: bar
- brooklyn.config:
- serviceLiteralValue1: Foo
- serviceLiteralValue2: Bar
- brooklyn.policies:
- - policyType: org.apache.brooklyn.core.test.policy.TestPolicy
- brooklyn.config:
- policyLiteralValue1: Hello
- policyLiteralValue2: World
- test.confName: Name from YAML
- test.confFromFunction: "$brooklyn:formatString(\"%s: is a fun place\", \"$brooklyn\")"
- test.attributeSensor: $brooklyn:sensor("org.apache.brooklyn.core.test.entity.TestEntity", "test.name")
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml
deleted file mode 100644
index f51f4d7..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml
+++ /dev/null
@@ -1,39 +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.
-#
-name: java-cluster-db-example
-location: localhost
-services:
-- serviceType: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
- name: My Web
- brooklyn.config:
- proxy.http.port: 9210+
- http.port: 9280+
- memberSpec:
- $brooklyn:entitySpec:
- type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
- brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
- java.sysprops:
- brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",
- component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n")
-- serviceType: org.apache.brooklyn.entity.database.mysql.MySqlNode
- id: db
- name: My DB
- brooklyn.config:
- datastore.creation.script.url: classpath://visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-propagating-enricher.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-propagating-enricher.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-propagating-enricher.yaml
deleted file mode 100644
index 1973851..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-propagating-enricher.yaml
+++ /dev/null
@@ -1,32 +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.
-#
-name: test-propagating-enricher
-description: TestEntity with Propagating Enricher at application-level using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
-services:
-- serviceType: org.apache.brooklyn.core.test.entity.TestEntity
- id: te1
- name: testentity
- brooklyn.config:
- test.confName: Name from YAML
-brooklyn.enrichers:
-- enricherType: org.apache.brooklyn.enricher.stock.Propagator
- brooklyn.config:
- enricher.producer: $brooklyn:component("te1")
- enricher.propagating.propagatingAll: true
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-referencing-enrichers.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-referencing-enrichers.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-referencing-enrichers.yaml
deleted file mode 100644
index f1d6a24..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-referencing-enrichers.yaml
+++ /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.
-#
-# Creates an application with the following structure, with each entity (including the application) having
-# an enricher with references to all other entities (including itself and the app) via config keys
-#
-# app
-# (app enricher)
-# |
-# -------|-------
-# | |
-# entity1 entity2
-# (e1 enricher) (e2 enricher)
-# |
-# -------|-------
-# | |
-# child1 child2
-# (c1 enricher) (c2 enricher)
-# |
-# -------|-------
-# | |
-# gchild1 gchild2
-# (g1 enricher) (g2 enricher)
-name: test-referencing-enrichers
-description: Test multi-layer application with each entity having an enricher referencing all other entities
-origin: https://github.com/apache/incubator-brooklyn
-id: app1
-brooklyn.enrichers:
- - enricherType: org.apache.brooklyn.camp.brooklyn.TestReferencingEnricher
- brooklyn.config:
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
-services:
-- serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: e1
- name: entity 1
- brooklyn.enrichers:
- - enricherType: org.apache.brooklyn.camp.brooklyn.TestReferencingEnricher
- brooklyn.config:
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
- brooklyn.children:
- - serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: c1
- name: child 1
- brooklyn.enrichers:
- - enricherType: org.apache.brooklyn.camp.brooklyn.TestReferencingEnricher
- brooklyn.config:
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
- brooklyn.children:
- - serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: gc1
- name: grandchild 1
- brooklyn.enrichers:
- - enricherType: org.apache.brooklyn.camp.brooklyn.TestReferencingEnricher
- brooklyn.config:
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
- - serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: gc2
- name: grandchild 2
- brooklyn.enrichers:
- - enricherType: org.apache.brooklyn.camp.brooklyn.TestReferencingEnricher
- brooklyn.config:
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
- - serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: c2
- name: child 2
- brooklyn.enrichers:
- - enricherType: org.apache.brooklyn.camp.brooklyn.TestReferencingEnricher
- brooklyn.config:
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
-- serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: e2
- name: entity 2
- brooklyn.enrichers:
- - enricherType: org.apache.brooklyn.camp.brooklyn.TestReferencingEnricher
- brooklyn.config:
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d03f254b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-referencing-entities.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-referencing-entities.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-referencing-entities.yaml
deleted file mode 100644
index c87a8de..0000000
--- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-referencing-entities.yaml
+++ /dev/null
@@ -1,136 +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.
-#
-# Creates an application with the following structure, with each entity (including the application) having
-# references to all other entities (including itself and the app) via config keys
-#
-# app
-# |
-# -----|-----
-# | |
-# entity1 entity2
-# |
-# -----|-----
-# | |
-# child1 child2
-# |
-# -----|-----
-# | |
-# gchild1 gchild2
-name: test-referencing-entities
-description: Test multi-layer application with each entity referencing all other entities
-origin: https://github.com/apache/incubator-brooklyn
-id: app1
-brooklyn.config:
- test.reference.root: $brooklyn:root()
- test.reference.scope_root: $brooklyn:scopeRoot()
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:entity("e1")
- test.reference.entity1a: $brooklyn:config("test.reference.entity1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
- test.reference.bogus: $brooklyn:child("c1")
-services:
-- serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: e1
- name: entity 1
- brooklyn.config:
- test.reference.root: $brooklyn:root()
- test.reference.scope_root: $brooklyn:scopeRoot()
- test.reference.app: $brooklyn:component("parent", "ignored")
- test.reference.entity1: $brooklyn:component("this", "ignored")
- test.reference.entity1a: $brooklyn:ancestor("app1").child("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("child", "c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
- test.reference.bogus: $brooklyn:descendant("app1")
- brooklyn.children:
- - serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: c1
- name: child 1
- brooklyn.config:
- self: $brooklyn:entity("c1")
- test.reference.root: $brooklyn:root()
- test.reference.scope_root: $brooklyn:scopeRoot()
- test.reference.app: $brooklyn:parent().parent()
- test.reference.entity1: $brooklyn:parent()
- test.reference.entity1a: $brooklyn:entity("e1").parent().child("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:config("self")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
- test.reference.bogus: $brooklyn:component("bogus")
- brooklyn.children:
- - serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: gc1
- name: grandchild 1
- brooklyn.config:
- test.reference.root: $brooklyn:root()
- test.reference.scope_root: $brooklyn:scopeRoot()
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
- - serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: gc2
- name: grandchild 2
- brooklyn.config:
- test.reference.root: $brooklyn:root()
- test.reference.scope_root: $brooklyn:scopeRoot()
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
- - serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: c2
- name: child 2
- brooklyn.config:
- test.reference.root: $brooklyn:root()
- test.reference.scope_root: $brooklyn:scopeRoot()
- test.reference.app: $brooklyn:parent().parent().descendant("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
-- serviceType: org.apache.brooklyn.camp.brooklyn.ReferencingYamlTestEntity
- id: e2
- name: entity 2
- brooklyn.config:
- test.reference.root: $brooklyn:root()
- test.reference.scope_root: $brooklyn:scopeRoot()
- test.reference.app: $brooklyn:component("app1")
- test.reference.entity1: $brooklyn:component("e1")
- test.reference.entity2: $brooklyn:component("e2")
- test.reference.child1: $brooklyn:component("c1")
- test.reference.child2: $brooklyn:component("c2")
- test.reference.grandchild1: $brooklyn:component("gc1")
- test.reference.grandchild2: $brooklyn:component("gc2")
\ No newline at end of file