[jboss-osgi-commits] JBoss-OSGI SVN: r93673 - in projects/jboss-osgi: trunk/testsuite and 10 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-09-18 05:26:15 -0400 (Fri, 18 Sep 2009) New Revision: 93673 Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/BeanA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/BeanB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ServiceA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ServiceB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/blueprint/ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/blueprint/performance-blueprint.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/blueprint/performance-blueprint.xml Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: [JBOSGI-155] OutOfMemoryError on repeated install/unstall bundle Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java 2009-09-18 08:42:23 UTC (rev 93672) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java 2009-09-18 09:26:15 UTC (rev 93673) @@ -53,8 +53,6 @@ /** The attributes */ private PackageAttribute requirePackage; - public static long count; - /** * Create a new OSGiPackageRequirement. * @@ -112,15 +110,7 @@ if (Constants.RESOLUTION_OPTIONAL.equals(resolution)) setOptional(true); } - - count++; } - - @Override - protected void finalize() throws Throwable - { - count--; - } /** * Get the requirePackage metadata. Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2009-09-18 08:42:23 UTC (rev 93672) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2009-09-18 09:26:15 UTC (rev 93673) @@ -124,6 +124,9 @@ <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi151-bundleC.jar" files="${tests.resources.dir}/jbosgi151/jbosgi151-bundleC.bnd" /> <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi151-bundleD.jar" files="${tests.resources.dir}/jbosgi151/jbosgi151-bundleD.bnd" /> + <!-- performance --> + <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/performance-blueprint.jar" files="${tests.resources.dir}/performance/blueprint/performance-blueprint.bnd" /> + <!-- startlevel --> <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/service/startlevel.jar" files="${tests.resources.dir}/service/startlevel/startlevel.bnd" /> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-09-18 08:42:23 UTC (rev 93672) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-09-18 09:26:15 UTC (rev 93673) @@ -16,6 +16,7 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>*:jboss-osgi-apache-xerces:jar</include> + <include>*:jboss-osgi-blueprint:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> <include>*:jboss-osgi-husky:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java 2009-09-18 08:42:23 UTC (rev 93672) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java 2009-09-18 09:26:15 UTC (rev 93673) @@ -46,10 +46,9 @@ public void testInstallOnly() throws Exception { OSGiRuntime runtime = new OSGiTestHelper().getDefaultRuntime(); - LogServiceCapability logCapability = new LogServiceCapability(); try { - runtime.addCapability(logCapability); + runtime.addCapability(new LogServiceCapability()); OSGiBundle bundleA = runtime.installBundle("jbosgi99-bundleA.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java (from rev 93663, projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintStressTestCase.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java 2009-09-18 09:26:15 UTC (rev 93673) @@ -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.performance.blueprint; + +//$Id: BlueprintTestCase.java 91550 2009-07-22 13:10:41Z thomas.diesler(a)jboss.com $ + +import static org.junit.Assert.assertNotNull; + +import org.jboss.osgi.blueprint.BlueprintCapability; +import org.jboss.osgi.spi.testing.OSGiBundle; +import org.jboss.osgi.spi.testing.OSGiRuntime; +import org.jboss.osgi.spi.testing.OSGiServiceReference; +import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.test.osgi.performance.blueprint.bundle.ServiceA; +import org.jboss.test.osgi.performance.blueprint.bundle.ServiceB; +import org.junit.Ignore; +import org.junit.Test; +import org.osgi.service.blueprint.container.BlueprintContainer; + +/** + * A simple Blueprint Container test. + * + * @author thomas.diesler(a)jboss.com + * @since 12-Jul-2009 + */ +public class BlueprintStressTestCase +{ + @Test + @Ignore + public void testBlueprintBundleInstall() throws Exception + { + OSGiRuntime runtime = new OSGiTestHelper().getDefaultRuntime(); + BlueprintCapability blueprintCapability = new BlueprintCapability(); + try + { + long lastTime = System.currentTimeMillis(); + for (int i = 0; i < 100; i++) + { + runtime.addCapability(blueprintCapability); + + OSGiBundle bundle = runtime.installBundle("performance-blueprint.jar"); + bundle.start(); + + OSGiServiceReference sref = runtime.getServiceReference(BlueprintContainer.class.getName()); + assertNotNull("BlueprintContainer service not null", sref); + + OSGiServiceReference srefA = runtime.getServiceReference(ServiceA.class.getName()); + assertNotNull("ServiceA not null", srefA); + + OSGiServiceReference srefB = runtime.getServiceReference(ServiceB.class.getName()); + assertNotNull("ServiceB not null", srefB); + + bundle.uninstall(); + runtime.removeCapability(blueprintCapability); + + long currTime = System.currentTimeMillis(); + System.out.println("#" + (i + 1) + " " + (currTime - lastTime) + "ms "); + + lastTime = currTime; + } + } + finally + { + runtime.shutdown(); + } + } +} \ No newline at end of file Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/BeanA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/BeanA.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/BeanA.java 2009-09-18 09:26:15 UTC (rev 93673) @@ -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.performance.blueprint.bundle; + +import javax.management.MBeanServer; + + +//$Id$ + +/** + * A basic bean + * + * @author thomas.diesler(a)jboss.com + * @since 13-May-2009 + */ +public class BeanA implements ServiceA +{ + private MBeanServer mbeanServer; + + public BeanA() + { + } + + public MBeanServer getMbeanServer() + { + return mbeanServer; + } + + public void setMbeanServer(MBeanServer mbeanServer) + { + this.mbeanServer = mbeanServer; + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/BeanA.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/BeanB.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/BeanB.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/BeanB.java 2009-09-18 09:26:15 UTC (rev 93673) @@ -0,0 +1,50 @@ +/* + * 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.performance.blueprint.bundle; + + +//$Id$ + +/** + * A basic bean + * + * @author thomas.diesler(a)jboss.com + * @since 13-May-2009 + */ +public class BeanB implements ServiceB +{ + private BeanA beanA; + + public BeanB() + { + } + + public BeanA getBeanA() + { + return beanA; + } + + public void setBeanA(BeanA beanA) + { + this.beanA = beanA; + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/BeanB.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ServiceA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ServiceA.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ServiceA.java 2009-09-18 09:26:15 UTC (rev 93673) @@ -0,0 +1,37 @@ +/* + * 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.performance.blueprint.bundle; + +import javax.management.MBeanServer; + +//$Id$ + +/** + * A basic service + * + * @author thomas.diesler(a)jboss.com + * @since 13-May-2009 + */ +public interface ServiceA +{ + MBeanServer getMbeanServer(); +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ServiceA.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ServiceB.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ServiceB.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ServiceB.java 2009-09-18 09:26:15 UTC (rev 93673) @@ -0,0 +1,35 @@ +/* + * 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.performance.blueprint.bundle; + +//$Id$ + +/** + * A basic service + * + * @author thomas.diesler(a)jboss.com + * @since 13-May-2009 + */ +public interface ServiceB +{ + BeanA getBeanA(); +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/bundle/ServiceB.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-18 08:42:23 UTC (rev 93672) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-18 09:26:15 UTC (rev 93673) @@ -20,8 +20,10 @@ <entry><key>org.osgi.framework.system.packages.extra</key><value> <!-- [JBOSGI-145] JAXB classes are loaded from the system classpath --> com.sun.xml.internal.bind.v2, - + + <!-- YourKit Profiling com.yourkit.runtime, + --> org.jboss.beans.metadata.plugins;version=2.0, org.jboss.beans.metadata.plugins.builder;version=2.0, Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/blueprint/performance-blueprint.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/blueprint/performance-blueprint.bnd (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/blueprint/performance-blueprint.bnd 2009-09-18 09:26:15 UTC (rev 93673) @@ -0,0 +1,10 @@ +# bnd build -classpath target/test-classes -output target/test-libs/performance-blueprint.jar src/test/resources/performance/blueprint/performance-blueprint.bnd + +Bundle-SymbolicName: performance-blueprint + +Export-Package: org.jboss.test.osgi.performance.blueprint.bundle + +Include-Resource: \ + OSGI-INF/blueprint/performance-blueprint.xml=performance-blueprint.xml + +-removeheaders: Include-Resource Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/blueprint/performance-blueprint.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/blueprint/performance-blueprint.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/blueprint/performance-blueprint.xml 2009-09-18 09:26:15 UTC (rev 93673) @@ -0,0 +1,19 @@ +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"> + + <bean id="beanA" class="org.jboss.test.osgi.performance.blueprint.bundle.BeanA"> + <property name="mbeanServer" ref="mbeanService"/> + </bean> + + <service id="serviceA" ref="beanA" interface="org.jboss.test.osgi.performance.blueprint.bundle.ServiceA"> + </service> + + <service id="serviceB" interface="org.jboss.test.osgi.performance.blueprint.bundle.ServiceB"> + <bean class="org.jboss.test.osgi.performance.blueprint.bundle.BeanB"> + <property name="beanA" ref="beanA"/> + </bean> + </service> + + <reference id="mbeanService" interface="javax.management.MBeanServer"/> + +</blueprint> \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/performance/blueprint/performance-blueprint.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-18 08:42:23 UTC (rev 93672) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-18 09:26:15 UTC (rev 93673) @@ -246,16 +246,6 @@ <scope>provided</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Xmx1024m</argLine> - </configuration> - </plugin> - </plugins> - </build> </profile> <profile> <id>framework-default</id> @@ -277,7 +267,9 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <!--argLine>-agentlib:yjpagent</argLine--> + <!-- YourKit Profiling + <argLine>-agentlib:yjpagent=onexit=memory</argLine> + --> </configuration> </plugin> </plugins>