[jboss-osgi-commits] JBoss-OSGI SVN: r104000 - in projects/jboss-osgi/trunk: distribution/docbook/en/images and 3 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Thu Apr 15 09:47:22 EDT 2010
Author: thomas.diesler at 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òùüAYYY½óÎ;ÕÕÕø¨
+{{{,©¼¼$É
+
+ð£GÖP^$I
áììlB´ @ûr¹\òðáCG,6'644h§/ÿ\±b>U}}½JuÅÆÆâ/¿üRC.Z´g>}:nz¡Pèèè-[¦P(H,++£*7bCCþówÞ
+
øl÷ïßÇþþþ8¥ÅvÔpãµ(j¾aÃyyyáí~úÔHkWÑò.mwÍhßÜ꣥6Íе"wÿ!++K(R«zÓ§OWÉ<eÊU«V
+8ÐØØ úúú¼ë³Ï>£Óÿ¾â¬Y³pJ¥éééêMOOÇAÔËË«_¿~8qàÀnnnXRzzzmm-^+¥Ñhÿïÿý?jÖóÉ'Ì;wîܹ£S¦®®®ÔX¯ã'°ö¤Ä,]º4...// ÂÂÂòòòòòr<Þ{mN¼©â<QQQøT&&&ü±æÚþQN>³¬¬¬pbpp0~îq86ñ,ºW¯^¹¹¹¹¹¹FFF2¬°°ðرc8B¡Ð¦Tn¼Ö²QS @<<<æϯeÑT®¢Í]Úiw÷ѲuÉAC7oÞ~¨>*svvVþ³´´oôïßßÖÖVyÃÕÕO½¨ 2TbJJ
+ÃQÏðüùóçÏãm+++®{AE»»ûÝ»wBþù§ö
+
+ݳg®]»víÚµËÜÜ|âÄS§N2e
+îϯÍÓ{öìþ=1<òÄPá¯5¤R©@ PNÅÊöêÕK}¹ºõÚ2ddd?þÁþù'5ÀÖO_~ùåíÛ·kkkB,kçÎTÇ{mÑT®¢Í]Úiw÷i¶öââbíÃòÍÍÍêU122Â-~"S¥aÔill¤ò(WqW r~ª,Dû~òÉ'666'Oüí·ßp:Ï?þüùóç'MtìØ1ñÚ<x9üaPï޽ϣò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ä
+¨aL&[³fMRRîùm-6wéé>¥Ë¿¬ekkkjjcaRRò+z<JGQïÛ1bÞ(..f)ñàÁëׯ_¿~½¢¢bðàÁøÅ
+5UC]»ÖÅÅÅÅÅåÒ¥KRË/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<IdEEÅ#°ÏhCCCHHHBB\. Ù°aC]]Iååå3gÎ<pà
+_¼x±··÷34þñÇ[·!tàÀÈÈH±XÌçóçÌ3~üx//¯[·n©dV?¼®®nÁãÇ1c~ªPËÀJÕ I±±±^^^[·n%IR]zʵk×
+
+cbbi4ÚèÑ£÷íÛ·sçN$«««Ùl¶µµ5BÈØØø«¯¾²··¿wï^]]ÝÖ[±MU||ü9sðsj]HHºæÔÔÔ~ýúN6Çã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ÕÔÔPFqìرÌÌÌ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áÂEN0ÁÇÇG=½¢¢ÃáàmóòåKmvµXjõz£*¹Å¶Æ½nûöí|òê½ÿ¾©©)Ãi±]?~¼ÿþÔÔÔÄÄÄ
+t:].óùüÑb»8;; LMM½½½q,ÉdØ+P¹ («Û׶ïôéÓ/_¾dÉK.ݹsGC0®®®\.W¹ê¾ùæÉ'/]ºtøðáoã[:>}úta¿D"QÏÖÚ
+Çãñð4þÝwßurr¸Eµ9B¡P,X° 11111ñäÉË/wwwONNvvv¾|ù2Oj.æR»"##ÿýw¤ä§üÚ:¡Ñh
+
B]zKjjª²Zì¹ÊápðÄÈÈhÒ¤I6múî»ï:4zôèÔÔTe%YYYmmlKKËÊÊJjÈ ìW®aW¥ÖPo-¶5Bè§~úàZ<mFFF^^Þ£G.^¼£açW¾CÔ#¬rhÓ¾Ô)B¨´´ôöíÛþþþQw¾£¼¼ü-}ÍIdJJÊðáà (++#I²¶¶öîÝ»êÏøøxLV__éÒ%å]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ûöíÓ²
+Åþ)É&NxëÖ-@ÐÔÔtýúu???mvµXêë
+Wrm]UU
gO¥;öÕ«W$IjhuÔ@Ã
+£~xPPÐ_~9räHì®ÖZZ»
d2Ùúõëããã?~¡gxí|WíÁûöíKÄøñãmll|}}Uò
åçç»»»ª,D
,Y²$%%ÅÚÚÚËË+&&fÃ
+ÚÎf³årùÊ+wïÞ@£ÑÞ}÷Ý#FDDD$$$MyÏ=*«¼`CùúúªÚõÙg^½úÀhN8Îð?88xêÔ©NNN*.\¨:}úôÖ[}||¤RiÿþýW¬X1kÖ,Ð1c>þøãEÕ××ÓéôqãÆmݺN§8qbË-ÞÞÞt:ÝÑÑñèÑ£Ô4X3"h ¹¹¹666«W¯$IrÑ¢ECmll|í®ÖJRoxýråÊk×®UiësçÎݹsgìر'2øùobb£Þ.¿þúkkGM6M¥ (1ê7LbóæÍÊËê·ëÏ?ÿÜÚ-´oß>www.»}ûö+W^¿~
+4z
+B'Nttt<yò$5Ù·oß1cìììÂÃï^½ÊápF
Çäx@íB§N¢öR>þü¦MZQQQVV¶lÙ2'''kkëQ£F
b% ¡«W¯ÚÛÛãÃU´»áèè¢ìäp1br6 V/¯r.^¼«Çbÿ<tèô =#ìV½$1S¦LÉÎÎFõíÛ!´gÏíÛ·#B¹¹¹Ë/¯¬¬\ºt)uHlllCCA2ìÚµk¡ÃÏ9S¡PäääôïßöìÙæææêâââ¾ýö[źzõªwÆÖ8|øðo¿ýjnn7o^qq1Éäp8W¯^-,,LMM9s¦@ (,,Ä=¿Åó´»V"<yKDäú÷ï?hÐ üü|A*Î3§©òªðþûï?>%%%..îý÷ß߶mBÈÅÅeñâÅÐö (/sÿQÂÒÒÒÒÒÒÀÀ ¦¦&..!4þüüüüGÍ=!ôÍ7ß444P<877·¨¨(44!tëÖ-$,Xz---?û쳨¨ÅÖ/~úôiZZZ;f4EEE6m:vìXQQQqq1A?ÿü3Þ[YY¹`Álñîèè¨n)êH1[Æf³
+Aii)ÏWñ¶ÍÎÎn`ª¼fffÊé4mûöí½{÷.++[¸páãÇ c0Ðv.RR³åÖveddÈd2ñùçÁd27nÜÅÊOû?üpÀAàõyD"Ë_{Ýôô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áÏçª/
BP>}:¨ÌÔÔ\,ãçÏ«g£´I$õ½Ô ýâÅÇ722:wî\QQ^Õ.*&»ÙÙÙ999L&ÓÙÙYyoû+ORÔùñÇñçM¤R)5$ö:ÊÊÊZµjUaaaMMMRRÒç>|ø°aÃ<== Ëå[·nËå2,66?KÇ×Ae¸ÿ477ÇÅÅÉåòçÏïÙ³Gùqç>ÿýïåryeeåéÓ§5
+¿s1333fNÇSz¤RiÇvQ1`kk]PP0zôhÎÜ"%%%xõ_`§ÂL
+
CÇøIII¡E9;;Ëåò'O´xxZÜQ¬B|||FFBè³Ï>#a¢¼fÒªáU®qóæÍ?üÐÜܼS>è
+
+¦
+_¼x±··÷3>þøã²²²uëÖåæænÙ²%+++,,lþüù®®®QQQ6lðóóó÷÷¯©©A8pÀÇÇÇÃÃ#22R,«_=??ÿ/¾@L2ÅÅÅ%""B$$ëáááååµuëV$ù|þ9sÆïååuëÖ-zJqq±\.7nÜþó$SSSúõëgjj:mÚ4²³³ ÑP']J]C:»TUJJ¯¯¯AG?~¼ºÝT¥M£3IIIjqoZZÚæÍïܹcjjºcÇkkkåñäãÇ÷ïßÀãñÉãñÒÓÓY,Ö?þ¨AÃÃO:õ믿ÊåòC]»v-33355Çãeee%'''&&2äÞ½{{öìÁåê)õõõÞÞÞ/^LJJºzõjRRREEÃÁàp8/_¾DM0ÁÇÇ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æLCCT*ÈÉÉÑ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Ñ¢ECmS
t*lll´×Ù)ªæïïO£ÑæÍGºÝTÕSy^sv×QwïÞ]´hѯ
+P¥gªà5§>ðôéÓµk×êÚ TõtU0ÅÐ233A¨zK
+]û
P¥ª¦LÒ#´Vy³1K7 TõtU0Å
+¦íß úäÇ_kq?HJâåå5"ò¹Æ22Úøýß½z{*}R¢CìOÌëÐ[$%ÍzÑlúþýϬͼ7ÃÐÆ00(¨IYÆÇnòDoP¥Oª @´½ Y¶ö^ÕÊØL1õ3¦ÿýÏäïv5íEGUÕBq'3Þ% JTé[è»-)*ã#vù_26£ êgL7ïM·îË0ïM76¤ÿ³dĤ1è´g¯ÌM{½£ßJ@>©êfºcÒÍÍÛ>1vúÆ£ÖýP®ØßQÝ G.l&ba` W{÷fg?olªçJ@>©Òõ¯L&ruuõ÷÷<tèº
+eW£âg£îSræÌ¥K"<x0}útLÖ"½äËÄÍÿç³.Õ
+r_¨PNdÐiB¡¨¸´JÊ2î¢ÊÕ% JTénP÷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écfeQjh 211ùûÓò&}ÌÌMÍl®kQÝQªôINjZåÉäñº£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³ÙfffFFF£ªªÊÂÂ";;»¦¦¦ÛêG7U»7î@wù庺:222266666ÆÝÀ×××^¹r¥{êG7U»wÏYYY/>qâD\\.GwËËËFSSÅ200022ÂÝb0ÔOþWUUq8ÿþ÷¿]]?º©
+ܽ{|5jÔæÍu¿<§o<2`«zô7aôbÑÌ{ÓYLIûÇÄÌ×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@@
+ܽu6bÚ´i}ûöE-X°ààÁÕÕÕ¡¡¡xúxäÈ6íéé¹eËËUIA9;; LMM½½½BG&¥§§Ñ§O»wï²Ùmøî82cb±Xû~2777SOiüZ÷ULö÷Áøã?ìì캨±uS¸{ëU Ñhx«¢P(ÜÝÝïܹsùò常¸+W®¨§P³ß¿1JÛr¹ú³®®N§kÿ©>Ýqd666ÆýP*655Ñh4¹\Î`0p?ËåD,K¥RÙ?0L¹\>hÐ ®klÝTîÞz VZebbrüøqooo++«~øaöìÙx*¾eË6½~ýz¹\¾mÛ6
+ç÷ôôLLL6mH$9sæ/¿üÒ¦ýRÌ!#ÖK¾ÌÐÆ"DBõMFHÔÜÌ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æTVVvuýè¦*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/jboss/osgi/spi/package-summary.html">org.jboss.osgi.spi</ulink> - Common classes and interfaces.</listitem>
<listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jboss/osgi/spi/capability/package-summary.html">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.Beta7/apidocs/org/jboss/osgi/spi/framework/package-summary.html">org.jboss.osgi.spi.framework</ulink> - Framework integration and bootstrap.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jboss/osgi/spi/management/package-summary.html">org.jboss.osgi.spi.management</ulink> - Management view on deployed bundles.</listitem>
<listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jboss/osgi/spi/service/package-summary.html">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.Beta7/apidocs/org/jboss/osgi/spi/util/package-summary.html">org.jboss.osgi.spi.util</ulink> - A collection of SPI provided utilities.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jboss/osgi/testing/package-summary.html">org.jboss.osgi.testing</ulink> - 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/MBeanServer.html">MBeanServer</ulink>.</para>
+ <para>JBoss OSGi provides standard <ulink url="http://www.osgi.org/javadoc/r4v42/org/osgi/jmx/package-frame.html">org.osgi.jmx</ulink> management.
+ Additional to that we provide an <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink> service
+ and a few other extensions through the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jboss/osgi/jmx/package-summary.html">
+ 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/jboss/osgi/spi/management/ManagedFrameworkMBean.html">
- 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/jboss/osgi/spi/management/ManagedBundle.html">
- 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/jboss/osgi/testing/package-summary.html">org.jboss.osgi.testing</ulink>.
+ <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/jboss/osgi/testing/OSGiRuntime.html">OSGiRuntime</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
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/HttpService.html">org.osgi.service.http.HttpService</ulink></emphasis></listitem>
+ </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/MBeanServer.html">MBeanServer</ulink> 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/MBeanServer.html">javax.management.MBeanServer</ulink></emphasis></listitem>
- <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jboss/osgi/spi/management/ManagedBundleService.html">org.jboss.osgi.spi.management.ManagedBundleService</ulink></emphasis></listitem>
- <!-- 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/jboss/osgi/jmx/FrameworkMBeanExt.html">org.jboss.osgi.jmx.FrameworkMBeanExt</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jboss/osgi/jmx/BundleStateMBeanExt.html">org.jboss.osgi.jmx.BundleStateMBeanExt</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jboss/osgi/jmx/PackageStateMBeanExt.html">org.jboss.osgi.jmx.PackageStateMBeanExt</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta7/apidocs/org/jboss/osgi/jmx/ServiceStateMBeanExt.html">org.jboss.osgi.jmx.ServiceStateMBeanExt</ulink></emphasis></listitem>
</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 at 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 at 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 at 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 at 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 at 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 at 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 at 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
More information about the jboss-osgi-commits
mailing list