September 2009 - jboss-osgi-commits

JBoss-OSGI SVN: r93524 - in projects/jboss-osgi/trunk/testsuite: example and 1 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 07:28:54 -0400 (Tue, 15 Sep 2009) New Revision: 93524 Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Use surefile argLine as property from parent Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-09-15 11:28:02 UTC (rev 93523) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-09-15 11:28:54 UTC (rev 93524) @@ -221,7 +221,6 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Xmx1024m</argLine> <excludes> <exclude>${target.container.excludes}</exclude> </excludes> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-15 11:28:02 UTC (rev 93523) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-15 11:28:54 UTC (rev 93524) @@ -192,7 +192,6 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Xmx1024m</argLine> <excludes> <exclude>${target.container.excludes}</exclude> <exclude>org/jboss/test/osgi/jbosgi39/**</exclude> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-15 11:28:02 UTC (rev 93523) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-15 11:28:54 UTC (rev 93524) @@ -179,8 +179,6 @@ <name>!framework</name> </property> </activation> - -  <dependencies> <dependency> <groupId>org.jboss.osgi.runtime</groupId> @@ -189,13 +187,6 @@ <scope>provided</scope> </dependency> </dependencies> - -  - </profile> <!-- @@ -275,6 +266,16 @@ <scope>provided</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Xmx1024m ${surefire.argline.parent}</argLine> + </configuration> + </plugin> + </plugins> + </build> </profile> <!--

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93523 - projects/jboss-osgi/projects/parent/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 07:28:02 -0400 (Tue, 15 Sep 2009) New Revision: 93523 Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml Log: Use surefile argLine as property from parent Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-09-15 10:37:17 UTC (rev 93522) +++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-09-15 11:28:02 UTC (rev 93523) @@ -17,6 +17,7 @@ <version.aqute.bnd>0.0.323</version.aqute.bnd> <version.jboss.logging>2.0.5.GA</version.jboss.logging> <version.junit>4.6</version.junit> + <surefire.argline.parent>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/tst.policy</surefire.argline.parent> </properties>  @@ -309,16 +310,9 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/tst.policy</argLine> + <argLine>${surefire.argline.parent}</argLine> <systemProperties> <property> - <name>java.security.manager</name> - </property> - <property> - <name>java.security.policy</name> - <value>tst.policy</value> - </property> - <property> <name>java.protocol.handler.pkgs</name> <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> </property>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93521 - projects/jboss-osgi/projects/parent/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 06:32:03 -0400 (Tue, 15 Sep 2009) New Revision: 93521 Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml Log: Use security manager with remote testing Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-09-15 10:31:18 UTC (rev 93520) +++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-09-15 10:32:03 UTC (rev 93521) @@ -309,8 +309,16 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <argLine>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/tst.policy</argLine> <systemProperties> <property> + <name>java.security.manager</name> + </property> + <property> + <name>java.security.policy</name> + <value>tst.policy</value> + </property> + <property> <name>java.protocol.handler.pkgs</name> <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> </property>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93520 - in projects/jboss-osgi/trunk/hudson/hudson-home/jobs: jbossosgi-matrix-jbossmc and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 06:31:18 -0400 (Tue, 15 Sep 2009) New Revision: 93520 Modified: 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: Start matrix jobs 2h later 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-15 10:22:04 UTC (rev 93519) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-09-15 10:31:18 UTC (rev 93520) @@ -27,7 +27,7 @@ <disabled>false</disabled> <triggers class="vector"> <hudson.triggers.TimerTrigger> - <spec>0 20 * * *</spec> + <spec>0 21 * * *</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-15 10:22:04 UTC (rev 93519) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml 2009-09-15 10:31:18 UTC (rev 93520) @@ -27,7 +27,7 @@ <disabled>false</disabled> <triggers class="vector"> <hudson.triggers.TimerTrigger> - <spec>0 21 * * *</spec> + <spec>0 23 * * *</spec> </hudson.triggers.TimerTrigger> </triggers> <axes>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93519 - projects/jboss-osgi/trunk/testsuite.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 06:22:04 -0400 (Tue, 15 Sep 2009) New Revision: 93519 Modified: projects/jboss-osgi/trunk/testsuite/pom.xml Log: Use security manager with remote testing Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-15 09:54:24 UTC (rev 93518) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-15 10:22:04 UTC (rev 93519) @@ -35,7 +35,6 @@  <properties> <version.jboss.naming>5.0.1.GA</version.jboss.naming> - <version.jbossas.client>5.1.0.GA</version.jbossas.client> </properties>  @@ -328,21 +327,6 @@ <properties> <target.container.excludes>org/jboss/test/osgi/nothing-to-exclude</target.container.excludes> </properties> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <version>${version.jbossas.client}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - <type>pom</type> - </dependency> - </dependencies> </profile> <!-- @@ -360,21 +344,6 @@ <properties> <target.container.excludes>org/jboss/test/osgi/nothing-to-exclude</target.container.excludes> </properties> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <version>${version.jbossas.client}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - <type>pom</type> - </dependency> - </dependencies> </profile> <!-- @@ -392,21 +361,6 @@ <properties> <target.container.excludes>org/jboss/test/osgi/nothing-to-exclude</target.container.excludes> </properties> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <version>${version.jbossas.client}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - <type>pom</type> - </dependency> - </dependencies> </profile> <!-- @@ -424,21 +378,6 @@ <properties> <target.container.excludes>org/jboss/test/osgi/nothing-to-exclude</target.container.excludes> </properties> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <version>${version.jbossas.client}</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - <type>pom</type> - </dependency> - </dependencies> </profile> </profiles>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93518 - in projects/jboss-osgi/trunk/testsuite: functional/src/test/java/org/jboss/test/osgi/capabilities and 6 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 05:54:24 -0400 (Tue, 15 Sep 2009) New Revision: 93518 Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml Log: Use CompendiumCapability Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-09-15 09:36:31 UTC (rev 93517) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-09-15 09:54:24 UTC (rev 93518) @@ -61,7 +61,6 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - runtime.installCompendium(); runtime.addCapability(new LogServiceCapability()); OSGiBundle bundle = runtime.getBundle("jboss-osgi-apache-xerces", null); @@ -93,7 +92,6 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - runtime.installCompendium(); runtime.addCapability(new LogServiceCapability()); OSGiBundle bundle = runtime.getBundle("jboss-osgi-jaxb", null); @@ -116,7 +114,6 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - runtime.installCompendium(); runtime.addCapability(new LogServiceCapability()); OSGiBundle bundle = runtime.getBundle("jboss-osgi-xml-binding", null); @@ -139,7 +136,6 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - runtime.installCompendium(); runtime.addCapability(new LogServiceCapability()); OSGiBundle bundle = runtime.getBundle("jboss-osgi-jndi", null); @@ -162,7 +158,6 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - runtime.installCompendium(); runtime.addCapability(new LogServiceCapability()); OSGiBundle bundle = runtime.getBundle("jboss-osgi-jmx", null); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-09-15 09:36:31 UTC (rev 93517) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-09-15 09:54:24 UTC (rev 93518) @@ -34,7 +34,6 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.launch.Framework; -import org.osgi.service.http.HttpService; /** * [JBOSGI-151] Cannot resolve circular dependencies @@ -111,7 +110,6 @@ } @Test - @Ignore public void testCircularInstallCbeforeD() throws Exception { BundleContext sysContext = framework.getBundleContext(); @@ -164,31 +162,7 @@ bundleD.uninstall(); bundleC.uninstall(); } - - @Test - @Ignore - public void testCompendiumAndHttpService() throws Exception - { - BundleContext sysContext = framework.getBundleContext(); - - Bundle httpBundle = sysContext.installBundle(getBundleLocation("bundles/org.apache.felix.http.jetty.jar")); - assertEquals("INSTALLED expected", Bundle.INSTALLED, httpBundle.getState()); - - Bundle cmpnBundle = sysContext.installBundle(getBundleLocation("bundles/org.osgi.compendium.jar")); - assertEquals("INSTALLED expected", Bundle.INSTALLED, cmpnBundle.getState()); - - httpBundle.start(); - assertEquals("ACTIVE expected", Bundle.ACTIVE, httpBundle.getState()); - assertEquals("RESOLVED expected", Bundle.RESOLVED, cmpnBundle.getState()); - - Class<?> classCmpn = cmpnBundle.loadClass(HttpService.class.getName()); - Class<?> classHttp = httpBundle.loadClass(HttpService.class.getName()); - assertEquals("Class for BeanB", classCmpn, classHttp); - - httpBundle.uninstall(); - cmpnBundle.uninstall(); - } - + private String getBundleLocation(String jarname) { return new OSGiTestHelper().getTestArchiveURL(jarname).toExternalForm(); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java 2009-09-15 09:36:31 UTC (rev 93517) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java 2009-09-15 09:54:24 UTC (rev 93518) @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +import org.jboss.osgi.spi.capability.CompendiumCapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; @@ -50,7 +51,7 @@ OSGiRuntime runtime = getDefaultRuntime(); try { - runtime.installCompendium(); + runtime.addCapability(new CompendiumCapability()); OSGiBundle bundleA = runtime.installBundle("jbosgi37-bundleA.jar"); bundleA.start(); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java 2009-09-15 09:36:31 UTC (rev 93517) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java 2009-09-15 09:54:24 UTC (rev 93518) @@ -27,6 +27,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.jboss.osgi.spi.capability.CompendiumCapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; @@ -58,7 +59,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - runtime.installCompendium(); + runtime.addCapability(new CompendiumCapability()); OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); assertTrue("Bundle installed", bundleX.getState() <= Bundle.RESOLVED); @@ -83,7 +84,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - runtime.installCompendium(); + runtime.addCapability(new CompendiumCapability()); OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); assertTrue("Bundle installed", bundleX.getState() <= Bundle.RESOLVED); @@ -112,7 +113,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - runtime.installCompendium(); + runtime.addCapability(new CompendiumCapability()); OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); assertTrue("Bundle installed", bundleX.getState() <= Bundle.RESOLVED); @@ -145,7 +146,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - runtime.installCompendium(); + runtime.addCapability(new CompendiumCapability()); OSGiBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); @@ -184,7 +185,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - runtime.installCompendium(); + runtime.addCapability(new CompendiumCapability()); OSGiBundle bundleA = runtime.installBundle("jbosgi38-bundleA.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-09-15 09:36:31 UTC (rev 93517) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-09-15 09:54:24 UTC (rev 93518) @@ -54,7 +54,6 @@ OSGiRuntime runtime = getDefaultRuntime(); try { - runtime.installCompendium(); runtime.addCapability(new ConfigAdminCapability()); OSGiBundle bundleA = runtime.installBundle("jbosgi41-bundleA.jar"); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java 2009-09-15 09:36:31 UTC (rev 93517) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java 2009-09-15 09:54:24 UTC (rev 93518) @@ -68,7 +68,6 @@ { runtime = new OSGiTestHelper().getDefaultRuntime(); - runtime.installCompendium(); runtime.addCapability(new JNDICapability()); runtime.addCapability(new JMXCapability()); runtime.addCapability(new XMLBindingCapability()); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java 2009-09-15 09:36:31 UTC (rev 93517) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java 2009-09-15 09:54:24 UTC (rev 93518) @@ -25,6 +25,7 @@ import static org.junit.Assert.assertEquals; +import org.jboss.osgi.spi.capability.CompendiumCapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; @@ -45,7 +46,7 @@ OSGiRuntime runtime = getDefaultRuntime(); try { - runtime.installCompendium(); + runtime.addCapability(new CompendiumCapability()); OSGiBundle bundle = runtime.installBundle("service/startlevel.jar"); bundle.start(); Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-15 09:36:31 UTC (rev 93517) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-15 09:54:24 UTC (rev 93518) @@ -397,6 +397,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> <version>${version.jbossas.client}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> <scope>test</scope> <type>pom</type> </dependency>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93517 - in projects/jboss-osgi/projects: bundles/xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb and 3 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 05:36:31 -0400 (Tue, 15 Sep 2009) New Revision: 93517 Added: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java projects/jboss-osgi/projects/bundles/xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/ConfigAdminCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/LogServiceCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java Log: Add CompendiumCapability 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-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -26,6 +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.testing.OSGiRuntime; /** @@ -60,6 +61,8 @@ super(SAXParserFactory.class.getName()); setFilter("(" + PARSER_PROVIDER + "=" + PROVIDER_JBOSS_OSGI + ")"); + addDependency(new CompendiumCapability()); + addBundle("bundles/jboss-osgi-apache-xerces.jar"); } } \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java 2009-09-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/bundles/xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -47,6 +47,7 @@ super (XMLBindingService.class.getName()); addDependency(new JAXBCapability()); + addBundle("bundles/jboss-osgi-common-core.jar"); addBundle("bundles/jboss-osgi-xml-binding.jar"); } Added: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java (rev 0) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -0,0 +1,49 @@ +/* + * 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.osgi.spi.capability; + +//$Id$ + +import org.jboss.osgi.spi.testing.OSGiRuntime; +import org.jboss.osgi.spi.testing.OSGiTestHelper; + +/** + * Adds the OSGi compedium capability to the {@link OSGiRuntime} + * under test. + * + * Installed bundle: org.osgi.compendium.jar + * + * @author thomas.diesler(a)jboss.com + * @since 16-Sep-2009 + */ +public class CompendiumCapability extends Capability +{ + public CompendiumCapability() + { + super(null); + + if (new OSGiTestHelper().isFrameworkEquinox()) + addBundle("bundles/org.eclipse.osgi.services.jar"); + else + addBundle("bundles/org.osgi.compendium.jar"); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/ConfigAdminCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/ConfigAdminCapability.java 2009-09-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/ConfigAdminCapability.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -42,6 +42,9 @@ public ConfigAdminCapability() { super(ConfigurationAdmin.class.getName()); + + addDependency(new CompendiumCapability()); + addBundle("bundles/org.apache.felix.metatype.jar"); addBundle("bundles/org.apache.felix.configadmin.jar"); } Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/LogServiceCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/LogServiceCapability.java 2009-09-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/LogServiceCapability.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -40,6 +40,9 @@ public LogServiceCapability() { super(LogService.class.getName()); + + addDependency(new CompendiumCapability()); + addBundle("bundles/org.apache.felix.log.jar"); addBundle("bundles/jboss-osgi-common.jar"); } Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java 2009-09-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -43,6 +43,8 @@ { super(MicrocontainerService.class.getName()); + addDependency(new CompendiumCapability()); + addBundle("bundles/jboss-osgi-microcontainer.jar"); } } \ No newline at end of file Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-09-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -59,11 +59,6 @@ OSGiBundle installBundle(String location) throws BundleException; /** - * Install the compedium bundle for this runtime - */ - OSGiBundle installCompendium() throws BundleException; - - /** * Get the array of installed {@link OSGiBundle}s */ OSGiBundle[] getBundles(); Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java 2009-09-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -191,4 +191,44 @@ { return getTestHelper().getServerHost(); } + + /** + * Delegates to {@link OSGiTestHelper#getTargetContainer()} + */ + public String getTargetContainer() + { + return getTestHelper().getTargetContainer(); + } + + /** + * Delegates to {@link OSGiTestHelper#getFramework()} + */ + public String getFramework() + { + return getTestHelper().getFramework(); + } + + /** + * Delegates to {@link OSGiTestHelper#isFrameworkEquinox()} + */ + public boolean isFrameworkEquinox() + { + return getTestHelper().isFrameworkEquinox(); + } + + /** + * Delegates to {@link OSGiTestHelper#isFrameworkFelix()} + */ + public boolean isFrameworkFelix() + { + return getTestHelper().isFrameworkFelix(); + } + + /** + * Delegates to {@link OSGiTestHelper#isFrameworkJBossMC()} + */ + public boolean isFrameworkJBossMC() + { + return getTestHelper().isFrameworkJBossMC(); + } } Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java 2009-09-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -184,4 +184,29 @@ { return System.getProperty("jboss.bind.address", "localhost"); } + + public String getTargetContainer() + { + return System.getProperty("target.container"); + } + + public String getFramework() + { + return System.getProperty("framework"); + } + + public boolean isFrameworkEquinox() + { + return "equinox".equals(getTargetContainer()); + } + + public boolean isFrameworkFelix() + { + return "felix".equals(getTargetContainer()); + } + + public boolean isFrameworkJBossMC() + { + return "jbossmc".equals(getTargetContainer()); + } } Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-09-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -87,12 +87,6 @@ return registerBundle(location, bundle); } - public OSGiBundle installCompendium() throws BundleException - { - String compendiumLocation = System.getProperty("org.osgi.compendium.jar", "bundles/org.osgi.compendium.jar"); - return installBundle(compendiumLocation); - } - public OSGiBundle[] getBundles() { List<OSGiBundle> absBundles = new ArrayList<OSGiBundle>(); Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-09-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -83,9 +83,14 @@ for (Capability dependency : capability.getDependencies()) addCapability(dependency); + OSGiServiceReference[] srefs = null; + // Check if the service provided by the capability exists already - OSGiServiceReference[] srefs = getServiceReferences(capability.getServiceName(), capability.getFilter()); - if (srefs == null) + String serviceName = capability.getServiceName(); + if (serviceName != null) + srefs = getServiceReferences(serviceName, capability.getFilter()); + + if (srefs == null || srefs.length == 0) { log.debug("Add capability: " + capability); Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-09-15 08:24:49 UTC (rev 93516) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-09-15 09:36:31 UTC (rev 93517) @@ -94,37 +94,6 @@ } } - public OSGiBundle installCompendium() throws BundleException - { - try - { - RemoteBundle bundle = null; - - // Asume that the compendium is already installed in the remote runtime - for (ManagedBundleMBean bundleMBean : getRemoteFramework().getBundles()) - { - String symbolicName = bundleMBean.getSymbolicName(); - if (symbolicName.equals("org.osgi.compendium") || symbolicName.equals("osgi.cmpn")) - { - bundle = new RemoteBundle(this, bundleMBean, null); - } - } - - if (bundle == null) - throw new BundleException("Cannot obtain compendium"); - - return bundle; - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new BundleException("Cannot obtain compendium", ex); - } - } - @Override public void deploy(String location) throws Exception {

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93516 - in projects/jboss-osgi/trunk: hudson/hudson-home/jobs/jbossosgi-matrix-equinox and 2 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 04:24:49 -0400 (Tue, 15 Sep 2009) New Revision: 93516 Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-actions-spec.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-jbossas-integration.xml Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.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/testsuite/functional/pom.xml Log: Add support for IzPack Ant script. Exclude jboss600/jdk1.5 from all matrix runs. Disable functional tests for equinox. Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-actions-spec.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-actions-spec.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-actions-spec.xml 2009-09-15 08:24:49 UTC (rev 93516) @@ -0,0 +1,10 @@ +<antactions> + <pack name="JBossAS Integration"> + <antcall order="beforepack" buildresource="antBuild.xml" quiet="yes" verbose="no"> + <property name="frameworkSelection" value="${frameworkSelection}"/> + <property name="jbossInstallPath" value="${jbossInstallPath}"/> + <property name="jbossSelection" value="${jbossSelection}"/> + <target name="delete-resources"/> + </antcall> + </pack> +</antactions> \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-actions-spec.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-jbossas-integration.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-jbossas-integration.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-jbossas-integration.xml 2009-09-15 08:24:49 UTC (rev 93516) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <target name="delete-resources" depends="init,delete-jboss600-jbossmc"> + </target> + + <target name="init"> + <condition property="jboss.jboss600.jbossmc"> + <and> + <equals arg1="${frameworkSelection}" arg2="jbossmc"/> + <equals arg1="${jbossSelection}" arg2="jboss600"/> + </and> + </condition> + </target> + + <target name="delete-jboss600-jbossmc" if="jboss.jboss600.jbossmc"> + </target> + +</project> Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-jbossas-integration.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF 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-15 07:18:21 UTC (rev 93515) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-15 08:24:49 UTC (rev 93516) @@ -19,9 +19,20 @@ <locale> <langpack iso3="eng" /> </locale> + +  + <jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" /> + <jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" /> + +  + <listeners> + <listener installer="AntActionInstallerListener" uninstaller="AntActionUninstallerListener" /> + </listeners>  <resources> + <res id="AntActionsSpec.xml" src="@{filtered.resources.dir}/ant-actions-spec.xml" /> + <res id="antBuild.xml" src="@{filtered.resources.dir}/ant-jbossas-integration.xml" type="ant"/> <res id="userInputSpec.xml" src="@{filtered.resources.dir}/user-input-spec.xml" /> <res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt" /> </resources> @@ -57,8 +68,8 @@ <value>jbossmc</value> </condition> <condition type="or" id="isFelixOrEquinox"> - <condition type="ref" refid="isFelix"/> - <condition type="ref" refid="isEquinox"/> + <condition type="ref" refid="isFelix" /> + <condition type="ref" refid="isEquinox" /> </condition> <condition type="variable" id="isJBoss501"> <name>jbossSelection</name> @@ -87,9 +98,9 @@ <panel classname="HelloPanel" /> <panel classname="TargetPanel" /> <panel classname="TreePacksPanel" /> - <panel classname="UserInputPanel" id="framework.select"/> - <panel classname="UserInputPanel" id="jbossas.select.felix.equinox" condition="isFelixOrEquinox"/> - <panel classname="UserInputPanel" id="jbossas.select.jbossmc" condition="isJBossMC"/> + <panel classname="UserInputPanel" id="framework.select" /> + <panel classname="UserInputPanel" id="jbossas.select.felix.equinox" condition="isFelixOrEquinox" /> + <panel classname="UserInputPanel" id="jbossas.select.jbossmc" condition="isJBossMC" /> <panel classname="UserInputPanel" id="jboss.home.select" /> <panel classname="SummaryPanel" /> <panel classname="InstallPanel" /> @@ -98,32 +109,32 @@  <packs> - -  - + <pack name="JBossOSGi Distribution" required="yes"> - + <description>Documentation, Binary Artifacts and Sources</description>  <fileset dir="@{deploy.artifacts.dir}/etc" targetdir="$INSTALL_PATH" override="true"> <include name="JBossORG-EULA.txt" /> - <include name="ReleaseNotes.html"/> + <include name="ReleaseNotes.html" /> </fileset> - +  - <fileset dir="@{deploy.artifacts.dir}/docs/userguide" targetdir="$INSTALL_PATH/docs/userguide" override="true"/> - <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-javadoc-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true"/> - + <fileset dir="@{deploy.artifacts.dir}/docs/userguide" targetdir="$INSTALL_PATH/docs/userguide" override="true" /> + <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-javadoc-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true" /> +  <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-testsuite-example.zip" targetdir="$INSTALL_PATH" unpack="true" override="true" /> - +  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/source" override="true"> <include name="jboss-common-core-sources.jar" /> @@ -148,30 +159,30 @@ <include name="jboss-osgi-webconsole-sources.jar" /> <include name="jboss-osgi-xml-binding-sources.jar" /> </fileset> - + </pack> - -  - + <pack name="JBossOSGi Runtime" required="no" preselected="yes"> - + <description>Standalone JBossOSGi Runtime</description>  - <fileset dir="@{runtime.dir}/bin" targetdir="$INSTALL_PATH/runtime/bin" override="true"/> - <executable targetfile="$INSTALL_PATH/runtime/bin/run.sh" stage="never" keep="true"/> - + <fileset dir="@{runtime.dir}/bin" targetdir="$INSTALL_PATH/runtime/bin" override="true" /> + <executable targetfile="$INSTALL_PATH/runtime/bin/run.sh" stage="never" keep="true" /> +  <fileset dir="@{runtime.dir}/conf" targetdir="$INSTALL_PATH/runtime/conf/META-INF/services" override="true"> <include name="org.jboss.osgi.spi.framework.OSGiBootstrapProvider" /> </fileset> - +  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true"> <include name="args4j.jar" /> @@ -182,17 +193,17 @@ <include name="jboss-vfs.jar" /> <include name="log4j.jar" /> </fileset> - +  - <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/minimal/conf" override="true"/> + <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/minimal/conf" override="true" /> <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> <include name="org.apache.felix.log.jar" /> <include name="jboss-osgi-common.jar" /> <include name="jboss-osgi-hotdeploy.jar" /> </fileset> - +  - <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/default/conf" override="true"/> + <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/default/conf" override="true" /> <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy" override="true">  <include name="jboss-osgi-common-core.jar" /> @@ -201,41 +212,46 @@ </fileset>  - <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/web/conf" override="true"/> + <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/web/conf" override="true" /> <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/web/deploy" override="true">  <include name="jboss-osgi-common-core.jar" /> <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-jndi.jar" /> -  +  <include name="jboss-osgi-webconsole.jar" /> <include name="org.apache.felix.http.jetty.jar" /> </fileset>  - <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/all/conf" override="true"/> + <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/all/conf" override="true" /> <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">  <include name="jboss-osgi-common-core.jar" /> <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-jndi.jar" /> -  +  <include name="jboss-osgi-webconsole.jar" /> <include name="org.apache.felix.http.jetty.jar" /> -  +  <include name="jboss-osgi-apache-xerces.jar" /> <include name="jboss-osgi-blueprint.jar" /> <include name="jboss-osgi-jaxb.jar" /> <include name="jboss-osgi-xml-binding.jar" /> </fileset> - +  - - <singlefile condition="isFelix" src="@{runtime.dir}/conf/jboss-osgi-felix.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" override="true"/> - <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-minimal.properties" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-extra.properties" override="true"/> - <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-default.properties" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-extra.properties" override="true"/> - <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-web.properties" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-extra.properties" override="true"/> - <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties" override="true"/> + + <singlefile condition="isFelix" src="@{runtime.dir}/conf/jboss-osgi-felix.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" + override="true" /> + <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-minimal.properties" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-extra.properties" + override="true" /> + <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-default.properties" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-extra.properties" + override="true" /> + <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-web.properties" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-extra.properties" + override="true" /> + <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties" + override="true" /> <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true"> <include name="jboss-osgi-runtime-felix.jar" /> <include name="org.apache.felix.framework.jar" /> @@ -248,10 +264,11 @@ <include name="org.apache.felix.metatype.jar" /> <include name="jboss-osgi-microcontainer.jar" /> </fileset> - +  - - <singlefile condition="isEquinox" src="@{runtime.dir}/conf/jboss-osgi-equinox.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" override="true"/> + + <singlefile condition="isEquinox" src="@{runtime.dir}/conf/jboss-osgi-equinox.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" + override="true" /> <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true"> <include name="jboss-osgi-runtime-equinox.jar" /> <include name="org.eclipse.osgi.jar" /> @@ -264,13 +281,17 @@ <include name="org.apache.felix.metatype.jar" /> <include name="jboss-osgi-microcontainer.jar" /> </fileset> - +  - - <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-bootstrap.xml" override="true"/> - <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-bootstrap.xml" override="true"/> - <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-bootstrap.xml" override="true"/> - <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-bootstrap.xml" override="true"/> + + <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-bootstrap.xml" + override="true" /> + <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-bootstrap.xml" + override="true" /> + <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-bootstrap.xml" + override="true" /> + <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-bootstrap.xml" + override="true" /> <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true"> <include name="jaxb-api.jar" /> <include name="jboss-classloader.jar" /> @@ -303,32 +324,33 @@ <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> <include name="org.osgi.compendium.jar" /> </fileset> - + </pack> - -  - + <pack name="JBossAS Integration" required="no" preselected="yes"> - + <description>Integration with an existing JBossAS instance</description>  - <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/resources/jbossas-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true"> + <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/resources/jbossas-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" + override="true"> <include name="metadata-deployer-jboss-beans.xml" /> </fileset> - +  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-deployers.jar" /> <include name="jboss-osgi-spi.jar" /> </fileset> - +  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> <include name="jboss-osgi-apache-xerces.jar" /> @@ -340,38 +362,43 @@ <include name="org.apache.felix.http.jetty.jar" /> <include name="org.apache.felix.log.jar" /> </fileset> - +  - - <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> + + <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + override="true"> <include name="jboss-osgi-runtime-felix.jar" /> <include name="jboss-osgi-runtime-jbossas.jar" /> <include name="org.apache.felix.framework.jar" /> </fileset> - <singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml" - target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/> - <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> + <singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" + override="true" /> + <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + override="true"> <include name="jboss-osgi-runtime-jbossas.jar" /> </fileset> <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> <include name="org.apache.felix.configadmin.jar" /> <include name="org.apache.felix.metatype.jar" /> </fileset> - <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.apache.felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> + <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.apache.felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" + override="true"> <include name="org.osgi.compendium.jar" /> </fileset> - +  - - <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> + + <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + override="true"> <include name="jboss-osgi-runtime-equinox.jar" /> <include name="jboss-osgi-runtime-jbossas.jar" /> <include name="org.apache.equinox.framework.jar" /> - <include name="org.eclipse.osgi.jar"/> + <include name="org.eclipse.osgi.jar" /> </fileset> - <singlefile condition="isEquinox" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml" - target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/> - <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> + <singlefile condition="isEquinox" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" + override="true" /> + <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + override="true"> <include name="jboss-osgi-runtime-jbossas.jar" /> </fileset> <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> @@ -379,29 +406,35 @@ <include name="org.apache.felix.metatype.jar" /> <include name="org.eclipse.osgi.services.jar" /> </fileset> - +  - - <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> + + <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + override="true"> <include name="jboss-osgi-runtime-microcontainer.jar" /> </fileset> - <singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml" - target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/> + <singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" + override="true" /> <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/lib" override="true"> <include name="jboss-classloader.jar" /> <include name="jboss-classloading.jar" /> <include name="jboss-dependency.jar" /> </fileset> - <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> + <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + override="true"> <include name="org.osgi.core.jar" /> </fileset> - <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> + <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" + 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-common-core.jar" /> <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-jndi.jar" /> </fileset> - + </pack> </packs> 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-15 07:18:21 UTC (rev 93515) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2009-09-15 08:24:49 UTC (rev 93516) @@ -55,6 +55,7 @@ </values> </axis> </axes> + <combinationFilter>!(container=='jboss600' && jdk=='jdk1.5')</combinationFilter> <builders> <hudson.tasks.Shell> <command> 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-15 07:18:21 UTC (rev 93515) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-09-15 08:24:49 UTC (rev 93516) @@ -55,6 +55,7 @@ </values> </axis> </axes> + <combinationFilter>!(container=='jboss600' && jdk=='jdk1.5')</combinationFilter> <builders> <hudson.tasks.Shell> <command> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-15 07:18:21 UTC (rev 93515) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-15 08:24:49 UTC (rev 93516) @@ -135,7 +135,9 @@ <exclude>org/jboss/test/osgi/jbosgi99/**</exclude> <exclude>org/jboss/test/osgi/jbosgi108/**</exclude> <exclude>org/jboss/test/osgi/jbosgi112/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi142/**</exclude> <exclude>org/jboss/test/osgi/jbosgi143/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi151/**</exclude> <exclude>org/jboss/test/osgi/service/microcontainer/**</exclude> <exclude>org/jboss/test/osgi/service/startlevel/**</exclude> </excludes>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93515 - projects/jboss-osgi/trunk/hudson.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 03:18:21 -0400 (Tue, 15 Sep 2009) New Revision: 93515 Modified: projects/jboss-osgi/trunk/hudson/build.xml Log: Fix jboss-5.1.0.GA download Modified: projects/jboss-osgi/trunk/hudson/build.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/build.xml 2009-09-15 02:50:46 UTC (rev 93514) +++ projects/jboss-osgi/trunk/hudson/build.xml 2009-09-15 07:18:21 UTC (rev 93515) @@ -99,8 +99,8 @@ <get src="${hudson.jboss501.zip}" dest="${thirdparty.dir}/jboss-5.0.1.GA.zip" usetimestamp="true" verbose="true"/> </target> <target name="get-jboss510" depends="init-thirdparty" unless="jboss510.available"> - <property name="hudson.jboss501.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA.zip"/> - <get src="${hudson.jboss501.zip}" dest="${thirdparty.dir}/jboss-5.1.0.GA.zip" usetimestamp="true" verbose="true"/> + <property name="hudson.jboss510.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA.zip"/> + <get src="${hudson.jboss510.zip}" dest="${thirdparty.dir}/jboss-5.1.0.GA.zip" usetimestamp="true" verbose="true"/> </target> <!--

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93507 - projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-14 16:12:35 -0400 (Mon, 14 Sep 2009) New Revision: 93507 Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java Log: Give HttpService 10s for startup Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-09-14 19:53:03 UTC (rev 93506) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-09-14 20:12:35 UTC (rev 93507) @@ -56,8 +56,8 @@ runtime = new OSGiTestHelper().getDefaultRuntime(); runtime.addCapability(new HttpCapability()); - // Allow 5000ms for the HttpService to become available - long timeout = 25; + // Allow 10s for the HttpService to become available + long timeout = 50; OSGiServiceReference sref = runtime.getServiceReference(HttpService.class.getName()); while (sref == null && (timeout--) > 0) {

16 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits September 2009