update the osgi tests code for BROOKLYN-162 refactoring (replacing newly restored old files in original location with the updated files we made in the temporary location)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d7f0de23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d7f0de23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d7f0de23 Branch: refs/heads/master Commit: d7f0de23b920cf23316ebfa0f931736b9224aa94 Parents: 7ce6c49 Author: Alex Heneveld <[email protected]> Authored: Thu Aug 20 13:50:28 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Thu Aug 20 13:50:28 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/osgi/tests/SimpleApplication.java | 28 ----------- .../osgi/tests/SimpleApplicationImpl.java | 27 ----------- .../java/brooklyn/osgi/tests/SimpleEntity.java | 28 ----------- .../brooklyn/osgi/tests/SimpleEntityImpl.java | 26 ---------- .../brooklyn/osgi/tests/SimpleLocation.java | 35 -------------- .../java/brooklyn/osgi/tests/SimplePolicy.java | 36 -------------- .../test/osgi/entities/SimpleApplication.java | 28 +++++++++++ .../osgi/entities/SimpleApplicationImpl.java | 27 +++++++++++ .../test/osgi/entities/SimpleEntity.java | 28 +++++++++++ .../test/osgi/entities/SimpleEntityImpl.java | 26 ++++++++++ .../test/osgi/entities/SimpleLocation.java | 35 ++++++++++++++ .../test/osgi/entities/SimplePolicy.java | 36 ++++++++++++++ .../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 | 38 --------------- .../osgi/tests/more/MoreEntityImpl.java | 44 ----------------- .../brooklyn/osgi/tests/more/MoreLocation.java | 25 ---------- .../brooklyn/osgi/tests/more/MorePolicy.java | 27 ----------- .../brooklyn/osgi/tests/more/MoreTemplate.java | 30 ------------ .../test/osgi/entities/more/MoreEntity.java | 37 +++++++++++++++ .../test/osgi/entities/more/MoreEntityImpl.java | 43 +++++++++++++++++ .../test/osgi/entities/more/MoreLocation.java | 24 ++++++++++ .../test/osgi/entities/more/MorePolicy.java | 25 ++++++++++ .../test/osgi/entities/more/MoreTemplate.java | 24 ++++++++++ .../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 | 46 ++++++++++++++++++ .../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 | 46 ++++++++++++++++++ .../test/osgi/entities/more/MoreLocation.java | 26 ++++++++++ .../test/osgi/entities/more/MorePolicy.java | 29 ++++++++++++ .../test/osgi/entities/more/MoreTemplate.java | 26 ++++++++++ 38 files changed, 583 insertions(+), 606 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java deleted file mode 100644 index 79d8550..0000000 --- a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.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 brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.proxying.ImplementedBy; - -@ImplementedBy(SimpleApplicationImpl.class) -public interface SimpleApplication extends StartableApplication { - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java deleted file mode 100644 index e9651f7..0000000 --- a/core/src/test/dependencies/osgi/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/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java deleted file mode 100644 index 496f386..0000000 --- a/core/src/test/dependencies/osgi/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 brooklyn.entity.Entity; -import brooklyn.entity.proxying.ImplementedBy; - -@ImplementedBy(SimpleEntityImpl.class) -public interface SimpleEntity extends Entity { - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java deleted file mode 100644 index 66a6655..0000000 --- a/core/src/test/dependencies/osgi/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/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java deleted file mode 100644 index 253a2b0..0000000 --- a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.osgi.tests; - -import brooklyn.config.ConfigKey; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.location.basic.AbstractLocation; -import brooklyn.util.flags.SetFromFlag; - -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/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java deleted file mode 100644 index 10a0094..0000000 --- a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.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.entity.basic.ConfigKeys; -import brooklyn.config.ConfigKey; -import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.util.flags.SetFromFlag; - -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/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java b/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java new file mode 100644 index 0000000..dcfb495 --- /dev/null +++ b/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.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.ImplementedBy; +import org.apache.brooklyn.core.entity.StartableApplication; + +@ImplementedBy(SimpleApplicationImpl.class) +public interface SimpleApplication extends StartableApplication { + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java b/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java new file mode 100644 index 0000000..fe6f1a2 --- /dev/null +++ b/core/src/test/dependencies/osgi/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 org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.StartableApplication; + +public class SimpleApplicationImpl extends AbstractApplication implements StartableApplication, SimpleApplication { + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntity.java b/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntity.java new file mode 100644 index 0000000..87cd944 --- /dev/null +++ b/core/src/test/dependencies/osgi/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.ImplementedBy; + +@ImplementedBy(SimpleEntityImpl.class) +public interface SimpleEntity extends Entity { + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java b/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java new file mode 100644 index 0000000..2595c39 --- /dev/null +++ b/core/src/test/dependencies/osgi/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 org.apache.brooklyn.core.entity.AbstractEntity; + + +public class SimpleEntityImpl extends AbstractEntity implements SimpleEntity { + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java b/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java new file mode 100644 index 0000000..60749cf --- /dev/null +++ b/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java @@ -0,0 +1,35 @@ +/* + * 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.config.ConfigKeys; +import org.apache.brooklyn.core.location.AbstractLocation; +import org.apache.brooklyn.util.core.flags.SetFromFlag; + +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/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java b/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java new file mode 100644 index 0000000..fdea821 --- /dev/null +++ b/core/src/test/dependencies/osgi/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.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.config.ConfigKeys; +import org.apache.brooklyn.core.policy.AbstractPolicy; +import org.apache.brooklyn.util.core.flags.SetFromFlag; + +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/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/resources/brooklyn/osgi/tests/icon.gif ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/resources/brooklyn/osgi/tests/icon.gif b/core/src/test/dependencies/osgi/entities/src/main/resources/brooklyn/osgi/tests/icon.gif deleted file mode 100644 index e565824..0000000 Binary files a/core/src/test/dependencies/osgi/entities/src/main/resources/brooklyn/osgi/tests/icon.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/entities/src/main/resources/org/apache/brooklyn/test/osgi/entities/icon.gif ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/src/main/resources/org/apache/brooklyn/test/osgi/entities/icon.gif b/core/src/test/dependencies/osgi/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/core/src/test/dependencies/osgi/entities/src/main/resources/org/apache/brooklyn/test/osgi/entities/icon.gif differ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java deleted file mode 100644 index f26f1f1..0000000 --- a/core/src/test/dependencies/osgi/more-entities-v1/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 brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.effector.Effectors; -import brooklyn.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 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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java deleted file mode 100644 index 80d6b97..0000000 --- a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java +++ /dev/null @@ -1,44 +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 brooklyn.util.config.ConfigBag; - - -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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java deleted file mode 100644 index 75a9ff4..0000000 --- a/core/src/test/dependencies/osgi/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 brooklyn.location.basic.AbstractLocation; - -public class MoreLocation extends AbstractLocation { -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java deleted file mode 100644 index 082c234..0000000 --- a/core/src/test/dependencies/osgi/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 brooklyn.catalog.Catalog; -import brooklyn.policy.basic.AbstractPolicy; - -public class MorePolicy extends AbstractPolicy { - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java deleted file mode 100644 index 283e5da..0000000 --- a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.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 brooklyn.entity.Application; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.ImplementedBy; - -public class MoreTemplate extends AbstractApplication { -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java new file mode 100644 index 0000000..4efd1e3 --- /dev/null +++ b/core/src/test/dependencies/osgi/more-entities-v1/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.effector.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.core.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java new file mode 100644 index 0000000..c1eecd3 --- /dev/null +++ b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -0,0 +1,43 @@ +/* + * 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.effector.EffectorBody; +import org.apache.brooklyn.core.entity.AbstractEntity; +import org.apache.brooklyn.util.core.config.ConfigBag; + +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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java new file mode 100644 index 0000000..943c53c --- /dev/null +++ b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java @@ -0,0 +1,24 @@ +/* + * 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.location.AbstractLocation; + +public class MoreLocation extends AbstractLocation { +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java new file mode 100644 index 0000000..b72768b --- /dev/null +++ b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.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.core.policy.AbstractPolicy; + +public class MorePolicy extends AbstractPolicy { + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java new file mode 100644 index 0000000..c66ed32 --- /dev/null +++ b/core/src/test/dependencies/osgi/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java @@ -0,0 +1,24 @@ +/* + * 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.entity.AbstractApplication; + +public class MoreTemplate extends AbstractApplication { +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java b/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java deleted file mode 100644 index 553cbc5..0000000 --- a/core/src/test/dependencies/osgi/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 brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.effector.Effectors; -import brooklyn.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java deleted file mode 100644 index 6200787..0000000 --- a/core/src/test/dependencies/osgi/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 brooklyn.policy.PolicySpec; -import brooklyn.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java b/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java new file mode 100644 index 0000000..f0ace90 --- /dev/null +++ b/core/src/test/dependencies/osgi/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.effector.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.core.effector.Effectors; + +@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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java new file mode 100644 index 0000000..d2cfa08 --- /dev/null +++ b/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -0,0 +1,46 @@ +/* + * 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.policy.PolicySpec; +import org.apache.brooklyn.core.effector.EffectorBody; +import org.apache.brooklyn.core.entity.AbstractEntity; +import org.apache.brooklyn.util.core.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java deleted file mode 100644 index 987a7f8..0000000 --- a/core/src/test/dependencies/osgi/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 brooklyn.catalog.Catalog; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.effector.Effectors; -import brooklyn.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java deleted file mode 100644 index a3952cf..0000000 --- a/core/src/test/dependencies/osgi/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 brooklyn.policy.PolicySpec; -import brooklyn.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java deleted file mode 100644 index 9f2b9b5..0000000 --- a/core/src/test/dependencies/osgi/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 brooklyn.catalog.Catalog; -import 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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java deleted file mode 100644 index 06d7fb3..0000000 --- a/core/src/test/dependencies/osgi/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 brooklyn.catalog.Catalog; -import brooklyn.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java deleted file mode 100644 index 3fa86f9..0000000 --- a/core/src/test/dependencies/osgi/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 brooklyn.catalog.Catalog; -import brooklyn.entity.Application; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.effector.Effectors; -import brooklyn.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java new file mode 100644 index 0000000..2124f86 --- /dev/null +++ b/core/src/test/dependencies/osgi/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.effector.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.core.effector.Effectors; + +@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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java new file mode 100644 index 0000000..0aff562 --- /dev/null +++ b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -0,0 +1,46 @@ +/* + * 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.policy.PolicySpec; +import org.apache.brooklyn.core.effector.EffectorBody; +import org.apache.brooklyn.core.entity.AbstractEntity; +import org.apache.brooklyn.util.core.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java new file mode 100644 index 0000000..ed10541 --- /dev/null +++ b/core/src/test/dependencies/osgi/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.core.location.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java new file mode 100644 index 0000000..7909d5b --- /dev/null +++ b/core/src/test/dependencies/osgi/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.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/d7f0de23/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java new file mode 100644 index 0000000..9e0fc85 --- /dev/null +++ b/core/src/test/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.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.core.entity.AbstractApplication; + +@Catalog(name="More Template", description="Cataliog item OSGi test template") +public class MoreTemplate extends AbstractApplication { +}
