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

JBoss-OSGI SVN: r91576 - projects/jboss-osgi/trunk/distribution/installer.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 15:42:25 -0400 (Wed, 22 Jul 2009) New Revision: 91576 Modified: projects/jboss-osgi/trunk/distribution/installer/pom.xml Log: Add blueprint to 'all' profile Modified: projects/jboss-osgi/trunk/distribution/installer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/pom.xml 2009-07-22 19:31:07 UTC (rev 91575) +++ projects/jboss-osgi/trunk/distribution/installer/pom.xml 2009-07-22 19:42:25 UTC (rev 91576) @@ -114,6 +114,23 @@ </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-blueprint</artifactId> + <version>${version.jboss.osgi.blueprint}</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-blueprint</artifactId> + <version>${version.jboss.osgi.blueprint}</version> + <classifier>javadoc</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> <version>${version.jboss.osgi.common}</version> </dependency>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91575 - in projects/jboss-osgi: projects/bundles/jmx/trunk and 2 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 15:31:07 -0400 (Wed, 22 Jul 2009) New Revision: 91575 Modified: projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/pom.xml Log: Update to common-core 2.2.11.SP1 Modified: projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml 2009-07-22 19:30:49 UTC (rev 91574) +++ projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml 2009-07-22 19:31:07 UTC (rev 91575) @@ -21,7 +21,7 @@ <artifactId>jboss-osgi-common-core</artifactId> <packaging>bundle</packaging> - <version>2.2.11</version> + <version>2.2.11.SP1</version>  <parent> Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-22 19:30:49 UTC (rev 91574) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-22 19:31:07 UTC (rev 91575) @@ -32,7 +32,7 @@  <properties> - <version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core> + <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> </properties> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-22 19:30:49 UTC (rev 91574) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-22 19:31:07 UTC (rev 91575) @@ -45,7 +45,7 @@ <version.jboss.osgi.apache.xerces>2.9.1.SP1</version.jboss.osgi.apache.xerces> <version.jboss.osgi.blueprint>1.0.0.Alpha1</version.jboss.osgi.blueprint> <version.jboss.osgi.common>1.0.0</version.jboss.osgi.common> - <version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core> + <version.jboss.osgi.common.core>2.2.11.SP1</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> Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-07-22 19:30:49 UTC (rev 91574) +++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-07-22 19:31:07 UTC (rev 91575) @@ -32,7 +32,7 @@  <properties> <version.apache.felix.log>1.0.0</version.apache.felix.log> - <version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core> + <version.jboss.osgi.common.core>2.2.11.SP1</version.jboss.osgi.common.core> <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky> <version.jboss.osgi.microcontainer>1.0.0</version.jboss.osgi.microcontainer> <version.jboss.osgi.runtime.felix>1.0.0</version.jboss.osgi.runtime.felix>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91573 - in projects/jboss-osgi/trunk: distribution/installer/scripts and 2 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 15:20:19 -0400 (Wed, 22 Jul 2009) New Revision: 91573 Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch040-framework-integration.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch090-references.xml projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-src-distro.xml projects/jboss-osgi/trunk/reactor/blueprint/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java Log: Update userguide Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch040-framework-integration.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch040-framework-integration.xml 2009-07-22 19:18:27 UTC (rev 91572) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch040-framework-integration.xml 2009-07-22 19:20:19 UTC (rev 91573) @@ -20,7 +20,7 @@ <para>The Apache Felix integration can be configured through properties in the <link linkend="ChapRuntime">JBoss OSGi Runtime</link>. </para> - <programlisting role="XML"><![CDATA[ + <programlisting> cat conf/jboss-osgi-framework.properties # The OSGiFramework implementation @@ -44,7 +44,7 @@ file://${osgi.home}/server/minimal/bundles/org.apache.felix.log.jar \ file://${osgi.home}/server/minimal/bundles/jboss-osgi-common.jar \ file://${osgi.home}/server/minimal/bundles/jboss-osgi-hotdeploy.jar - ]]></programlisting> + </programlisting> <para>In the <ulink url="http://www.jboss.org/jbossas">JBossAS</ulink> integration we use <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> beans configuration.</para> Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2009-07-22 19:18:27 UTC (rev 91572) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2009-07-22 19:20:19 UTC (rev 91573) @@ -220,7 +220,7 @@ <title>Blueprint Container Service</title> <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-blueprint.jar</emphasis> bundle provides - a early access of a Blueprint extender service.</para> + an early access of a Blueprint extender service.</para> <para>The <ulink url="http://jbossosgi.blogspot.com/2009/04/osgi-blueprint-service-rfc-124.html">Blueprint Container</ulink> service allows bundles to contain standard blueprint descriptors, which can be used for component wiring Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2009-07-22 19:18:27 UTC (rev 91572) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2009-07-22 19:20:19 UTC (rev 91573) @@ -24,6 +24,7 @@ [INFO] ------------------------------------------------------------------------ ... build-test-jars: + # example-blueprint (example-blueprint.jar) 6 # example-http (example-http.jar) 4 # example-jmx (example-jmx.jar) 4 # example-jndi (example-jndi.jar) 1 @@ -31,31 +32,49 @@ # example-mcservice-bundleA (example-mcservice-bundleA.jar) 2 # example-mcservice-bundleB (example-mcservice-bundleB.jar) 3 # example-simple (example-simple.jar) 2 - # example-simple-husky (example-simple-husky.jar) 4 + # example-simple-husky (example-simple-husky.jar) 4 + # example-xml-jaxb (example-xml-jaxb.jar) 8 + # example-xml-parser (example-xml-parser.jar) 4 ------------------------------------------------------- T E S T S ------------------------------------------------------- + Running org.jboss.test.osgi.example.blueprint.BlueprintTestCase + Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.222 sec + Running org.jboss.test.osgi.example.xml.jaxb.JAXBTestCase + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.685 sec Running org.jboss.test.osgi.example.microcontainer.MicrocontainerTestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.006 sec + Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.917 sec + Running org.jboss.test.osgi.example.xml.parser.SAXParserTestCase + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.01 sec Running org.jboss.test.osgi.example.http.HttpServiceTestCase - Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.735 sec + Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.45 sec + Running org.jboss.test.osgi.example.xml.parser.DOMParserTestCase + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.016 sec Running org.jboss.test.osgi.example.log.LogServiceTestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.385 sec + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.923 sec Running org.jboss.test.osgi.example.jndi.JNDITestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.535 sec + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.921 sec Running org.jboss.test.osgi.example.jmx.JMXTestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.643 sec + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.937 sec Running org.jboss.test.osgi.example.simple.SimpleTestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.166 sec + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.588 sec Running org.jboss.test.osgi.example.simple.SimpleHuskyTestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.384 sec + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.813 sec + + Results : + + Tests run: 19, Failures: 0, Errors: 0, Skipped: 0 </programlisting> <para>To run the examples against a remote OSGi Runtime, you need to provide the target container that the runtime should connect to. This can be done with the <emphasis role="bold">target.container</emphasis> system property.</para> + <programlisting> + mvn -Dtarget.container=runtime test + </programlisting> + <para>Suported target container values are:</para> <itemizedlist> @@ -65,6 +84,7 @@ <listitem>jboss520</listitem> <listitem>jboss600</listitem> </itemizedlist> + </sect1> <sect1 xml:id="SecSimpleExample"> @@ -72,6 +92,66 @@ <para>The simple example is covered in: <link linkend="SecWritingTests">Writing Test Cases</link></para> </sect1> + <sect1 xml:id="SecXMLParserServiceExample"> + <title>SAX/DOM Parser Service Example</title> + + <para>The <emphasis role="bold">example-xml-parser.jar</emphasis> bundle gets a DocumentBuilderFactory/SAXParserFactory + respectivly and unmarshalls an XML document using that parser. + </para> + + <programlisting role="JAVA"> + ServiceReference sref = context.getServiceReference(DocumentBuilderFactory.class.getName()); + if (sref == null) + throw new IllegalStateException("DocumentBuilderFactory not available"); + + DocumentBuilderFactory factory = (DocumentBuilderFactory)context.getService(sref); + factory.setValidating(false); + + DocumentBuilder domBuilder = factory.newDocumentBuilder(); + URL resURL = context.getBundle().getResource("example-xml-parser.xml"); + Document dom = domBuilder.parse(resURL.openStream()); + assertNotNull("Document not null", dom); + </programlisting> + + <programlisting role="JAVA"> + ServiceReference sref = context.getServiceReference(SAXParserFactory.class.getName()); + if (sref == null) + throw new IllegalStateException("SAXParserFactory not available"); + + SAXParserFactory factory = (SAXParserFactory)context.getService(sref); + factory.setValidating(false); + + SAXParser saxParser = factory.newSAXParser(); + URL resURL = context.getBundle().getResource("example-xml-parser.xml"); + + SAXHandler saxHandler = new SAXHandler(); + saxParser.parse(resURL.openStream(), saxHandler); + assertEquals("content", saxHandler.getContent()); + </programlisting> + </sect1> + + <sect1 xml:id="SecJAXBServiceExample"> + <title>JAXB Service Example</title> + + <para>The <emphasis role="bold">example-xml-jaxb.jar</emphasis> bundle gets the JAXBContext from the JAXBService + and unmarshalls an XML document using JAXB + </para> + + <programlisting role="JAVA"> + ServiceReference sref = context.getServiceReference(JAXBService.class.getName()); + if (sref == null) + throw new IllegalStateException("JAXBService not available"); + + JAXBService service = (JAXBService)context.getService(sref); + JAXBContext jaxbContext = service.newJAXBContext(getClass().getPackage().getName()); + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + + URL resURL = context.getBundle().getResource("booking.xml"); + JAXBElement rootElement = unmarshaller.unmarshal(resURL.openStream()); + assertNotNull("root element not null", rootElement); + </programlisting> + </sect1> + <sect1 xml:id="SecJMXServiceExample"> <title>JMX Service Example</title> @@ -254,4 +334,69 @@ </programlisting> </sect1> + <sect1 xml:id="SecBlueprintContainerExample"> + <title>Blueprint Container Example</title> + + <para>The <emphasis role="bold">example-blueprint.jar</emphasis> bundle contains a number of + components that are wired together and registerd as OSGi service through the Blueprint Container + Service.</para> + + <para>The example uses this simple blueprint descriptor</para> + + <programlisting role="XML"><![CDATA[ + <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" ...> + + <bean id="beanA" class="org.jboss.test.osgi.example.blueprint.bundle.BeanA"> + <property name="mbeanServer" ref="mbeanService"/> + </bean> + + <service id="serviceA" ref="beanA" interface="org.jboss.test.osgi.example.blueprint.bundle.ServiceA"> + </service> + + <service id="serviceB" interface="org.jboss.test.osgi.example.blueprint.bundle.ServiceB"> + <bean class="org.jboss.test.osgi.example.blueprint.bundle.BeanB"> + <property name="beanA" ref="beanA"/> + </bean> + </service> + + <reference id="mbeanService" interface="javax.management.MBeanServer"/> + + </blueprint> + ]]></programlisting> + + <para>The Blueprint Container registers two services <emphasis role="bold">ServiceA</emphasis> and + <emphasis role="bold">ServiceB</emphasis>. ServiceA is backed up by <emphasis role="bold">BeanA</emphasis>, + ServiceB is backed up by the anonymous <emphasis role="bold">BeanB</emphasis>. BeanA is injected into + BeanB and the <emphasis role="bold">MBeanServer</emphasis> gets injected into BeanA. Both beans are plain POJOs. + There is <emphasis role="bold">no BundleActivator</emphasis> neccessary to register the services.</para> + + <para>The example test verifies the correct wiring like this</para> + + <programlisting role="JAVA"> + @Test + public void testServiceA() throws Exception + { + ServiceReference sref = context.getServiceReference(ServiceA.class.getName()); + assertNotNull("ServiceA not null", sref); + + ServiceA service = (ServiceA)context.getService(sref); + MBeanServer mbeanServer = service.getMbeanServer(); + assertNotNull("MBeanServer not null", mbeanServer); + } + </programlisting> + + <programlisting role="JAVA"> + @Test + public void testServiceB() throws Exception + { + ServiceReference sref = context.getServiceReference(ServiceB.class.getName()); + assertNotNull("ServiceB not null", sref); + + ServiceB service = (ServiceB)context.getService(sref); + BeanA beanA = service.getBeanA(); + assertNotNull("BeanA not null", beanA); + } + </programlisting> + </sect1> + </chapter> Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch090-references.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch090-references.xml 2009-07-22 19:18:27 UTC (rev 91572) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch090-references.xml 2009-07-22 19:20:19 UTC (rev 91573) @@ -9,7 +9,7 @@ <itemizedlist> <listitem><ulink url="http://www.jboss.org/community/wiki/JBoss OSGi">JBoss OSGi Wiki</ulink></listitem> - <listitem><ulink url="http://jbossosgi.blogspot.com">JBoss OSGi Diary (Blog)</ulink></listitem> + <listitem><ulink url="http://jbossosgi.blogspot.com">JBoss OSGi Diary</ulink></listitem> <listitem><ulink url="https://jira.jboss.org/jira/browse/JBOSGI">Issue Tracking</ulink></listitem> <listitem><ulink url="http://jbmuc.dyndns.org:8280/hudson">Hudson QA</ulink></listitem> <listitem><ulink url="https://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi">Subversion</ulink></listitem> Modified: projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-src-distro.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-src-distro.xml 2009-07-22 19:18:27 UTC (rev 91572) +++ projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-src-distro.xml 2009-07-22 19:20:19 UTC (rev 91573) @@ -9,7 +9,7 @@ <fileSets> <fileSet> - <directory>..</directory> + <directory>../..</directory> <outputDirectory>/</outputDirectory> <excludes> <exclude>**/target/**</exclude> Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-07-22 19:18:27 UTC (rev 91572) +++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-07-22 19:20:19 UTC (rev 91573) @@ -25,8 +25,8 @@  <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-reactor</artifactId> - <version>1.0.0.Beta3</version> + <artifactId>jboss-osgi-parent</artifactId> + <version>1.0.1</version> </parent>  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-07-22 19:18:27 UTC (rev 91572) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java 2009-07-22 19:20:19 UTC (rev 91573) @@ -50,7 +50,7 @@ import org.w3c.dom.Node; /** - * A test that uses a SAX parser to read an XML document. + * A test that uses a DOM parser to read an XML document. * * @see http://www.osgi.org/javadoc/r4v41/org/osgi/util/xml/XMLParserActivator.html * @@ -96,9 +96,9 @@ // Stop here if the context is not injected assumeNotNull(context); - DocumentBuilder domParser = getDocumentBuilder(); + DocumentBuilder domBuilder = getDocumentBuilder(); URL resURL = context.getBundle().getResource("example-xml-parser.xml"); - Document dom = domParser.parse(resURL.openStream()); + Document dom = domBuilder.parse(resURL.openStream()); assertNotNull("Document not null", dom); Element root = dom.getDocumentElement(); @@ -119,6 +119,7 @@ DocumentBuilderFactory factory = (DocumentBuilderFactory)context.getService(sref); factory.setValidating(false); - return factory.newDocumentBuilder(); + DocumentBuilder domBuilder = factory.newDocumentBuilder(); + return domBuilder; } } \ No newline at end of file

16 years, 5 months

1
0
0 / 0

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

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 09:10:58 -0400 (Wed, 22 Jul 2009) New Revision: 91551 Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml Log: Add site info to distribution management Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-22 13:10:41 UTC (rev 91550) +++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-22 13:10:58 UTC (rev 91551) @@ -10,7 +10,7 @@ <url>http://www.jboss.org/community/wiki/JBossOSGi</url> <description>JBossOSGi</description> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.1</version>  <properties> @@ -200,12 +200,17 @@ <url>dav:https://snapshots.jboss.org/maven2</url> </snapshotRepository>  <site> <id>jbmuc.dyndns.org</id> - <url>scp://jbmuc.dyndns.org/var/www/html/jboss-osgi - </url> + <url>scp://jbmuc.dyndns.org/var/www/html/jboss-osgi-${version.jboss.osgi}</url> </site> - --> +  </distributionManagement>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91550 - in projects/jboss-osgi: projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util and 6 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 09:10:41 -0400 (Wed, 22 Jul 2009) New Revision: 91550 Added: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/package.html Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartLevelDeployer.java projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-done.png projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-installpath.png projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-structure.png projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-verify.png projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-welcome.png projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml projects/jboss-osgi/trunk/distribution/docbook/src/main/resources/bookinfo.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java Log: Update userguide Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartLevelDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartLevelDeployer.java 2009-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartLevelDeployer.java 2009-07-22 13:10:41 UTC (rev 91550) @@ -33,7 +33,11 @@ import org.osgi.util.tracker.ServiceTracker; /** - * This is the Bundle start level Deployer + * Sets the bundle's start level on the StartLevel service. + * + * A start level can be given when the bundle is deployed through the + * WebConsole. Currently, neither hot deployment nor SPI test framework + * deployments support start levels. * * @author Thomas.Diesler(a)jboss.com * @since 08-Jul-2009 Added: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/package.html =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/package.html (rev 0) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/package.html 2009-07-22 13:10:41 UTC (rev 91550) @@ -0,0 +1,5 @@ +<html> +<body> +A collection of SPI provided utilities. +</body> +</html> Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-done.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-installpath.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-structure.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-verify.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-welcome.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml 2009-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml 2009-07-22 13:10:41 UTC (rev 91550) @@ -21,7 +21,7 @@ <para>To run the installer execute the following command:</para> <programlisting> - java -jar jboss-osgi-installer-1.0.0.Beta2.jar + java -jar jboss-osgi-installer-1.0.0.Beta3.jar </programlisting> <para>The installer first shows a welcome screen</para> @@ -127,7 +127,7 @@ JBoss OSGi Bootstrap Environment - OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta2/runtime + OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta3/runtime JAVA: /usr/java/jdk1.6/bin/java @@ -135,7 +135,7 @@ ========================================================================= - 16:18:32,974 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta2 + 16:18:32,974 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta3 16:18:33,403 INFO [FelixIntegration] Installed bundle [1]: org.osgi.compendium 16:18:33,412 INFO [FelixIntegration] Installed bundle [2]: org.apache.felix.log 16:18:33,425 INFO [FelixIntegration] Installed bundle [3]: jboss-osgi-common @@ -161,13 +161,17 @@ deployment is verified by an accompaning test case</para> <itemizedlist> - <listitem><emphasis role="bold">LogServiceTestCase</emphasis> - Interact with a local and remote Log Service</listitem> + <listitem><emphasis role="bold">BlueprintTestCase</emphasis> - A simple Blueprint Container test</listitem> + <listitem><emphasis role="bold">DOMParserTestCase</emphasis> - A test that uses a DOM parser to read an XML document</listitem> <listitem><emphasis role="bold">HttpServiceTestCase</emphasis> - Register servlets and resources with the HTTP Service</listitem> + <listitem><emphasis role="bold">JAXBTestCase</emphasis> - A test that uses JAXB to read an XML document</listitem> <listitem><emphasis role="bold">JMXTestCase</emphasis> - Register an MBean through the JMX Service</listitem> <listitem><emphasis role="bold">JNDITestCase</emphasis> - Bind objects to the Naming Service</listitem> + <listitem><emphasis role="bold">LogServiceTestCase</emphasis> - Interact with a local and remote Log Service</listitem> <listitem><emphasis role="bold">MicrocontainerTestCase</emphasis> - Call a service from an MC bean and vica versa</listitem> + <listitem><emphasis role="bold">SAXParserTestCase</emphasis> - A test that uses a SAX parser to read an XML document</listitem> + <listitem><emphasis role="bold">SimpleHuskyTestCase</emphasis> - Accesses a service from within the test case</listitem> <listitem><emphasis role="bold">SimpleTestCase</emphasis> - A simple bundle lifecycle test</listitem> - <listitem><emphasis role="bold">SimpleHuskyTestCase</emphasis> - Accesses a service from within the test case</listitem> </itemizedlist> </sect1> @@ -206,9 +210,7 @@ </imageobject> </mediaobject> - <note> - <title>TODO: Cleanup and document console provided functionality</title> - </note> + <para>The Web Console can also be used to install, start, stop and uninstall bundles.</para> </sect1> <sect1 xml:id="SecHudson"> @@ -288,7 +290,7 @@ Buildfile: build.xml init: - [echo] V1.0.0.Beta2 + [echo] V1.0.0.Beta3 init-hudson: [echo] @@ -316,7 +318,7 @@ Buildfile: build.xml init: - [echo] V1.0.0.Beta2 + [echo] V1.0.0.Beta3 init-hudson: [echo] @@ -342,7 +344,7 @@ Buildfile: build.xml init: - [echo] V1.0.0.Beta2 + [echo] V1.0.0.Beta3 init-hudson: [echo] Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml 2009-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml 2009-07-22 13:10:41 UTC (rev 91550) @@ -9,8 +9,8 @@ <title>Overview</title> - <para>Formerly a trimmed down <ulink url="http://http://jboss.org/jbossas">JBossAS</ulink> distribution, the - JBoss OSGi Runtime has now evolved into a pure OSGi container onto which components, services and applications can be deployed.</para> + <para>The JBoss OSGi Runtime is an OSGi container onto which components, + services and applications can be deployed.</para> <mediaobject> <imageobject> @@ -32,7 +32,7 @@ <para>Integration of the <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> as an OSGi service allows you to write your applications in a POJO programming model without much "pollution" of OSGi specific API - the MC will do the - wiring for you. Future releases of JBoss OSGi will come with a full implementation of + wiring for you. JBoss OSGi now also comes with an early alpha implementation of <ulink url="http://jbossosgi.blogspot.com/2009/04/osgi-blueprint-service-rfc-124.html">Blueprint Service (RFC-124)</ulink>, which standardizes this idea and takes it further.</para> @@ -112,6 +112,12 @@ - so instead of simply installing a bundle to the underlying OSGi framework it passes to the chain of deployers which each deal with a specific aspect of bundle deployment. </listitem> + + <listitem><emphasis role="bold">Blueprint Container Support</emphasis> - + The <ulink url="http://jbossosgi.blogspot.com/2009/04/osgi-blueprint-service-rfc-124.html">Blueprint Container</ulink> service allows bundles + to contain standard blueprint descriptors, which can be used for component wiring and injection of blueprint components. + The idea is to use a plain POJO programming model and let Blueprint do the wiring for you. There should be + no need for OSGi API to "pollute" your application logic.</listitem> </itemizedlist> </sect1> @@ -122,10 +128,6 @@ contains the list of bundles that are installed/started automatically. You can start create you own profile by setting up a new directory with your specific set of bundles.</para> - <note> - <title>TODO: [JBOSGI-98] Support configuration per profile</title> - </note> - <para>A runtime profile can be started using the <emphasis role="bold">-c comand line option</emphasis>.</para> <programlisting> @@ -134,7 +136,7 @@ JBossOSGi Bootstrap Environment - OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta2/runtime + OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta3/runtime JAVA: /usr/java/jdk1.6/bin/java @@ -142,7 +144,7 @@ ========================================================================= - 10:33:13,758 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta2 + 10:33:13,758 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta3 10:33:14,185 INFO [FelixIntegration] Installed bundle [1]: org.osgi.compendium 10:33:14,194 INFO [FelixIntegration] Installed bundle [2]: org.apache.felix.log 10:33:14,203 INFO [FelixIntegration] Installed bundle [3]: jboss-osgi-common @@ -202,6 +204,7 @@ <listitem><emphasis role="bold">jboss-osgi-jaxb.jar</emphasis> - JAXB support</listitem> <listitem><emphasis role="bold">jboss-osgi-xml-binding.jar</emphasis> - XML Binding (JBossXB) support</listitem> <listitem><emphasis role="bold">jboss-osgi-microcontainer.jar</emphasis> - Microcontainer support</listitem> + <listitem><emphasis role="bold">jboss-osgi-blueprint.jar</emphasis> - Blueprint Container support</listitem> </itemizedlist> </sect1> Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml 2009-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml 2009-07-22 13:10:41 UTC (rev 91550) @@ -24,17 +24,17 @@ </imageobject> </mediaobject> - <para>The latest version of the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs">JBoss OSGi SPI</ulink> - JavaDoc is published online as part of the JBoss OSGi <ulink url="http://jbmuc.dyndns.org:8280/hudson">Hudson QA Environment</ulink>.</para> + <para>The latest version of the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs">JBoss OSGi SPI</ulink>.</para> <itemizedlist> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi</ulink> - Common classes and interfaces.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.capability</ulink> - Capabilities that can be installed in the OSGi framework.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.framework</ulink> - Framework integration and bootstrap.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.logging</ulink> - Support for Bundle logging.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.management</ulink> - Management view on deployed bundles.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.service</ulink> - A collection of SPI provided services.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.testing</ulink> - OSGi test support classes and interfaces.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi</ulink> - Common classes and interfaces.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.capability</ulink> - Capabilities that can be installed in the OSGi framework.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.framework</ulink> - Framework integration and bootstrap.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.logging</ulink> - Support for Bundle logging.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.management</ulink> - Management view on deployed bundles.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.service</ulink> - A collection of SPI provided services.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.testing</ulink> - OSGi test support classes and interfaces.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.util</ulink> - A collection of SPI provided utilities.</listitem> </itemizedlist> <emphasis role="bold">Bootstrapping JBoss OSGi</emphasis> @@ -72,8 +72,8 @@ <para>The JBoss OSGi SPI comes with two bootstrap providers:</para> <itemizedlist> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">PropertiesBootstrapProvider</ulink></listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">MicrocontainerBootstrapProvider</ulink></listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">PropertiesBootstrapProvider</ulink></listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">MicrocontainerBootstrapProvider</ulink></listitem> </itemizedlist> <para>OSGiBootstrapProvider implementations that read their configurtation from some other source are possible, but currently not @@ -99,6 +99,7 @@ <listitem><emphasis role="bold">BundleManagementDeployer</emphasis> - Register the Bundle as MBean with JMX</listitem> <listitem><emphasis role="bold">BundleMetaDataDeployer</emphasis> - Create BundleMetaData from Manifest Headers</listitem> <listitem><emphasis role="bold">BundleRealDeployer</emphasis> - Installs the Bundle into the Framework's SystemContext</listitem> + <listitem><emphasis role="bold">BundleStartLevelDeployer</emphasis> - Sets the bundle's start level on the StartLevel service</listitem> <listitem><emphasis role="bold">BundleStartStopDeployer</emphasis> - Starts the Bundle when dependencies are resolved</listitem> <listitem><emphasis role="bold">BundleStructureDeployer</emphasis> - Determine the structure of a Bundle deployment</listitem> </itemizedlist> @@ -131,6 +132,12 @@ <para>On undeploy the Bundle gets uninstalled from the Framework's SystemContext.</para> + <emphasis role="bold">BundleStartLevelDeployer</emphasis> + + <para>Sets the bundle's start level on the StartLevel service. A start level can be given when + the bundle is deployed through the WebConsole. Currently, neither hot deployment nor SPI test + framework deployments support start levels.</para> + <emphasis role="bold">BundleStartStopDeployer</emphasis> <para>The BundleStartStopDeployer currently works in two modes:</para> @@ -174,7 +181,7 @@ <emphasis role="bold">The ManagedFramework</emphasis> - <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org..."> + <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org..."> ManagedFramework</ulink> gives you access to the MBean views of the deployed Bundles. It is registerd under the name:</para> <itemizedlist> @@ -183,7 +190,7 @@ <emphasis role="bold">The ManagedBundle</emphasis> - <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org..."> + <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org..."> ManagedBundle</ulink> gives you access to the MBean views of a deployed Bundle. It is registerd under the name:</para> <itemizedlist> @@ -193,7 +200,7 @@ <emphasis role="bold">Accessing the Management Objects</emphasis> <para>If you work with the JBoss OSGi Testsuite you get access to the Managed Objects through the JBoss OSGi SPI provided - <ulink url="http://junit.sourceforge.net/">JUnit</ulink> support package <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.testing</ulink>. + <ulink url="http://junit.sourceforge.net/">JUnit</ulink> support package <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.testing</ulink>. </para> <para>If you install JBoss OSGi in an already existing JBossAS instance you also get access to the Managed Objects through the JBoss provided @@ -214,7 +221,7 @@ <title>Writing Test Cases</title> <para>JBoss OSGi comes with <ulink url="http://www.junit.org">JUnit</ulink> test support as part of the SPI provided - <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.testing</ulink> + <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.testing</ulink> package. There are two distinct test scenarios that we support:</para> <itemizedlist> Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml 2009-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml 2009-07-22 13:10:41 UTC (rev 91550) @@ -64,39 +64,39 @@ <para>Here is how it works </para> <orderedlist> - <listitem>A <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb...">Bridge</ulink> + <listitem>A <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">Bridge</ulink> intercepts a test and determines the FQN of the test case and the test method from the call stack. It then delegates the execution to the same (or another) test in and isolated test environment. An isolated test environment is one that does not have the same class loading space as the test itself.</listitem> - <listitem>A Bridge is associated with an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> + <listitem>A Bridge is associated with an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> Invoker</ulink>. Invokers may be arbitarily complex. Local 'in proccess' invokers are possible just as well as remote invokers. </listitem> - <listitem>The Invoker sends the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> - Request</ulink> to a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> + <listitem>The Invoker sends the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> + Request</ulink> to a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> Connector</ulink> in the isolated test environment.</listitem> - <listitem>A Connector has associated <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> + <listitem>A Connector has associated <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> PackageListeners</ulink> that are responsible for processing test cases for their respective test packages.</listitem> - <listitem>A PackageListeners delegates the Request to a test <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> - Runner</ulink>, typicaly this would be a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> + <listitem>A PackageListeners delegates the Request to a test <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> + Runner</ulink>, typicaly this would be a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> JUnitRunner</ulink>.</listitem> - <listitem>The Runner injects the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> - Context</ulink> into the test case and returns a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> + <listitem>The Runner injects the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> + Context</ulink> into the test case and returns a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> Response</ulink>, which the Connector returns to the Invoker.</listitem> - <listitem>The Bridge finally translates potential <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> + <listitem>The Bridge finally translates potential <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> Failures</ulink> that may be contained in the Result, to test failures on the client side.</listitem> </orderedlist> <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-husky.jar</emphasis> bundle registers the Connectors. - The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> + The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> JMXConnector</ulink> is always registered. - The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb..."> + The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb..."> SocketConnector</ulink> is registered when the appropriate configuration options are set. It then registers the - <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-husky-parent/jb...">HuskyExtender</ulink>, + <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">HuskyExtender</ulink>, which is a <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/framework/BundleListener.html">BundleListener</ulink> that inspects every incomming bundle for the <emphasis role="bold">Test-Package</emphasis> manifest header. The Extender creates a PackageListener for every package in the 'Test-Package' manifest header and registers them with the available Connectors.</para> Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2009-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2009-07-22 13:10:41 UTC (rev 91550) @@ -5,10 +5,43 @@ <title>Provided Bundles and Services</title> + <sect1 xml:id="SecBundleXerces"> + <title>XML Parser Services</title> + + <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-apache-xerces.jar</emphasis> bundle provides services + from DOM and SAX parsing.</para> + + <para>The services are registered with the Framework under the name</para> + + <itemizedlist> + <listitem><emphasis role="bold">javax.xml.parsers.SAXParserFactory</emphasis></listitem> + <listitem><emphasis role="bold">javax.xml.parsers.DocumentBuilderFactory</emphasis></listitem> + </itemizedlist> + + <para>Please see <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/util/xml/XMLParserActivator.html">XMLParserActivator</ulink> + for details.</para> + + </sect1> + + <sect1 xml:id="SecBundleJAXB"> + <title>JAXB Service</title> + + <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-jaxb.jar</emphasis> bundle provides a service + to create <ulink url="http://java.sun.com/javase/6/docs/api/javax/xml/bind/JAXBContext.html">JAXBContext</ulink> + instances.</para> + + <para>The service is registered with the Framework under the name</para> + + <itemizedlist> + <listitem><emphasis role="bold">org.jboss.osgi.jaxb.JAXBService</emphasis></listitem> + </itemizedlist> + + </sect1> + <sect1 xml:id="SecBundleJMX"> <title>JMX Service</title> - <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-jmx.jar</emphasis> bundle activator discoveres and registers the + <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-jmx.jar</emphasis> bundle activator discovers and registers the <ulink url="http://java.sun.com/javase/6/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink> with the framework. It also tracks the naming service and binds the RMIAdaptor into JNDI for remote JMX access</para> @@ -135,7 +168,7 @@ <para>On the client side you can install an arbitrary <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink> with the <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">RemoteLogReaderService</ulink>. The testsuite typically - installs an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org...">LogEntryCache</ulink> + installs an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">LogEntryCache</ulink> that filters the received log messages.</para> <programlisting role="JAVA"> @@ -160,11 +193,11 @@ <sect1 xml:id="SecBundleMicrocontainer"> <title>Microcontainer Service</title> - <para>JBoss OSGi SPI comes with a service that give access to the <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> Kernel. + <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-microcontainer.jar</emphasis> bundle provides a service that give access to the <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> Kernel. The service is registered with the Framework under the name</para> <itemizedlist> - <listitem><emphasis role="bold">org.jboss.osgi.spi.service.MicrocontainerService</emphasis></listitem> + <listitem><emphasis role="bold">org.jboss.osgi.microcontainer.MicrocontainerService</emphasis></listitem> </itemizedlist> <para>Here is an example of how an OSGi component can access an arbitrary MC bean.</para> @@ -183,4 +216,16 @@ </programlisting> </sect1> + <sect1 xml:id="SecBundleBlueprint"> + <title>Blueprint Container Service</title> + + <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-blueprint.jar</emphasis> bundle provides + a early access of a Blueprint extender service.</para> + + <para>The <ulink url="http://jbossosgi.blogspot.com/2009/04/osgi-blueprint-service-rfc-124.html">Blueprint Container</ulink> + service allows bundles to contain standard blueprint descriptors, which can be used for component wiring + and injection of blueprint components. The idea is to use a plain POJO programming model and let + Blueprint do the wiring for you. There should be no need for OSGi API to "pollute" your application logic.</para> + </sect1> + </chapter> Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2009-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2009-07-22 13:10:41 UTC (rev 91550) @@ -126,7 +126,7 @@ <note> <para>Please note that access to the MBeanServer from the test case is part of the - <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org..."> + <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org..."> OSGiRuntime</ulink> abstraction.</para> </note> @@ -172,7 +172,7 @@ <note> <para>Please note that access to the InitialContext from the test case is part of the - <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta2/jboss-osgi-spi/apidocs/org..."> + <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org..."> OSGiRuntime</ulink> abstraction.</para> </note> Modified: projects/jboss-osgi/trunk/distribution/docbook/src/main/resources/bookinfo.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/src/main/resources/bookinfo.xml 2009-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/trunk/distribution/docbook/src/main/resources/bookinfo.xml 2009-07-22 13:10:41 UTC (rev 91550) @@ -4,12 +4,13 @@ <bookinfo> <title>JBossOSGi - User Guide</title> + + <releaseinfo>Version: 1.0.0.Beta3</releaseinfo> + <pubdate>Date: 22-Jul-2009</pubdate> +  - <releaseinfo>Version: ${version} (Draft)</releaseinfo> <pubdate>Date: ${buildNumber}</pubdate> + --> </bookinfo> 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-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-07-22 13:10:41 UTC (rev 91550) @@ -115,6 +115,7 @@ <include name="jboss-logging-log4j-javadoc.jar" /> <include name="jboss-logging-spi-javadoc.jar" /> <include name="jboss-osgi-apache-xerces-javadoc.jar" /> + <include name="jboss-osgi-blueprint-javadoc.jar" /> <include name="jboss-osgi-common-core-javadoc.jar" /> <include name="jboss-osgi-common-javadoc.jar" /> <include name="jboss-osgi-deployers-javadoc.jar" /> @@ -142,6 +143,7 @@ <include name="jboss-logging-log4j-sources.jar" /> <include name="jboss-logging-spi-sources.jar" /> <include name="jboss-osgi-apache-xerces-sources.jar" /> + <include name="jboss-osgi-blueprint-sources.jar" /> <include name="jboss-osgi-common-core-sources.jar" /> <include name="jboss-osgi-common-sources.jar" /> <include name="jboss-osgi-deployers-sources.jar" /> @@ -239,6 +241,7 @@ <include name="org.apache.felix.metatype.jar" />  <include name="jboss-osgi-apache-xerces.jar" /> + <include name="jboss-osgi-blueprint.jar" /> <include name="jboss-osgi-jaxb.jar" /> <include name="jboss-osgi-microcontainer.jar" /> <include name="jboss-osgi-xml-binding.jar" /> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-22 13:10:41 UTC (rev 91550) @@ -87,19 +87,6 @@ </repository> </repositories> -  - <distributionManagement> - <site> - <id>jbmuc.dyndns.org</id> - <url>scp://jbmuc.dyndns.org/var/www/html/jboss-osgi-${version} - </url> - </site> -  - </distributionManagement> -  <profiles> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2009-07-22 12:51:01 UTC (rev 91549) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2009-07-22 13:10:41 UTC (rev 91550) @@ -49,7 +49,7 @@ import org.osgi.service.blueprint.container.BlueprintContainer; /** - * Blueprint example test. + * A simple Blueprint Container test. * * @author thomas.diesler(a)jboss.com * @since 12-Jul-2009

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91547 - in projects/jboss-osgi: projects/bundles/common/trunk and 24 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 06:10:58 -0400 (Wed, 22 Jul 2009) New Revision: 91547 Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml projects/jboss-osgi/projects/bundles/common/trunk/pom.xml projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml projects/jboss-osgi/projects/spi/trunk/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/ projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanA.java projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanB.java projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/ServiceA.java projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/ServiceB.java projects/jboss-osgi/trunk/reactor/pom.xml Log: Prepare for release. Remove SNAPSHOTS Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,18 +21,18 @@ <artifactId>jboss-osgi-apache-xerces</artifactId> <packaging>bundle</packaging> - <version>2.9.1-SNAPSHOT</version> + <version>2.9.1.SP1</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <properties> <version.apache.xerces>2.9.1</version.apache.xerces> - <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.0</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> Modified: projects/jboss-osgi/projects/bundles/common/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,18 +21,18 @@ <artifactId>jboss-osgi-common</artifactId> <packaging>bundle</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <properties> <version.jboss.logging>2.0.5.GA</version.jboss.logging> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.spi>1.0.0</version.jboss.osgi.spi> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,18 +21,18 @@ <artifactId>jboss-osgi-hotdeploy</artifactId> <packaging>bundle</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  <properties> - <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.0</version.jboss.osgi.common> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -25,7 +25,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-husky-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent>  Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -22,20 +22,20 @@ <artifactId>jboss-osgi-husky-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  <properties> <version.apache.felix.log>1.0.0</version.apache.felix.log> - <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> - <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix> + <version.jboss.osgi.jmx>1.0.0</version.jboss.osgi.jmx> + <version.jboss.osgi.runtime.felix>1.0.0</version.jboss.osgi.runtime.felix> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -25,7 +25,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-husky-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent>  Modified: projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,18 +21,18 @@ <artifactId>jboss-osgi-jaxb</artifactId> <packaging>bundle</packaging> - <version>2.1.10-SNAPSHOT</version> + <version>2.1.10.SP1</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  <properties> - <version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces> + <version.jboss.osgi.apache.xerces>2.9.1.SP1</version.jboss.osgi.apache.xerces> <version.xml.bind>2.1.10</version.xml.bind> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,13 +21,13 @@ <artifactId>jboss-osgi-common-core</artifactId> <packaging>bundle</packaging> - <version>2.2.11-SNAPSHOT</version> + <version>2.2.11</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <properties> Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,20 +21,20 @@ <artifactId>jboss-osgi-xml-binding</artifactId> <packaging>bundle</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  <properties> <version.jboss.xb>2.0.1.GA</version.jboss.xb> <version.javassist>3.9.0.GA</version.javassist> - <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb> + <version.jboss.osgi.jaxb>2.1.10.SP1</version.jboss.osgi.jaxb> <version.jboss.reflect>2.0.0.GA</version.jboss.reflect> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,19 +21,19 @@ <artifactId>jboss-osgi-jmx</artifactId> <packaging>bundle</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  <properties> - <version.jboss.osgi.common.core>2.2.11-SNAPSHOT</version.jboss.osgi.common.core> - <version.jboss.osgi.jndi>1.0.0-SNAPSHOT</version.jboss.osgi.jndi> + <version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core> + <version.jboss.osgi.jndi>1.0.0</version.jboss.osgi.jndi> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,19 +21,19 @@ <artifactId>jboss-osgi-jndi</artifactId> <packaging>bundle</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  <properties> <version.jboss.naming>5.0.1.GA</version.jboss.naming> - <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.0</version.jboss.osgi.common> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,22 +21,22 @@ <artifactId>jboss-osgi-microcontainer</artifactId> <packaging>bundle</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  <properties> <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer> - <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> - <version.jboss.osgi.runtime.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.deployers> - <version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding> + <version.jboss.osgi.jmx>1.0.0</version.jboss.osgi.jmx> + <version.jboss.osgi.runtime.deployers>1.0.0</version.jboss.osgi.runtime.deployers> + <version.jboss.osgi.xml.binding>2.0.1</version.jboss.osgi.xml.binding> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,18 +21,18 @@ <artifactId>jboss-osgi-remotelog</artifactId> <packaging>bundle</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  <properties> - <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.0</version.jboss.osgi.common> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,13 +21,13 @@ <artifactId>jboss-osgi-webconsole</artifactId> <packaging>bundle</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  @@ -39,7 +39,7 @@ <version.felix.scr>1.0.0</version.felix.scr> <version.felix.webconsole>1.2.10</version.felix.webconsole> <version.javax.servlet>2.4</version.javax.servlet> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.spi>1.0.0</version.jboss.osgi.spi> <version.json>20070829</version.json> </properties> Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -20,18 +20,18 @@ <artifactId>jboss-osgi-deployers</artifactId> <packaging>jar</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <properties> <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.spi>1.0.0</version.jboss.osgi.spi> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -20,20 +20,20 @@ <artifactId>jboss-osgi-runtime-equinox</artifactId> <packaging>jar</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  <properties> <version.eclipse.equinox>3.4.2</version.eclipse.equinox> <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.spi>1.0.0</version.jboss.osgi.spi> </properties>  Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -20,20 +20,20 @@ <artifactId>jboss-osgi-runtime-felix</artifactId> <packaging>jar</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <properties> <version.apache.felix.core>1.2.0</version.apache.felix.core> <version.felix.framework>1.8.1</version.felix.framework> <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.spi>1.0.0</version.jboss.osgi.spi> </properties>  Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -20,17 +20,17 @@ <artifactId>jboss-osgi-runtime-jbossas</artifactId> <packaging>jar</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <properties> - <version.jboss.osgi.microcontainer>1.0.0-SNAPSHOT</version.jboss.osgi.microcontainer> + <version.jboss.osgi.microcontainer>1.0.0</version.jboss.osgi.microcontainer> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -20,19 +20,19 @@ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> <packaging>jar</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <properties> <version.knopflerfish>2.2.0</version.knopflerfish> <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.spi>1.0.0</version.jboss.osgi.spi> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -20,13 +20,13 @@ <artifactId>jboss-osgi-spi</artifactId> <packaging>jar</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>  <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -25,7 +25,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent>  @@ -42,25 +42,25 @@ <version.apache.felix.log>1.0.0</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-SNAPSHOT</version.jboss.osgi.apache.xerces> - <version.jboss.osgi.blueprint>1.0.0-SNAPSHOT</version.jboss.osgi.blueprint> - <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> - <version.jboss.osgi.common.core>2.2.11-SNAPSHOT</version.jboss.osgi.common.core> - <version.jboss.osgi.hotdeploy>1.0.0-SNAPSHOT</version.jboss.osgi.hotdeploy> - <version.jboss.osgi.husky>1.0.0-SNAPSHOT</version.jboss.osgi.husky> - <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb> - <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> - <version.jboss.osgi.jndi>1.0.0-SNAPSHOT</version.jboss.osgi.jndi> - <version.jboss.osgi.microcontainer>1.0.0-SNAPSHOT</version.jboss.osgi.microcontainer> - <version.jboss.osgi.remotelog>1.0.0-SNAPSHOT</version.jboss.osgi.remotelog> - <version.jboss.osgi.runtime.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.deployers> - <version.jboss.osgi.runtime.equinox>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.equinox> - <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix> - <version.jboss.osgi.runtime.jbossas>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.jbossas> - <version.jboss.osgi.runtime.knopflerfish>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.knopflerfish> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.osgi.webconsole>1.0.0-SNAPSHOT</version.jboss.osgi.webconsole> - <version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding> + <version.jboss.osgi.apache.xerces>2.9.1.SP1</version.jboss.osgi.apache.xerces> + <version.jboss.osgi.blueprint>1.0.0.Alpha1</version.jboss.osgi.blueprint> + <version.jboss.osgi.common>1.0.0</version.jboss.osgi.common> + <version.jboss.osgi.common.core>2.2.11</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.microcontainer>1.0.0</version.jboss.osgi.microcontainer> + <version.jboss.osgi.remotelog>1.0.0</version.jboss.osgi.remotelog> + <version.jboss.osgi.runtime.deployers>1.0.0</version.jboss.osgi.runtime.deployers> + <version.jboss.osgi.runtime.equinox>1.0.0</version.jboss.osgi.runtime.equinox> + <version.jboss.osgi.runtime.felix>1.0.0</version.jboss.osgi.runtime.felix> + <version.jboss.osgi.runtime.jbossas>1.0.0</version.jboss.osgi.runtime.jbossas> + <version.jboss.osgi.runtime.knopflerfish>1.0.0</version.jboss.osgi.runtime.knopflerfish> + <version.jboss.osgi.spi>1.0.0</version.jboss.osgi.spi> + <version.jboss.osgi.webconsole>1.0.0</version.jboss.osgi.webconsole> + <version.jboss.osgi.xml.binding>2.0.1</version.jboss.osgi.xml.binding> <version.osgi>r4v41</version.osgi> </properties> Property changes on: projects/jboss-osgi/trunk/reactor ___________________________________________________________________ Name: svn:externals - spi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk bundles/apache-xerces https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... #bundles/common https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... #bundles/hotdeploy https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... #bundles/husky https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... #bundles/jaxb https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... #bundles/jmx https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... #bundles/jndi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... #bundles/jboss-common-core https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jboss-xml-binding https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/microcontainer https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... #bundles/remotelog https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... #bundles/webconsole https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... #runtime/deployers https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... #runtime/equinox https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... #runtime/felix https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... #runtime/jbossas https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... #runtime/knopflerfish https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... + spi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk bundles/apache-xerces https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/common https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/hotdeploy https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/husky https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jaxb https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jmx https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jndi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jboss-common-core https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jboss-xml-binding https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/microcontainer https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/remotelog https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/webconsole https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... runtime/deployers https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... runtime/equinox https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... runtime/felix https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... runtime/jbossas https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... runtime/knopflerfish https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... Modified: projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -24,7 +24,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-blueprint-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha1</version> </parent>  Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -20,7 +20,7 @@ <artifactId>jboss-osgi-blueprint-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha1</version>  <parent> @@ -32,10 +32,10 @@  <properties> <version.apache.felix.log>1.0.0</version.apache.felix.log> - <version.jboss.osgi.common.core>2.2.11-SNAPSHOT</version.jboss.osgi.common.core> - <version.jboss.osgi.husky>1.0.0-SNAPSHOT</version.jboss.osgi.husky> - <version.jboss.osgi.microcontainer>1.0.0-SNAPSHOT</version.jboss.osgi.microcontainer> - <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix> + <version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core> + <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky> + <version.jboss.osgi.microcontainer>1.0.0</version.jboss.osgi.microcontainer> + <version.jboss.osgi.runtime.felix>1.0.0</version.jboss.osgi.runtime.felix> <version.osgi>r4v41</version.osgi> </properties> Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -32,7 +32,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-blueprint-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha1</version> </parent>  Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanA.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanA.java 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanA.java 2009-07-22 10:10:58 UTC (rev 91547) @@ -38,7 +38,6 @@ public BeanA() { - System.out.println("new BeanA"); } public MBeanServer getMbeanServer() @@ -48,7 +47,6 @@ public void setMbeanServer(MBeanServer mbeanServer) { - System.out.println("BeanA: setMbeanServer"); this.mbeanServer = mbeanServer; } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanB.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanB.java 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanB.java 2009-07-22 10:10:58 UTC (rev 91547) @@ -36,7 +36,6 @@ public BeanB() { - System.out.println("new BeanB"); } public BeanA getBeanA() @@ -46,7 +45,6 @@ public void setBeanA(BeanA beanA) { - System.out.println("BeanB: setBeanA"); this.beanA = beanA; } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/ServiceA.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/ServiceA.java 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/ServiceA.java 2009-07-22 10:10:58 UTC (rev 91547) @@ -21,6 +21,8 @@ */ package org.jboss.test.osgi.blueprint.container.bundle; +import javax.management.MBeanServer; + //$Id$ /** @@ -31,4 +33,5 @@ */ public interface ServiceA { + MBeanServer getMbeanServer(); } \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/ServiceB.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/ServiceB.java 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/ServiceB.java 2009-07-22 10:10:58 UTC (rev 91547) @@ -31,4 +31,5 @@ */ public interface ServiceB { + BeanA getBeanA(); } \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) +++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-07-22 10:10:58 UTC (rev 91547) @@ -28,9 +28,23 @@ <modules> <module>spi</module> + <module>runtime/equinox</module> + <module>runtime/felix</module> + <module>runtime/knopflerfish</module> + <module>runtime/deployers</module> + <module>bundles/common</module> + <module>bundles/jboss-common-core</module> <module>bundles/apache-xerces</module> + <module>bundles/jaxb</module> <module>bundles/jboss-xml-binding</module> + <module>bundles/jndi</module> + <module>bundles/jmx</module> + <module>bundles/remotelog</module> + <module>bundles/webconsole</module> + <module>bundles/hotdeploy</module> <module>bundles/microcontainer</module> + <module>bundles/husky</module> + <module>runtime/jbossas</module> <module>blueprint</module> </modules>

16 years, 5 months

1
0
0 / 0

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

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 05:29:13 -0400 (Wed, 22 Jul 2009) New Revision: 91546 Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml Log: version=1.0.2-SNAPSHOT Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-22 09:28:26 UTC (rev 91545) +++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-22 09:29:13 UTC (rev 91546) @@ -10,7 +10,7 @@ <url>http://www.jboss.org/community/wiki/JBossOSGi</url> <description>JBossOSGi</description> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version>  <properties>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91545 - projects/jboss-osgi/projects/parent/tags.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 05:28:26 -0400 (Wed, 22 Jul 2009) New Revision: 91545 Added: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.1/ Log: Release jboss-osgi-parent-1.0.1 Copied: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.1 (from rev 91544, projects/jboss-osgi/projects/parent/trunk)

16 years, 5 months

1
0
0 / 0

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

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 05:27:10 -0400 (Wed, 22 Jul 2009) New Revision: 91544 Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml Log: version=1.0.1 Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-22 09:21:14 UTC (rev 91543) +++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-22 09:27:10 UTC (rev 91544) @@ -10,7 +10,7 @@ <url>http://www.jboss.org/community/wiki/JBossOSGi</url> <description>JBossOSGi</description> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version>  <properties>

16 years, 5 months

1
0
0 / 0

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

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-22 05:06:17 -0400 (Wed, 22 Jul 2009) New Revision: 91542 Added: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/blueprint-example.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd Removed: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintContainerTestCase.java Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/BeanA.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/BeanB.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/ServiceA.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/ServiceB.java projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/parser/example-xml-parser.bnd Log: [JBOSGI-73] Provide Blueprint example Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml 2009-07-22 08:26:39 UTC (rev 91541) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml 2009-07-22 09:06:17 UTC (rev 91542) @@ -42,6 +42,9 @@  +  + <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/example-blueprint.jar" files="${tests.resources.dir}/blueprint/example-blueprint.bnd" /> +  <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/example-http.jar" files="${tests.resources.dir}/http/example-http.bnd" /> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-07-22 08:26:39 UTC (rev 91541) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-07-22 09:06:17 UTC (rev 91542) @@ -16,6 +16,7 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>*:jboss-osgi-apache-xerces:jar</include> + <include>*:jboss-osgi-blueprint:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> <include>*:jboss-osgi-husky:jar</include> Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint (from rev 91539, projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container) Deleted: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintContainerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2009-07-22 06:02:38 UTC (rev 91539) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintContainerTestCase.java 2009-07-22 09:06:17 UTC (rev 91542) @@ -1,279 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.blueprint.container; - -//$Id$ - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeNotNull; - -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import javax.management.MBeanServer; - -import org.jboss.osgi.blueprint.BlueprintCapability; -import org.jboss.osgi.husky.Bridge; -import org.jboss.osgi.husky.BridgeFactory; -import org.jboss.osgi.husky.HuskyCapability; -import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.testing.OSGiBundle; -import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTestHelper; -import org.jboss.test.osgi.blueprint.container.bundle.BeanA; -import org.jboss.test.osgi.blueprint.container.bundle.BeanB; -import org.jboss.test.osgi.blueprint.container.bundle.ServiceA; -import org.jboss.test.osgi.blueprint.container.bundle.ServiceB; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.blueprint.container.BlueprintContainer; -import org.osgi.service.blueprint.reflect.BeanMetadata; -import org.osgi.service.blueprint.reflect.ComponentMetadata; -import org.osgi.service.blueprint.reflect.ReferenceMetadata; -import org.osgi.service.blueprint.reflect.ServiceMetadata; - -/** - * BlueprintContainer API tests - * - * @author thomas.diesler(a)jboss.com - * @since 13-May-2009 - */ -public class BlueprintContainerTestCase -{ - @ProvideContext - public static BundleContext context; - - private static OSGiRuntime runtime; - private static Bridge huskyBridge; - - @BeforeClass - public static void beforeClass() throws Exception - { - if (context == null) - { - runtime = new OSGiTestHelper().getDefaultRuntime(); - runtime.addCapability(new HuskyCapability()); - runtime.addCapability(new BlueprintCapability()); - - huskyBridge = BridgeFactory.getBridge(); - - OSGiBundle bundle = runtime.installBundle("container-basic.jar"); - bundle.start(); - } - } - - @AfterClass - public static void afterClass() throws Exception - { - if (context == null) - runtime.shutdown(); - } - - @Test - public void testBlueprintBundleInstall() throws Exception - { - if (context == null) - huskyBridge.run(); - - assumeNotNull(context); - - Bundle bundle = context.getBundle(); - assertEquals("container-basic", bundle.getSymbolicName()); - } - - @Test - public void testBlueprintContainerAvailable() throws Exception - { - if (context == null) - huskyBridge.run(); - - assumeNotNull(context); - - BlueprintContainer bpContainer = getBlueprintContainer(); - assertNotNull("BlueprintContainer available", bpContainer); - } - - @Test - public void getComponent() throws Exception - { - if (context == null) - huskyBridge.run(); - - assumeNotNull(context); - - BlueprintContainer bpContainer = getBlueprintContainer(); - BeanA beanA = (BeanA)bpContainer.getComponentInstance("beanA"); - assertNotNull("ComponentInstance available", beanA); - } - - @Test - public void getService() throws Exception - { - if (context == null) - huskyBridge.run(); - - assumeNotNull(context); - - ServiceReference srefA = context.getServiceReference(ServiceA.class.getName()); - assertNotNull("ServiceReference available", srefA); - - ServiceA serviceA = (ServiceA)context.getService(srefA); - assertNotNull("Service available", serviceA); - - ServiceReference srefB = context.getServiceReference(ServiceB.class.getName()); - assertNotNull("ServiceReference available", srefB); - - ServiceB serviceB = (ServiceB)context.getService(srefB); - assertNotNull("Service available", serviceB); - - BeanB beanB = (BeanB)serviceB; - BeanA beanA = beanB.getBeanA(); - assertNotNull("BeanA available", beanA); - - MBeanServer mbeanServer = beanA.getMbeanServer(); - assertNotNull("MBeanServer available", mbeanServer); - } - - @Test - public void testComponentMetadataByName() throws Exception - { - if (context == null) - huskyBridge.run(); - - assumeNotNull(context); - - BlueprintContainer bpContainer = getBlueprintContainer(); - ComponentMetadata compMetadata = bpContainer.getComponentMetadata("beanA"); - - assertNotNull("ComponentMetadata not null", compMetadata); - assertEquals("beanA", compMetadata.getId()); - } - - @Test - public void getComponentIds() throws Exception - { - if (context == null) - huskyBridge.run(); - - assumeNotNull(context); - - BlueprintContainer bpContainer = getBlueprintContainer(); - Set<String> compNames = bpContainer.getComponentIds(); - - assertNotNull("ComponentNames not null", compNames); - assertEquals("ComponentNames size", 4, compNames.size()); - assertTrue("ComponentNames contains beanA", compNames.contains("beanA")); - assertTrue("ComponentNames contains serviceA", compNames.contains("serviceA")); - assertTrue("ComponentNames contains serviceB", compNames.contains("serviceB")); - assertTrue("ComponentNames contains mbeanService", compNames.contains("mbeanService")); - } - - @Test - public void testBeanMetadata() throws Exception - { - if (context == null) - huskyBridge.run(); - - assumeNotNull(context); - - BlueprintContainer bpContainer = getBlueprintContainer(); - Collection<BeanMetadata> bcMetadata = bpContainer.getMetadata(BeanMetadata.class); - - assertNotNull("BeanComponentsMetadata not null", bcMetadata); - assertEquals("BeanComponentsMetadata size", 1, bcMetadata.size()); - - BeanMetadata bmd = bcMetadata.iterator().next(); - assertEquals("beanA", bmd.getId()); - assertEquals(BeanA.class.getName(), bmd.getClassName()); - } - - @Test - public void testServiceMetadata() throws Exception - { - if (context == null) - huskyBridge.run(); - - assumeNotNull(context); - - BlueprintContainer bpContainer = getBlueprintContainer(); - Collection<ServiceMetadata> servicesMetadata = bpContainer.getMetadata(ServiceMetadata.class); - - assertNotNull("ServiceMetadata not null", servicesMetadata); - assertEquals("ServiceMetadata size", 2, servicesMetadata.size()); - - Iterator<ServiceMetadata> itServices = servicesMetadata.iterator(); - ServiceMetadata serviceA = itServices.next(); - assertEquals("serviceA", serviceA.getId()); - - List<String> interfaceNamesA = serviceA.getInterfaces(); - assertNotNull("InterfaceNames not null", interfaceNamesA); - assertEquals("InterfaceNames size", 1, interfaceNamesA.size()); - assertEquals("InterfaceName", ServiceA.class.getName(), interfaceNamesA.get(0)); - - ServiceMetadata serviceB = itServices.next(); - assertEquals("serviceB", serviceB.getId()); - - List<String> interfaceNamesB = serviceB.getInterfaces(); - assertNotNull("InterfaceNames not null", interfaceNamesB); - assertEquals("InterfaceNames size", 1, interfaceNamesB.size()); - assertEquals("InterfaceName", ServiceB.class.getName(), interfaceNamesB.get(0)); - } - - @Test - public void testServiceReferenceMetadata() throws Exception - { - if (context == null) - huskyBridge.run(); - - assumeNotNull(context); - - BlueprintContainer bpContainer = getBlueprintContainer(); - Collection<ReferenceMetadata> srefsMetadata = bpContainer.getMetadata(ReferenceMetadata.class); - - assertNotNull("ReferenceMetadata not null", srefsMetadata); - assertEquals("ReferenceMetadata size", 1, srefsMetadata.size()); - - ReferenceMetadata srefMetadata = srefsMetadata.iterator().next(); - assertEquals("mbeanService", srefMetadata.getId()); - - String interfaceName = srefMetadata.getInterface(); - assertNotNull("InterfaceName not null", interfaceName); - assertEquals("InterfaceName", MBeanServer.class.getName(), interfaceName); - } - - private BlueprintContainer getBlueprintContainer() - { - ServiceReference sref = context.getServiceReference(BlueprintContainer.class.getName()); - assertNotNull("BlueprintContainer service not null", sref); - - BlueprintContainer bpContainer = (BlueprintContainer)context.getService(sref); - return bpContainer; - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java (from rev 91539, projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2009-07-22 09:06:17 UTC (rev 91542) @@ -0,0 +1,146 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.example.blueprint; + +//$Id$ + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assume.assumeNotNull; + +import javax.management.MBeanServer; + +import org.jboss.osgi.blueprint.BlueprintCapability; +import org.jboss.osgi.husky.Bridge; +import org.jboss.osgi.husky.BridgeFactory; +import org.jboss.osgi.husky.HuskyCapability; +import org.jboss.osgi.husky.annotation.ProvideContext; +import org.jboss.osgi.spi.testing.OSGiBundle; +import org.jboss.osgi.spi.testing.OSGiRuntime; +import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.test.osgi.example.blueprint.bundle.BeanA; +import org.jboss.test.osgi.example.blueprint.bundle.ServiceA; +import org.jboss.test.osgi.example.blueprint.bundle.ServiceB; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.service.blueprint.container.BlueprintContainer; + +/** + * Blueprint example test. + * + * @author thomas.diesler(a)jboss.com + * @since 12-Jul-2009 + */ +public class BlueprintTestCase +{ + @ProvideContext + public static BundleContext context; + + private static OSGiRuntime runtime; + private static Bridge huskyBridge; + + @BeforeClass + public static void beforeClass() throws Exception + { + if (context == null) + { + runtime = new OSGiTestHelper().getDefaultRuntime(); + runtime.addCapability(new HuskyCapability()); + runtime.addCapability(new BlueprintCapability()); + + huskyBridge = BridgeFactory.getBridge(); + + OSGiBundle bundle = runtime.installBundle("example-blueprint.jar"); + bundle.start(); + } + } + + @AfterClass + public static void afterClass() throws Exception + { + if (context == null) + runtime.shutdown(); + } + + @Test + public void testBlueprintBundleInstall() throws Exception + { + if (context == null) + huskyBridge.run(); + + assumeNotNull(context); + + Bundle bundle = context.getBundle(); + assertEquals("example-blueprint", bundle.getSymbolicName()); + } + + @Test + public void testBlueprintContainerAvailable() throws Exception + { + if (context == null) + huskyBridge.run(); + + assumeNotNull(context); + + ServiceReference sref = context.getServiceReference(BlueprintContainer.class.getName()); + assertNotNull("BlueprintContainer service not null", sref); + + BlueprintContainer bpContainer = (BlueprintContainer)context.getService(sref); + assertNotNull("BlueprintContainer available", bpContainer); + } + + @Test + public void testServiceA() throws Exception + { + if (context == null) + huskyBridge.run(); + + assumeNotNull(context); + + ServiceReference sref = context.getServiceReference(ServiceA.class.getName()); + assertNotNull("ServiceA not null", sref); + + ServiceA service = (ServiceA)context.getService(sref); + MBeanServer mbeanServer = service.getMbeanServer(); + assertNotNull("MBeanServer not null", mbeanServer); + } + + @Test + public void testServiceB() throws Exception + { + if (context == null) + huskyBridge.run(); + + assumeNotNull(context); + + ServiceReference sref = context.getServiceReference(ServiceB.class.getName()); + assertNotNull("ServiceB not null", sref); + + ServiceB service = (ServiceB)context.getService(sref); + BeanA beanA = service.getBeanA(); + assertNotNull("BeanA not null", beanA); + } +} \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/BeanA.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanA.java 2009-07-22 06:02:38 UTC (rev 91539) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/BeanA.java 2009-07-22 09:06:17 UTC (rev 91542) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.osgi.blueprint.container.bundle; +package org.jboss.test.osgi.example.blueprint.bundle; import javax.management.MBeanServer; @@ -38,7 +38,6 @@ public BeanA() { - System.out.println("new BeanA"); } public MBeanServer getMbeanServer() @@ -48,7 +47,6 @@ public void setMbeanServer(MBeanServer mbeanServer) { - System.out.println("BeanA: setMbeanServer"); this.mbeanServer = mbeanServer; } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/BeanB.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanB.java 2009-07-22 06:02:38 UTC (rev 91539) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/BeanB.java 2009-07-22 09:06:17 UTC (rev 91542) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.osgi.blueprint.container.bundle; +package org.jboss.test.osgi.example.blueprint.bundle; //$Id$ @@ -36,7 +36,6 @@ public BeanB() { - System.out.println("new BeanB"); } public BeanA getBeanA() @@ -46,7 +45,6 @@ public void setBeanA(BeanA beanA) { - System.out.println("BeanB: setBeanA"); this.beanA = beanA; } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/ServiceA.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/ServiceA.java 2009-07-22 06:02:38 UTC (rev 91539) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/ServiceA.java 2009-07-22 09:06:17 UTC (rev 91542) @@ -19,8 +19,10 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.osgi.blueprint.container.bundle; +package org.jboss.test.osgi.example.blueprint.bundle; +import javax.management.MBeanServer; + //$Id$ /** @@ -31,4 +33,5 @@ */ public interface ServiceA { + MBeanServer getMbeanServer(); } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/ServiceB.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/ServiceB.java 2009-07-22 06:02:38 UTC (rev 91539) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/bundle/ServiceB.java 2009-07-22 09:06:17 UTC (rev 91542) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.osgi.blueprint.container.bundle; +package org.jboss.test.osgi.example.blueprint.bundle; //$Id$ @@ -31,4 +31,5 @@ */ public interface ServiceB { + BeanA getBeanA(); } \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/blueprint-example.xml (from rev 91539, projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/container/OSGI-INF/blueprint/basic-service.xml) =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/blueprint-example.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/blueprint-example.xml 2009-07-22 09:06:17 UTC (rev 91542) @@ -0,0 +1,19 @@ +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"> + + <bean id="beanA" class="org.jboss.test.osgi.example.blueprint.bundle.BeanA"> + <property name="mbeanServer" ref="mbeanService"/> + </bean> + + <service id="serviceA" ref="beanA" interface="org.jboss.test.osgi.example.blueprint.bundle.ServiceA"> + </service> + + <service id="serviceB" interface="org.jboss.test.osgi.example.blueprint.bundle.ServiceB"> + <bean class="org.jboss.test.osgi.example.blueprint.bundle.BeanB"> + <property name="beanA" ref="beanA"/> + </bean> + </service> + + <reference id="mbeanService" interface="javax.management.MBeanServer"/> + +</blueprint> \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd (from rev 91539, projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/container/container-basic.bnd) =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd 2009-07-22 09:06:17 UTC (rev 91542) @@ -0,0 +1,23 @@ +# bnd build -classpath target/test-classes -output target/test-libs/example-blueprint.jar src/test/resources/blueprint/example-blueprint.bnd + +Bundle-SymbolicName: example-blueprint + +Export-Package: org.jboss.test.osgi.example.blueprint, org.jboss.test.osgi.example.blueprint.bundle + +Import-Package: \ + javax.management, \ + org.jboss.osgi.blueprint, \ + org.jboss.osgi.husky, \ + org.jboss.osgi.husky.annotation, \ + org.jboss.osgi.spi.capability, \ + org.jboss.osgi.spi.testing, \ + org.junit, \ + org.osgi.framework, \ + org.osgi.service.blueprint.* + +Include-Resource: \ + OSGI-INF/blueprint/blueprint-example.xml=blueprint-example.xml + +Test-Package: org.jboss.test.osgi.example.blueprint + +-removeheaders: Include-Resource Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd 2009-07-22 08:26:39 UTC (rev 91541) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd 2009-07-22 09:06:17 UTC (rev 91542) @@ -6,7 +6,8 @@ Export-Package: org.jboss.test.osgi.example.xml.jaxb Import-Package: com.sun.xml.bind.v2, javax.xml.bind*, javax.xml.datatype, javax.xml.namespace, \ - org.jboss.osgi.husky*, org.jboss.osgi.jaxb, org.jboss.osgi.spi.*, org.junit, org.osgi.framework + org.jboss.osgi.husky*, org.jboss.osgi.jaxb, org.jboss.osgi.spi*, \ + org.junit, org.osgi.framework Include-Resource: booking.xml, booking.xsd Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/parser/example-xml-parser.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/parser/example-xml-parser.bnd 2009-07-22 08:26:39 UTC (rev 91541) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/parser/example-xml-parser.bnd 2009-07-22 09:06:17 UTC (rev 91542) @@ -5,7 +5,7 @@ # Export the package that contains the test case Export-Package: org.jboss.test.osgi.example.xml.parser -Import-Package: javax.xml.parsers, org.jboss.osgi.*, org.jboss.osgi.spi.*, org.jboss.osgi.xml, \ +Import-Package: javax.xml.parsers, org.jboss.osgi.*, org.jboss.osgi.xml, \ org.junit, org.osgi.framework, org.w3c.dom*, org.xml.sax*

16 years, 5 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 July 2009