JBoss-OSGI SVN: r93814 - in projects/jboss-osgi/trunk/hudson/hudson-home: jobs/JBoss-5.2.0 and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-21 13:35:02 -0400 (Mon, 21 Sep 2009)
New Revision: 93814
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
Log:
Update snpoashots on AS builds
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-09-21 17:18:15 UTC (rev 93813)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-09-21 17:35:02 UTC (rev 93814)
@@ -33,7 +33,7 @@
;;
'jboss520')
SERVER_NAME=default
- JBOSS_BUILD=jboss-5.2.0.Beta
+ JBOSS_BUILD=jboss-5.2.0-SNAPSHOT
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip
RUNTIME_HOME=$WORKSPACE/$JBOSS_BUILD
RUNTIME_LOG=$RUNTIME_HOME/server/$SERVER_NAME/log/server.log
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml 2009-09-21 17:18:15 UTC (rev 93813)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml 2009-09-21 17:35:02 UTC (rev 93814)
@@ -27,7 +27,7 @@
<jdk>jdk1.5</jdk>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 16 * * *</spec>
+ <spec>0 21 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<builders>
@@ -48,7 +48,7 @@
# Build JBoss
#
cd jbossas
-mvn clean install
+mvn -U clean install
#
# Start JBossAS
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-09-21 17:18:15 UTC (rev 93813)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-09-21 17:35:02 UTC (rev 93814)
@@ -27,7 +27,7 @@
<jdk>jdk1.6</jdk>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 17 * * *</spec>
+ <spec>0 22 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<builders>
@@ -48,7 +48,7 @@
# Build JBoss
#
cd jbossas
-mvn clean install
+mvn -U clean install
#
# Start JBossAS
16 years, 10 months
JBoss-OSGI SVN: r93813 - in projects/jboss-osgi/trunk/hudson/hudson-home/jobs: JBoss-6.0.0 and 4 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-21 13:18:15 -0400 (Mon, 21 Sep 2009)
New Revision: 93813
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
Log:
Use mvn for AS builds
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml 2009-09-21 17:10:34 UTC (rev 93812)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml 2009-09-21 17:18:15 UTC (rev 93813)
@@ -48,7 +48,7 @@
# Build JBoss
#
cd jbossas
-build/build.sh clean main
+mvn clean install
#
# Start JBossAS
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-09-21 17:10:34 UTC (rev 93812)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-09-21 17:18:15 UTC (rev 93813)
@@ -48,7 +48,7 @@
# Build JBoss
#
cd jbossas
-./build.sh clean install
+mvn clean install
#
# Start JBossAS
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml 2009-09-21 17:10:34 UTC (rev 93812)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml 2009-09-21 17:18:15 UTC (rev 93813)
@@ -27,7 +27,7 @@
<disabled>false</disabled>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 18 * * *</spec>
+ <spec>0 0 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<axes>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2009-09-21 17:10:34 UTC (rev 93812)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2009-09-21 17:18:15 UTC (rev 93813)
@@ -27,7 +27,7 @@
<disabled>false</disabled>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 19 * * *</spec>
+ <spec>0 2 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<axes>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-09-21 17:10:34 UTC (rev 93812)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-09-21 17:18:15 UTC (rev 93813)
@@ -27,7 +27,7 @@
<disabled>false</disabled>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 21 * * *</spec>
+ <spec>0 4 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<axes>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml 2009-09-21 17:10:34 UTC (rev 93812)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml 2009-09-21 17:18:15 UTC (rev 93813)
@@ -27,7 +27,7 @@
<disabled>false</disabled>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 23 * * *</spec>
+ <spec>0 6 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<axes>
16 years, 10 months
JBoss-OSGI SVN: r93812 - projects/jboss-osgi/trunk/testsuite.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-21 13:10:34 -0400 (Mon, 21 Sep 2009)
New Revision: 93812
Modified:
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Give jbossmc hudson run more heap
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-21 15:55:18 UTC (rev 93811)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-21 17:10:34 UTC (rev 93812)
@@ -246,6 +246,16 @@
<scope>provided</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Xmx512m</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>framework-default</id>
16 years, 10 months
JBoss-OSGI SVN: r93687 - in projects/jboss-osgi: projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-18 07:51:46 -0400 (Fri, 18 Sep 2009)
New Revision: 93687
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
Log:
Remove XB support from runtime-jbossas
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-09-18 11:35:52 UTC (rev 93686)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-09-18 11:51:46 UTC (rev 93687)
@@ -76,13 +76,10 @@
http://jira.codehaus.org/browse/MDEP-175
-->
<includeArtifactIds>
- jboss-osgi-apache-xerces,jboss-osgi-jaxb,jboss-osgi-microcontainer,jboss-osgi-xml-binding
+ jboss-osgi-microcontainer
</includeArtifactIds>
<includes>
- org/jboss/osgi/jaxb/*.class,
- org/jboss/osgi/jbossxb/*.class,
- org/jboss/osgi/microcontainer/integration/*.class,
- org/jboss/osgi/xml/*.class
+ org/jboss/osgi/microcontainer/integration/*.class
</includes>
</configuration>
</plugin>
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-09-18 11:35:52 UTC (rev 93686)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-09-18 11:51:46 UTC (rev 93687)
@@ -90,9 +90,9 @@
KernelController controller = kernel.getController();
// Register the XMLBindingService
- XMLBindingService xbService = new XMLBindingService(){};
- bundleContext.registerService(XMLBindingService.class.getName(), xbService, null);
- log.debug("XMLBindingService registered");
+ //XMLBindingService xbService = new XMLBindingService(){};
+ //bundleContext.registerService(XMLBindingService.class.getName(), xbService, null);
+ //log.debug("XMLBindingService registered");
// Preregister some MC beans
installBean(controller, BEAN_SYSTEM_BUNDLE_CONTEXT, bundleContext);
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-18 11:35:52 UTC (rev 93686)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-18 11:51:46 UTC (rev 93687)
@@ -359,7 +359,9 @@
<include name="jboss-osgi-common-core.jar" />
<include name="jboss-osgi-jaxb.jar" />
<include name="jboss-osgi-jmx.jar" />
+ <include name="jboss-osgi-jndi.jar" />
<include name="jboss-osgi-webconsole.jar" />
+ <include name="jboss-osgi-xml-binding.jar" />
<include name="org.apache.felix.http.jetty.jar" />
<include name="org.apache.felix.log.jar" />
</fileset>
@@ -430,11 +432,6 @@
override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
- <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
- override="true">
- <include name="jboss-osgi-jndi.jar" />
- <include name="jboss-osgi-xml-binding.jar" />
- </fileset>
</pack>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-18 11:35:52 UTC (rev 93686)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-18 11:51:46 UTC (rev 93687)
@@ -40,7 +40,6 @@
org.jboss.osgi.spi.service;version=1.0,
org.jboss.osgi.spi.testing;version=1.0,
org.jboss.osgi.spi.util;version=1.0,
- org.jboss.osgi.xml;version=1.0,
<!-- jboss -->
org.jboss.beans.metadata.plugins;version=2.0,
16 years, 10 months
JBoss-OSGI SVN: r93686 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-18 07:35:52 -0400 (Fri, 18 Sep 2009)
New Revision: 93686
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
Log:
Remove JMX and JNDI support from runtime-jbossas
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-18 11:35:11 UTC (rev 93685)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-18 11:35:52 UTC (rev 93686)
@@ -32,7 +32,6 @@
<!-- jboss-osgi -->
org.jboss.osgi.jbossxb;version=2.0,
- org.jboss.osgi.jndi;version=1.0,
org.jboss.osgi.microcontainer;version=1.0,
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
16 years, 10 months
JBoss-OSGI SVN: r93685 - in projects/jboss-osgi/projects: bundles/jndi/trunk and 4 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-18 07:35:11 -0400 (Fri, 18 Sep 2009)
New Revision: 93685
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
Log:
Remove JMX and JNDI support from runtime-jbossas
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2009-09-18 11:35:11 UTC (rev 93685)
@@ -154,7 +154,7 @@
try
{
- // Check if the RMIAdaptor is alrady bound
+ // Check if the RMIAdaptor is already bound
iniCtx.lookup(rmiAdaptorPath);
}
catch (NamingException lookupEx)
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-09-18 11:35:11 UTC (rev 93685)
@@ -91,6 +91,7 @@
org.jboss.osgi.spi.util;version="1.0",
org.jboss.util.naming,
org.jboss.util.threadpool,
+ org.jnp.interfaces,
org.osgi.framework,
org.osgi.service.log,
</Import-Package>
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java 2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java 2009-09-18 11:35:11 UTC (rev 93685)
@@ -41,8 +41,9 @@
public void create()
{
- String implVersion = getClass().getPackage().getImplementationVersion();
- log.info("OSGi Integration Equinox - " + implVersion);
+ // Log INFO about this implementation
+ log.info(getClass().getPackage().getImplementationTitle());
+ log.info(getClass().getPackage().getImplementationVersion());
// Load the framework instance
FrameworkFactory factory = ServiceLoader.loadService(FrameworkFactory.class);
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2009-09-18 11:35:11 UTC (rev 93685)
@@ -42,8 +42,9 @@
public void create()
{
- String implVersion = getClass().getPackage().getImplementationVersion();
- log.info("OSGi Integration Felix - " + implVersion);
+ // Log INFO about this implementation
+ log.info(getClass().getPackage().getImplementationTitle());
+ log.info(getClass().getPackage().getImplementationVersion());
// When a Felix instance is embedded in a host application,
// the host application must inform the Felix instance that it is embedded
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-09-18 11:35:11 UTC (rev 93685)
@@ -76,13 +76,11 @@
http://jira.codehaus.org/browse/MDEP-175
-->
<includeArtifactIds>
- jboss-osgi-apache-xerces,jboss-osgi-jaxb,jboss-osgi-jmx,jboss-osgi-jndi,jboss-osgi-microcontainer,jboss-osgi-xml-binding
+ jboss-osgi-apache-xerces,jboss-osgi-jaxb,jboss-osgi-microcontainer,jboss-osgi-xml-binding
</includeArtifactIds>
<includes>
org/jboss/osgi/jaxb/*.class,
org/jboss/osgi/jbossxb/*.class,
- org/jboss/osgi/jmx/*.class,
- org/jboss/osgi/jndi/*.class,
org/jboss/osgi/microcontainer/integration/*.class,
org/jboss/osgi/xml/*.class
</includes>
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-09-18 11:35:11 UTC (rev 93685)
@@ -27,8 +27,6 @@
import java.util.Properties;
import javax.management.MBeanServer;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
@@ -91,15 +89,6 @@
Kernel kernel = getKernel();
KernelController controller = kernel.getController();
- // Register the MBeanServer
- bundleContext.registerService(MBeanServer.class.getName(), mbeanServer, null);
- log.debug("MBeanServer registered");
-
- // Register the InitialContext
- InitialContext initialContext = getInitialContext();
- bundleContext.registerService(InitialContext.class.getName(), initialContext, null);
- log.debug("InitialContext registered");
-
// Register the XMLBindingService
XMLBindingService xbService = new XMLBindingService(){};
bundleContext.registerService(XMLBindingService.class.getName(), xbService, null);
@@ -131,16 +120,4 @@
{
unregisterMicrocontainerServiceMBean(mbeanServer);
}
-
- private InitialContext getInitialContext()
- {
- try
- {
- return new InitialContext();
- }
- catch (NamingException ex)
- {
- throw new IllegalStateException("Cannot register InitialContext", ex);
- }
- }
}
\ No newline at end of file
16 years, 10 months
JBoss-OSGI SVN: r93673 - in projects/jboss-osgi: trunk/testsuite and 10 other directories.
by jboss-osgi-commits＠lists.jboss.org
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>
16 years, 10 months
JBoss-OSGI SVN: r93669 - projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-18 02:49:00 -0400 (Fri, 18 Sep 2009)
New Revision: 93669
Modified:
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java
Log:
Fix dependent capabilities
Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java 2009-09-18 06:47:03 UTC (rev 93668)
+++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java 2009-09-18 06:49:00 UTC (rev 93669)
@@ -26,7 +26,7 @@
import javax.xml.parsers.SAXParserFactory;
import org.jboss.osgi.spi.capability.Capability;
-import org.jboss.osgi.spi.capability.CompendiumCapability;
+import org.jboss.osgi.spi.capability.LogServiceCapability;
import org.jboss.osgi.spi.testing.OSGiRuntime;
/**
@@ -61,7 +61,7 @@
super(SAXParserFactory.class.getName());
setFilter("(" + PARSER_PROVIDER + "=" + PROVIDER_JBOSS_OSGI + ")");
- addDependency(new CompendiumCapability());
+ addDependency(new LogServiceCapability());
addBundle("bundles/jboss-osgi-apache-xerces.jar");
}
16 years, 10 months
JBoss-OSGI SVN: r93668 - projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-18 02:47:03 -0400 (Fri, 18 Sep 2009)
New Revision: 93668
Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
Log:
[JBOSGI-155] OutOfMemoryError on repeated install/unstall bundle
Restore example test resources
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-18 06:45:22 UTC (rev 93667)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-18 06:47:03 UTC (rev 93668)
@@ -21,8 +21,6 @@
<!-- [JBOSGI-145] JAXB classes are loaded from the system classpath -->
com.sun.xml.internal.bind.v2,
- com.yourkit.runtime,
-
org.jboss.beans.metadata.plugins;version=2.0,
org.jboss.beans.metadata.plugins.builder;version=2.0,
org.jboss.beans.metadata.spi;version=2.0,
@@ -30,7 +28,6 @@
org.jboss.dependency.spi;version=2.0,
org.jboss.kernel.spi.dependency;version=2.0,
org.jboss.logging;version=2.0,
- org.jboss.virtual;version=2.1,
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
16 years, 10 months
JBoss-OSGI SVN: r93667 - in projects/jboss-osgi/trunk/testsuite/example/src/test: resources/blueprint and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-18 02:45:22 -0400 (Fri, 18 Sep 2009)
New Revision: 93667
Removed:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintStressTestCase.java
Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd
Log:
[JBOSGI-155] OutOfMemoryError on repeated install/unstall bundle
Restore example test resources
Deleted: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintStressTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintStressTestCase.java 2009-09-18 03:34:37 UTC (rev 93666)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintStressTestCase.java 2009-09-18 06:45:22 UTC (rev 93667)
@@ -1,87 +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.example.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.example.blueprint.bundle.ServiceA;
-import org.jboss.test.osgi.example.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("example-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 ");
-
- //Thread.sleep(2000);
- lastTime = currTime;
- }
- }
- finally
- {
- runtime.shutdown();
- }
- }
-}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd 2009-09-18 03:34:37 UTC (rev 93666)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd 2009-09-18 06:45:22 UTC (rev 93667)
@@ -11,7 +11,6 @@
org.jboss.osgi.husky.annotation, \
org.jboss.osgi.spi.capability, \
org.jboss.osgi.spi.testing, \
- org.jboss.virtual, \
org.junit, \
org.osgi.framework, \
org.osgi.service.blueprint.*
16 years, 10 months