From a2fbb31bd7177515eddca72a5cc5087e0fa59490 Mon Sep 17 00:00:00 2001 From: Kishanthan Date: Fri, 18 Dec 2015 15:19:36 +0530 Subject: [PATCH] Revert "Merge pull request #768 from Manuri/archetype-issue-plus-tests" This reverts commit 69fa79d62f50f722ee3b987e4532f9f459059a3e, reversing changes made to a880f43a10143cbb9039e35b93167e642b7434c9. --- .../projects/bundle/archetype.properties | 4 - .../test/resources/projects/bundle/goal.txt | 1 - .../projects/bundle/reference/pom.xml | 68 --------------- .../main/java/org/test/bundle/Greeter.java | 47 ---------- .../org/test/bundle/internal/Activator.java | 50 ----------- .../java/org/test/bundle/GreeterTest.java | 31 ------- .../projects/component/archetype.properties | 4 - .../resources/projects/component/goal.txt | 1 - .../projects/component/reference/pom.xml | 66 -------------- .../main/java/org/test/component/Greeter.java | 13 --- .../java/org/test/component/GreeterImpl.java | 32 ------- .../test/component/internal/DataHolder.java | 50 ----------- .../component/internal/ServiceComponent.java | 85 ------------------- archetypes/pom.xml | 9 -- pom.xml | 4 +- 15 files changed, 1 insertion(+), 464 deletions(-) delete mode 100644 archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/archetype.properties delete mode 100644 archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/goal.txt delete mode 100644 archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/pom.xml delete mode 100644 archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/main/java/org/test/bundle/Greeter.java delete mode 100644 archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/main/java/org/test/bundle/internal/Activator.java delete mode 100644 archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/test/java/org/test/bundle/GreeterTest.java delete mode 100644 archetypes/carbon-component-archetype/src/test/resources/projects/component/archetype.properties delete mode 100644 archetypes/carbon-component-archetype/src/test/resources/projects/component/goal.txt delete mode 100644 archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/pom.xml delete mode 100644 archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/Greeter.java delete mode 100644 archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/GreeterImpl.java delete mode 100644 archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/internal/DataHolder.java delete mode 100644 archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/internal/ServiceComponent.java diff --git a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/archetype.properties b/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/archetype.properties deleted file mode 100644 index c194e46d048..00000000000 --- a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/archetype.properties +++ /dev/null @@ -1,4 +0,0 @@ -groupId=org.test -artifactId=org.test.bundle -version=1.0.0 -package=org.test.bundle diff --git a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/goal.txt b/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/goal.txt deleted file mode 100644 index deea7981b52..00000000000 --- a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/goal.txt +++ /dev/null @@ -1 +0,0 @@ -clean install verify \ No newline at end of file diff --git a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/pom.xml b/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/pom.xml deleted file mode 100644 index 7de095c97aa..00000000000 --- a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - 4.0.0 - org.test - org.test.bundle - 1.0.0 - bundle - WSO2 Carbon - Sample OSGi Bundle - http://wso2.com - - - - org.osgi - org.osgi.core - ^osgi.core.api.version^ - - - org.testng - testng - ^testng.version^ - - - - - - - org.apache.felix - maven-bundle-plugin - ^maven.bundle.plugin.version^ - true - - - org.test.bundle.internal.Activator - ${project.artifactId} - ${project.artifactId} - org.test.bundle.internal - - !org.test.bundle.internal, - org.test.bundle.*;version="${project.version}" - - - org.osgi.framework.*;version="^osgi.framework.package.import.version.range^" - - - - - - - - diff --git a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/main/java/org/test/bundle/Greeter.java b/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/main/java/org/test/bundle/Greeter.java deleted file mode 100644 index 80abf4a8b79..00000000000 --- a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/main/java/org/test/bundle/Greeter.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.test.bundle; - -import java.util.logging.Logger; - -/** - * This class greets. - * - * @since 1.0.0 - */ -public class Greeter { - Logger logger = Logger.getLogger(Greeter.class.getName()); - - private String name; - - public Greeter(String name) { - this.name = name; - } - - /** - * This method outputs an info log saying Hello. - */ - public void hello() { - logger.info("Hello " + name); - } - - /** - * This method outputs an info log saying bye. - */ - public void bye() { - logger.info("Bye " + name); - } -} diff --git a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/main/java/org/test/bundle/internal/Activator.java b/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/main/java/org/test/bundle/internal/Activator.java deleted file mode 100644 index 7fe4593798c..00000000000 --- a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/main/java/org/test/bundle/internal/Activator.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.test.bundle.internal; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.test.bundle.Greeter; - -/** - * This is a sample bundle activator class. - * - * @since 1.0.0 - */ -public class Activator implements BundleActivator { - private Greeter greeter; - - /** - * This is called when the bundle is started. - * - * @param bundleContext BundleContext of this bundle - * @throws Exception Could be thrown while bundle starting - */ - public void start(BundleContext bundleContext) throws Exception { - greeter = new Greeter("WSO2"); - greeter.hello(); - } - - /** - * This is called when the bundle is stopped. - * - * @param bundleContext BundleContext of this bundle - * @throws Exception Could be thrown while bundle stopping - */ - public void stop(BundleContext bundleContext) throws Exception { - greeter.bye(); - } -} diff --git a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/test/java/org/test/bundle/GreeterTest.java b/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/test/java/org/test/bundle/GreeterTest.java deleted file mode 100644 index 9bfbfc110ac..00000000000 --- a/archetypes/carbon-bundle-archetype/src/test/resources/projects/bundle/reference/src/test/java/org/test/bundle/GreeterTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.test.bundle; - -import org.testng.Assert; -import org.testng.annotations.Test; - -/** - * Unit test for Greeter class. - * - * @since 1.0.0 - */ -public class GreeterTest { - @Test - public void shouldAnswerWithTrue() { - Assert.assertTrue(true); - } -} diff --git a/archetypes/carbon-component-archetype/src/test/resources/projects/component/archetype.properties b/archetypes/carbon-component-archetype/src/test/resources/projects/component/archetype.properties deleted file mode 100644 index 085ef896eba..00000000000 --- a/archetypes/carbon-component-archetype/src/test/resources/projects/component/archetype.properties +++ /dev/null @@ -1,4 +0,0 @@ -groupId=org.test -artifactId=org.test.component -version=1.0.0 -package=org.test.component diff --git a/archetypes/carbon-component-archetype/src/test/resources/projects/component/goal.txt b/archetypes/carbon-component-archetype/src/test/resources/projects/component/goal.txt deleted file mode 100644 index deea7981b52..00000000000 --- a/archetypes/carbon-component-archetype/src/test/resources/projects/component/goal.txt +++ /dev/null @@ -1 +0,0 @@ -clean install verify \ No newline at end of file diff --git a/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/pom.xml b/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/pom.xml deleted file mode 100644 index 698345ee905..00000000000 --- a/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - org.wso2.carbon - carbon-kernel-parent - ^project.version^ - - 4.0.0 - org.test.component - 1.0.0 - bundle - WSO2 Carbon - Sample Carbon Component - - This is a sample implementation of a Carbon Component - which consumes an OSGi service registered by Carbon Kernel - and registers another OSGi service - - http://wso2.com - - - - org.osgi - org.osgi.core - - - org.wso2.carbon - org.wso2.carbon.core - - - org.wso2.eclipse.osgi - org.eclipse.osgi.services - - - - - org.test.component.internal - - !org.test.component.internal, - org.test.component.*;version="^project.version^" - - - org.osgi.framework.*;version="^osgi.framework.package.import.version.range^", - org.wso2.carbon.kernel;version="^carbon.kernel.package.import.version.range^" - - - - diff --git a/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/Greeter.java b/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/Greeter.java deleted file mode 100644 index f44ba694d60..00000000000 --- a/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/Greeter.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.test.component; - -/** - * This interface contains methods for greeting. - * - * @since 1.0.0 - */ -public interface Greeter { - - void hello(); - - void bye(); -} diff --git a/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/GreeterImpl.java b/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/GreeterImpl.java deleted file mode 100644 index f56c8e69c42..00000000000 --- a/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/GreeterImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.test.component; - -import java.util.logging.Logger; - -/** - * This class implements the Greeter interface. - * - * @since 1.0.0 - */ -public class GreeterImpl implements Greeter { - Logger logger = Logger.getLogger(GreeterImpl.class.getName()); - - private String name; - - public GreeterImpl(String name) { - this.name = name; - } - - /** - * Output an info log saying Hello. - */ - public void hello() { - logger.info("Hello" + name); - } - - /** - * Outputs an info log saying bye. - */ - public void bye() { - logger.info("Bye " + name); - } -} diff --git a/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/internal/DataHolder.java b/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/internal/DataHolder.java deleted file mode 100644 index 36d83e76d8f..00000000000 --- a/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/internal/DataHolder.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.test.component.internal; - -import org.wso2.carbon.kernel.CarbonRuntime; - -import java.util.logging.Logger; - -/** - * DataHolder to hold org.wso2.carbon.kernel.CarbonRuntime instance referenced through - * org.wso2.carbon.helloworld.internal.ServiceComponent. - * - * @since 1.0.0 - */ -public class DataHolder { - Logger logger = Logger.getLogger(DataHolder.class.getName()); - - private static DataHolder instance = new DataHolder(); - private CarbonRuntime carbonRuntime; - - private DataHolder() { - - } - - /** - * This returns the DataHolder instance. - * - * @return The DataHolder instance of this singleton class - */ - public static DataHolder getInstance() { - return instance; - } - - /** - * Returns the CarbonRuntime service which gets set through a service component. - * - * @return CarbonRuntime Service - */ - public CarbonRuntime getCarbonRuntime() { - return carbonRuntime; - } - - /** - * This method is for setting the CarbonRuntime service. This method is used by - * ServiceComponent. - * - * @param carbonRuntime The reference being passed through ServiceComponent - */ - public void setCarbonRuntime(CarbonRuntime carbonRuntime) { - this.carbonRuntime = carbonRuntime; - } -} diff --git a/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/internal/ServiceComponent.java b/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/internal/ServiceComponent.java deleted file mode 100644 index 5e7a3785fec..00000000000 --- a/archetypes/carbon-component-archetype/src/test/resources/projects/component/reference/src/main/java/org/test/component/internal/ServiceComponent.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.test.component.internal; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; -import org.osgi.service.component.annotations.Activate; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Deactivate; -import org.osgi.service.component.annotations.Reference; -import org.osgi.service.component.annotations.ReferenceCardinality; -import org.osgi.service.component.annotations.ReferencePolicy; -import org.test.component.Greeter; -import org.test.component.GreeterImpl; -import org.wso2.carbon.kernel.CarbonRuntime; - -import java.util.logging.Logger; - -/** - * Service component to consume CarbonRuntime instance which has been registered as an OSGi service - * by Carbon Kernel. - * - * @since 1.0.0 - */ -@Component( - name = "org.test.component.internal.ServiceComponent", - immediate = true -) -public class ServiceComponent { - - Logger logger = Logger.getLogger(ServiceComponent.class.getName()); - private ServiceRegistration serviceRegistration; - - /** - * This is the activation method of ServiceComponent. This will be called when its references are - * satisfied. - * - * @param bundleContext the bundle context instance of this bundle. - * @throws Exception this will be thrown if an issue occurs while executing the activate method - */ - @Activate - protected void start(BundleContext bundleContext) throws Exception { - logger.info("Service Component is activated"); - - // Register GreeterImpl instance as an OSGi service. - serviceRegistration = bundleContext.registerService(Greeter.class.getName(), new GreeterImpl("WSO2"), null); - } - - /** - * This is the deactivation method of ServiceComponent. This will be called when this component - * is being stopped or references are satisfied during runtime. - * - * @throws Exception this will be thrown if an issue occurs while executing the de-activate method - */ - @Deactivate - protected void stop() throws Exception { - logger.info("Service Component is deactivated"); - - // Unregister Greeter OSGi service - serviceRegistration.unregister(); - } - - /** - * This bind method will be called when CarbonRuntime OSGi service is registered. - * - * @param carbonRuntime The CarbonRuntime instance registered by Carbon Kernel as an OSGi service - */ - @Reference( - name = "carbon.runtime.service", - service = CarbonRuntime.class, - cardinality = ReferenceCardinality.MANDATORY, - policy = ReferencePolicy.DYNAMIC, - unbind = "unsetCarbonRuntime" - ) - protected void setCarbonRuntime(CarbonRuntime carbonRuntime) { - DataHolder.getInstance().setCarbonRuntime(carbonRuntime); - } - - /** - * This is the unbind method which gets called at the un-registration of CarbonRuntime OSGi service. - * - * @param carbonRuntime The CarbonRuntime instance registered by Carbon Kernel as an OSGi service - */ - protected void unsetCarbonRuntime(CarbonRuntime carbonRuntime) { - DataHolder.getInstance().setCarbonRuntime(null); - } -} diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 3e0149aaae3..5fe01b667d6 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -47,15 +47,6 @@ - - - ${project.basedir}/src/test/resources - true - - **/* - - - org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index 186081e7539..318d154e2d0 100644 --- a/pom.xml +++ b/pom.xml @@ -44,11 +44,9 @@ parent + archetypes launcher core - - archetypes tests features tools