BROOKLYN-162 - apply org.apache package prefix to osgi test bundles; NB these might be moved back to core/test/dependencies as per discussion at #810, once we finish a few more package prefixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e114a252 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e114a252 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e114a252 Branch: refs/heads/master Commit: e114a25263b0a74185c975e852ffde74896283ff Parents: 412a5a1 Author: Alex Heneveld <[email protected]> Authored: Tue Aug 18 13:49:13 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Aug 18 14:51:57 2015 +0100 ---------------------------------------------------------------------- .../core/management/osgi/OsgiTestResources.java | 8 ++-- .../brooklyn/osgi/tests/SimpleApplication.java | 29 ------------ .../osgi/tests/SimpleApplicationImpl.java | 27 ----------- .../java/brooklyn/osgi/tests/SimpleEntity.java | 28 ----------- .../brooklyn/osgi/tests/SimpleEntityImpl.java | 26 ---------- .../brooklyn/osgi/tests/SimpleLocation.java | 36 -------------- .../java/brooklyn/osgi/tests/SimplePolicy.java | 37 --------------- .../test/osgi/entities/SimpleApplication.java | 29 ++++++++++++ .../osgi/entities/SimpleApplicationImpl.java | 27 +++++++++++ .../test/osgi/entities/SimpleEntity.java | 28 +++++++++++ .../test/osgi/entities/SimpleEntityImpl.java | 26 ++++++++++ .../test/osgi/entities/SimpleLocation.java | 36 ++++++++++++++ .../test/osgi/entities/SimplePolicy.java | 37 +++++++++++++++ .../main/resources/brooklyn/osgi/tests/icon.gif | Bin 43 -> 0 bytes .../apache/brooklyn/test/osgi/entities/icon.gif | Bin 0 -> 43 bytes .../brooklyn/osgi/tests/more/MoreEntity.java | 39 --------------- .../osgi/tests/more/MoreEntityImpl.java | 45 ------------------ .../brooklyn/osgi/tests/more/MoreLocation.java | 25 ---------- .../brooklyn/osgi/tests/more/MorePolicy.java | 27 ----------- .../brooklyn/osgi/tests/more/MoreTemplate.java | 31 ------------ .../test/osgi/entities/more/MoreEntity.java | 39 +++++++++++++++ .../test/osgi/entities/more/MoreEntityImpl.java | 45 ++++++++++++++++++ .../test/osgi/entities/more/MoreLocation.java | 25 ++++++++++ .../test/osgi/entities/more/MorePolicy.java | 27 +++++++++++ .../test/osgi/entities/more/MoreTemplate.java | 31 ++++++++++++ .../brooklyn/osgi/tests/more/MoreEntity.java | 38 --------------- .../osgi/tests/more/MoreEntityImpl.java | 47 ------------------- .../test/osgi/entities/more/MoreEntity.java | 37 +++++++++++++++ .../test/osgi/entities/more/MoreEntityImpl.java | 47 +++++++++++++++++++ .../brooklyn/osgi/tests/more/MoreEntity.java | 41 ---------------- .../osgi/tests/more/MoreEntityImpl.java | 47 ------------------- .../brooklyn/osgi/tests/more/MoreLocation.java | 27 ----------- .../brooklyn/osgi/tests/more/MorePolicy.java | 30 ------------ .../brooklyn/osgi/tests/more/MoreTemplate.java | 32 ------------- .../test/osgi/entities/more/MoreEntity.java | 40 ++++++++++++++++ .../test/osgi/entities/more/MoreEntityImpl.java | 47 +++++++++++++++++++ .../test/osgi/entities/more/MoreLocation.java | 26 ++++++++++ .../test/osgi/entities/more/MorePolicy.java | 29 ++++++++++++ .../test/osgi/entities/more/MoreTemplate.java | 31 ++++++++++++ 39 files changed, 611 insertions(+), 616 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiTestResources.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiTestResources.java b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiTestResources.java index b44da4d..d44727c 100644 --- a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiTestResources.java +++ b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiTestResources.java @@ -41,9 +41,9 @@ public class OsgiTestResources { * defines an entity and an application, to confirm it can be read and used by brooklyn */ public static final String BROOKLYN_TEST_OSGI_ENTITIES_PATH = "/brooklyn/osgi/brooklyn-test-osgi-entities.jar"; - public static final String BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_APPLICATION = "brooklyn.osgi.tests.SimpleApplication"; - public static final String BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_ENTITY = "brooklyn.osgi.tests.SimpleEntity"; - public static final String BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_POLICY = "brooklyn.osgi.tests.SimplePolicy"; + public static final String BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_APPLICATION = "org.apache.brooklyn.test.osgi.entities.SimpleApplication"; + public static final String BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_ENTITY = "org.apache.brooklyn.test.osgi.entities.SimpleEntity"; + public static final String BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_POLICY = "org.apache.brooklyn.test.osgi.entities.SimplePolicy"; /** * brooklyn-test-osgi-more-entities_0.1.0 - @@ -54,7 +54,7 @@ public class OsgiTestResources { public static final String BROOKLYN_TEST_MORE_ENTITIES_SYMBOLIC_NAME_FULL = "org.apache.brooklyn.test.resources.osgi."+BROOKLYN_TEST_MORE_ENTITIES_SYMBOLIC_NAME_FINAL_PART; public static final String BROOKLYN_TEST_MORE_ENTITIES_V1_PATH = "/brooklyn/osgi/" + BROOKLYN_TEST_MORE_ENTITIES_SYMBOLIC_NAME_FINAL_PART + "_0.1.0.jar"; - public static final String BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY = "brooklyn.osgi.tests.more.MoreEntity"; + public static final String BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY = "org.apache.brooklyn.test.osgi.entities.more.MoreEntity"; /** * brooklyn-test-osgi-more-entities_0.2.0 - http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java deleted file mode 100644 index 772f248..0000000 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java +++ /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. - */ -package brooklyn.osgi.tests; - - -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - -import brooklyn.entity.basic.StartableApplication; - -@ImplementedBy(SimpleApplicationImpl.class) -public interface SimpleApplication extends StartableApplication { - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java deleted file mode 100644 index e9651f7..0000000 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java +++ /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. - */ -package brooklyn.osgi.tests; - - -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.basic.StartableApplication; - -public class SimpleApplicationImpl extends AbstractApplication implements StartableApplication, SimpleApplication { - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java deleted file mode 100644 index 8b62d9b..0000000 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java +++ /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. - */ -package brooklyn.osgi.tests; - - -import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - -@ImplementedBy(SimpleEntityImpl.class) -public interface SimpleEntity extends Entity { - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java deleted file mode 100644 index 66a6655..0000000 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.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 brooklyn.osgi.tests; - -import brooklyn.entity.basic.AbstractEntity; - - -public class SimpleEntityImpl extends AbstractEntity implements SimpleEntity { - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java deleted file mode 100644 index 9817017..0000000 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java +++ /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. - */ -package brooklyn.osgi.tests; - -import brooklyn.config.ConfigKey; -import brooklyn.entity.basic.ConfigKeys; - -import org.apache.brooklyn.core.util.flags.SetFromFlag; -import org.apache.brooklyn.location.basic.AbstractLocation; - -public class SimpleLocation extends AbstractLocation { - @SetFromFlag("config1") - public static final ConfigKey<String> CONFIG1 = ConfigKeys.newStringConfigKey("config1"); - - @SetFromFlag("config2") - public static final ConfigKey<String> CONFIG2 = ConfigKeys.newStringConfigKey("config2"); - - @SetFromFlag("config3") - public static final ConfigKey<String> CONFIG3 = ConfigKeys.newStringConfigKey("config3"); -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java deleted file mode 100644 index a034886..0000000 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java +++ /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. - */ -package brooklyn.osgi.tests; - - -import org.apache.brooklyn.core.policy.basic.AbstractPolicy; -import org.apache.brooklyn.core.util.flags.SetFromFlag; - -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.config.ConfigKey; - -public class SimplePolicy extends AbstractPolicy { - @SetFromFlag("config1") - public static final ConfigKey<String> CONFIG1 = ConfigKeys.newStringConfigKey("config1"); - - @SetFromFlag("config2") - public static final ConfigKey<String> CONFIG2 = ConfigKeys.newStringConfigKey("config2"); - - @SetFromFlag("config3") - public static final ConfigKey<String> CONFIG3 = ConfigKeys.newStringConfigKey("config3"); -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java new file mode 100644 index 0000000..c0f47e9 --- /dev/null +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java @@ -0,0 +1,29 @@ +/* + * 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.osgi.entities; + + +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + +import brooklyn.entity.basic.StartableApplication; + +@ImplementedBy(SimpleApplicationImpl.class) +public interface SimpleApplication extends StartableApplication { + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java new file mode 100644 index 0000000..11be4ac --- /dev/null +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java @@ -0,0 +1,27 @@ +/* + * 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.osgi.entities; + + +import brooklyn.entity.basic.AbstractApplication; +import brooklyn.entity.basic.StartableApplication; + +public class SimpleApplicationImpl extends AbstractApplication implements StartableApplication, SimpleApplication { + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntity.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntity.java new file mode 100644 index 0000000..0446544 --- /dev/null +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntity.java @@ -0,0 +1,28 @@ +/* + * 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.osgi.entities; + + +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + +@ImplementedBy(SimpleEntityImpl.class) +public interface SimpleEntity extends Entity { + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java new file mode 100644 index 0000000..339508c --- /dev/null +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java @@ -0,0 +1,26 @@ +/* + * 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.osgi.entities; + +import brooklyn.entity.basic.AbstractEntity; + + +public class SimpleEntityImpl extends AbstractEntity implements SimpleEntity { + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java new file mode 100644 index 0000000..e0b4981 --- /dev/null +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java @@ -0,0 +1,36 @@ +/* + * 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.osgi.entities; + +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.location.basic.AbstractLocation; + +import brooklyn.entity.basic.ConfigKeys; + +public class SimpleLocation extends AbstractLocation { + @SetFromFlag("config1") + public static final ConfigKey<String> CONFIG1 = ConfigKeys.newStringConfigKey("config1"); + + @SetFromFlag("config2") + public static final ConfigKey<String> CONFIG2 = ConfigKeys.newStringConfigKey("config2"); + + @SetFromFlag("config3") + public static final ConfigKey<String> CONFIG3 = ConfigKeys.newStringConfigKey("config3"); +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java new file mode 100644 index 0000000..a1fbc84 --- /dev/null +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java @@ -0,0 +1,37 @@ +/* + * 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.osgi.entities; + + +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; + +import brooklyn.entity.basic.ConfigKeys; + +public class SimplePolicy extends AbstractPolicy { + @SetFromFlag("config1") + public static final ConfigKey<String> CONFIG1 = ConfigKeys.newStringConfigKey("config1"); + + @SetFromFlag("config2") + public static final ConfigKey<String> CONFIG2 = ConfigKeys.newStringConfigKey("config2"); + + @SetFromFlag("config3") + public static final ConfigKey<String> CONFIG3 = ConfigKeys.newStringConfigKey("config3"); +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/resources/brooklyn/osgi/tests/icon.gif ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/resources/brooklyn/osgi/tests/icon.gif b/utils/test-bundles/entities/src/main/resources/brooklyn/osgi/tests/icon.gif deleted file mode 100644 index e565824..0000000 Binary files a/utils/test-bundles/entities/src/main/resources/brooklyn/osgi/tests/icon.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/entities/src/main/resources/org/apache/brooklyn/test/osgi/entities/icon.gif ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/resources/org/apache/brooklyn/test/osgi/entities/icon.gif b/utils/test-bundles/entities/src/main/resources/org/apache/brooklyn/test/osgi/entities/icon.gif new file mode 100644 index 0000000..e565824 Binary files /dev/null and b/utils/test-bundles/entities/src/main/resources/org/apache/brooklyn/test/osgi/entities/icon.gif differ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java deleted file mode 100644 index 5a75515..0000000 --- a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java +++ /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. - */ -package brooklyn.osgi.tests.more; - - -import org.apache.brooklyn.api.entity.Effector; -import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - -import brooklyn.entity.effector.Effectors; - -@ImplementedBy(MoreEntityImpl.class) -public interface MoreEntity extends Entity { - - public static final Effector<String> SAY_HI = Effectors.effector(String.class, "sayHI") - .description("says HI to an uppercased name") - .parameter(String.class, "name") - .buildAbstract(); - - /** Makes a string saying hi to the given name, in uppercase, for testing. */ - String sayHI(String name); - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java deleted file mode 100644 index ece1b1e..0000000 --- a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java +++ /dev/null @@ -1,45 +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 brooklyn.osgi.tests.more; - -import org.apache.brooklyn.core.util.config.ConfigBag; - -import brooklyn.entity.basic.AbstractEntity; -import brooklyn.entity.effector.EffectorBody; - - -public class MoreEntityImpl extends AbstractEntity implements MoreEntity { - - @Override - public void init() { - super.init(); - getMutableEntityType().addEffector(SAY_HI, new EffectorBody<String>() { - @Override - public String call(ConfigBag parameters) { - return sayHI((String)parameters.getStringKey("name")); - } - }); - } - - @Override - public String sayHI(String name) { - return "Hi "+name.toUpperCase()+" from V1"; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java deleted file mode 100644 index 19f0f59..0000000 --- a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java +++ /dev/null @@ -1,25 +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 brooklyn.osgi.tests.more; - - -import org.apache.brooklyn.location.basic.AbstractLocation; - -public class MoreLocation extends AbstractLocation { -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java deleted file mode 100644 index 466d8e2..0000000 --- a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java +++ /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. - */ -package brooklyn.osgi.tests.more; - - -import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.core.policy.basic.AbstractPolicy; - -public class MorePolicy extends AbstractPolicy { - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java deleted file mode 100644 index 07fb799..0000000 --- a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java +++ /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. - */ -package brooklyn.osgi.tests.more; - - -import org.apache.brooklyn.api.entity.Application; -import org.apache.brooklyn.api.entity.Effector; -import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.effector.Effectors; - -public class MoreTemplate extends AbstractApplication { -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java new file mode 100644 index 0000000..4f2dddd --- /dev/null +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java @@ -0,0 +1,39 @@ +/* + * 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.osgi.entities.more; + + +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + +import brooklyn.entity.effector.Effectors; + +@ImplementedBy(MoreEntityImpl.class) +public interface MoreEntity extends Entity { + + public static final Effector<String> SAY_HI = Effectors.effector(String.class, "sayHI") + .description("says HI to an uppercased name") + .parameter(String.class, "name") + .buildAbstract(); + + /** Makes a string saying hi to the given name, in uppercase, for testing. */ + String sayHI(String name); + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java new file mode 100644 index 0000000..91df765 --- /dev/null +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -0,0 +1,45 @@ +/* + * 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.osgi.entities.more; + +import org.apache.brooklyn.core.util.config.ConfigBag; + +import brooklyn.entity.basic.AbstractEntity; +import brooklyn.entity.effector.EffectorBody; + + +public class MoreEntityImpl extends AbstractEntity implements MoreEntity { + + @Override + public void init() { + super.init(); + getMutableEntityType().addEffector(SAY_HI, new EffectorBody<String>() { + @Override + public String call(ConfigBag parameters) { + return sayHI((String)parameters.getStringKey("name")); + } + }); + } + + @Override + public String sayHI(String name) { + return "Hi "+name.toUpperCase()+" from V1"; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java new file mode 100644 index 0000000..8af0a34 --- /dev/null +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java @@ -0,0 +1,25 @@ +/* + * 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.osgi.entities.more; + + +import org.apache.brooklyn.location.basic.AbstractLocation; + +public class MoreLocation extends AbstractLocation { +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java new file mode 100644 index 0000000..291d1d3 --- /dev/null +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java @@ -0,0 +1,27 @@ +/* + * 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.osgi.entities.more; + + +import org.apache.brooklyn.api.catalog.Catalog; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; + +public class MorePolicy extends AbstractPolicy { + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java new file mode 100644 index 0000000..983b49c --- /dev/null +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java @@ -0,0 +1,31 @@ +/* + * 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.osgi.entities.more; + + +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + +import brooklyn.entity.basic.AbstractApplication; +import brooklyn.entity.effector.Effectors; + +public class MoreTemplate extends AbstractApplication { +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java deleted file mode 100644 index 0ad2ab6..0000000 --- a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java +++ /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. - */ -package brooklyn.osgi.tests.more; - - -import org.apache.brooklyn.api.entity.Effector; -import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.effector.Effectors; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - -@ImplementedBy(MoreEntityImpl.class) -public interface MoreEntity extends Entity { - - public static final Effector<String> SAY_HI = Effectors.effector(String.class, "sayHI") - .description("says HO to an uppercased name") - .parameter(String.class, "name") - .buildAbstract(); - - /** Makes a string saying HO to the given name, in contrast to v1 and v2. */ - String sayHI(String name); - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java deleted file mode 100644 index 3dd4059..0000000 --- a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java +++ /dev/null @@ -1,47 +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 brooklyn.osgi.tests.more; - -import brooklyn.entity.basic.AbstractEntity; -import brooklyn.entity.effector.EffectorBody; -import org.apache.brooklyn.api.policy.PolicySpec; -import org.apache.brooklyn.core.util.config.ConfigBag; - - -public class MoreEntityImpl extends AbstractEntity implements MoreEntity { - - /** Unlike v1, this declares an explicit dependency on SimplePolicy */ - @Override - public void init() { - super.init(); - getMutableEntityType().addEffector(SAY_HI, new EffectorBody<String>() { - @Override - public String call(ConfigBag parameters) { - return sayHI((String)parameters.getStringKey("name")); - } - }); - addPolicy(PolicySpec.create(brooklyn.osgi.tests.SimplePolicy.class)); - } - - /** Returns HO instead of HI (like v2 non-evil twin) or Hi (like v1) */ - public String sayHI(String name) { - return "HO "+name.toUpperCase()+" FROM V2 EVIL TWIN"; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java new file mode 100644 index 0000000..cf8b58d --- /dev/null +++ b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java @@ -0,0 +1,37 @@ +/* + * 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.osgi.entities.more; + +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import brooklyn.entity.effector.Effectors; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + +@ImplementedBy(MoreEntityImpl.class) +public interface MoreEntity extends Entity { + + public static final Effector<String> SAY_HI = Effectors.effector(String.class, "sayHI") + .description("says HO to an uppercased name") + .parameter(String.class, "name") + .buildAbstract(); + + /** Makes a string saying HO to the given name, in contrast to v1 and v2. */ + String sayHI(String name); + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java new file mode 100644 index 0000000..acf33d3 --- /dev/null +++ b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -0,0 +1,47 @@ +/* + * 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.osgi.entities.more; + +import brooklyn.entity.basic.AbstractEntity; +import brooklyn.entity.effector.EffectorBody; +import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.config.ConfigBag; + + +public class MoreEntityImpl extends AbstractEntity implements MoreEntity { + + /** Unlike v1, this declares an explicit dependency on SimplePolicy */ + @Override + public void init() { + super.init(); + getMutableEntityType().addEffector(SAY_HI, new EffectorBody<String>() { + @Override + public String call(ConfigBag parameters) { + return sayHI((String)parameters.getStringKey("name")); + } + }); + addPolicy(PolicySpec.create(org.apache.brooklyn.test.osgi.entities.SimplePolicy.class)); + } + + /** Returns HO instead of HI (like v2 non-evil twin) or Hi (like v1) */ + public String sayHI(String name) { + return "HO "+name.toUpperCase()+" FROM V2 EVIL TWIN"; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java deleted file mode 100644 index 67138ed..0000000 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java +++ /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. - */ -package brooklyn.osgi.tests.more; - - -import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.Effector; -import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.effector.Effectors; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - -@Catalog(name="More Entity v2") -@ImplementedBy(MoreEntityImpl.class) -public interface MoreEntity extends Entity { - - public static final Effector<String> SAY_HI = Effectors.effector(String.class, "sayHI") - .description("says HI to an uppercased name") - .parameter(String.class, "name") - .buildAbstract(); - - /** Makes a string saying hi to the given name, in uppercase, for testing. - * In contrast to v1, impl here returns HI not Hi. */ - String sayHI(String name); - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java deleted file mode 100644 index e560b54..0000000 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java +++ /dev/null @@ -1,47 +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 brooklyn.osgi.tests.more; - -import brooklyn.entity.basic.AbstractEntity; -import brooklyn.entity.effector.EffectorBody; -import org.apache.brooklyn.api.policy.PolicySpec; -import org.apache.brooklyn.core.util.config.ConfigBag; - - -public class MoreEntityImpl extends AbstractEntity implements MoreEntity { - - /** Unlike v1, this declares an explicit dependency on SimplePolicy */ - @Override - public void init() { - super.init(); - getMutableEntityType().addEffector(SAY_HI, new EffectorBody<String>() { - @Override - public String call(ConfigBag parameters) { - return sayHI((String)parameters.getStringKey("name")); - } - }); - addPolicy(PolicySpec.create(brooklyn.osgi.tests.SimplePolicy.class)); - } - - /** Unlike v1, this returns "HI " rather than "Hi " */ - public String sayHI(String name) { - return "HI "+name.toUpperCase()+" FROM V2"; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java deleted file mode 100644 index dfcf311..0000000 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java +++ /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. - */ -package brooklyn.osgi.tests.more; - - -import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.location.basic.AbstractLocation; - -@Catalog(name="More Location", description="Cataliog item OSGi test location") -public class MoreLocation extends AbstractLocation { -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java deleted file mode 100644 index 43c53b5..0000000 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java +++ /dev/null @@ -1,30 +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 brooklyn.osgi.tests.more; - - -import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.core.policy.basic.AbstractPolicy; - -@Catalog(name="More Policy", description="Cataliog item OSGi test policy") -public class MorePolicy extends AbstractPolicy { - public String sayHI(String name) { - return "HI "+name.toUpperCase()+" FROM V2"; - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java deleted file mode 100644 index 5cdf688..0000000 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java +++ /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. - */ -package brooklyn.osgi.tests.more; - - -import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.Application; -import org.apache.brooklyn.api.entity.Effector; -import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.effector.Effectors; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - -@Catalog(name="More Template", description="Cataliog item OSGi test template") -public class MoreTemplate extends AbstractApplication { -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java new file mode 100644 index 0000000..18a2b8f --- /dev/null +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java @@ -0,0 +1,40 @@ +/* + * 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.osgi.entities.more; + +import org.apache.brooklyn.api.catalog.Catalog; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import brooklyn.entity.effector.Effectors; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + +@Catalog(name="More Entity v2") +@ImplementedBy(MoreEntityImpl.class) +public interface MoreEntity extends Entity { + + public static final Effector<String> SAY_HI = Effectors.effector(String.class, "sayHI") + .description("says HI to an uppercased name") + .parameter(String.class, "name") + .buildAbstract(); + + /** Makes a string saying hi to the given name, in uppercase, for testing. + * In contrast to v1, impl here returns HI not Hi. */ + String sayHI(String name); + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java new file mode 100644 index 0000000..0f021b4 --- /dev/null +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -0,0 +1,47 @@ +/* + * 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.osgi.entities.more; + +import brooklyn.entity.basic.AbstractEntity; +import brooklyn.entity.effector.EffectorBody; +import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.config.ConfigBag; + + +public class MoreEntityImpl extends AbstractEntity implements MoreEntity { + + /** Unlike v1, this declares an explicit dependency on SimplePolicy */ + @Override + public void init() { + super.init(); + getMutableEntityType().addEffector(SAY_HI, new EffectorBody<String>() { + @Override + public String call(ConfigBag parameters) { + return sayHI((String)parameters.getStringKey("name")); + } + }); + addPolicy(PolicySpec.create(org.apache.brooklyn.test.osgi.entities.SimplePolicy.class)); + } + + /** Unlike v1, this returns "HI " rather than "Hi " */ + public String sayHI(String name) { + return "HI "+name.toUpperCase()+" FROM V2"; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java new file mode 100644 index 0000000..34e8232 --- /dev/null +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java @@ -0,0 +1,26 @@ +/* + * 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.osgi.entities.more; + +import org.apache.brooklyn.api.catalog.Catalog; +import org.apache.brooklyn.location.basic.AbstractLocation; + +@Catalog(name="More Location", description="Cataliog item OSGi test location") +public class MoreLocation extends AbstractLocation { +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java new file mode 100644 index 0000000..f1c6cb9 --- /dev/null +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java @@ -0,0 +1,29 @@ +/* + * 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.osgi.entities.more; + +import org.apache.brooklyn.api.catalog.Catalog; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; + +@Catalog(name="More Policy", description="Cataliog item OSGi test policy") +public class MorePolicy extends AbstractPolicy { + public String sayHI(String name) { + return "HI "+name.toUpperCase()+" FROM V2"; + } +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e114a252/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java new file mode 100644 index 0000000..0dfb0fd --- /dev/null +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java @@ -0,0 +1,31 @@ +/* + * 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.osgi.entities.more; + +import org.apache.brooklyn.api.catalog.Catalog; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import brooklyn.entity.basic.AbstractApplication; +import brooklyn.entity.effector.Effectors; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + +@Catalog(name="More Template", description="Cataliog item OSGi test template") +public class MoreTemplate extends AbstractApplication { +}
