remove the temporary test-bundles location of osgi test jars, and remove from pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/51b560d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/51b560d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/51b560d9 Branch: refs/heads/master Commit: 51b560d9d04658b5d261ed45a99c72683b68b808 Parents: d7f0de2 Author: Alex Heneveld <[email protected]> Authored: Thu Aug 20 13:52:58 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Thu Aug 20 14:41:34 2015 +0100 ---------------------------------------------------------------------- pom.xml | 1 - utils/test-bundles/README.md | 29 ------- utils/test-bundles/entities/pom.xml | 81 ------------------ .../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 -------- .../apache/brooklyn/test/osgi/entities/icon.gif | Bin 43 -> 0 bytes utils/test-bundles/more-entities-v1/pom.xml | 78 ----------------- .../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 ------ .../more-entities-v2-evil-twin/pom.xml | 85 ------------------- .../test/osgi/entities/more/MoreEntity.java | 37 -------- .../test/osgi/entities/more/MoreEntityImpl.java | 46 ---------- utils/test-bundles/more-entities-v2/pom.xml | 84 ------------------ .../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 ------ utils/test-bundles/pom.xml | 44 ---------- 26 files changed, 985 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51b560d9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6fe2e34..0f1ba1c 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,6 @@ <module>utils/groovy</module> <module>utils/jmx/jmxmp-ssl-agent</module> <module>utils/jmx/jmxrmi-agent</module> - <module>utils/test-bundles</module> <module>utils/test-support</module> <module>utils/rest-swagger</module> </modules> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51b560d9/utils/test-bundles/README.md ---------------------------------------------------------------------- diff --git a/utils/test-bundles/README.md b/utils/test-bundles/README.md deleted file mode 100644 index ee8539b..0000000 --- a/utils/test-bundles/README.md +++ /dev/null @@ -1,29 +0,0 @@ -This directory contains source code for OSGi bundle files -used for testing. - -Binaries are included under src/test/resources. They are -copied there when these projects are built, and the binaries -are included in source control to speed up build times -(as these projects do not change much). These projects are -NOT built as part of the normal brooklyn build. - -See OsgiTestResources.java for information on the bundles. - ----- -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. - http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51b560d9/utils/test-bundles/entities/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/pom.xml b/utils/test-bundles/entities/pom.xml deleted file mode 100644 index 9e78c37..0000000 --- a/utils/test-bundles/entities/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - - <groupId>org.apache.brooklyn.test.resources.osgi</groupId> - <artifactId>brooklyn-test-osgi-entities</artifactId> - <version>0.1.0</version> - - <name>OSGi bundled test entities</name> - - <description> - Simple entities for testing the OSGi functionality - </description> - - <parent> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-parent</artifactId> - <version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> - <relativePath>../../../parent/pom.xml</relativePath> - </parent> - - <properties> - <maven.install.skip>true</maven.install.skip> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-core</artifactId> - <version>${brooklyn.version}</version> - </dependency> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-api</artifactId> - <version>${brooklyn.version}</version> - </dependency> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-utils-common</artifactId> - <version>${brooklyn.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.5.3</version> - <configuration> - <instructions> - <Bundle-Version>${project.version}</Bundle-Version> - <Brooklyn-Feature-BuildId>${buildNumber}</Brooklyn-Feature-BuildId> - <Brooklyn-Feature-BuildBranch>${scmBranch}</Brooklyn-Feature-BuildBranch> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51b560d9/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 deleted file mode 100644 index dcfb495..0000000 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/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 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/51b560d9/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 deleted file mode 100644 index fe6f1a2..0000000 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/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 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/51b560d9/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 deleted file mode 100644 index 87cd944..0000000 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/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 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/51b560d9/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 deleted file mode 100644 index 2595c39..0000000 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/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 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/51b560d9/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 deleted file mode 100644 index 60749cf..0000000 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/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 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/51b560d9/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 deleted file mode 100644 index fdea821..0000000 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/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 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/51b560d9/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 deleted file mode 100644 index e565824..0000000 Binary files a/utils/test-bundles/entities/src/main/resources/org/apache/brooklyn/test/osgi/entities/icon.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51b560d9/utils/test-bundles/more-entities-v1/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/pom.xml b/utils/test-bundles/more-entities-v1/pom.xml deleted file mode 100644 index a498082..0000000 --- a/utils/test-bundles/more-entities-v1/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - - <groupId>org.apache.brooklyn.test.resources.osgi</groupId> - <artifactId>brooklyn-test-osgi-more-entities</artifactId> - <version>0.1.0</version> - - <name>OSGi bundled test entities</name> - - <description> - Simple entities for testing the OSGi functionality - </description> - - <parent> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-parent</artifactId> - <version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> - <relativePath>../../../parent/pom.xml</relativePath> - </parent> - <dependencies> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-core</artifactId> - <version>${brooklyn.version}</version> - </dependency> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-api</artifactId> - <version>${brooklyn.version}</version> - </dependency> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-utils-common</artifactId> - <version>${brooklyn.version}</version> - </dependency> - </dependencies> - - <properties> - <maven.install.skip>true</maven.install.skip> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.5.3</version> - <configuration> - <instructions> - <Bundle-Version>${project.version}</Bundle-Version> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51b560d9/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 deleted file mode 100644 index 4efd1e3..0000000 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.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 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/51b560d9/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 deleted file mode 100644 index c1eecd3..0000000 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test.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/51b560d9/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 deleted file mode 100644 index 943c53c..0000000 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -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/51b560d9/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 deleted file mode 100644 index b72768b..0000000 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.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 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/51b560d9/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 deleted file mode 100644 index c66ed32..0000000 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -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/51b560d9/utils/test-bundles/more-entities-v2-evil-twin/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/pom.xml b/utils/test-bundles/more-entities-v2-evil-twin/pom.xml deleted file mode 100644 index 0794ed1..0000000 --- a/utils/test-bundles/more-entities-v2-evil-twin/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - - <groupId>org.apache.brooklyn.test.resources.osgi.evil_twin</groupId> - <artifactId>brooklyn-test-osgi-more-entities</artifactId> - <version>0.2.0</version> - - <name>OSGi bundled test entities</name> - - <description> - Simple entities for testing the OSGi functionality - </description> - - <parent> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-parent</artifactId> - <version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> - <relativePath>../../../parent/pom.xml</relativePath> - </parent> - - <properties> - <maven.install.skip>true</maven.install.skip> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-core</artifactId> - <version>${brooklyn.version}</version> - </dependency> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-api</artifactId> - <version>${brooklyn.version}</version> - </dependency> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-utils-common</artifactId> - <version>${brooklyn.version}</version> - </dependency> - <dependency> - <groupId>org.apache.brooklyn.test.resources.osgi</groupId> - <artifactId>brooklyn-test-osgi-entities</artifactId> - <version>0.1.0</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.5.3</version> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.brooklyn.test.resources.osgi.brooklyn-test-osgi-more-entities</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51b560d9/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 deleted file mode 100644 index f0ace90..0000000 --- a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.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 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/51b560d9/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 deleted file mode 100644 index d2cfa08..0000000 --- a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test.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/51b560d9/utils/test-bundles/more-entities-v2/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/pom.xml b/utils/test-bundles/more-entities-v2/pom.xml deleted file mode 100644 index 7eed44b..0000000 --- a/utils/test-bundles/more-entities-v2/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - - <groupId>org.apache.brooklyn.test.resources.osgi</groupId> - <artifactId>brooklyn-test-osgi-more-entities</artifactId> - <version>0.2.0</version> - - <name>OSGi bundled test entities</name> - - <description> - Simple entities for testing the OSGi functionality - </description> - - <parent> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-parent</artifactId> - <version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> - <relativePath>../../../parent/pom.xml</relativePath> - </parent> - - <properties> - <maven.install.skip>true</maven.install.skip> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-core</artifactId> - <version>${brooklyn.version}</version> - </dependency> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-api</artifactId> - <version>${brooklyn.version}</version> - </dependency> - <dependency> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-utils-common</artifactId> - <version>${brooklyn.version}</version> - </dependency> - <dependency> - <groupId>org.apache.brooklyn.test.resources.osgi</groupId> - <artifactId>brooklyn-test-osgi-entities</artifactId> - <version>0.1.0</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.5.3</version> - <configuration> - <instructions> - <Bundle-Version>${project.version}</Bundle-Version> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51b560d9/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 deleted file mode 100644 index 2124f86..0000000 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test.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/51b560d9/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 deleted file mode 100644 index 0aff562..0000000 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test.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/51b560d9/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 deleted file mode 100644 index ed10541..0000000 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test.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/51b560d9/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 deleted file mode 100644 index 7909d5b..0000000 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.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 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/51b560d9/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 deleted file mode 100644 index 9e0fc85..0000000 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test.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 { -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51b560d9/utils/test-bundles/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-bundles/pom.xml b/utils/test-bundles/pom.xml deleted file mode 100644 index d21ce93..0000000 --- a/utils/test-bundles/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn</artifactId> - <version>0.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> - <relativePath>../../pom.xml</relativePath> - </parent> - - <groupId>org.apache.brooklyn.test</groupId> - <artifactId>brooklyn-test-bundles</artifactId> - <packaging>pom</packaging> - - <name>Brooklyn Test Bundles</name> - <description> - OSGi bundles used for testing. - </description> - - <modules> - <module>entities</module> - <module>more-entities-v1</module> - <module>more-entities-v2</module> - <module>more-entities-v2-evil-twin</module> - </modules> -</project>
