August 2009 - jboss-osgi-commits - Jboss List Archives

JBoss-OSGI SVN: r92970 - projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser.

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

Author: thomas.diesler(a)jboss.com Date: 2009-08-28 11:56:12 -0400 (Fri, 28 Aug 2009) New Revision: 92970 Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java Log: Use jboss provided service Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java 2009-08-28 15:55:41 UTC (rev 92969) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java 2009-08-28 15:56:12 UTC (rev 92970) @@ -44,6 +44,7 @@ import org.junit.Before; import org.junit.Test; import org.osgi.framework.BundleContext; +import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -109,14 +110,15 @@ assertEquals("content", child.getTextContent()); } - private DocumentBuilder getDocumentBuilder() throws ParserConfigurationException + private DocumentBuilder getDocumentBuilder() throws ParserConfigurationException, InvalidSyntaxException { // This service gets registerd by the jboss-osgi-apache-xerces service - ServiceReference sref = context.getServiceReference(DocumentBuilderFactory.class.getName()); - if (sref == null) + String filter = "(" + XMLParserCapability.PARSER_PROVIDER + "=" + XMLParserCapability.PROVIDER_JBOSS_OSGI + ")"; + ServiceReference[] srefs = context.getServiceReferences(DocumentBuilderFactory.class.getName(), filter); + if (srefs == null) throw new IllegalStateException("DocumentBuilderFactory not available"); - DocumentBuilderFactory factory = (DocumentBuilderFactory)context.getService(sref); + DocumentBuilderFactory factory = (DocumentBuilderFactory)context.getService(srefs[0]); factory.setValidating(false); DocumentBuilder domBuilder = factory.newDocumentBuilder(); Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java 2009-08-28 15:55:41 UTC (rev 92969) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java 2009-08-28 15:56:12 UTC (rev 92970) @@ -43,6 +43,7 @@ import org.junit.Before; import org.junit.Test; import org.osgi.framework.BundleContext; +import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; @@ -102,14 +103,15 @@ assertEquals("content", saxHandler.getContent()); } - private SAXParser getSAXParser() throws SAXException, ParserConfigurationException + private SAXParser getSAXParser() throws SAXException, ParserConfigurationException, InvalidSyntaxException { // This service gets registerd by the jboss-osgi-apache-xerces service - ServiceReference sref = context.getServiceReference(SAXParserFactory.class.getName()); - if (sref == null) + String filter = "(" + XMLParserCapability.PARSER_PROVIDER + "=" + XMLParserCapability.PROVIDER_JBOSS_OSGI + ")"; + ServiceReference[] srefs = context.getServiceReferences(SAXParserFactory.class.getName(), filter); + if (srefs == null) throw new IllegalStateException("SAXParserFactory not available"); - SAXParserFactory factory = (SAXParserFactory)context.getService(sref); + SAXParserFactory factory = (SAXParserFactory)context.getService(srefs[0]); factory.setValidating(false); SAXParser saxParser = factory.newSAXParser();

16 years, 3 months

1
0
0 / 0

JBoss-OSGI SVN: r92969 - 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-08-28 11:55:41 -0400 (Fri, 28 Aug 2009) New Revision: 92969 Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java Log: Improve service logging Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java =================================================================== --- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java 2009-08-28 15:33:48 UTC (rev 92968) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java 2009-08-28 15:55:41 UTC (rev 92969) @@ -23,6 +23,7 @@ //$Id$ +import java.util.Arrays; import java.util.Hashtable; import javax.xml.parsers.DocumentBuilderFactory; @@ -31,6 +32,8 @@ import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.osgi.xml.internal.XMLParserActivator; import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; +import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; @@ -116,18 +119,23 @@ props.put(XMLParserCapability.PARSER_PROVIDER, XMLParserCapability.PROVIDER_JBOSS_OSGI); } - private void logSAXParserFactory(BundleContext context) + private void logSAXParserFactory(BundleContext context) throws InvalidSyntaxException { - ServiceReference saxRef = context.getServiceReference(SAXParserFactory.class.getName()); - if (saxRef != null) + ServiceReference[] saxRefs = context.getServiceReferences(SAXParserFactory.class.getName(), null); + if (saxRefs != null) { - Object factory = context.getService(saxRef); - log.log(LogService.LOG_DEBUG, "SAXParserFactory: " + factory.getClass().getName()); + for (ServiceReference sref : saxRefs) + { + Object factory = context.getService(sref); + log.log(LogService.LOG_DEBUG, "SAXParserFactory: " + factory.getClass().getName()); - for (String key : saxRef.getPropertyKeys()) - { - Object value = saxRef.getProperty(key); - log.log(LogService.LOG_DEBUG, " " + key + "=" + value); + for (String key : sref.getPropertyKeys()) + { + Object value = sref.getProperty(key); + if (key.equals(Constants.OBJECTCLASS)) + value = Arrays.asList((String[])value); + log.log(LogService.LOG_DEBUG, " " + key + "=" + value); + } } } else @@ -136,18 +144,23 @@ } } - private void logDOMParserFactory(BundleContext context) + private void logDOMParserFactory(BundleContext context) throws InvalidSyntaxException { - ServiceReference domRef = context.getServiceReference(DocumentBuilderFactory.class.getName()); - if (domRef != null) + ServiceReference[] domRefs = context.getServiceReferences(DocumentBuilderFactory.class.getName(), null); + if (domRefs != null) { - Object factory = context.getService(domRef); - log.log(LogService.LOG_DEBUG, "DocumentBuilderFactory: " + factory.getClass().getName()); + for (ServiceReference sref : domRefs) + { + Object factory = context.getService(sref); + log.log(LogService.LOG_DEBUG, "DocumentBuilderFactory: " + factory.getClass().getName()); - for (String key : domRef.getPropertyKeys()) - { - Object value = domRef.getProperty(key); - log.log(LogService.LOG_DEBUG, " " + key + "=" + value); + for (String key : sref.getPropertyKeys()) + { + Object value = sref.getProperty(key); + if (key.equals(Constants.OBJECTCLASS)) + value = Arrays.asList((String[])value); + log.log(LogService.LOG_DEBUG, " " + key + "=" + value); + } } } else

16 years, 3 months

1
0
0 / 0

JBoss-OSGI SVN: r92968 - in projects/jboss-osgi/trunk: reactor/blueprint and 9 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-08-28 11:33:48 -0400 (Fri, 28 Aug 2009) New Revision: 92968 Added: projects/jboss-osgi/trunk/testsuite/example/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/impl/.project projects/jboss-osgi/trunk/reactor/blueprint/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 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/jbosgi108/OSGI108TestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml Log: Update versions Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/pom.xml 2009-08-28 15:33:48 UTC (rev 92968) @@ -42,15 +42,15 @@ <version.apache.felix.log>1.1.0-SNAPSHOT</version.apache.felix.log> <version.apache.felix.metatype>1.0.2</version.apache.felix.metatype> <version.izpack>4.3.1</version.izpack> - <version.jboss.osgi.apache.xerces>2.9.1.SP1</version.jboss.osgi.apache.xerces> + <version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces> <version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint> <version.jboss.osgi.common>1.0.1-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13-SNAPSHOT</version.jboss.osgi.common.core> <version.jboss.osgi.hotdeploy>1.0.0</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP1</version.jboss.osgi.jaxb> - <version.jboss.osgi.jmx>1.0.0</version.jboss.osgi.jmx> - <version.jboss.osgi.jndi>1.0.0</version.jboss.osgi.jndi> + <version.jboss.osgi.jmx>1.0.1-SNAPSHOT</version.jboss.osgi.jmx> + <version.jboss.osgi.jndi>1.0.1-SNAPSHOT</version.jboss.osgi.jndi> <version.jboss.osgi.microcontainer>1.0.1-SNAPSHOT</version.jboss.osgi.microcontainer> <version.jboss.osgi.runtime.deployers>1.0.1-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.runtime.equinox>3.5-SNAPSHOT</version.jboss.osgi.runtime.equinox> @@ -63,6 +63,149 @@ <version.osgi>r4v42-20090728</version.osgi> </properties> +  + <dependencyManagement> + <dependencies> + +  + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + <version>${version.jboss.osgi.spi}</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-apache-xerces</artifactId> + <version>${version.jboss.osgi.apache.xerces}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-blueprint</artifactId> + <version>${version.jboss.osgi.blueprint}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common-core</artifactId> + <version>${version.jboss.osgi.common.core}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-hotdeploy</artifactId> + <version>${version.jboss.osgi.hotdeploy}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-husky</artifactId> + <version>${version.jboss.osgi.husky}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jaxb</artifactId> + <version>${version.jboss.osgi.jaxb}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <version>${version.jboss.osgi.jmx}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jndi</artifactId> + <version>${version.jboss.osgi.jndi}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-microcontainer</artifactId> + <version>${version.jboss.osgi.microcontainer}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-webconsole</artifactId> + <version>${version.jboss.osgi.webconsole}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-xml-binding</artifactId> + <version>${version.jboss.osgi.xml.binding}</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployers</artifactId> + <version>${version.jboss.osgi.runtime.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-runtime-jbossas</artifactId> + <version>${version.jboss.osgi.runtime.jbossas}</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-runtime-equinox</artifactId> + <version>${version.jboss.osgi.runtime.equinox}</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version.jboss.osgi.runtime.felix}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.configadmin</artifactId> + <version>${version.apache.felix.configadmin}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.jetty</artifactId> + <version>${version.apache.felix.http.jetty}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <version>${version.apache.felix.log}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.metatype</artifactId> + <version>${version.apache.felix.metatype}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${version.apache.felix.core}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${version.apache.felix.core}</version> + </dependency> + +  + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${version.osgi}</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${version.osgi}</version> + </dependency> + </dependencies> + </dependencyManagement> +  <repositories> <repository> Modified: projects/jboss-osgi/trunk/reactor/blueprint/impl/.project =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/impl/.project 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/reactor/blueprint/impl/.project 2009-08-28 15:33:48 UTC (rev 92968) @@ -17,7 +17,7 @@ </buildCommand> </buildSpec> <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> </natures> </projectDescription> Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-08-28 15:33:48 UTC (rev 92968) @@ -25,75 +25,14 @@  <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.2-SNAPSHOT</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta4</version> </parent> -  - <properties> - <version.apache.felix.log>1.0.0</version.apache.felix.log> - <version.jboss.osgi.common.core>2.2.13-SNAPSHOT</version.jboss.osgi.common.core> - <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky> - <version.jboss.osgi.microcontainer>1.0.1-SNAPSHOT</version.jboss.osgi.microcontainer> - <version.jboss.osgi.runtime.felix>1.9.0-SNAPSHOT</version.jboss.osgi.runtime.felix> - <version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi> - <version.osgi>r4v42-20090728</version.osgi> - </properties> -  <modules> <module>impl</module> <module>testsuite</module> </modules> -  - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <version>${version.apache.felix.log}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common-core</artifactId> - <version>${version.jboss.osgi.common.core}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <version>${version.jboss.osgi.husky}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - <version>${version.jboss.osgi.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version.jboss.osgi.runtime.felix}</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>${version.osgi}</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>${version.osgi}</version> - </dependency> - </dependencies> - </dependencyManagement> - -  - <profiles> - </profiles> - </project> Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-08-28 15:33:48 UTC (rev 92968) @@ -73,6 +73,11 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-apache-xerces</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common-core</artifactId> <scope>provided</scope> </dependency> @@ -81,6 +86,11 @@ <artifactId>jboss-osgi-husky</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <scope>provided</scope> + </dependency>  <dependency> Added: projects/jboss-osgi/trunk/testsuite/example/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/.settings/org.maven.ide.eclipse.prefs 2009-08-28 15:33:48 UTC (rev 92968) @@ -0,0 +1,9 @@ +#Fri Aug 28 15:55:21 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-08-28 15:33:48 UTC (rev 92968) @@ -162,7 +162,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <exclude>org/jboss/test/osgi/**</exclude> + <exclude>org/jboss/test/osgi/foo/**</exclude> </excludes> </configuration> </plugin> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2009-08-28 15:33:48 UTC (rev 92968) @@ -58,7 +58,7 @@ private OSGiBundle bundle; @Before - public void setUp() throws BundleException + public void setUp() throws Exception { // Only do this if we are not within the OSGi Runtime if (context == null) Added: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-08-28 15:33:48 UTC (rev 92968) @@ -0,0 +1,44 @@ +# +# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider +# +# $Id$ +# + +# The OSGiFramework implementation +org.jboss.osgi.spi.framework.impl=org.jboss.osgi.equinox.framework.EquinoxIntegration + +# Properties to configure the Framework +org.osgi.framework.storage=${basedir}/target/osgi-store +org.osgi.framework.storage.clean=onFirstInit + +# Extra System Packages +org.osgi.framework.system.packages.extra=\ + org.jboss.logging, \ + org.jboss.net.protocol, \ + org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.framework;version=1.0, \ + org.jboss.osgi.spi.logging;version=1.0, \ + org.jboss.osgi.spi.management;version=1.0, \ + 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.virtual, \ + org.jboss.virtual.plugins.registry, \ + org.jboss.virtual.plugins.context.jar, \ + org.jboss.virtual.plugins.vfs.helpers, \ + org.jboss.virtual.protocol, \ + org.jboss.util, \ + org.jboss.util.id, \ + org.jboss.util.threadpool, \ + org.jboss.util.propertyeditor, \ + org.osgi.framework;version\=1.4 + +# Bundles that need to be installed with the Framework automatically +org.jboss.osgi.spi.framework.autoInstall=\ + file://${test.archive.directory}/bundles/org.osgi.compendium.jar + +# Bundles that need to be started automatically +org.jboss.osgi.spi.framework.autoStart=\ + file://${test.archive.directory}/bundles/org.apache.felix.log.jar \ + file://${test.archive.directory}/bundles/jboss-osgi-common.jar Property changes on: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF 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-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-08-28 15:33:48 UTC (rev 92968) @@ -45,7 +45,6 @@ import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.xml.XMLParserCapability; import org.junit.Test; -import org.osgi.framework.BundleException; /** * Test OSGi runtime capabilities @@ -56,7 +55,7 @@ public class CapabilityTestCase extends OSGiTest { @Test - public void testXMLParserCapability() throws BundleException + public void testXMLParserCapability() throws Exception { OSGiRuntime runtime = getEmbeddedRuntime(); try @@ -85,7 +84,7 @@ } @Test - public void testJAXBCapability() throws BundleException + public void testJAXBCapability() throws Exception { OSGiRuntime runtime = getEmbeddedRuntime(); try @@ -105,7 +104,7 @@ } @Test - public void testXMLBindingCapability() throws BundleException + public void testXMLBindingCapability() throws Exception { OSGiRuntime runtime = getEmbeddedRuntime(); try @@ -125,7 +124,7 @@ } @Test - public void testJNDICapability() throws BundleException + public void testJNDICapability() throws Exception { OSGiRuntime runtime = getEmbeddedRuntime(); try Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java 2009-08-28 15:33:48 UTC (rev 92968) @@ -53,7 +53,7 @@ private static OSGiRuntime runtime; @BeforeClass - public static void beforeClass() throws BundleException + public static void beforeClass() throws Exception { runtime = new OSGiTestHelper().getDefaultRuntime(); runtime.addCapability(new JMXCapability()); Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-08-28 15:33:48 UTC (rev 92968) @@ -46,14 +46,12 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> </dependency>  <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> - <version>${version.apache.felix.configadmin}</version> <scope>provided</scope> <exclusions> <exclusion> @@ -69,7 +67,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.jetty</artifactId> - <version>${version.apache.felix.http.jetty}</version> <scope>provided</scope> <exclusions> <exclusion> @@ -85,7 +82,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> - <version>${version.apache.felix.log}</version> <scope>provided</scope> <exclusions> <exclusion> @@ -101,7 +97,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.metatype</artifactId> - <version>${version.apache.felix.metatype}</version> <scope>provided</scope> <exclusions> <exclusion> @@ -116,20 +111,22 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-apache-xerces</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-blueprint</artifactId> - <version>${version.jboss.osgi.blueprint}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-husky</artifactId> - <version>${version.jboss.osgi.husky}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> - <version>${version.jboss.osgi.common}</version> <scope>provided</scope> </dependency>

16 years, 3 months

1
0
0 / 0

JBoss-OSGI SVN: r92966 - in projects/jboss-osgi/projects/bundles/jmx/trunk: src/main/java/org/jboss/osgi/jmx and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2009-08-28 11:30:29 -0400 (Fri, 28 Aug 2009) New Revision: 92966 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java Log: Update versions Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-08-28 15:30:03 UTC (rev 92965) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-08-28 15:30:29 UTC (rev 92966) @@ -21,20 +21,20 @@ <artifactId>jboss-osgi-jmx</artifactId> <packaging>bundle</packaging> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent>  <properties> <version.jboss.osgi.common.core>2.2.11.SP1</version.jboss.osgi.common.core> - <version.jboss.osgi.jndi>1.0.0</version.jboss.osgi.jndi> - <version.osgi>r4v41</version.osgi> + <version.jboss.osgi.jndi>1.0.1-SNAPSHOT</version.jboss.osgi.jndi> + <version.osgi>r4v42-20090728</version.osgi> </properties>  Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2009-08-28 15:30:03 UTC (rev 92965) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2009-08-28 15:30:29 UTC (rev 92966) @@ -23,8 +23,6 @@ //$Id$ -import java.util.Properties; - import javax.management.MBeanServer; import org.jboss.osgi.spi.capability.Capability; @@ -55,9 +53,8 @@ { super(MBeanServer.class.getName()); - Properties props = getProperties(); - props.setProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost")); - props.setProperty("org.jboss.osgi.jmx.rmi.port", "1198"); + addSystemProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost")); + addSystemProperty("org.jboss.osgi.jmx.rmi.port", "1198"); addBundle("bundles/jboss-osgi-jmx.jar"); }

16 years, 3 months

1
0
0 / 0

JBoss-OSGI SVN: r92965 - in projects/jboss-osgi/projects/bundles/jndi/trunk: src/main/java/org/jboss/osgi/jndi and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2009-08-28 11:30:03 -0400 (Fri, 28 Aug 2009) New Revision: 92965 Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java Log: Update versions Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-08-28 15:28:28 UTC (rev 92964) +++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-08-28 15:30:03 UTC (rev 92965) @@ -21,20 +21,20 @@ <artifactId>jboss-osgi-jndi</artifactId> <packaging>bundle</packaging> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent>  <properties> <version.jboss.naming>5.0.1.GA</version.jboss.naming> - <version.jboss.osgi.common>1.0.0</version.jboss.osgi.common> - <version.osgi>r4v41</version.osgi> + <version.jboss.osgi.common>1.0.1-SNAPSHOT</version.jboss.osgi.common> + <version.osgi>r4v42-20090728</version.osgi> </properties>  Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2009-08-28 15:28:28 UTC (rev 92964) +++ projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2009-08-28 15:30:03 UTC (rev 92965) @@ -23,8 +23,6 @@ //$Id$ -import java.util.Properties; - import javax.naming.InitialContext; import org.jboss.osgi.spi.capability.Capability; @@ -56,10 +54,9 @@ { super(InitialContext.class.getName()); - Properties props = getProperties(); - props.setProperty("org.jboss.osgi.jndi.host", System.getProperty("jboss.bind.address", "localhost")); - props.setProperty("org.jboss.osgi.jndi.rmi.port", "1198"); - props.setProperty("org.jboss.osgi.jndi.port", "1199"); + addSystemProperty("org.jboss.osgi.jndi.host", System.getProperty("jboss.bind.address", "localhost")); + addSystemProperty("org.jboss.osgi.jndi.rmi.port", "1198"); + addSystemProperty("org.jboss.osgi.jndi.port", "1199"); addBundle("bundles/jboss-osgi-common-core.jar"); addBundle("bundles/jboss-osgi-jndi.jar");

16 years, 3 months

1
0
0 / 0

JBoss-OSGI SVN: r92964 - in projects/jboss-osgi/projects/bundles/apache-xerces/trunk: src/main/java/org/jboss/osgi/xml and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2009-08-28 11:28:28 -0400 (Fri, 28 Aug 2009) New Revision: 92964 Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java Log: Add support for service (provider=jboss.osgi) Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-08-28 15:27:02 UTC (rev 92963) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-08-28 15:28:28 UTC (rev 92964) @@ -21,21 +21,21 @@ <artifactId>jboss-osgi-apache-xerces</artifactId> <packaging>bundle</packaging> - <version>2.9.1.SP1</version> + <version>2.9.1-SNAPSHOT</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <properties> <version.apache.xerces>2.9.1</version.apache.xerces> - <version.jboss.osgi.common>1.0.0</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.1-SNAPSHOT</version.jboss.osgi.common> <version.wutka.dtdparser>1.2.1</version.wutka.dtdparser> <version.xml.resolver>1.2</version.xml.resolver> - <version.osgi>r4v41</version.osgi> + <version.osgi>r4v42-20090728</version.osgi> </properties> <dependencies> Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java =================================================================== --- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java 2009-08-28 15:27:02 UTC (rev 92963) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java 2009-08-28 15:28:28 UTC (rev 92964) @@ -42,56 +42,29 @@ */ public class XMLParserActivatorExt extends XMLParserActivator { - /* - * Service property specifying if factory is configured to support XInclude aware parsers. - * The value is of type <code>Boolean</code>. - */ - public static final String PARSER_XINCLUDEAWARE = "parser.xincludeAware"; - private LogService log; public void start(BundleContext context) throws Exception { log = new LogServiceTracker(context); - + super.start(context); - + logSAXParserFactory(context); logDOMParserFactory(context); } - + @Override @SuppressWarnings("unchecked") public void setDOMProperties(DocumentBuilderFactory factory, Hashtable props) { - // check if this parser can be configured to validate - boolean validating = true; - factory.setValidating(true); - factory.setNamespaceAware(false); - try - { - factory.newDocumentBuilder(); - } - catch (Exception pce_val) - { - validating = false; - } + super.setDOMProperties(factory, props); - // check if this parser can be configured to be namespaceaware - boolean namespaceaware = true; - factory.setValidating(false); - factory.setNamespaceAware(true); - try - { - factory.newDocumentBuilder(); - } - catch (Exception pce_nsa) - { - namespaceaware = false; - } + boolean xinclude = true; + Boolean validating = (Boolean)props.get(PARSER_VALIDATING); + Boolean namespaceaware = (Boolean)props.get(PARSER_NAMESPACEAWARE); // check if this parser can be configured to be xinclude aware - boolean xinclude = true; factory.setValidating(validating); factory.setNamespaceAware(namespaceaware); factory.setXIncludeAware(true); @@ -105,49 +78,24 @@ } // set the factory values - factory.setValidating(validating); - factory.setNamespaceAware(namespaceaware); factory.setXIncludeAware(xinclude); - + // set the OSGi service properties - props.put(PARSER_VALIDATING, new Boolean(validating)); - props.put(PARSER_NAMESPACEAWARE, new Boolean(namespaceaware)); - props.put(PARSER_XINCLUDEAWARE, new Boolean(xinclude)); + props.put(XMLParserCapability.PARSER_XINCLUDEAWARE, new Boolean(xinclude)); + props.put(XMLParserCapability.PARSER_PROVIDER, XMLParserCapability.PROVIDER_JBOSS_OSGI); } - @Override @SuppressWarnings("unchecked") public void setSAXProperties(SAXParserFactory factory, Hashtable props) { - // check if this parser can be configured to validate - boolean validating = true; - factory.setValidating(true); - factory.setNamespaceAware(false); - try - { - factory.newSAXParser(); - } - catch (Exception pce_val) - { - validating = false; - } + super.setSAXProperties(factory, props); - // check if this parser can be configured to be namespaceaware - boolean namespaceaware = true; - factory.setValidating(false); - factory.setNamespaceAware(true); - try - { - factory.newSAXParser(); - } - catch (Exception pce_nsa) - { - namespaceaware = false; - } - - // check if this parser can be configured to be xinclude aware boolean xinclude = true; + Boolean validating = (Boolean)props.get(PARSER_VALIDATING); + Boolean namespaceaware = (Boolean)props.get(PARSER_NAMESPACEAWARE); + + // check if this parser can be configured to be xinclude aware factory.setValidating(validating); factory.setNamespaceAware(namespaceaware); factory.setXIncludeAware(true); @@ -161,14 +109,11 @@ } // set the factory values - factory.setValidating(validating); - factory.setNamespaceAware(namespaceaware); factory.setXIncludeAware(xinclude); // set the OSGi service properties - props.put(PARSER_NAMESPACEAWARE, new Boolean(namespaceaware)); - props.put(PARSER_VALIDATING, new Boolean(validating)); - props.put(PARSER_XINCLUDEAWARE, new Boolean(xinclude)); + props.put(XMLParserCapability.PARSER_XINCLUDEAWARE, new Boolean(xinclude)); + props.put(XMLParserCapability.PARSER_PROVIDER, XMLParserCapability.PROVIDER_JBOSS_OSGI); } private void logSAXParserFactory(BundleContext context) @@ -178,7 +123,7 @@ { Object factory = context.getService(saxRef); log.log(LogService.LOG_DEBUG, "SAXParserFactory: " + factory.getClass().getName()); - + for (String key : saxRef.getPropertyKeys()) { Object value = saxRef.getProperty(key); @@ -191,7 +136,6 @@ } } - private void logDOMParserFactory(BundleContext context) { ServiceReference domRef = context.getServiceReference(DocumentBuilderFactory.class.getName()); @@ -199,7 +143,7 @@ { Object factory = context.getService(domRef); log.log(LogService.LOG_DEBUG, "DocumentBuilderFactory: " + factory.getClass().getName()); - + for (String key : domRef.getPropertyKeys()) { Object value = domRef.getProperty(key); 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-08-28 15:27:02 UTC (rev 92963) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java 2009-08-28 15:28:28 UTC (rev 92964) @@ -29,8 +29,7 @@ import org.jboss.osgi.spi.testing.OSGiRuntime; /** - * Adds the XML parser capability to the {@link OSGiRuntime} - * under test. + * Adds the XML parser capability to the {@link OSGiRuntime} under test. * * It is ignored if the {@link SAXParserFactory} is already registered. * @@ -41,10 +40,26 @@ */ public class XMLParserCapability extends Capability { + /* + * Service property key for the 'provider' of this service. + */ + public static final String PARSER_PROVIDER = "provider"; + /* + * Service property value for the 'provider' of this service. + * The value is <code>jboss.osgi</code>. + */ + public static final String PROVIDER_JBOSS_OSGI = "jboss.osgi"; + /* + * Service property specifying if factory is configured to support XInclude aware parsers. + * The value is of type <code>Boolean</code>. + */ + public static final String PARSER_XINCLUDEAWARE = "parser.xincludeAware"; + public XMLParserCapability() { super(SAXParserFactory.class.getName()); - + setFilter("(" + PARSER_PROVIDER + "=" + PROVIDER_JBOSS_OSGI + ")"); + addBundle("bundles/jboss-osgi-apache-xerces.jar"); } } \ No newline at end of file

16 years, 3 months

1
0
0 / 0

JBoss-OSGI SVN: r92962 - projects/jboss-osgi/projects/bundles/common/trunk.

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

Author: thomas.diesler(a)jboss.com Date: 2009-08-28 11:26:56 -0400 (Fri, 28 Aug 2009) New Revision: 92962 Modified: projects/jboss-osgi/projects/bundles/common/trunk/pom.xml Log: Update versions Modified: projects/jboss-osgi/projects/bundles/common/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-08-28 15:23:38 UTC (rev 92961) +++ projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-08-28 15:26:56 UTC (rev 92962) @@ -27,13 +27,12 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <properties> - <version.jboss.logging>2.0.5.GA</version.jboss.logging> - <version.jboss.osgi.spi>1.0.0</version.jboss.osgi.spi> - <version.osgi>r4v41</version.osgi> + <version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi> + <version.osgi>r4v42-20090728</version.osgi> </properties>  @@ -44,13 +43,6 @@ <version>${version.jboss.osgi.spi}</version> </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - <version>${version.jboss.logging}</version> - <scope>provided</scope> - </dependency> -  <dependency> <groupId>org.osgi</groupId>

16 years, 3 months

1
0
0 / 0

JBoss-OSGI SVN: r92961 - in projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi: testing and 1 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-08-28 11:23:38 -0400 (Fri, 28 Aug 2009) New Revision: 92961 Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/Capability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.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/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: Support service filter in Capability Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/Capability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/Capability.java 2009-08-28 15:00:30 UTC (rev 92960) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/Capability.java 2009-08-28 15:23:38 UTC (rev 92961) @@ -24,22 +24,19 @@ //$Id$ import java.util.ArrayList; -import java.util.LinkedHashSet; +import java.util.Collections; +import java.util.HashMap; import java.util.List; -import java.util.Properties; -import java.util.Set; +import java.util.Map; import org.jboss.osgi.spi.testing.OSGiRuntime; /** - * An abstract OSGi capability that can be installed in an - * {@link OSGiRuntime}. + * An abstract OSGi capability that can be installed in an {@link OSGiRuntime}. * - * The capability is only installed if the service name given in the constructor - * is not already registered with the OSGi framework. + * The capability is only installed if the service name given in the constructor is not already registered with the OSGi framework. * - * It maintains an ordered set of dependent capabilities and bundles that - * must be installed to provide the functionality advertised by this capability. + * It maintains an ordered set of dependent capabilities and bundles that must be installed to provide the functionality advertised by this capability. * * @author thomas.diesler(a)jboss.com * @since 05-May-2009 @@ -47,19 +44,33 @@ public abstract class Capability { private String serviceName; - private Properties props = new Properties(); - - private Set<Capability> dependencies = new LinkedHashSet<Capability>(); - private Set<String> bundles = new LinkedHashSet<String>(); + private String filter; + private Map<String, String> systemProperties; + private List<Capability> dependencies; + private List<String> bundles; + /** - * Construct a capability that is identified by the given service name. - * If the service name is already registered with the {@link OSGiRuntime} - * adding this capability does nothing. + * Construct a capability that is identified by the given service name. + * + * If the service name is already registered with the {@link OSGiRuntime} adding this capability + * does nothing. */ public Capability(String serviceName) { + this(serviceName, null); + } + + /** + * Construct a capability that is identified by the given service name and filter string. + * + * If the service is already registered with the {@link OSGiRuntime} adding this capability + * does nothing. + */ + public Capability(String serviceName, String filter) + { this.serviceName = serviceName; + this.filter = filter; } /** @@ -71,33 +82,80 @@ } /** - * Get system properties provided by this capability. + * Get the filter that is used for service lookup. + */ + public String getFilter() + { + return filter; + } + + /** + * Set the filter that is used for service lookup. + */ + public void setFilter(String filter) + { + this.filter = filter; + } + + /** + * Add a system property provided by this capability. * - * Adding this capability will set the associated system properties - * if a propperty is not set already. + * Adding this capability will set the associated system properties if a propperty is not set already. */ - public Properties getProperties() + public void addSystemProperty(String key, String value) { - return props; + getPropertiesInternal().put(key, value); } + /** + * Get the system properties for this capability. + */ + public Map<String, String> getSystemProperties() + { + return Collections.unmodifiableMap(getPropertiesInternal()); + } + public List<Capability> getDependencies() { - return new ArrayList<Capability>(dependencies); + return Collections.unmodifiableList(getDependenciesInternal()); } - + + protected void addDependency(Capability dependency) + { + getDependenciesInternal().add(dependency); + } + public List<String> getBundles() { - return new ArrayList<String>(bundles); + return Collections.unmodifiableList(getBundlesInternal()); } protected void addBundle(String bundle) { - bundles.add(bundle); + getBundlesInternal().add(bundle); } - protected void addDependency(Capability dependency) + private Map<String, String> getPropertiesInternal() { - dependencies.add(dependency); + if (systemProperties == null) + systemProperties = new HashMap<String, String>(); + + return systemProperties; } + + private List<Capability> getDependenciesInternal() + { + if (dependencies == null) + dependencies = new ArrayList<Capability>(); + + return dependencies; + } + + private List<String> getBundlesInternal() + { + if (bundles == null) + bundles = new ArrayList<String>(); + + return bundles; + } } \ No newline at end of file Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java 2009-08-28 15:00:30 UTC (rev 92960) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java 2009-08-28 15:23:38 UTC (rev 92961) @@ -23,8 +23,6 @@ //$Id$ -import java.util.Properties; - import org.jboss.osgi.spi.testing.OSGiRuntime; import org.osgi.service.http.HttpService; @@ -51,9 +49,7 @@ public HttpCapability() { super(HttpService.class.getName()); - - Properties props = getProperties(); - props.setProperty("org.osgi.service.http.port", "8090"); + addSystemProperty("org.osgi.service.http.port", "8090"); addBundle("bundles/org.apache.felix.http.jetty.jar"); } 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-08-28 15:00:30 UTC (rev 92960) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-08-28 15:23:38 UTC (rev 92961) @@ -44,7 +44,7 @@ * Adding a capability recursively adds the orderded set of dependent capabilities * before it installs and starts the orderded set bundles. */ - void addCapability(Capability capability) throws BundleException; + void addCapability(Capability capability) throws BundleException, InvalidSyntaxException; /** * Remove a {@link Capability} from the runtime. 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-08-28 15:00:30 UTC (rev 92960) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-08-28 15:23:38 UTC (rev 92961) @@ -25,9 +25,9 @@ import java.net.URL; import java.util.ArrayList; -import java.util.Enumeration; import java.util.List; -import java.util.Properties; +import java.util.Map; +import java.util.Map.Entry; import javax.management.MBeanServer; import javax.management.MBeanServerConnection; @@ -125,16 +125,15 @@ } @Override - public void addCapability(Capability capability) throws BundleException + public void addCapability(Capability capability) throws BundleException, InvalidSyntaxException { // Copy the properties to the System props - Properties props = capability.getProperties(); - Enumeration<?> names = props.propertyNames(); - while (names.hasMoreElements()) + Map<String, String> props = capability.getSystemProperties(); + for (Entry<String, String> entry : props.entrySet()) { - String key = (String)names.nextElement(); - String value = props.getProperty(key); - System.setProperty(key, value); + String value = System.getProperty(entry.getKey()); + if (value == null) + System.setProperty(entry.getKey(), entry.getValue()); } super.addCapability(capability); 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-08-28 15:00:30 UTC (rev 92960) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-08-28 15:23:38 UTC (rev 92961) @@ -48,6 +48,7 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; +import org.osgi.framework.InvalidSyntaxException; /** * An abstract implementation of the {@link OSGiRuntime} @@ -74,15 +75,15 @@ return helper; } - public void addCapability(Capability capability) throws BundleException + public void addCapability(Capability capability) throws BundleException, InvalidSyntaxException { // Add dependent capabilies for (Capability dependency : capability.getDependencies()) addCapability(dependency); // Check if the service provided by the capability exists already - OSGiServiceReference sref = getServiceReference(capability.getServiceName()); - if (sref == null) + OSGiServiceReference[] srefs = getServiceReferences(capability.getServiceName(), capability.getFilter()); + if (srefs == null) { log.debug("Add capability: " + capability); @@ -113,14 +114,14 @@ { log.debug("Remove capability : " + capability); - List<String> bundleLocations = capability.getBundles(); + List<String> bundleLocations = new ArrayList<String>(capability.getBundles()); Collections.reverse(bundleLocations); for (String location : bundleLocations) failsafeUninstall(bundles.remove(location)); } - List<Capability> dependencies = capability.getDependencies(); + List<Capability> dependencies = new ArrayList<Capability>(capability.getDependencies()); Collections.reverse(dependencies); // Remove dependent capabilities 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-08-28 15:00:30 UTC (rev 92960) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-08-28 15:23:38 UTC (rev 92961) @@ -25,7 +25,6 @@ import java.net.URL; import java.util.HashSet; -import java.util.Properties; import java.util.Set; import javax.management.MBeanException; @@ -34,7 +33,6 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import org.jboss.osgi.spi.capability.Capability; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.management.MBeanProxyException; @@ -293,23 +291,4 @@ ObjectName oname = new ObjectName("jboss.system:service=MainDeployer"); getMBeanServer().invoke(oname, method, new Object[] { archiveURL }, new String[] { "java.net.URL" }); } - - /** - * A copy of the RemoteLogCapability from the - * jboss-osgi-remotelog bundle, on which the SPI - * should not have a dependency. - */ - class RemoteLogCapability extends Capability - { - public RemoteLogCapability() - { - super("org.jboss.osgi.remotelog.RemoteLogService"); - - Properties props = getProperties(); - props.setProperty("org.jboss.osgi.service.remote.log.reader", "true"); - props.setProperty("org.jboss.osgi.service.remote.log.host", System.getProperty("jboss.bind.address", "localhost")); - props.setProperty("org.jboss.osgi.service.remote.log.port", "5400"); - - addBundle("bundles/jboss-osgi-remotelog.jar"); - } - }} +}

16 years, 3 months

1
0
0 / 0

JBoss-OSGI SVN: r92949 - projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi142.

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

Author: thomas.diesler(a)jboss.com Date: 2009-08-28 08:20:55 -0400 (Fri, 28 Aug 2009) New Revision: 92949 Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi142/jbosgi142-bundleA.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi142/jbosgi142-bundleB.bnd Log: [JBOSGI-142] explicitly define the imports Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi142/jbosgi142-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi142/jbosgi142-bundleA.bnd 2009-08-28 11:55:56 UTC (rev 92948) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi142/jbosgi142-bundleA.bnd 2009-08-28 12:20:55 UTC (rev 92949) @@ -2,4 +2,4 @@ Bundle-SymbolicName: jbosgi142-bundleA Export-Package: org.jboss.test.osgi.jbosgi142.bundleA - +Import-Package: org.jboss.test.osgi.jbosgi142.bundleX Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi142/jbosgi142-bundleB.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi142/jbosgi142-bundleB.bnd 2009-08-28 11:55:56 UTC (rev 92948) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi142/jbosgi142-bundleB.bnd 2009-08-28 12:20:55 UTC (rev 92949) @@ -2,4 +2,5 @@ Bundle-SymbolicName: jbosgi142-bundleB Export-Package: org.jboss.test.osgi.jbosgi142.bundleB +Import-Package: org.jboss.test.osgi.jbosgi142.bundleX

16 years, 3 months

1
0
0 / 0

JBoss-OSGI SVN: r92948 - in projects/jboss-osgi/projects/runtime/microcontainer/trunk/src: test/java/org/jboss/test/osgi/classloader/test and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2009-08-28 07:55:56 -0400 (Fri, 28 Aug 2009) New Revision: 92948 Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/ExportImportPackageUnitTestCase.java Log: [JBOSGI-142] Negative test. More sytem packages. Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java 2009-08-28 11:48:52 UTC (rev 92947) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java 2009-08-28 11:55:56 UTC (rev 92948) @@ -63,11 +63,19 @@ else { // The default system packages + allPackages.add("javax.imageio"); + allPackages.add("javax.imageio.stream"); + allPackages.add("javax.management"); allPackages.add("javax.management.remote"); + allPackages.add("javax.naming"); + allPackages.add("javax.naming.event"); allPackages.add("javax.naming.spi"); + allPackages.add("javax.net"); + allPackages.add("javax.net.ssl"); + allPackages.add("javax.xml.datatype"); allPackages.add("javax.xml.namespace"); allPackages.add("javax.xml.parsers"); @@ -83,6 +91,7 @@ allPackages.add("org.w3c.dom.ranges"); allPackages.add("org.w3c.dom.views"); allPackages.add("org.w3c.dom.traversal"); + allPackages.add("org.xml.sax"); allPackages.add("org.xml.sax.ext"); allPackages.add("org.xml.sax.helpers"); Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/ExportImportPackageUnitTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/ExportImportPackageUnitTestCase.java 2009-08-28 11:48:52 UTC (rev 92947) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/ExportImportPackageUnitTestCase.java 2009-08-28 11:55:56 UTC (rev 92948) @@ -64,6 +64,8 @@ bundle2.start(); assertLoadClass(bundle2, A.class, bundle1); assertLoadClass(bundle2, B.class, bundle2); + + assertLoadClassFail(bundle1, B.class); } finally {

16 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits August 2009