[jboss-osgi-commits] JBoss-OSGI SVN: r100116 - in projects/jboss-osgi/trunk/testsuite/functional/src/test: java/org/jboss/test/osgi/jbosgi108/bundleB and 23 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-01-29 04:40:50 -0500 (Fri, 29 Jan 2010) New Revision: 100116 Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/OSGi108ActivatorA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleB/OSGi108ActivatorB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleA/OSGi112ActivatorA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleB/OSGi112ActivatorB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/OSGi161Activator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/OSGi214Activator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/OSGi37ActivatorA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/OSGi37ActivatorB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleA/OSGi38ActivatorA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleB/OSGi38ActivatorB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/bundleB/OSGi39ActivatorB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/OSGi41Activator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/bundle/OSGi99Activator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/bundle/internal/OSGi36Activator.java Removed: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/ActivatorBundleA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleB/ActivatorBundleB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleA/ActivatorBundleA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleB/ActivatorBundleB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/Activator161.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/Activator214.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleA/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleB/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/bundleB/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/bundle/Activator99.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/bundle/internal/ServiceActivator.java Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi108/jbosgi108-bundleA.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi108/jbosgi108-bundleB.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi112/jbosgi112-bundleA.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi112/jbosgi112-bundleB.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi161/jbosgi161-bundle.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi214/jbosgi214-bundle.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi37/jbosgi37-bundleA.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi37/jbosgi37-bundleB.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi38/jbosgi38-bundleA.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi38/jbosgi38-bundleB.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi39/jbosgi39-bundleB.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi41/jbosgi41-bundleA.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi99/jbosgi99-failonstart.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbossas/jbosgi36/jbosgi36.bnd Log: Unify BundleActivators Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/ActivatorBundleA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/ActivatorBundleA.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/ActivatorBundleA.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi108.bundleA; - -//$Id: ServiceActivator.java 87064 2009-04-09 11:08:56Z thomas.diesler(a)jboss.com $ - -import javax.management.MBeanServer; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - -public class ActivatorBundleA implements BundleActivator -{ - private SomeBean bean; - - public void start(BundleContext context) - { - bean = new SomeBean(); - - // Register the MBean - try - { - ServiceReference sref = context.getServiceReference(MBeanServer.class.getName()); - MBeanServer service = (MBeanServer)context.getService(sref); - service.registerMBean(bean, SomeBean.MBEAN_NAME); - } - catch (Exception ex) - { - throw new IllegalStateException(ex); - } - - ClassLoader cl = getClass().getClassLoader(); - String msg = "start with " + cl + " - hashCode: " + cl.hashCode(); - bean.addMessage(msg); - } - - public void stop(BundleContext context) - { - ClassLoader cl = getClass().getClassLoader(); - String msg = "stop with " + cl + " - hashCode: " + cl.hashCode(); - bean.addMessage(msg); - - // Register the MBean - try - { - ServiceReference sref = context.getServiceReference(MBeanServer.class.getName()); - MBeanServer service = (MBeanServer)context.getService(sref); - service.unregisterMBean(SomeBean.MBEAN_NAME); - } - catch (Exception ex) - { - throw new IllegalStateException(ex); - } - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/OSGi108ActivatorA.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/ActivatorBundleA.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/OSGi108ActivatorA.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/OSGi108ActivatorA.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi108.bundleA; + +//$Id: ServiceActivator.java 87064 2009-04-09 11:08:56Z thomas.diesler(a)jboss.com $ + +import javax.management.MBeanServer; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; + +public class OSGi108ActivatorA implements BundleActivator +{ + private SomeBean bean; + + public void start(BundleContext context) + { + bean = new SomeBean(); + + // Register the MBean + try + { + ServiceReference sref = context.getServiceReference(MBeanServer.class.getName()); + MBeanServer service = (MBeanServer)context.getService(sref); + service.registerMBean(bean, SomeBean.MBEAN_NAME); + } + catch (Exception ex) + { + throw new IllegalStateException(ex); + } + + ClassLoader cl = getClass().getClassLoader(); + String msg = "start with " + cl + " - hashCode: " + cl.hashCode(); + bean.addMessage(msg); + } + + public void stop(BundleContext context) + { + ClassLoader cl = getClass().getClassLoader(); + String msg = "stop with " + cl + " - hashCode: " + cl.hashCode(); + bean.addMessage(msg); + + // Register the MBean + try + { + ServiceReference sref = context.getServiceReference(MBeanServer.class.getName()); + MBeanServer service = (MBeanServer)context.getService(sref); + service.unregisterMBean(SomeBean.MBEAN_NAME); + } + catch (Exception ex) + { + throw new IllegalStateException(ex); + } + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleB/ActivatorBundleB.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleB/ActivatorBundleB.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleB/ActivatorBundleB.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi108.bundleB; - -//$Id$ - -import org.jboss.test.osgi.jbosgi108.bundleA.SomeBean; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class ActivatorBundleB implements BundleActivator -{ - private SomeBean bean = new SomeBean(); - - public void start(BundleContext context) - { - ClassLoader cl = getClass().getClassLoader(); - String msg = "start with " + cl + " - hashCode: " + cl.hashCode(); - bean.addMessage(msg); - } - - public void stop(BundleContext context) - { - ClassLoader cl = getClass().getClassLoader(); - String msg = "stop with " + cl + " - hashCode: " + cl.hashCode(); - bean.addMessage(msg); - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleB/OSGi108ActivatorB.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleB/ActivatorBundleB.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleB/OSGi108ActivatorB.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleB/OSGi108ActivatorB.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi108.bundleB; + +//$Id$ + +import org.jboss.test.osgi.jbosgi108.bundleA.SomeBean; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class OSGi108ActivatorB implements BundleActivator +{ + private SomeBean bean = new SomeBean(); + + public void start(BundleContext context) + { + ClassLoader cl = getClass().getClassLoader(); + String msg = "start with " + cl + " - hashCode: " + cl.hashCode(); + bean.addMessage(msg); + } + + public void stop(BundleContext context) + { + ClassLoader cl = getClass().getClassLoader(); + String msg = "stop with " + cl + " - hashCode: " + cl.hashCode(); + bean.addMessage(msg); + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleA/ActivatorBundleA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleA/ActivatorBundleA.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleA/ActivatorBundleA.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi112.bundleA; - -//$Id: ServiceActivator.java 87064 2009-04-09 11:08:56Z thomas.diesler(a)jboss.com $ - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleEvent; -import org.osgi.framework.BundleListener; -import org.osgi.framework.SynchronousBundleListener; - -public class ActivatorBundleA implements BundleActivator -{ - public void start(BundleContext context) - { - BundleListener listener = new SynchronousBundleListener() - { - public void bundleChanged(BundleEvent evt) - { - if (BundleEvent.STARTING == evt.getType()) - { - Bundle bundle = evt.getBundle(); - if ("jbosgi112-bundleB".equals(bundle.getSymbolicName())) - { - throw new RuntimeException("Cannot start bundle: " + bundle); - } - } - } - }; - context.addBundleListener(listener); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleA/OSGi112ActivatorA.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleA/ActivatorBundleA.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleA/OSGi112ActivatorA.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleA/OSGi112ActivatorA.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi112.bundleA; + +//$Id: ServiceActivator.java 87064 2009-04-09 11:08:56Z thomas.diesler(a)jboss.com $ + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.BundleListener; +import org.osgi.framework.SynchronousBundleListener; + +public class OSGi112ActivatorA implements BundleActivator +{ + public void start(BundleContext context) + { + BundleListener listener = new SynchronousBundleListener() + { + public void bundleChanged(BundleEvent evt) + { + if (BundleEvent.STARTING == evt.getType()) + { + Bundle bundle = evt.getBundle(); + if ("jbosgi112-bundleB".equals(bundle.getSymbolicName())) + { + throw new RuntimeException("Cannot start bundle: " + bundle); + } + } + } + }; + context.addBundleListener(listener); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleB/ActivatorBundleB.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleB/ActivatorBundleB.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleB/ActivatorBundleB.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi112.bundleB; - -//$Id$ - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class ActivatorBundleB implements BundleActivator -{ - public void start(BundleContext context) - { - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleB/OSGi112ActivatorB.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleB/ActivatorBundleB.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleB/OSGi112ActivatorB.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/bundleB/OSGi112ActivatorB.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi112.bundleB; + +//$Id$ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class OSGi112ActivatorB implements BundleActivator +{ + public void start(BundleContext context) + { + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -26,7 +26,7 @@ import org.jboss.osgi.spi.capability.LogServiceCapability; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiTestHelper; import org.junit.Test; import org.osgi.framework.Bundle; @@ -38,12 +38,19 @@ * @author thomas.diesler(a)jboss.com * @since 07-Oct-2009 */ -public class OSGi161TestCase extends OSGiTest +public class OSGi161TestCase { @Test - public void testLogging() throws Exception + public void testClientLogging() throws Exception { - OSGiRuntime runtime = getDefaultRuntime(); + + } + + @Test + public void testFrameworkLogging() throws Exception + { + OSGiTestHelper helper = new OSGiTestHelper(); + OSGiRuntime runtime = helper.getDefaultRuntime(); try { runtime.addCapability(new LogServiceCapability()); @@ -51,7 +58,7 @@ OSGiBundle bundleA = runtime.installBundle("jbosgi161-bundle.jar"); bundleA.start(); - assertBundleState(Bundle.ACTIVE, bundleA.getState()); + helper.assertBundleState(Bundle.ACTIVE, bundleA.getState()); bundleA.uninstall(); } finally Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/Activator161.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/Activator161.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/Activator161.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi161.bundle; - -// $Id:$ - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Activator161 implements BundleActivator -{ - public void start(BundleContext context) throws Exception - { - assertCommonsLogging(context); - - assertSL4J(context); - } - - public void stop(BundleContext context) throws Exception - { - } - - private void assertCommonsLogging(BundleContext context) - { - Log log = LogFactory.getLog(Activator161.class); - - String loggerClass = log.getClass().getName(); - - List<String> expected = new ArrayList<String>(); - expected.add("org.apache.commons.logging.impl.SLF4JLog"); - expected.add("org.apache.commons.logging.impl.Log4JLogger"); - expected.add("org.apache.commons.logging.impl.SLF4JLocationAwareLog"); - - if (expected.contains(loggerClass) == false) - throw new IllegalStateException("Unexpected logger: " + loggerClass); - - log.info("*******************************************"); - log.info("* jcl: " + context.getBundle()); - log.info("*******************************************"); - } - - private void assertSL4J(BundleContext context) - { - Logger log = LoggerFactory.getLogger(Activator161.class); - - String loggerClass = log.getClass().getName(); - - List<String> expected = new ArrayList<String>(); - expected.add("org.jboss.slf4j.JBossLoggerAdapter"); - expected.add("org.slf4j.impl.Log4jLoggerAdapter"); - expected.add("org.slf4j.impl.Slf4jLogger"); - - if (expected.contains(loggerClass) == false) - throw new IllegalStateException("Unexpected logger: " + loggerClass); - - log.info("*******************************************"); - log.info("* slf4j: " + context.getBundle()); - log.info("*******************************************"); - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/OSGi161Activator.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/Activator161.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/OSGi161Activator.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/OSGi161Activator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi161.bundle; + +// $Id:$ + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class OSGi161Activator implements BundleActivator +{ + public void start(BundleContext context) throws Exception + { + assertCommonsLogging(context); + + assertSL4J(context); + } + + public void stop(BundleContext context) throws Exception + { + } + + private void assertCommonsLogging(BundleContext context) + { + Log log = LogFactory.getLog(OSGi161Activator.class); + + String loggerClass = log.getClass().getName(); + + List<String> expected = new ArrayList<String>(); + expected.add("org.apache.commons.logging.impl.SLF4JLog"); + expected.add("org.apache.commons.logging.impl.Log4JLogger"); + expected.add("org.apache.commons.logging.impl.SLF4JLocationAwareLog"); + + if (expected.contains(loggerClass) == false) + throw new IllegalStateException("Unexpected logger: " + loggerClass); + + log.info("*******************************************"); + log.info("* jcl: " + context.getBundle()); + log.info("*******************************************"); + } + + private void assertSL4J(BundleContext context) + { + Logger log = LoggerFactory.getLogger(OSGi161Activator.class); + + String loggerClass = log.getClass().getName(); + + List<String> expected = new ArrayList<String>(); + expected.add("org.jboss.slf4j.JBossLoggerAdapter"); + expected.add("org.slf4j.impl.Log4jLoggerAdapter"); + expected.add("org.slf4j.impl.Slf4jLogger"); + + if (expected.contains(loggerClass) == false) + throw new IllegalStateException("Unexpected logger: " + loggerClass); + + log.info("*******************************************"); + log.info("* slf4j: " + context.getBundle()); + log.info("*******************************************"); + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/Activator214.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/Activator214.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/Activator214.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi214.bundle; - -//$Id$ - -import org.jboss.test.osgi.jbosgi214.SomeService; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * A Service Activator - * - * @author thomas.diesler(a)jboss.com - * @since 24-Apr-2009 - */ -public class Activator214 implements BundleActivator -{ - public void start(BundleContext context) - { - // Register a service that is bound to an interface from the system classpath - context.registerService(SomeService.class.getName(), new SomeServiceImpl(), null); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/OSGi214Activator.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/Activator214.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/OSGi214Activator.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/OSGi214Activator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi214.bundle; + +//$Id$ + +import org.jboss.test.osgi.jbosgi214.SomeService; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * A Service Activator + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class OSGi214Activator implements BundleActivator +{ + public void start(BundleContext context) + { + // Register a service that is bound to an interface from the system classpath + context.registerService(SomeService.class.getName(), new SomeServiceImpl(), null); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/OSGi37ActivatorA.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceActivator.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/OSGi37ActivatorA.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/OSGi37ActivatorA.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi37.bundleA; + +//$Id: ServiceActivator.java 87103 2009-04-09 22:18:31Z thomas.diesler(a)jboss.com $ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class OSGi37ActivatorA implements BundleActivator +{ + public void start(BundleContext context) + { + ServiceA service = new ServiceA(context); + context.registerService(ServiceA.class.getName(), service, null); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceActivator.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceActivator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi37.bundleA; - -//$Id: ServiceActivator.java 87103 2009-04-09 22:18:31Z thomas.diesler(a)jboss.com $ - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class ServiceActivator implements BundleActivator -{ - public void start(BundleContext context) - { - ServiceA service = new ServiceA(context); - context.registerService(ServiceA.class.getName(), service, null); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/OSGi37ActivatorB.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceActivator.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/OSGi37ActivatorB.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/OSGi37ActivatorB.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi37.bundleB; + +//$Id: ServiceActivator.java 87103 2009-04-09 22:18:31Z thomas.diesler(a)jboss.com $ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class OSGi37ActivatorB implements BundleActivator +{ + public void start(BundleContext context) + { + ServiceB service = new ServiceB(context); + context.registerService(ServiceB.class.getName(), service, null); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceActivator.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceActivator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi37.bundleB; - -//$Id: ServiceActivator.java 87103 2009-04-09 22:18:31Z thomas.diesler(a)jboss.com $ - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class ServiceActivator implements BundleActivator -{ - public void start(BundleContext context) - { - ServiceB service = new ServiceB(context); - context.registerService(ServiceB.class.getName(), service, null); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleA/OSGi38ActivatorA.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleA/ServiceActivator.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleA/OSGi38ActivatorA.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleA/OSGi38ActivatorA.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi38.bundleA; + +//$Id: ServiceActivator.java 85100 2009-03-02 13:58:48Z thomas.diesler(a)jboss.com $ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class OSGi38ActivatorA implements BundleActivator +{ + public void start(BundleContext context) + { + ServiceA service = new ServiceA(context); + context.registerService(ServiceA.class.getName(), service, null); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleA/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleA/ServiceActivator.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleA/ServiceActivator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi38.bundleA; - -//$Id: ServiceActivator.java 85100 2009-03-02 13:58:48Z thomas.diesler(a)jboss.com $ - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class ServiceActivator implements BundleActivator -{ - public void start(BundleContext context) - { - ServiceA service = new ServiceA(context); - context.registerService(ServiceA.class.getName(), service, null); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleB/OSGi38ActivatorB.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleB/ServiceActivator.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleB/OSGi38ActivatorB.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleB/OSGi38ActivatorB.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi38.bundleB; + +//$Id: ServiceActivator.java 85100 2009-03-02 13:58:48Z thomas.diesler(a)jboss.com $ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class OSGi38ActivatorB implements BundleActivator +{ + public void start(BundleContext context) + { + ServiceB service = new ServiceB(); + context.registerService(ServiceB.class.getName(), service, null); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleB/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleB/ServiceActivator.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/bundleB/ServiceActivator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi38.bundleB; - -//$Id: ServiceActivator.java 85100 2009-03-02 13:58:48Z thomas.diesler(a)jboss.com $ - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class ServiceActivator implements BundleActivator -{ - public void start(BundleContext context) - { - ServiceB service = new ServiceB(); - context.registerService(ServiceB.class.getName(), service, null); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/bundleB/OSGi39ActivatorB.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/bundleB/ServiceActivator.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/bundleB/OSGi39ActivatorB.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/bundleB/OSGi39ActivatorB.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi39.bundleB; + +//$Id: ServiceActivator.java 87064 2009-04-09 11:08:56Z thomas.diesler(a)jboss.com $ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class OSGi39ActivatorB implements BundleActivator +{ + public void start(BundleContext context) + { + ServiceB service = new ServiceB(); + context.registerService(ServiceB.class.getName(), service, null); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/bundleB/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/bundleB/ServiceActivator.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/bundleB/ServiceActivator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi39.bundleB; - -//$Id: ServiceActivator.java 87064 2009-04-09 11:08:56Z thomas.diesler(a)jboss.com $ - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class ServiceActivator implements BundleActivator -{ - public void start(BundleContext context) - { - ServiceB service = new ServiceB(); - context.registerService(ServiceB.class.getName(), service, null); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/OSGi41Activator.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceActivator.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/OSGi41Activator.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/OSGi41Activator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi41.bundleA; + +//$Id: ServiceActivator.java 85293 2009-03-05 13:45:47Z thomas.diesler(a)jboss.com $ + +import java.util.Dictionary; +import java.util.Hashtable; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class OSGi41Activator implements BundleActivator +{ + public void start(BundleContext context) + { + ServiceA serviceA = new ServiceA(context); + context.registerService(ServiceA.class.getName(), serviceA, null); + + Dictionary<String, String> props = new Hashtable<String, String>(); + props.put("service.pid", ServiceB.class.getName()); + + ServiceB serviceB = new ServiceB(context); + context.registerService(ServiceB.class.getName(), serviceB, props); + + serviceB.updateConfig("xxx", "yyy"); + serviceB.updateConfig("xxx", "zzz"); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceActivator.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceActivator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi41.bundleA; - -//$Id: ServiceActivator.java 85293 2009-03-05 13:45:47Z thomas.diesler(a)jboss.com $ - -import java.util.Dictionary; -import java.util.Hashtable; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class ServiceActivator implements BundleActivator -{ - public void start(BundleContext context) - { - ServiceA serviceA = new ServiceA(context); - context.registerService(ServiceA.class.getName(), serviceA, null); - - Dictionary<String, String> props = new Hashtable<String, String>(); - props.put("service.pid", ServiceB.class.getName()); - - ServiceB serviceB = new ServiceB(context); - context.registerService(ServiceB.class.getName(), serviceB, props); - - serviceB.updateConfig("xxx", "yyy"); - serviceB.updateConfig("xxx", "zzz"); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/bundle/Activator99.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/bundle/Activator99.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/bundle/Activator99.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbosgi99.bundle; - -//$Id: ServiceActivator.java 87064 2009-04-09 11:08:56Z thomas.diesler(a)jboss.com $ - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class Activator99 implements BundleActivator -{ - public void start(BundleContext context) - { - throw new IllegalStateException("Fail on start"); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/bundle/OSGi99Activator.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/bundle/Activator99.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/bundle/OSGi99Activator.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/bundle/OSGi99Activator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi99.bundle; + +//$Id: ServiceActivator.java 87064 2009-04-09 11:08:56Z thomas.diesler(a)jboss.com $ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class OSGi99Activator implements BundleActivator +{ + public void start(BundleContext context) + { + throw new IllegalStateException("Fail on start"); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/bundle/internal/OSGi36Activator.java (from rev 100115, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/bundle/internal/ServiceActivator.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/bundle/internal/OSGi36Activator.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/bundle/internal/OSGi36Activator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbossas.jbosgi36.bundle.internal; + +//$Id: SomeServiceActivator.java 86968 2009-04-08 15:51:12Z thomas.diesler(a)jboss.com $ + +import org.jboss.test.osgi.jbossas.jbosgi36.bundle.SomeService; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * A Service Activator + * + * @author thomas.diesler(a)jboss.com + * @since 04-Feb-2009 + */ +public class OSGi36Activator implements BundleActivator +{ + public void start(BundleContext context) + { + SomeService service = new SomeService(); + context.registerService(SomeService.class.getName(), service, null); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/bundle/internal/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/bundle/internal/ServiceActivator.java 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/bundle/internal/ServiceActivator.java 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.jbossas.jbosgi36.bundle.internal; - -//$Id: SomeServiceActivator.java 86968 2009-04-08 15:51:12Z thomas.diesler(a)jboss.com $ - -import org.jboss.test.osgi.jbossas.jbosgi36.bundle.SomeService; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * A Service Activator - * - * @author thomas.diesler(a)jboss.com - * @since 04-Feb-2009 - */ -public class ServiceActivator implements BundleActivator -{ - public void start(BundleContext context) - { - SomeService service = new SomeService(); - context.registerService(SomeService.class.getName(), service, null); - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi108/jbosgi108-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi108/jbosgi108-bundleA.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi108/jbosgi108-bundleA.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi108-bundleA.jar src/test/resources/jbosgi108/jbosgi108-bundleA.bnd Bundle-SymbolicName: jbosgi108-bundleA -Bundle-Activator: org.jboss.test.osgi.jbosgi108.bundleA.ActivatorBundleA +Bundle-Activator: org.jboss.test.osgi.jbosgi108.bundleA.OSGi108ActivatorA Export-Package: org.jboss.test.osgi.jbosgi108.bundleA Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi108/jbosgi108-bundleB.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi108/jbosgi108-bundleB.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi108/jbosgi108-bundleB.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,7 +1,7 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi108-bundleB.jar src/test/resources/jbosgi108/jbosgi108-bundleB.bnd Bundle-SymbolicName: jbosgi108-bundleB -Bundle-Activator: org.jboss.test.osgi.jbosgi108.bundleB.ActivatorBundleB +Bundle-Activator: org.jboss.test.osgi.jbosgi108.bundleB.OSGi108ActivatorB Export-Package: org.jboss.test.osgi.jbosgi108.bundleB Import-Package: org.osgi.framework, org.jboss.test.osgi.jbosgi108.bundleA Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi112/jbosgi112-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi112/jbosgi112-bundleA.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi112/jbosgi112-bundleA.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi112-bundleA.jar src/test/resources/jbosgi112/jbosgi112-bundleA.bnd Bundle-SymbolicName: jbosgi112-bundleA -Bundle-Activator: org.jboss.test.osgi.jbosgi112.bundleA.ActivatorBundleA +Bundle-Activator: org.jboss.test.osgi.jbosgi112.bundleA.OSGi112ActivatorA Export-Package: org.jboss.test.osgi.jbosgi112.bundleA Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi112/jbosgi112-bundleB.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi112/jbosgi112-bundleB.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi112/jbosgi112-bundleB.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,7 +1,7 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi112-bundleB.jar src/test/resources/jbosgi112/jbosgi112-bundleB.bnd Bundle-SymbolicName: jbosgi112-bundleB -Bundle-Activator: org.jboss.test.osgi.jbosgi112.bundleB.ActivatorBundleB +Bundle-Activator: org.jboss.test.osgi.jbosgi112.bundleB.OSGi112ActivatorB Export-Package: org.jboss.test.osgi.jbosgi112.bundleB Import-Package: org.osgi.framework, org.jboss.test.osgi.jbosgi112.bundleA Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi161/jbosgi161-bundle.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi161/jbosgi161-bundle.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi161/jbosgi161-bundle.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi161-bundle.jar src/test/resources/jbosgi161/bundle.bnd Bundle-SymbolicName: jbosgi161-bundle -Bundle-Activator: org.jboss.test.osgi.jbosgi161.bundle.Activator161 +Bundle-Activator: org.jboss.test.osgi.jbosgi161.bundle.OSGi161Activator Private-Package: org.jboss.test.osgi.jbosgi161.bundle Import-Package: org.apache.commons.logging, org.slf4j, org.osgi.framework Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi214/jbosgi214-bundle.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi214/jbosgi214-bundle.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi214/jbosgi214-bundle.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi214-bundle.jar src/test/resources/jbosgi214/jbosgi214-bundle.bnd Bundle-SymbolicName: jbosgi214-bundle -Bundle-Activator: org.jboss.test.osgi.jbosgi214.bundle.Activator214 +Bundle-Activator: org.jboss.test.osgi.jbosgi214.bundle.OSGi214Activator Export-Package: org.jboss.test.osgi.jbosgi214.bundle Import-Package: org.jboss.test.osgi.jbosgi214, org.osgi.framework Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi37/jbosgi37-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi37/jbosgi37-bundleA.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi37/jbosgi37-bundleA.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,7 +1,7 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi37-bundleA.jar src/test/resources/jbosgi37/jbosgi37-bundleA.bnd Bundle-SymbolicName: jbosgi37-bundleA -Bundle-Activator: org.jboss.test.osgi.jbosgi37.bundleA.ServiceActivator +Bundle-Activator: org.jboss.test.osgi.jbosgi37.bundleA.OSGi37ActivatorA Export-Package: org.jboss.test.osgi.jbosgi37.bundleA Include-Resource: ../../../target/test-libs/jbosgi37-subA.jar Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi37/jbosgi37-bundleB.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi37/jbosgi37-bundleB.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi37/jbosgi37-bundleB.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,7 +1,7 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi37-bundleB.jar src/test/resources/jbosgi37/jbosgi37-bundleB.bnd Bundle-SymbolicName: jbosgi37-bundleB -Bundle-Activator: org.jboss.test.osgi.jbosgi37.bundleB.ServiceActivator +Bundle-Activator: org.jboss.test.osgi.jbosgi37.bundleB.OSGi37ActivatorB Export-Package: org.jboss.test.osgi.jbosgi37.bundleB Include-Resource: ../../../target/test-libs/jbosgi37-subB.jar Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi38/jbosgi38-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi38/jbosgi38-bundleA.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi38/jbosgi38-bundleA.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi38-bundleA.jar src/test/resources/jbosgi38/bundleA.bnd Bundle-SymbolicName: jbosgi38-bundleA -Bundle-Activator: org.jboss.test.osgi.jbosgi38.bundleA.ServiceActivator +Bundle-Activator: org.jboss.test.osgi.jbosgi38.bundleA.OSGi38ActivatorA Export-Package: org.jboss.test.osgi.jbosgi38.bundleA Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi38/jbosgi38-bundleB.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi38/jbosgi38-bundleB.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi38/jbosgi38-bundleB.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi38-bundleB.jar src/test/resources/jbosgi38/bundleB.bnd Bundle-SymbolicName: jbosgi38-bundleB -Bundle-Activator: org.jboss.test.osgi.jbosgi38.bundleB.ServiceActivator +Bundle-Activator: org.jboss.test.osgi.jbosgi38.bundleB.OSGi38ActivatorB Export-Package: org.jboss.test.osgi.jbosgi38.bundleB Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi39/jbosgi39-bundleB.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi39/jbosgi39-bundleB.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi39/jbosgi39-bundleB.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi39-bundleB.jar src/test/resources/jbosgi39/bundleB.bnd Bundle-SymbolicName: jbosgi39-bundleB -Bundle-Activator: org.jboss.test.osgi.jbosgi39.bundleB.ServiceActivator +Bundle-Activator: org.jboss.test.osgi.jbosgi39.bundleB.OSGi39ActivatorB Export-Package: org.jboss.test.osgi.jbosgi39.bundleB Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi41/jbosgi41-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi41/jbosgi41-bundleA.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi41/jbosgi41-bundleA.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi41-bundleA.jar src/test/resources/jbosgi41/jbosgi41-bundleA.bnd Bundle-SymbolicName: jbosgi41-bundleA -Bundle-Activator: org.jboss.test.osgi.jbosgi41.bundleA.ServiceActivator +Bundle-Activator: org.jboss.test.osgi.jbosgi41.bundleA.OSGi41Activator Export-Package: org.jboss.test.osgi.jbosgi41.bundleA Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi99/jbosgi99-failonstart.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi99/jbosgi99-failonstart.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi99/jbosgi99-failonstart.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi99-bundleA.jar src/test/resources/jbosgi99/jbosgi99-bundleA.bnd Bundle-SymbolicName: jbosgi99-failonstart -Bundle-Activator: org.jboss.test.osgi.jbosgi99.bundle.Activator99 +Bundle-Activator: org.jboss.test.osgi.jbosgi99.bundle.OSGi99Activator Private-Package: org.jboss.test.osgi.jbosgi99.bundle Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbossas/jbosgi36/jbosgi36.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbossas/jbosgi36/jbosgi36.bnd 2010-01-29 08:33:40 UTC (rev 100115) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbossas/jbosgi36/jbosgi36.bnd 2010-01-29 09:40:50 UTC (rev 100116) @@ -1,7 +1,7 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi36-bundle.jar src/test/resources/jbosgi36/jbosgi36.bnd Bundle-SymbolicName: jbosgi36 -Bundle-Activator: org.jboss.test.osgi.jbossas.jbosgi36.bundle.internal.ServiceActivator +Bundle-Activator: org.jboss.test.osgi.jbossas.jbosgi36.bundle.internal.OSGi36Activator Export-Package: org.jboss.test.osgi.jbossas.jbosgi36.bundle Private-Package: org.jboss.test.osgi.jbossas.jbosgi36.bundle.internal