Author: thomas.diesler(a)jboss.com Date: 2010-04-15 09:47:17 -0400 (Thu, 15 Apr 2010) New Revision: 104000 Added: projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix.png projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXMBeanServerTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXStandardTestCase.java Removed: projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix-equinox.png projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix-felix.png projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix-jbossmc.png projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java Modified: projects/jboss-osgi/trunk/distribution/docbook/.gitignore projects/jboss-osgi/trunk/distribution/docbook/en/images/jmx-agent-view.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/ch070-provided-bundles.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml Log: Update userguide Modified: projects/jboss-osgi/trunk/distribution/docbook/.gitignore =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/.gitignore 2010-04-15 13:45:28 UTC (rev 103999) +++ projects/jboss-osgi/trunk/distribution/docbook/.gitignore 2010-04-15 13:47:17 UTC (rev 104000) @@ -1,2 +1,3 @@ /target /.settings +/target Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix-equinox.png =================================================================== (Binary files differ) Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix-felix.png =================================================================== (Binary files differ) Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix-jbossmc.png =================================================================== (Binary files differ) Added: projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix.png =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix.png (rev 0) +++ projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix.png 2010-04-15 13:47:17 UTC (rev 104000) @@ -0,0 +1,117 @@ +�PNG + + +AAAAAAo��߸ + +�����r��?s�N������$I~���8e���$I���A�YYY���;������� +{{{,����$ɀ� + +�G��P^
$I�������l����B����@�r�\����C�G,6'644h��/��\�b>U}}����Ju����/��RC.Z�g�>}:nz�P����-[�P(H�,++�*7bCC��w� +��l���lj���8��v�p�(�j�aÆyyy��~���HkW��.mw�h��ꕣ�6�е"w�!++K(R�zӧOW�<eʔU�V +8��ؘ ���������>�����Y�p�J�����MOO�A��˫_�~8q���nnnXRzzzmm-^+��h����?j���'�̝;w�ܹ�S��������X���'����,]�4...//� ���������r<�{m�N���<QQQ�T&&&���ڈ���QN�>��������pbpp0~�q86���,�W�^���������FFF2�����رc8�B�Ц�Tn�ֲQS �@�<<<�ϟ�e�T���]ڑ�iw�Ѳu�AC��7oއ~�>*svvV����o������Vy���O�� �2TbJJ +��Q������ϟ�m+++��{AE����ݻwB���� + +ݳg��]�v�ڵ���|�ĉS�N�2e +�ϯ�Ӊ�{���=1<��P�5�R�@ PN������K}������2�
ddd�?�����'5���O_~���۷kkkB,k�ΝT�{m�T���]ڑ�iw�i������b�Ç�����U�122�-~"S�a�ill��(WqW�r~�,�D�~��'666'O����p:��?�����'M�t��1���<�x9�a�P�޽�ϣ�g���7�|��w�pԨQvvvW�\i�sK˜b���F�\N�C;���]ڑjiw��,mDW7���9ި���J��o=^�x��GjD��|��W��ӧO��w�$����؈oddD�cGPYا����_����y��͛7��˗�������Qy�֭��4??���#��$VUU�P(��hyy���X�hѢE�:�&)))�с�b�ٳg���yyym +ZB�� +�a�L&[�fMRR��m-�6w��>���˿�ekkkjj�caRR��+z<JGQ�ە1b�(..f)�����ׯ_�~���b����� +5UC�]��������ҥK�R�˗/S�^�HD����jY����C�:t(99���jѢE?��snn�ȑ#�bj��/G՞P(LMM�Nu�ܹn><x��bU�����…)))8���x�������w6m��7�}:K[��J���x<�BQ\\��Gᡑ��C�%���0` +n������`���:u���}�رG��r�����F�}���?��چ��)�4h�ȑ#��]]]:~[ks�r8�l�����ٳZ��Ś�7�Vx����1c�T* +��Գ �������%K�(��ٳ���Z�rx}}�����Ǫg�R233-Z�V1/^�GiY'� �J�L���РP(��򼽽O�<I�dEEň#��hCCCHHHBB�\. ٰaC]]I����3g�<p� +_�x�����34�������[�!t��
���H�X����̙3~�x//�[�n�dV?���n���Ǐ�1c~��P��J� I����^^^[�n%IR]�zʵk� + +cbb���i4��ѣ��۷s�N�$����l���5B�����������w�^]]�֭[�M���U||��9s�s�j���]HH�����Ԁ��~�����N�6���i���R��U��mM~��m&�9~���j�������Z��gee���͟?���5**jÆ +~~~���555�M��Q�����D"�&�$I޺u�=��:aVVֲe�f̘�m�6\�gΜY�t)B���ӧO�\�� +������r��Q�F���PF��q�ر������s��a;�������;w�a'崴�͛7߹s���455U��;v찶������������x���,��LLL2dȽ{����s�� +���#�?~�m۶�w����'--M���˨^'׮]���LMM��xYYY�����Srss'N��l����$�J_�|9r�H___oo�5k�$&&������577��"�v����rǍ�p��EN�0���G=�������m����Kmv�Xj�z�*�Ŷƽn���|������)��i�]?~��������Ā� +���t:].������b�8;;��� �LMM���q,��d�+P� (��׶���ӗ/_�dɒK�.ݹsGC0���\.W����ɓ'/]�t���o�[:�>}�t�a�D"Q��� +����4��w�urr‰�E�9�B�P,X� 11111��ɓ˗/wwwONNvvv�|�2�Oj.�����R�"##��w����:��h +�B]�z���Kjj��Z���p����hҤI�6m���:4z����Te%YYYmmlKK���JjȠ�W�aW���Po-�5B觟~��Z<mFFF^^ޣG�.^���a��W�C�#�rhӾ�)B�������������Qw�����-}�I�dJJ���� �(++#I�����ݻ�ρ��x�LV__��%�]999ӧO + +�p8���-vc +�c +!//�3g���������-[�>|8(((&&���{��8�O�<����D=|�P�˛��s�Ή�b�X�����*��S�L�"�H�����F<�]�bźu��tz���w��QTT���iiiC����122�����&yyy���Ӳ� +ş�)��&N�x��-�@���t��u???mv�X�� +Wr�m]UU�gO���;�իW$Ijhuԛ@� +�~xPPЗ_~9r�H��ZZ��d2�������?~����g
�x�|W���������K����mll|}}U򇅅��绻�����,D���,Y�$%%������+&&fÆ +��f��r�ʕ+w��@�т���}��#FDDD$$$M�yϞ=*���`C���������g��^�������h�N8΃�?88x�ԩNNN*�.\���:}��֭[}||�Ri���W�X1k�,�И1c>���E�������q��mݺ�N��8qb˖-���t:�����ѣ�4X3"�h„ ���666�W�$IrѢEC�mll|��J�Rox�r�ʕk׮Ui�s��ݹsg�ر�'2��obb�����.���kkGM�6M� (1�7L�
b��������?���-�o�>www.��}���+W^�~� +4z +B'Nttt<y�$5�ٷoߘ1c�����ï^���pF����x@��B�N���R�>���M��ZQQQVV�l�2'''kk�Q�F������b% ��W������U�����������p�1b�r�6 V/�r.^����b���<t��
�=#����V��$1S�L���F���!�gϞ�۷#����B���˗/���\�t)uHlllCCA2��ڵk�ÇϜ9S�P������������������[��źz��w��8|��o���jnn�7o^qq1���p8���W�^-,,LMM�9s�@ (,,�=��󴻘V"�<y�KD�����?hР��|�A*�Ι3���������?>%%%..����߶mB���e������� (/s��Q������������&..!4�����G�͞=!��7�444P�<877���(44!t��-�$,X�z---?��
�����֋/~��iZZZ;f4EEE�6m:v�XQQQqq1A���?��3�[YY�`�l����n)��H1[�f���� +Aii)��W����n�`��fff��4m���{�.++[�p��Ǐ ����c0��v.RR���vedd�d2�����d27n܈���O�?�p��
A��y�D"��_{���t�TJĆ +�x�wV�\���X�bɒ%�'O���)((��~ii�'��!�boߝ�;v�B������cǪ�m�`��l6[e���ett4B(-- +!�f͚aÆA +�g�,�}h��իW� �iv[�7h� *�m۶�ԩS2�� j� +]TL77�C������cǎ}��r\n�`��-2gΜ�۷��|&���G���aoo?p�@���?���������G}��G���x����/ �B�P�>}:�����\,��ϟ�g��I$��Ԡ��ŋǏ722:w�\QQ^Ւ.*&����999L&���Yyo�+OR������M�R)5$
��:�����Z�jUaaaMMMRR���>|��a�<== ����[�n���2�,66?KǍ�Ae��477�������ϟ�ٳG�q��>����ryee��ӧ5� +�s1333f�N�Sz�Ri��vQ1`kk���]PP0z�h���"%%%x��_`��L +�C������III�E�9;;���'O��xx�Z�Q�B|||FFB��>#a�
�fҪ�U��q���?���ܼS>� + +� +_�x�����3>��㲲�u�����nٲ%+++,,l������QQQ6l���������A8p������#22R,�_=??��/�@L�2���%""B$�$������u�V�$�|��9sƏ���u��-��zJqq�\.7n����$SSS���gjj:m�4����� �P']�J]C�:�TUJJ������AG�?~���T�M��3III������jqoZZ��͛�ܹcjj����c�kkk����Ǐ��ߟ�����������������������Y,֏?��A�ÇO�:�믿���C�]�v-33355���eee%'''&&2�޽{{�����)������/^LJJ�z�jRRREE�����p8/_�DM�0���G���"U�Z�٥�JJJD"Q``�����m� + +�5親6��NA�� +)�6���b$��m���tz�� +�b��������'O�\�|�6bh4��PIQ(��������Η/_&IR=%//�ٳg�(&�I���eee%�����j_u�*��OgGT���/ `��
������������T
�� +�����ݽ{W�Z�6g���:s�LCC�T*������ѐ9))����d��Ǐ{{{{xx�;wN,�����D��9|�pPPPLLLQQ�\.WOy���ƍ�R�X,>{�l@@�ĉoݺ%����_����צ +�"U�j��NQ���w��톆�L���<z�hu +������ ƎK����mll|}}[n���+WΞ=[��|}}���h4ZPPлﾫ!���ǬY����/__߅���<��:u���SDDDBBA���A,\�P%%444??���t:=,,�L�W�$IrѢEC�mS�t�*lll���)����O���͛G���T�Sy^sv��Qw��]�h�� +P�g��5�>���ӵk��ڠT�tU0��233A�zK� +]��P���L��#�Vy�1K7 T�tU0� +��� ���_k�q?��HJ���5"��22����ߟ�z{��*}R
�C�O���[$%�z�l���Ϭͼ7�Ѐ�00(�IY��n��Do�P�O� @��� Y��^���L�1�3������v5�EGUՉBq'3�%�J�T�[���-)*�#v�_26�� �gL7�M���0�M76����dĤ1贂g��M{����J@�>��f�c���ͭ�>1v�ƣ
���P���߄Q� G�.�l&b�a` W�{�fg?ol��J@�>�������L&���ruu������<t萺� +eW��g��Sr�̙�K�"�<x0}�t�L֎"�������.� +r�_�PNd�iB����J�2���%�J�T�n�P��9}�tyy����ϝ;�����p?u��ٳg��W�nܸq�Ν-�ںf؆�����"$�|��IB���B5 +�HJJdH��,W���L��+��uG ��'U:=�P����˛?>��433 + +�|���M^^��O�{���7�L�<y�ҥÇoka� +"����U�Ĉ��b �$RR &%RR B�F���I�(%���ԁ?1x@'V��(
U��J����� +EB�H$n��� +E��z���(��w�7mtG ��'U:=��̿��o](��'��Ow�E�UH(FQH��0�6c�}��mP��I� :��� ����2%uA�֭����1���g57UWUU�P�O�z�Bw`�ϟĹr����!T+B�ڲZ_�9�/!��^���[ +�Q�A���(
U�� +D���B&}̦��Y��g}c���O��HRW�����d<����œ:��ZTw��*}R
�CXXXX <�3�cfeQ�jh �211����&}��M͘l��kQ�Q��I�NjZ��䛊�T�*���4�n�R����� +� +Sߕ���=��� +��[U7�i����������٭e��op�U����� ���jjjV�X���q���)�ݚ
woP�ߪzd����-,,��ۧ� +up���~M�woP�תz�B�
������}��uܿ[3�� +��[U�,+33�� +D� +�&��T鷪7V���WU�� +ܽ
+ܽ!@t9��Ȝ�����K33��8���!��ի��b�T�b���~tS�{����G榦���x�������D���MMM������!���������T�� � �qd>{������r���
��f��fff���FFF������";;������G7U��7��@w������:��222266666�ݒ���כ��^�r�{�G7U��w�YYY�/>q�D\\�.�Gw����FSS��200022���b0�O�WUUq8�����]]?�� +ܽ{|�5j��͛u�<�o<2`�z�7a�b��{�YL�I�Ǒ�Ď���w��gnnN�$~P��t���� ��ĝgc2��������G7U�N��* +���_|�B���`ʔ)..."��$���X//��[��$����̙3~�x//�[�n!��S�������ϟ����a�???����B�e�///�Ç��H:��lhh���(�H������D!�D�_(# + ��H$]�޺� +���ެA<|��ԩS����\.?t�еk�233SSSy<^VVVrrrbb�!C�ݻ�gϞ7n ��SB�?޿jjjbbb@@ +ܽu�6bڴi}��E-X�������ա��x����x��6����e����UIA9;;��� �LMM���BG&�������ѧO��w��m���82c�b�X��~2777SOi�Z�U�L�������?��캨�uS�{�U����hx���P(��ݓ���ܹs��常�+W���P�߿�1J�r�������N�k��>�qd666��P*�655�h4�\�`0p?����D,K�R�?0�L�\>hР�kl�T��z ���V�Zebbr��qooo++�~�a���x*�e�6��~�z�\�m�6� +����LLL�6m�H$�9s�/��Ҧ��R��!#�K��Ѐ�"�D�B�M��F�H�ܝ��R����Q,�X,��$�SZ9���Ժ�J[MgU�z����5k�_����p�B� <x�]y����N�������@Dtt4A.TI�p�����~���ӓ ��˗[Z��UG��b���� +@*���r<��f��)-��L&~��՟n�MUܽ{z��wOXXXXX�ʮ�����h�O��W�*gPOqwwwww��99�:�oIB�������+��82���R3y� �2� ���T*����������MU�h���ӧk׮�������#�a�D"����L&�A=�q�
TVV���vu��*p���
���!33S}젛�#�3������'�JE"�H$�z�H$��}��J��uS�{�� \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/jmx-agent-view.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 2010-04-15 13:45:28 UTC (rev 103999) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml 2010-04-15 13:47:17 UTC (rev 104000) @@ -140,7 +140,7 @@ ========================================================================= -13:10:35,143 INFO [OSGiBundleManager] JBossOSGi Core Framework - 1.0.0.Alpha3 +13:10:35,143 INFO [OSGiBundleManager] JBossOSGi Core Framework - 1.0.0.Alpha4 ... 13:10:36,405 INFO Start DeploymentScanner: [scandir=.../server/default/deploy,interval=2000ms] 13:10:36,416 INFO Bundle STARTED: Bundle{system.bundle-0.0.0} @@ -165,20 +165,20 @@ deployment is verified by an accompaning test case</para> <itemizedlist> - <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">InterceptorTestCase</emphasis> - Intercept and process bundle metadata</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">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">ServiceLoaderTestCase</emphasis> - Autoregister META-INF/services</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">TransactionTestCase</emphasis> - A simple transaction test</listitem> - <listitem><emphasis role="bold">WebAppTestCase</emphasis> - A web application (WAR) test</listitem> + <listitem><emphasis role="bold">blueprint</emphasis> - Basic Blueprint Container examples</listitem> + <listitem><emphasis role="bold">event</emphasis> - EventAdmin examples</listitem> + <listitem><emphasis role="bold">http</emphasis> - HttpService examples</listitem> + <listitem><emphasis role="bold">interceptor</emphasis> - Examples that intercept and process bundle metadata</listitem> + <listitem><emphasis role="bold">jmx</emphasis> - Standard and extended JMX examples</listitem> + <listitem><emphasis role="bold">jndi</emphasis> - Bind objects to the Naming Service</listitem> + <listitem><emphasis role="bold">jta</emphasis> - Transaction examples</listitem> + <listitem><emphasis role="bold">microcontainer</emphasis> - JBossMC/OSGi integration examples</listitem> + <listitem><emphasis role="bold">serviceloader</emphasis> - Autoregister META-INF/services</listitem> + <listitem><emphasis role="bold">simple</emphasis> - Simple OSGi examples (start here)</listitem> + <listitem><emphasis role="bold">webapp</emphasis> - WebApplication (WAR) examples</listitem> + <listitem><emphasis role="bold">xml binding</emphasis> - JBoss XML Binding examples</listitem> + <listitem><emphasis role="bold">xml jaxb</emphasis> - JAXB examples</listitem> + <listitem><emphasis role="bold">xml parser</emphasis> - SAX/DOM parser examples</listitem> </itemizedlist> </sect1> @@ -234,26 +234,14 @@ <para>If in future we should discover a problem with a previous JBoss OSGi release, it will be possible to provide a patch and verify that change using the original QA environment for that release.</para> - <para>With every release we test the matrix of supported target containers, frameworks and JDKs.</para> + <para>With every release we test the matrix of supported target containers and frameworks</para> <mediaobject> <imageobject> - <imagedata fileref="images/hudson-matrix-felix.png"/> + <imagedata fileref="images/hudson-matrix.png"/> </imageobject> </mediaobject> - <mediaobject> - <imageobject> - <imagedata fileref="images/hudson-matrix-equinox.png"/> - </imageobject> - </mediaobject> - - <mediaobject> - <imageobject> - <imagedata fileref="images/hudson-matrix-jbossmc.png"/> - </imageobject> - </mediaobject> - <emphasis role="bold">Set Hudson Properties</emphasis> <para>You need to set a few properties, especially these</para> @@ -278,7 +266,7 @@ #hudson.jboss501.zip=file:///home/username/Download/java/jboss/jboss-5.0.1.GA.zip #hudson.jboss510.zip=file:///home/username/Download/java/jboss/jboss-5.1.0.GA.zip -#hudson.jboss600.zip=file:///home/username/Download/java/jboss/jboss-6.0.0.M1.zip +#hudson.jboss600.zip=file:///home/username/Download/java/jboss/jboss-6.0.0.M2.zip # JDK settings java.home.jdk15=/usr/java/jdk1.5.0_22 Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml 2010-04-15 13:45:28 UTC (rev 103999) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml 2010-04-15 13:47:17 UTC (rev 104000) @@ -72,8 +72,7 @@ </listitem> <listitem><emphasis role="bold">Local and Remote JMX Support</emphasis> - - There is local as well as remote support for JMX. Similar to <ulink url="http://http://jboss.org/jbossas">JBossAS</ulink> - the JMXAdaptor (which provides the MBeanServerConnection) is bound to JNDI. + There is local as well as remote JSR160 support for JMX. </listitem> <listitem><emphasis role="bold">JNDI Support</emphasis> - @@ -151,7 +150,7 @@ ========================================================================= -12:10:48,713 INFO JBossOSGi Core Framework - 1.0.0.Alpha3 +12:10:48,713 INFO JBossOSGi Core Framework - 1.0.0.Alpha4 12:10:49,089 INFO Bundle INSTALLED: Bundle{osgi.cmpn:4.2.0.200908310645} 12:10:49,188 INFO Bundle INSTALLED: Bundle{org.apache.felix.log:1.0.0} 12:10:49,282 INFO Bundle INSTALLED: Bundle{jboss-osgi-common:1.0.2} @@ -181,6 +180,7 @@ <para>These additional bundles are installed:</para> <itemizedlist> + <listitem><emphasis role="bold">org.apache.aries.jmx.jar</emphasis> - Apache Aries JMX services</listitem> <listitem><emphasis role="bold">org.apache.felix.eventadmin.jar</emphasis> - Apache Event Admin service</listitem> <listitem><emphasis role="bold">jboss-osgi-common-core.jar</emphasis> - JBoss Common Core functionality</listitem> <listitem><emphasis role="bold">jboss-osgi-jmx.jar</emphasis> - JBoss OSGi JMX service</listitem> 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 2010-04-15 13:45:28 UTC (rev 103999) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml 2010-04-15 13:47:17 UTC (rev 104000) @@ -29,9 +29,9 @@ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... - Common classes and interfaces.</listitem> <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... - Capabilities that can be installed in the OSGi framework.</listitem> <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... - Framework integration and bootstrap.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... - Management view on deployed bundles.</listitem> <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... - A collection of SPI provided services.</listitem> <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... - A collection of SPI provided utilities.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... - Test support classes and interfaces.</listitem> </itemizedlist> <emphasis role="bold">Bootstrapping JBoss OSGi</emphasis> @@ -86,30 +86,15 @@ <sect1 xml:id="SecJMXView"> <title>Management View</title> - <para>JBoss OSGi registers the Framework and every deployed Bundle with the JMX <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanS... + <para>JBoss OSGi provides standard <ulink url="http://www.osgi.org/javadoc/r4v42/org/osgi/jmx/package-frame.ht... management. + Additional to that we provide an <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanS... service + and a few other extensions through the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... + org.jboss.osgi.jmx</ulink> API</para> - <emphasis role="bold">The ManagedFramework</emphasis> - - <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... - ManagedFramework</ulink> gives you access to the MBean views of the deployed Bundles. It is registerd under the name:</para> - - <itemizedlist> - <listitem><emphasis role="bold">jboss.osgi:service=ManagedFramework</emphasis></listitem> - </itemizedlist> - - <emphasis role="bold">The ManagedBundle</emphasis> - - <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... - ManagedBundle</ulink> gives you access to the MBean views of a deployed Bundle. It is registerd under the name:</para> - - <itemizedlist> - <listitem><emphasis role="bold">jboss.osgi:id=[BundleId],sname=[SymbolicName],version=[Version]</emphasis></listitem> - </itemizedlist> - <emphasis role="bold">Accessing the Management Objects</emphasis> - <para>If you work with the JBoss OSGi Testsuite you get access to these managed objects through the - <ulink url="http://junit.sourceforge.net/">JUnit</ulink> support package <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos...;. + <para>If you work with the JBoss OSGi runtime abstraction you get access to these managed objects through + <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos...;. </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 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 2010-04-15 13:45:28 UTC (rev 103999) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2010-04-15 13:47:17 UTC (rev 104000) @@ -36,6 +36,23 @@ <para>An example of how a bundle uses the HttpService to register servlet and resources is given in <link linkend="SecHTTPServiceExample">HttpService Example</link>.</para> + <para>The HttpService is configured with these properties.</para> + + <table> + <tr><th>Key</th><th>Value</th><th>Description</th></tr> + <tr valign="top"> + <td>org.osgi.service.http.port</td> + <td>8090</td> + <td>The property that sets the port the HttpService binds to</td> + </tr> + </table> + + <para>The service is registered with the Framework under the name</para> + + <itemizedlist> + <listitem><emphasis role="bold"><ulink url="http://www.osgi.org/javadoc/r4v42/org/osgi/service/http/HttpSer... + </itemizedlist> + </sect1> <sect1 xml:id="SecBundleJAXB"> @@ -58,8 +75,10 @@ <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/MBeanSer... with the framework. - It also tracks the naming service and binds the RMIAdaptor into JNDI for remote JMX access</para> + By default, it also sets up a remote connector at:</para> + <para><emphasis role="bold">service:jmx:rmi://localhost:1198/jndi/rmi://localhost:1090/osgi-jmx-connector</emphasis></para> + <para>The JMX Service is configured with these properties.</para> <table> @@ -67,17 +86,17 @@ <tr valign="top"> <td>org.jboss.osgi.jmx.host</td> <td>localhost</td> - <td>The property that sets the host that the RMIAdaptor binds to</td> + <td>The property that sets the host that the JMXConnector binds to</td> </tr> <tr valign="top"> - <td>org.jboss.osgi.jmx.port</td> - <td>1098</td> - <td>The property that sets the port that the RMIAdaptor binds to</td> + <td>org.jboss.osgi.jmx.rmi.port</td> + <td>1198</td> + <td>The property that sets the port that the JMXConnector binds to</td> </tr> <tr valign="top"> - <td>org.jboss.osgi.jmx.rmi.adaptor</td> - <td>jmx/invoker/RMIAdaptor</td> - <td>The property that sets the JNDI name the RMIAdaptor binds to</td> + <td>org.jboss.osgi.jmx.rmi.registry.port</td> + <td>1090</td> + <td>The property that sets the port that the RMI Registry binds to</td> </tr> </table> @@ -85,8 +104,10 @@ <itemizedlist> <listitem><emphasis role="bold"><ulink url="http://java.sun.com/javase/6/docs/api/javax/management/MBeanSer... - <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... - <!-- https://jira.jboss.org/jira/browse/JBOSGI-125 --> + <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... + <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... + <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... + <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jbos... </itemizedlist> </sect1> 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 2010-04-15 13:45:28 UTC (rev 103999) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2010-04-15 13:47:17 UTC (rev 104000) @@ -13,8 +13,8 @@ integrated in our <ulink url="http://www.jboss.org/community/docs/DOC-13275">Maven Build Process</ulink> and <ulink url="http://www.jboss.org/community/docs/DOC-13420">Hudson QA Environment</ulink>.</para> - <para>The examples can be either run against an embedded OSGi runtime or against - a remote OSGi runtime. Here is how you build and run the against the embedded runtime.</para> + <para>The examples can be either run against an embedded OSGi framework or against + the remote OSGi Runtime. Here is how you build and run the against the embedded framework.</para> <programlisting> [tdiesler@tddell example]$ mvn test @@ -51,8 +51,8 @@ <listitem>runtime</listitem> <listitem>jboss501</listitem> <listitem>jboss510</listitem> - <listitem>jboss520</listitem> <listitem>jboss600</listitem> + <listitem>jboss601</listitem> </itemizedlist> <para>To run the examples against a different OSGi Framework, you need to define the Deleted: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java 2010-04-15 13:45:28 UTC (rev 103999) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java 2010-04-15 13:47:17 UTC (rev 104000) @@ -1,101 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.example.enterprise.jmx; - -//$Id: JMXTestCase.java 95465 2009-10-23 05:59:57Z thomas.diesler(a)jboss.com $ - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.openmbean.TabularData; - -import org.jboss.osgi.jmx.JMXCapability; -import org.jboss.osgi.jmx.MBeanProxy; -import org.jboss.osgi.jmx.ObjectNameFactory; -import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiRuntimeHelper; -import org.jboss.osgi.testing.OSGiRuntimeTest; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osgi.jmx.framework.BundleStateMBean; - -/** - * A test that deployes a bundle that registeres an MBean - * - * @author thomas.diesler(a)jboss.com - * @since 15-Feb-2010 - */ -public class JMXEnterpriseTestCase extends OSGiRuntimeTest -{ - private static OSGiRuntime runtime; - - private BundleStateMBean bundleState; - - @BeforeClass - public static void setUpClass() throws Exception - { - OSGiRuntimeHelper helper = new OSGiRuntimeHelper(); - runtime = helper.getDefaultRuntime(); - runtime.addCapability(new JMXCapability()); - } - - @AfterClass - public static void tearDownClass() throws Exception - { - runtime.shutdown(); - runtime = null; - } - - @Test - public void testBundleStateMBean() throws Exception - { - BundleStateMBean bundleState = getBundleStateMBean(); - assertNotNull("BundleStateMBean not null", bundleState); - - TabularData bundleData = bundleState.listBundles(); - assertNotNull("TabularData not null", bundleData); - assertFalse("TabularData not empty", bundleData.isEmpty()); - } - - private BundleStateMBean getBundleStateMBean() throws Exception - { - if (bundleState == null) - { - int timeout = 5000; - MBeanServerConnection mbeanServer = runtime.getMBeanServer(); - ObjectName objectName = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME); - while (bundleState == null && 0 < (timeout -= 200)) - { - if (mbeanServer.isRegistered(objectName)) - { - bundleState = MBeanProxy.get(mbeanServer, objectName, BundleStateMBean.class); - break; - } - Thread.sleep(200); - } - } - return bundleState; - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXMBeanServerTestCase.java (from rev 103999, projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXMBeanServerTestCase.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXMBeanServerTestCase.java 2010-04-15 13:47:17 UTC (rev 104000) @@ -0,0 +1,74 @@ +/* + * 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.jmx; + +//$Id$ + +import static org.jboss.test.osgi.example.jmx.bundle.FooMBean.MBEAN_NAME; +import static org.junit.Assert.assertEquals; + +import org.jboss.osgi.jmx.JMXCapability; +import org.jboss.osgi.jmx.MBeanProxy; +import org.jboss.osgi.jndi.JNDICapability; +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeHelper; +import org.jboss.test.osgi.example.jmx.bundle.FooMBean; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * A test that deployes a bundle that registeres an MBean + * + * @author thomas.diesler(a)jboss.com + * @since 12-Feb-2009 + */ +public class JMXMBeanServerTestCase +{ + private static OSGiRuntime runtime; + + @BeforeClass + public static void setUpClass() throws Exception + { + runtime = new OSGiRuntimeHelper().getDefaultRuntime(); + runtime.addCapability(new JNDICapability()); + runtime.addCapability(new JMXCapability()); + } + + @AfterClass + public static void tearDownClass() throws Exception + { + runtime.shutdown(); + runtime = null; + } + + @Test + public void testMBeanAccess() throws Exception + { + OSGiBundle bundle = runtime.installBundle("example-jmx.jar"); + bundle.start(); + + FooMBean foo = (FooMBean)MBeanProxy.get(runtime.getMBeanServer(), MBEAN_NAME, FooMBean.class); + assertEquals("hello", foo.echo("hello")); + } +} \ No newline at end of file Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXStandardTestCase.java (from rev 103999, projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXStandardTestCase.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXStandardTestCase.java 2010-04-15 13:47:17 UTC (rev 104000) @@ -0,0 +1,74 @@ +/* + * 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.jmx; + +//$Id: JMXTestCase.java 95465 2009-10-23 05:59:57Z thomas.diesler(a)jboss.com $ + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + +import javax.management.openmbean.TabularData; + +import org.jboss.osgi.jmx.JMXCapability; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiRuntimeHelper; +import org.jboss.osgi.testing.OSGiRuntimeTest; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.osgi.jmx.framework.BundleStateMBean; + +/** + * A test that deployes a bundle that registeres an MBean + * + * @author thomas.diesler(a)jboss.com + * @since 15-Feb-2010 + */ +public class JMXStandardTestCase extends OSGiRuntimeTest +{ + private static OSGiRuntime runtime; + + @BeforeClass + public static void setUpClass() throws Exception + { + runtime = new OSGiRuntimeHelper().getDefaultRuntime(); + runtime.addCapability(new JMXCapability()); + } + + @AfterClass + public static void tearDownClass() throws Exception + { + runtime.shutdown(); + runtime = null; + } + + @Test + public void testBundleStateMBean() throws Exception + { + BundleStateMBean bundleState = runtime.getBundleStateMBean(); + assertNotNull("BundleStateMBean not null", bundleState); + + TabularData bundleData = bundleState.listBundles(); + assertNotNull("TabularData not null", bundleData); + assertFalse("TabularData not empty", bundleData.isEmpty()); + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2010-04-15 13:45:28 UTC (rev 103999) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2010-04-15 13:47:17 UTC (rev 104000) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.osgi.example.jmx; - -//$Id$ - -import static org.jboss.test.osgi.example.jmx.bundle.FooMBean.MBEAN_NAME; -import static org.junit.Assert.assertEquals; - -import org.jboss.osgi.jmx.JMXCapability; -import org.jboss.osgi.jmx.MBeanProxy; -import org.jboss.osgi.jndi.JNDICapability; -import org.jboss.osgi.testing.OSGiBundle; -import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiRuntimeHelper; -import org.jboss.test.osgi.example.jmx.bundle.FooMBean; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * A test that deployes a bundle that registeres an MBean - * - * @author thomas.diesler(a)jboss.com - * @since 12-Feb-2009 - */ -public class JMXTestCase -{ - private static OSGiRuntime runtime; - - @BeforeClass - public static void setUpClass() throws Exception - { - runtime = new OSGiRuntimeHelper().getDefaultRuntime(); - runtime.addCapability(new JNDICapability()); - runtime.addCapability(new JMXCapability()); - } - - @AfterClass - public static void tearDownClass() throws Exception - { - runtime.shutdown(); - runtime = null; - } - - @Test - public void testMBeanAccess() throws Exception - { - OSGiBundle bundle = runtime.installBundle("example-jmx.jar"); - bundle.start(); - - FooMBean foo = (FooMBean)MBeanProxy.get(runtime.getMBeanServer(), MBEAN_NAME, FooMBean.class); - assertEquals("hello", foo.echo("hello")); - } -} \ No newline at end of file